Permalink
Browse files

ENHANCEMENT:SSF-30 - changed the SCSS so that the styling on the view…

… tabs is more specific to pages and files.
  • Loading branch information...
1 parent a284853 commit c0e1500ded51de8fb143a3a720122a350a50a628 jbridson committed Mar 7, 2012
Showing with 132 additions and 53 deletions.
  1. +22 −10 admin/css/screen.css
  2. +110 −43 admin/scss/_style.scss
View

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

Oops, something went wrong.
View
@@ -80,25 +80,6 @@ body.cms {
@include inline-block;
}
-.cms-edit-form {
- .cms-content-header-tabs {
- .ui-tabs-nav {
- li {
- a {
- text-indent:0;
- }
- }
- .ui-state-default,
- .ui-widget-content .ui-state-default,
- .ui-widget-header .ui-state-default {
- a {
- color:$color-text-dark;
- }
- }
- }
- }
-}
-
.cms-content-header {
padding: ($grid-y - 8) $grid-x $grid-y;
height: $grid-y * 4;
@@ -144,17 +125,6 @@ body.cms {
font-weight: bold;
line-height: $grid-y * 2;
padding: ($grid-y * 2 - 4) ($grid-x * 2 + 4) $grid-y + 3;
- text-indent:-9999em;
-
- &.content-treeview {
- background:url(../images/content-header-tabs-sprite.png) no-repeat 2px 0px;
- }
- &.content-galleryview {
- background:url(../images/content-header-tabs-sprite.png) no-repeat -87px 0px;
- }
- &.content-listview {
- background:url(../images/content-header-tabs-sprite.png) no-repeat -38px 0px;
- }
}
}
@@ -172,18 +142,6 @@ body.cms {
border: {
top:none;
}
-
- a {
- &.content-treeview {
- background:url(../images/content-header-tabs-sprite.png) no-repeat 2px -40px;
- }
- &.content-galleryview {
- background:url(../images/content-header-tabs-sprite.png) no-repeat -87px -40px;
- }
- &.content-listview {
- background:url(../images/content-header-tabs-sprite.png) no-repeat -38px -40px;
- }
- }
}
.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr {
border-radius:0;
@@ -196,6 +154,25 @@ body.cms {
}
}
+.cms-edit-form {
+ .cms-content-header-tabs {
+ .ui-tabs-nav {
+ li {
+ a {
+ text-indent:0;
+ }
+ }
+ .ui-state-default,
+ .ui-widget-content .ui-state-default,
+ .ui-widget-header .ui-state-default {
+ a {
+ color:$color-text-dark;
+ }
+ }
+ }
+ }
+}
+
/** --------------------------------------------
* Tabs
* -------------------------------------------- */
@@ -244,6 +221,96 @@ body.cms {
}
}
+.CMSPagesController {
+ .cms-content-header-tabs {
+ .ui-tabs-nav {
+ li {
+ a {
+ font-weight: bold;
+ line-height: $grid-y * 2;
+ padding: ($grid-y * 2 - 4) ($grid-x * 2 + 4) $grid-y + 3;
+ text-indent:-9999em;
+
+ &.content-treeview {
+ background:url(../images/content-header-tabs-sprite.png) no-repeat 2px 0px;
+ }
+ &.content-galleryview {
+ background:url(../images/content-header-tabs-sprite.png) no-repeat -87px 0px;
+ }
+ &.content-listview {
+ background:url(../images/content-header-tabs-sprite.png) no-repeat -38px 0px;
+ }
+ }
+ }
+
+ .ui-state-active,
+ .ui-widget-content .ui-state-active,
+ .ui-widget-header .ui-state-active {
+ border: {
+ top:none;
+ }
+
+ a {
+ &.content-treeview {
+ background:url(../images/content-header-tabs-sprite.png) no-repeat 2px -40px;
+ }
+ &.content-galleryview {
+ background:url(../images/content-header-tabs-sprite.png) no-repeat -87px -40px;
+ }
+ &.content-listview {
+ background:url(../images/content-header-tabs-sprite.png) no-repeat -38px -40px;
+ }
+ }
+ }
+ }
+ }
+}
+
+.AssetAdmin {
+ .cms-content-header-tabs {
+ .ui-tabs-nav {
+ li {
+ a {
+ font-weight: bold;
+ line-height: $grid-y * 2;
+ padding: ($grid-y * 2 - 4) ($grid-x * 2 + 4) $grid-y + 3;
+ text-indent:-9999em;
+
+ &.content-treeview {
+ background:url(../images/content-header-tabs-sprite.png) no-repeat 2px 0px;
+ }
+ &.content-galleryview {
+ background:url(../images/content-header-tabs-sprite.png) no-repeat -87px 0px;
+ }
+ &.content-listview {
+ background:url(../images/content-header-tabs-sprite.png) no-repeat -38px 0px;
+ }
+ }
+ }
+
+ .ui-state-active,
+ .ui-widget-content .ui-state-active,
+ .ui-widget-header .ui-state-active {
+ border: {
+ top:none;
+ }
+
+ a {
+ &.content-treeview {
+ background:url(../images/content-header-tabs-sprite.png) no-repeat 2px -40px;
+ }
+ &.content-galleryview {
+ background:url(../images/content-header-tabs-sprite.png) no-repeat -87px -40px;
+ }
+ &.content-listview {
+ background:url(../images/content-header-tabs-sprite.png) no-repeat -38px -40px;
+ }
+ }
+ }
+ }
+ }
+}
+
/** -------------------------------------------------------
* Loading Interface
* ------------------------------------------------------- */
@@ -1328,4 +1395,4 @@ form.small {
}
}
}
- }
+}

0 comments on commit c0e1500

Please sign in to comment.