Permalink
Browse files

ENHANCEMENT:Trac#7166 - styled the new combined tree and edit view.

  • Loading branch information...
Jeremy Bridson
Jeremy Bridson committed Apr 18, 2012
1 parent 65fc81f commit 330dd3008c8648fd1fd6ebe0a045e0278ab7eb7f
Showing with 143 additions and 19 deletions.
  1. +24 −5 admin/css/screen.css
  2. +1 −1 admin/scss/_menu.scss
  3. +117 −13 admin/scss/_style.scss
  4. +1 −0 admin/scss/themes/_default.scss
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -83,7 +83,7 @@
.cms-menu {
z-index: 80;
- background: $color-menu-background;
+ background: $color-base;
border-right: 1px solid $color-menu-border;
width: ($grid-x * 24) - 1; /* 8x24 - 1 */
View
@@ -122,6 +122,13 @@ body.cms {
.crumb {
display:table-cell;
line-height:26px;
+ padding:0 5px;
+ }
+ .crumb:first-child {
+ padding-left:0px;
+ }
+ .crumb:last-child {
+ padding-right:0px;
}
}
}
@@ -185,13 +192,6 @@ body.cms {
text-indent:0;
}
}
- .ui-state-default,
- .ui-widget-content .ui-state-default,
- .ui-widget-header .ui-state-default {
- a {
- color:$color-text-dark;
- }
- }
}
}
}
@@ -373,8 +373,8 @@ body.cms {
margin: $grid-y $grid-x*2 $grid-y*2 $grid-x*2;
height: $grid-y*4;
z-index: 70;
-
- @include box-shadow($tab-panel-texture-color 0 $grid-y*-2 $grid-y*2);
+ background-color:darken($color-widget-bg, 2%);
+ @include box-shadow(darken($color-widget-bg, 2%) 0 $grid-y*-2 $grid-y*2);
}
/** --------------------------------------------
@@ -597,7 +597,7 @@ body.cms {
* panel
*/
.cms-content-tools {
- background-color: darken($color-widget-bg, 5%);
+ background-color: $color-panel-background;
width: $grid-x * 24;
border-right: 1px solid darken($color-widget-bg, 15%);
overflow-y: auto;
@@ -1590,7 +1590,111 @@ form.import-form {
* Page Edit Controller
* -------------------------------------------- */
-.cms-container .CMSMain.CMSPageEditController {
- // Fix pixel gap between nav tree and main page header
- margin-left:-1px;
+.cms-container {
+ .CMSMain.CMSPageEditController {
+ // Fix pixel gap between nav tree and main page header
+ margin-left:-1px;
+ //Styling of tabs on page edit
+ .cms-edit-form {
+ background:darken($color-widget-bg, 2%);
+ .ui-tabs-nav {
+ float:right;
+ margin:$grid-x $grid-x*3 -1px 0;
+ li {
+ a {
+ font-weight: bold;
+ line-height: $grid-y * 2;
+ padding: $grid-y $grid-x*2.5 $grid-y;
+ }
+ }
+ .ui-state-default,
+ .ui-widget-content .ui-state-default,
+ .ui-widget-header .ui-state-default {
+ border:1px solid $color-button-generic-border;
+ }
+ .ui-state-active,
+ .ui-widget-content .ui-state-active,
+ .ui-widget-header .ui-state-active {
+ padding-bottom:1px;
+ background:darken($color-widget-bg, 2%);
+ border:1px solid $color-button-generic-border;
+ }
+ }
+ }
+ .ss-tabset .ui-tabs-panel {
+ background:darken($color-widget-bg, 2%);
+ clear:both;
+ border-top:1px solid $color-button-generic-border;
+ }
+ }
+ //Styling of tabs on page settings
+ .CMSPageSettingsController {
+ .cms-edit-form {
+ background:darken($color-widget-bg, 2%);
+ .ui-tabs-nav {
+ float:right;
+ margin:$grid-x $grid-x*5 -1px 0;
+ li {
+ a {
+ font-weight: bold;
+ line-height: $grid-y * 2;
+ padding: $grid-y $grid-x*2.5 $grid-y;
+ }
+ }
+ .ui-state-default,
+ .ui-widget-content .ui-state-default,
+ .ui-widget-header .ui-state-default {
+ border:1px solid $color-button-generic-border;
+ }
+ .ui-state-active,
+ .ui-widget-content .ui-state-active,
+ .ui-widget-header .ui-state-active {
+ padding-bottom:1px;
+ background:darken($color-widget-bg, 2%);
+ border:1px solid $color-button-generic-border;
+ }
+ }
+ }
+ .ss-tabset .ui-tabs-panel {
+ background:darken($color-widget-bg, 2%);
+ clear:both;
+ border-top:1px solid $color-button-generic-border;
+ }
+ }
+ //Styling of tabs on page History
+ .CMSPageHistoryController {
+ .cms-edit-form {
+ background:darken($color-widget-bg, 2%);
+ .ui-tabs-nav {
+ float:right;
+ margin:$grid-x $grid-x*3 -1px 0;
+ li {
+ a {
+ font-weight: bold;
+ line-height: $grid-y * 2;
+ padding: $grid-y $grid-x*2.5 $grid-y;
+ }
+ }
+ .ui-state-default,
+ .ui-widget-content .ui-state-default,
+ .ui-widget-header .ui-state-default {
+ border:1px solid $color-button-generic-border;
+ }
+ .ui-state-active,
+ .ui-widget-content .ui-state-active,
+ .ui-widget-header .ui-state-active {
+ padding-bottom:1px;
+ background:darken($color-widget-bg, 2%);
+ border:1px solid $color-button-generic-border;
+ }
+ }
+ }
+ .ss-tabset .ui-tabs-panel {
+ background:darken($color-widget-bg, 2%);
+ clear:both;
+ border-top:1px solid $color-button-generic-border;
+ }
+ }
}
+
+
@@ -27,6 +27,7 @@ $color-highlight-opacity: rgba(255, 255, 102, 0.3) !default;
$color-menu-button: #338DC1 !default;
$color-menu-background: #c6d7df !default;
$color-menu-border: #8c99a1 !default;
+$color-panel-background: #c6d7df !default;
$color-text: #444 !default;
$color-text-light: white !default;

0 comments on commit 330dd30

Please sign in to comment.