Permalink
Browse files

BUGFIX:fixed various styling issues in cms (raised in SSF-188)

  • Loading branch information...
1 parent 18131ae commit 76ddb3c53bd2ea9eb72fb37f0355af5fef14e7fe jbridson committed Feb 17, 2012
Showing with 204 additions and 122 deletions.
  1. +2 −0 admin/css/ie7.css
  2. +103 −92 admin/css/screen.css
  3. +42 −6 admin/scss/_menu.scss
  4. +52 −18 admin/scss/_style.scss
  5. +2 −2 admin/scss/_tree.scss
  6. +3 −4 admin/scss/_uitheme.scss
View
@@ -12,3 +12,5 @@ html { overflow: hidden; }
.cms-content-toolbar { border-bottom: 1px solid #c9cdce; padding-bottom: 5px; }
.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { background-image: none; }
+
+.jstree li a .ui-icon { text-indent: 0px !important; }
View
Oops, something went wrong.
View
@@ -58,6 +58,7 @@
font-weight: bold;
font-size: 14px;
@include hide-text-overflow();
+ padding-top:1px;
}
}
@@ -142,7 +143,7 @@
text-shadow: lighten($color-base, 5%) 1px 1px 0;
color: $color-text-dark;
padding: ($grid-y - 1) 5px ($grid-y - 1) 8px;
- background-color: $color-base;
+ background-color: darken($color-base, 12%);
cursor: pointer;
@include background-image(linear-gradient(
@@ -212,10 +213,6 @@
}
}
}
-
- ul {
- display: none;
- }
&.current { //need to apply current stlye to flyout also (at least line height)
a {
@@ -249,7 +246,6 @@
li {
background-color: darken($color-menu-button, 10%);
-
a {
font-size: $font-base-size - 1;
padding: 0 10px 0 40px;
@@ -286,6 +282,46 @@
}
}
+ ul {
+ display: none;
+ #Menu-CMSPagesController {
+ a {
+ background-image:none;
+ font-size: 11px;
+ padding: 0 10px 0 40px;
+ height: 32px;
+ line-height: 32px;
+ }
+ }
+ #Menu-CMSPageAddController {
+ a {
+ background-image:none;
+ font-size: 11px;
+ padding: 0 10px 0 40px;
+ height: 32px;
+ line-height: 32px;
+ }
+ }
+ #Menu-AssetAdmin {
+ a {
+ background-image:none;
+ font-size: 11px;
+ padding: 0 10px 0 40px;
+ height: 32px;
+ line-height: 32px;
+ }
+ }
+ #Menu-CMSFileAddController {
+ a {
+ background-image:none;
+ font-size: 11px;
+ padding: 0 10px 0 40px;
+ height: 32px;
+ line-height: 32px;
+ }
+ }
+ }
+
/* Style applied to the menu flyout only when the collapsed setting */
ul.collapsed-flyout {
display: block;
@@ -179,6 +179,13 @@ body.cms {
}
}
}
+ .ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr {
+ border-radius:0;
+ }
+
+ .ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl {
+ border-radius:0;
+ }
}
}
}
@@ -238,14 +245,6 @@ body.cms {
border-bottom:none;
}
}
-
- .ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr {
- border-radius:0;
- }
-
- .ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl {
- border-radius:0;
- }
}
/** -------------------------------------------------------
@@ -480,10 +479,13 @@ body.cms {
float: right;
}
- .cms-tree-view-modes * {
- display: inline-block;
- label {
- color:$color-text-blue-link;
+ .cms-tree-view-modes {
+ padding-top:5px;
+ * {
+ display: inline-block;
+ label {
+ color:$color-text-blue-link;
+ }
}
}
@@ -518,7 +520,7 @@ body.cms {
}
div {
- background:url(../images/btn_icons/settings.png) 5px 4px no-repeat;
+ background:url(../images/btn_icons/settings.png) 5px 6px no-repeat;
border-left:none;
width:100%;
}
@@ -548,7 +550,6 @@ body.cms {
position: relative;
.cms-panel-header {
- padding: 0;
margin: 0 0 $grid-y - 1;
line-height: $grid-y * 3;
@@ -559,12 +560,11 @@ body.cms {
width: ($grid-x * 22);
padding: $grid-y $grid-x;
overflow: auto;
+ height:100%;
}
.cms-content-header {
background-color: darken($color-widget-bg, 40%);
- border-bottom: 2px solid darken($color-widget-bg, 50%);
-
@include background-image(
linear-gradient(darken($color-widget-bg, 20%), darken($color-widget-bg, 40%))
);
@@ -878,6 +878,13 @@ form.member-profile-form {
margin:0 0 -1px 0;
}
}
+ .ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr {
+ border-radius:0;
+ }
+
+ .ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl {
+ border-radius:0;
+ }
}
.cms {
@@ -960,15 +967,42 @@ form.member-profile-form {
width: 100%;
}
+ &#cms-content-tools-CMSPageEditController {
+ .cms-panel-content-collapsed {
+ width: 40px;
+ display: none; // Avoids FOUC
+
+ h2, h3 {
+ border-bottom: 0;
+ margin-left: $grid-y;
+ @include transform-origin(bottom, right);
+ @include rotate(270deg);
+ }
+ .cms-panel-header {
+ width: 600px;
+ position:relative;
+ top:24px;
+ right:577px;
+ text-align:right;
+ }
+ }
+ }
+
.cms-panel-content-collapsed {
width: 40px;
display: none; // Avoids FOUC
h2, h3 {
border-bottom: 0;
margin-left: $grid-y;
- @include transform-origin(bottom, left);
- @include rotate(90deg);
+ @include transform-origin(bottom, right);
+ @include rotate(270deg);
+ }
+ .cms-panel-header {
+ width: 600px;
+ position:relative;
+ right:577px;
+ text-align:right;
}
}
@@ -6,7 +6,7 @@
* but we need it earlier in order to correctly display the uninitialized tree.
*/
-.cms {
+.cms, .TreeDropdownField .treedropdownfield-panel {
.jstree {
ul {
display: block;
@@ -397,7 +397,7 @@
}
}
-.cms-tree.jstree-apple {
+.tree-holder.jstree-apple, .cms-tree.jstree-apple {
& li.Root {
& strong {
@@ -55,10 +55,9 @@
background-color: darken($color-widget-bg, 20%);
padding: 8px 8px 6px 8px;
border-bottom: 2px solid darken($color-widget-bg, 35%);
- @include linear-gradient(color-stops(
- darken($color-widget-bg, 5%),
- darken($color-widget-bg, 30%)
- ));
+ @include background-image(
+ linear-gradient(darken($color-widget-bg, 5%), darken($color-widget-bg, 30%))
+ );
border-bottom: 3px solid darken($color-widget-bg, 50%);
padding: 8px;
@include border-radius(0);

0 comments on commit 76ddb3c

Please sign in to comment.