Browse files

MINOR Tree and content toolbar styling fixes (SSF-138, SSF-71)

  • Loading branch information...
1 parent 4bd526f commit 23e7aeeea454caac608edd4fa71b9eb2b8572a46 jbridson committed with chillu Feb 8, 2012
View
11 admin/css/ie7.css
@@ -1,3 +1,14 @@
html { overflow: hidden; }
.field input.text, .field textarea, .field .TreeDropdownField { padding-left: 0; padding-right: 0; }
+
+.ss-ui-button.cms-page-add-button { float: left; }
+
+.ss-ui-button.cms-page-add-button.ui-state-hover, .cms .ss-ui-button.cms-page-add-button:hover { background: #80bf40 url("../images/btn_icons-saaa1989272.png") 5px -49px no-repeat; }
+
+.cms-tree-view-modes div { float: left; }
+.cms-tree-view-modes span { float: left; padding-top: 5px; }
+
+.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; }
View
8 admin/css/ie8.css
@@ -1,2 +1,10 @@
.cms-panel .cms-panel-content-collapsed { width: 40px; }
.cms-panel .cms-panel-content-collapsed h2, .cms-panel .cms-panel-content-collapsed h3 { display: none; }
+
+.cms-content-toolbar .cms-tree-view-modes .checkboxAboveTree { margin-right: 1px; }
+
+.cms-content-toolbar { border-bottom: 1px solid #c9cdce; }
+
+.ss-ui-button.cms-page-add-button.ui-state-hover, .cms .ss-ui-button.cms-page-add-button:hover { background: #80bf40 url("../images/btn_icons-saaa1989272.png") 5px -49px no-repeat; }
+
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { background-image: none; }
View
86 admin/css/screen.css
@@ -68,7 +68,7 @@ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav,
.cms .ui-tabs .ui-tabs-nav li { top: 0; }
.cms .ui-tabs .ui-tabs-nav li a { padding: 0 15px; }
.cms .ui-tabs .ui-tabs-nav.ui-state-active { border-color: gray; }
-.cms .ui-tabs .ui-tabs-panel { background: transparent; padding: 16px 16px; }
+.cms .ui-tabs .ui-tabs-panel { background: transparent; padding: 16px 40px 16px 25px; }
.cms .ui-widget-content, .cms .ui-widget { color: #444444; font-size: 12px; font-family: Arial, sans-serif; border: 0; }
.cms .ui-widget-header { background-color: #b0bec7; padding: 8px 8px 6px 8px; border-bottom: 2px solid #8399a7; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #dde3e7), color-stop(100%, #92a5b2)); background-image: -webkit-linear-gradient(top, #dde3e7, #92a5b2); background-image: -moz-linear-gradient(top, #dde3e7, #92a5b2); background-image: -o-linear-gradient(top, #dde3e7, #92a5b2); background-image: -ms-linear-gradient(top, #dde3e7, #92a5b2); background-image: linear-gradient(top, #dde3e7, #92a5b2); border-bottom: 3px solid #5c7382; padding: 8px; -moz-border-radius: 0; -webkit-border-radius: 0; -o-border-radius: 0; -ms-border-radius: 0; -khtml-border-radius: 0; border-radius: 0; }
.cms .ui-widget-header .ui-dialog-title { padding: 6px 0; text-shadow: #ced7dc 1px 1px 0; }
@@ -101,29 +101,24 @@ form.nostyle .middleColumn { margin-left: 0; }
form.stacked .field label, .field.stacked label { display: block; float: none; padding-bottom: 10px; }
form.stacked .field .middleColumn, .field.stacked .middleColumn { margin-left: 0px; clear: left; }
-form.small .field label.left, .field.small label.left { width: 112px; }
-form.small .field .middleColumn, .field.small .middleColumn { margin-left: 120px; }
-form.small .field input.text, form.small .field textarea, form.small .field select, form.small .field .TreeDropdownField, .field.small input.text, .field.small textarea, .field.small select, .field.small .TreeDropdownField { width: auto; }
-
.field { /* TreeDropdowns */ /* dropdowns */ /* chzn override */ /* Date Fields */ }
.field .TreeDropdownField { padding: 0; }
.field .TreeDropdownField .treedropdownfield-panel { border: 1px solid #b3b3b3; border-top: none; -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -o-border-bottom-left-radius: 4px; -ms-border-bottom-left-radius: 4px; -khtml-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -o-border-bottom-right-radius: 4px; -ms-border-bottom-right-radius: 4px; -khtml-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
.field .TreeDropdownField.treedropdownfield-open-tree { -moz-border-radius-bottomleft: 0; -webkit-border-bottom-left-radius: 0; -o-border-bottom-left-radius: 0; -ms-border-bottom-left-radius: 0; -khtml-border-bottom-left-radius: 0; border-bottom-left-radius: 0; -moz-border-radius-bottomright: 0; -webkit-border-bottom-right-radius: 0; -o-border-bottom-right-radius: 0; -ms-border-bottom-right-radius: 0; -khtml-border-bottom-right-radius: 0; border-bottom-right-radius: 0; }
.field .dropdown select { margin-top: 8px; }
.field .chzn-container .chzn-results li { font-size: 11px; line-height: 16px; padding: 4px 4px; }
.field .chzn-container-active .chzn-single { border: 1px solid #9a9a9a; }
-.field .chzn-container-single .chzn-single { height: 26px; line-height: 26px; /* not relative, as then we'd had to redo most of chzn */ font-size: 12px; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #efefef), color-stop(10%, #ffffff), color-stop(90%, #ffffff), color-stop(100%, #efefef)); background-image: -webkit-linear-gradient(#efefef, #ffffff 10%, #ffffff 90%, #efefef); background-image: -moz-linear-gradient(#efefef, #ffffff 10%, #ffffff 90%, #efefef); background-image: -o-linear-gradient(#efefef, #ffffff 10%, #ffffff 90%, #efefef); background-image: -ms-linear-gradient(#efefef, #ffffff 10%, #ffffff 90%, #efefef); background-image: linear-gradient(#efefef, #ffffff 10%, #ffffff 90%, #efefef); }
+.field .chzn-container-single .chzn-single { height: 30px; line-height: 32px; /* not relative, as then we'd had to redo most of chzn */ font-size: 12px; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #efefef), color-stop(10%, #ffffff), color-stop(90%, #ffffff), color-stop(100%, #efefef)); background-image: -webkit-linear-gradient(#efefef, #ffffff 10%, #ffffff 90%, #efefef); background-image: -moz-linear-gradient(#efefef, #ffffff 10%, #ffffff 90%, #efefef); background-image: -o-linear-gradient(#efefef, #ffffff 10%, #ffffff 90%, #efefef); background-image: -ms-linear-gradient(#efefef, #ffffff 10%, #ffffff 90%, #efefef); background-image: linear-gradient(#efefef, #ffffff 10%, #ffffff 90%, #efefef); }
.field .chzn-container-single .chzn-single:hover, .field .chzn-container-single .chzn-single:focus, .field .chzn-container-single .chzn-single:active { text-decoration: none; outline: none; }
.field .chzn-container-single .chzn-single div { width: 24px; }
-.field .chzn-container-single .chzn-single div b { background-position: 4px 0px; }
+.field .chzn-container-single .chzn-single div b { background-position: 1px 4px; }
.field input.hasDatepicker { width: 50%; max-width: 96px; }
/** ---------------------------------------------------- Buttons ---------------------------------------------------- */
.Actions { min-height: 30px; }
.Actions > div { overflow: auto; }
.cms-preview-toggle-link { display: block; float: right; font-size: 12px; text-decoration: none; }
-.cms-preview-toggle-link span.ui-button-text { padding: 0; }
.cms input.loading, .cms input.ui-state-default.loading, .cms .ui-widget-content input.ui-state-default.loading, .cms .ui-widget-header input.ui-state-default.loading { padding-left: 24px; color: #525252; background: #eeeded url(../../images/network-save.gif) no-repeat 4px center; border-color: #d5d3d3; cursor: default; text-shadow: none; -moz-box-shadow: none; -webkit-box-shadow: none; -o-box-shadow: none; box-shadow: none; }
.cms .ss-ui-button { /* all buttons */ padding: 5px 12px; font-weight: bold; text-decoration: none; margin: 0; line-height: 16px; color: #393939; background-color: #e6e6e6; border: 1px solid #c0c0c2; border-bottom: 1px solid #a6a6a9; cursor: pointer; text-shadow: white 0 1px 1px; background: #e6e6e6; background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #d9d9d9)); background: -webkit-linear-gradient(#ffffff, #d9d9d9); background: -moz-linear-gradient(#ffffff, #d9d9d9); background: -o-linear-gradient(#ffffff, #d9d9d9); background: -ms-linear-gradient(#ffffff, #d9d9d9); background: linear-gradient(#ffffff, #d9d9d9); /* constructive */ /* destructive */ /* generic action buttons */ }
@@ -133,7 +128,7 @@ form.small .field input.text, form.small .field textarea, form.small .field sele
.cms .ss-ui-button.ss-ui-action-constructive { background-image: none; padding-left: 24px; padding-right: 6px; font-weight: bold; margin-left: 8px; color: white; border-color: #78a127; border-bottom-color: #59781d; background: #669933 url('../images/btn_icons-saaa1989272.png') 5px 5px no-repeat; background: url('../images/btn_icons-saaa1989272.png') 5px 5px no-repeat, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #80bf40), color-stop(100%, #59862d)); background: url('../images/btn_icons-saaa1989272.png') 5px 5px no-repeat, -webkit-linear-gradient(#80bf40, #59862d); background: url('../images/btn_icons-saaa1989272.png') 5px 5px no-repeat, -moz-linear-gradient(#80bf40, #59862d); background: url('../images/btn_icons-saaa1989272.png') 5px 5px no-repeat, -o-linear-gradient(#80bf40, #59862d); background: url('../images/btn_icons-saaa1989272.png') 5px 5px no-repeat, -ms-linear-gradient(#80bf40, #59862d); background: url('../images/btn_icons-saaa1989272.png') 5px 5px no-repeat, linear-gradient(#80bf40, #59862d); text-shadow: #4d7326 0 1px 1px; }
.cms .ss-ui-button.ss-ui-action-constructive.ui-state-hover, .cms .ss-ui-button.ss-ui-action-constructive:hover { border-color: #59781d; background: #80bf40 url('../images/btn_icons-saaa1989272.png') 6px 6px no-repeat; background: url('../images/btn_icons-saaa1989272.png') 5px 5px no-repeat, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #8cc653), color-stop(100%, #669933)); background: url('../images/btn_icons-saaa1989272.png') 5px 5px no-repeat, -webkit-linear-gradient(#8cc653, #669933); background: url('../images/btn_icons-saaa1989272.png') 5px 5px no-repeat, -moz-linear-gradient(#8cc653, #669933); background: url('../images/btn_icons-saaa1989272.png') 5px 5px no-repeat, -o-linear-gradient(#8cc653, #669933); background: url('../images/btn_icons-saaa1989272.png') 5px 5px no-repeat, -ms-linear-gradient(#8cc653, #669933); background: url('../images/btn_icons-saaa1989272.png') 5px 5px no-repeat, linear-gradient(#8cc653, #669933); }
.cms .ss-ui-button.ss-ui-action-constructive:active, .cms .ss-ui-button.ss-ui-action-constructive:focus, .cms .ss-ui-button.ss-ui-action-constructive.ui-state-active, .cms .ss-ui-button.ss-ui-action-constructive.ui-state-focus { background: #619130 url('../images/btn_icons-saaa1989272.png') 5px 5px no-repeat; -moz-box-shadow: inset 0 1px 3px #17181a, 0 1px 0 rgba(255, 255, 255, 0.6); -webkit-box-shadow: inset 0 1px 3px #17181a, 0 1px 0 rgba(255, 255, 255, 0.6); -o-box-shadow: inset 0 1px 3px #17181a, 0 1px 0 rgba(255, 255, 255, 0.6); box-shadow: inset 0 1px 3px #17181a, 0 1px 0 rgba(255, 255, 255, 0.6); }
-.cms .ss-ui-button.cms-page-add-button { background-image: none; padding-left: 24px; padding-right: 6px; font-weight: bold; margin-left: 8px; color: white; border-color: #78a127; border-bottom-color: #59781d; background: #669933 url('../images/btn_icons-saaa1989272.png') 5px -49px no-repeat; background: url('../images/btn_icons-saaa1989272.png') 5px -49px no-repeat, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #80bf40), color-stop(100%, #59862d)); background: url('../images/btn_icons-saaa1989272.png') 5px -49px no-repeat, -webkit-linear-gradient(#80bf40, #59862d); background: url('../images/btn_icons-saaa1989272.png') 5px -49px no-repeat, -moz-linear-gradient(#80bf40, #59862d); background: url('../images/btn_icons-saaa1989272.png') 5px -49px no-repeat, -o-linear-gradient(#80bf40, #59862d); background: url('../images/btn_icons-saaa1989272.png') 5px -49px no-repeat, -ms-linear-gradient(#80bf40, #59862d); background: url('../images/btn_icons-saaa1989272.png') 5px -49px no-repeat, linear-gradient(#80bf40, #59862d); text-shadow: #4d7326 0 1px 1px; -moz-border-radius: 4px; -webkit-border-radius: 4px; -o-border-radius: 4px; -ms-border-radius: 4px; -khtml-border-radius: 4px; border-radius: 4px; }
+.cms .ss-ui-button.cms-page-add-button { background-image: none; padding-left: 24px; padding-right: 6px; font-weight: bold; margin-left: 8px; color: white; border-color: #78a127; border-bottom-color: #59781d; background: #669933 url('../images/btn_icons-saaa1989272.png') 5px -49px no-repeat; background: url('../images/btn_icons-saaa1989272.png') 5px -49px no-repeat, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #80bf40), color-stop(100%, #59862d)); background: url('../images/btn_icons-saaa1989272.png') 5px -49px no-repeat, -webkit-linear-gradient(#80bf40, #59862d); background: url('../images/btn_icons-saaa1989272.png') 5px -49px no-repeat, -moz-linear-gradient(#80bf40, #59862d); background: url('../images/btn_icons-saaa1989272.png') 5px -49px no-repeat, -o-linear-gradient(#80bf40, #59862d); background: url('../images/btn_icons-saaa1989272.png') 5px -49px no-repeat, -ms-linear-gradient(#80bf40, #59862d); background: url('../images/btn_icons-saaa1989272.png') 5px -49px no-repeat, linear-gradient(#80bf40, #59862d); text-shadow: #4d7326 0 1px 1px; }
.cms .ss-ui-button.cms-page-add-button.ui-state-hover, .cms .ss-ui-button.cms-page-add-button:hover { border-color: #59781d; background: #80bf40 url('../images/btn_icons-saaa1989272.png') 6px -48px no-repeat; background: url('../images/btn_icons-saaa1989272.png') 5px -49px no-repeat, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #8cc653), color-stop(100%, #669933)); background: url('../images/btn_icons-saaa1989272.png') 5px -49px no-repeat, -webkit-linear-gradient(#8cc653, #669933); background: url('../images/btn_icons-saaa1989272.png') 5px -49px no-repeat, -moz-linear-gradient(#8cc653, #669933); background: url('../images/btn_icons-saaa1989272.png') 5px -49px no-repeat, -o-linear-gradient(#8cc653, #669933); background: url('../images/btn_icons-saaa1989272.png') 5px -49px no-repeat, -ms-linear-gradient(#8cc653, #669933); background: url('../images/btn_icons-saaa1989272.png') 5px -49px no-repeat, linear-gradient(#8cc653, #669933); }
.cms .ss-ui-button.cms-page-add-button:active, .cms .ss-ui-button.cms-page-add-button:focus, .cms .ss-ui-button.cms-page-add-button.ui-state-active, .cms .ss-ui-button.cms-page-add-button.ui-state-focus { background: #619130 url('../images/btn_icons-saaa1989272.png') 5px -49px no-repeat; -moz-box-shadow: inset 0 1px 3px #17181a, 0 1px 0 rgba(255, 255, 255, 0.6); -webkit-box-shadow: inset 0 1px 3px #17181a, 0 1px 0 rgba(255, 255, 255, 0.6); -o-box-shadow: inset 0 1px 3px #17181a, 0 1px 0 rgba(255, 255, 255, 0.6); box-shadow: inset 0 1px 3px #17181a, 0 1px 0 rgba(255, 255, 255, 0.6); }
.cms .ss-ui-button.ss-ui-action-destructive { color: red; background-color: #e6e6e6; }
@@ -187,7 +182,18 @@ input.radio { margin-left: 0; }
.action-hidden { display: none; }
-/** This file defines most styles of the CMS: Colors, fonts, backgrounds, alignments, dimensions. Use SCSS variable definitions in screen.css to avoid repeating styles like background colours or padding dimensions. See themes/_default.scss to get started. To avoid this file getting too large and complicated, it is encouraged to create new SCSS files for larger components like the CMS menu or tree (see _tree.scss and _menu.scss). */
+/**
+* This file defines most styles of the CMS: Colors, fonts, backgrounds,
+* alignments, dimensions.
+*
+* Use SCSS variable definitions in screen.css to avoid repeating styles
+* like background colours or padding dimensions. See themes/_default.scss
+* to get started.
+*
+* To avoid this file getting too large and complicated, it is encouraged to
+* create new SCSS files for larger components like the CMS menu or tree
+* (see _tree.scss and _menu.scss).
+*/
/** ---------------------------------------------------- Core Styles. ---------------------------------------------------- */
html, body { width: 100%; height: 100%; font-size: 12px; line-height: 16px; font-family: Arial, sans-serif; color: #444444; }
html html, html body, html div, html span, html applet, html object, html iframe, html h1, html h2, html h3, html h4, html h5, html h6, html p, html blockquote, html pre, html a, html abbr, html acronym, html address, html big, html cite, html code, html del, html dfn, html em, html img, html ins, html kbd, html q, html s, html samp, html small, html strike, html strong, html sub, html sup, html tt, html var, html b, html u, html i, html center, html dl, html dt, html dd, html ol, html ul, html li, html fieldset, html form, html label, html legend, html table, html caption, html tbody, html tfoot, html thead, html tr, html th, html td, html article, html aside, html canvas, html details, html embed, html figure, html figcaption, html footer, html header, html hgroup, html menu, html nav, html output, html ruby, html section, html summary, html time, html mark, html audio, html video, body html, body body, body div, body span, body applet, body object, body iframe, body h1, body h2, body h3, body h4, body h5, body h6, body p, body blockquote, body pre, body a, body abbr, body acronym, body address, body big, body cite, body code, body del, body dfn, body em, body img, body ins, body kbd, body q, body s, body samp, body small, body strike, body strong, body sub, body sup, body tt, body var, body b, body u, body i, body center, body dl, body dt, body dd, body ol, body ul, body li, body fieldset, body form, body label, body legend, body table, body caption, body tbody, body tfoot, body thead, body tr, body th, body td, body article, body aside, body canvas, body details, body embed, body figure, body figcaption, body footer, body header, body hgroup, body menu, body nav, body output, body ruby, body section, body summary, body time, body mark, body audio, body video { margin: 0; padding: 0; border: 0; font-size: 100%; font: inherit; vertical-align: baseline; }
@@ -206,6 +212,8 @@ body.cms { overflow: hidden; }
.cms a:hover, .cms a:focus { text-decoration: underline; }
.cms body .ui-widget { font-family: Arial, sans-serif; font-size: 12px; }
.cms strong { font-weight: bold; }
+.cms .ss-ui-button.cms-page-add-button { margin-left: 0px; font-size: 13px; -moz-border-radius: 4px; -webkit-border-radius: 4px; -o-border-radius: 4px; -ms-border-radius: 4px; -khtml-border-radius: 4px; border-radius: 4px; }
+.cms .ss-ui-button.cms-page-add-button:hover { text-decoration: none; }
/** -------------------------------------------- Helpers -------------------------------------------- */
.cms-helper-hide-actions .Actions { display: none; }
@@ -216,15 +224,24 @@ body.cms { overflow: hidden; }
.cms-preview, .cms-menu, .cms-content, .cms-content-header, .cms-content-tools, .cms-content-fields, .cms-edit-form, .cms-preview, .cms-preview iframe, .cms-preview-controls { display: -moz-inline-box; -moz-box-orient: vertical; display: inline-block; vertical-align: middle; *vertical-align: auto; }
.cms-preview, .cms-menu, .cms-content, .cms-content-header, .cms-content-tools, .cms-content-fields, .cms-edit-form, .cms-preview, .cms-preview iframe, .cms-preview-controls { *display: inline; }
-.cms-content-header { background-color: #b0bec7; padding: 8px 8px 6px; height: 32px; z-index: 60; border-bottom: 2px solid #8399a7; -moz-box-shadow: #eceff1 0 8px 16px; -webkit-box-shadow: #eceff1 0 8px 16px; -o-box-shadow: #eceff1 0 8px 16px; box-shadow: #eceff1 0 8px 16px; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ced7dc), color-stop(100%, #92a5b2)); background-image: -webkit-linear-gradient(#ced7dc, #92a5b2); background-image: -moz-linear-gradient(#ced7dc, #92a5b2); background-image: -o-linear-gradient(#ced7dc, #92a5b2); background-image: -ms-linear-gradient(#ced7dc, #92a5b2); background-image: linear-gradient(#ced7dc, #92a5b2); }
+.cms-content-header { padding: 0px 8px 8px; height: 32px; z-index: 60; background-image: url(../images/textures/cms_content_header.png); background-repeat: repeat; }
.cms-content-header h2 { float: left; padding: 8px 8px 0 0; font-size: 14px; line-height: 24px; font-weight: bold; text-shadow: #bfcad2 1px 1px 0; width: 176px; margin: 0; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; o-text-overflow: ellipsis; }
.cms-content-header > div { width: 9999em; overflow: hidden; }
-.cms-content-header .cms-content-header-tabs { float: left; }
-
-.ui-tabs .cms-content-header .ui-tabs-nav li a, .cms-dialog .ui-tabs-nav .ui-tabs-nav li a { font-weight: bold; line-height: 16px; padding: 11px 12px 9px; border-bottom: 2px solid #b3b3b3; }
-.ui-tabs .cms-content-header .ui-state-default, .ui-tabs .cms-content-header .ui-widget-content .ui-state-default, .ui-tabs .cms-content-header .ui-widget-header .ui-state-default, .cms-dialog .ui-tabs-nav .ui-state-default, .cms-dialog .ui-tabs-nav .ui-widget-content .ui-state-default, .cms-dialog .ui-tabs-nav .ui-widget-header .ui-state-default { background-color: #d9d9d9; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #d9d9d9), color-stop(100%, #c0c0c0)); background-image: -webkit-linear-gradient(#d9d9d9, #c0c0c0); background-image: -moz-linear-gradient(#d9d9d9, #c0c0c0); background-image: -o-linear-gradient(#d9d9d9, #c0c0c0); background-image: -ms-linear-gradient(#d9d9d9, #c0c0c0); background-image: linear-gradient(#d9d9d9, #c0c0c0); border-color: #a6a6a6; text-shadow: white 0 1px 0; }
-.ui-tabs .cms-content-header .ui-state-active, .ui-tabs .cms-content-header .ui-widget-content .ui-state-active, .ui-tabs .cms-content-header .ui-widget-header .ui-state-active, .cms-dialog .ui-tabs-nav .ui-state-active, .cms-dialog .ui-tabs-nav .ui-widget-content .ui-state-active, .cms-dialog .ui-tabs-nav .ui-widget-header .ui-state-active { background: #eceff1; }
-.ui-tabs .cms-content-header .ui-state-active a, .ui-tabs .cms-content-header .ui-widget-content .ui-state-active a, .ui-tabs .cms-content-header .ui-widget-header .ui-state-active a, .cms-dialog .ui-tabs-nav .ui-state-active a, .cms-dialog .ui-tabs-nav .ui-widget-content .ui-state-active a, .cms-dialog .ui-tabs-nav .ui-widget-header .ui-state-active a { border-bottom: 2px solid #eceff1; }
+.cms-content-header .cms-content-header-tabs { position: fixed; right: 40px; }
+
+.ui-tabs .cms-content-header .ui-tabs-nav li, .cms-dialog .ui-tabs-nav .ui-tabs-nav li { margin: 0; }
+.ui-tabs .cms-content-header .ui-tabs-nav li a, .cms-dialog .ui-tabs-nav .ui-tabs-nav li a { font-weight: bold; line-height: 16px; padding: 12px 20px 11px; text-indent: -9999em; }
+.ui-tabs .cms-content-header .ui-tabs-nav li a.content-treeview, .cms-dialog .ui-tabs-nav .ui-tabs-nav li a.content-treeview { background: url(../images/content-header-tabs-sprite.png) no-repeat 2px 0px; }
+.ui-tabs .cms-content-header .ui-tabs-nav li a.content-galleryview, .cms-dialog .ui-tabs-nav .ui-tabs-nav li a.content-galleryview { background: url(../images/content-header-tabs-sprite.png) no-repeat -87px 0px; }
+.ui-tabs .cms-content-header .ui-tabs-nav li a.content-listview, .cms-dialog .ui-tabs-nav .ui-tabs-nav li a.content-listview { background: url(../images/content-header-tabs-sprite.png) no-repeat -38px 0px; }
+.ui-tabs .cms-content-header .ui-state-default, .ui-tabs .cms-content-header .ui-widget-content .ui-state-default, .ui-tabs .cms-content-header .ui-widget-header .ui-state-default, .cms-dialog .ui-tabs-nav .ui-state-default, .cms-dialog .ui-tabs-nav .ui-widget-content .ui-state-default, .cms-dialog .ui-tabs-nav .ui-widget-header .ui-state-default { background-color: #b0bec7; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #b0bec7), color-stop(100%, #8ca1ae)); background-image: -webkit-linear-gradient(#b0bec7, #8ca1ae); background-image: -moz-linear-gradient(#b0bec7, #8ca1ae); background-image: -o-linear-gradient(#b0bec7, #8ca1ae); background-image: -ms-linear-gradient(#b0bec7, #8ca1ae); background-image: linear-gradient(#b0bec7, #8ca1ae); border-right-color: #a6a6a6; border-left-color: #d9d9d9; border-top: none; border-bottom: none; text-shadow: white 0 1px 0; }
+.ui-tabs .cms-content-header .ui-state-active, .ui-tabs .cms-content-header .ui-widget-content .ui-state-active, .ui-tabs .cms-content-header .ui-widget-header .ui-state-active, .cms-dialog .ui-tabs-nav .ui-state-active, .cms-dialog .ui-tabs-nav .ui-widget-content .ui-state-active, .cms-dialog .ui-tabs-nav .ui-widget-header .ui-state-active { background: #eceff1; border-right-color: #a6a6a6; border-left-color: #a6a6a6; border-top: none; margin-right: -1px; margin-left: -1px; z-index: 2; }
+.ui-tabs .cms-content-header .ui-state-active a, .ui-tabs .cms-content-header .ui-widget-content .ui-state-active a, .ui-tabs .cms-content-header .ui-widget-header .ui-state-active a, .cms-dialog .ui-tabs-nav .ui-state-active a, .cms-dialog .ui-tabs-nav .ui-widget-content .ui-state-active a, .cms-dialog .ui-tabs-nav .ui-widget-header .ui-state-active a { border-bottom: none; }
+.ui-tabs .cms-content-header .ui-state-active a.content-treeview, .ui-tabs .cms-content-header .ui-widget-content .ui-state-active a.content-treeview, .ui-tabs .cms-content-header .ui-widget-header .ui-state-active a.content-treeview, .cms-dialog .ui-tabs-nav .ui-state-active a.content-treeview, .cms-dialog .ui-tabs-nav .ui-widget-content .ui-state-active a.content-treeview, .cms-dialog .ui-tabs-nav .ui-widget-header .ui-state-active a.content-treeview { background: url(../images/content-header-tabs-sprite.png) no-repeat 2px -40px; }
+.ui-tabs .cms-content-header .ui-state-active a.content-galleryview, .ui-tabs .cms-content-header .ui-widget-content .ui-state-active a.content-galleryview, .ui-tabs .cms-content-header .ui-widget-header .ui-state-active a.content-galleryview, .cms-dialog .ui-tabs-nav .ui-state-active a.content-galleryview, .cms-dialog .ui-tabs-nav .ui-widget-content .ui-state-active a.content-galleryview, .cms-dialog .ui-tabs-nav .ui-widget-header .ui-state-active a.content-galleryview { background: url(../images/content-header-tabs-sprite.png) no-repeat -87px -40px; }
+.ui-tabs .cms-content-header .ui-state-active a.content-listview, .ui-tabs .cms-content-header .ui-widget-content .ui-state-active a.content-listview, .ui-tabs .cms-content-header .ui-widget-header .ui-state-active a.content-listview, .cms-dialog .ui-tabs-nav .ui-state-active a.content-listview, .cms-dialog .ui-tabs-nav .ui-widget-content .ui-state-active a.content-listview, .cms-dialog .ui-tabs-nav .ui-widget-header .ui-state-active a.content-listview { background: url(../images/content-header-tabs-sprite.png) no-repeat -38px -40px; }
+.ui-tabs .cms-content-header .ui-corner-all, .ui-tabs .cms-content-header .ui-corner-top, .ui-tabs .cms-content-header .ui-corner-right, .ui-tabs .cms-content-header .ui-corner-tr, .cms-dialog .ui-tabs-nav .ui-corner-all, .cms-dialog .ui-tabs-nav .ui-corner-top, .cms-dialog .ui-tabs-nav .ui-corner-right, .cms-dialog .ui-tabs-nav .ui-corner-tr { border-radius: 0; }
+.ui-tabs .cms-content-header .ui-corner-all, .ui-tabs .cms-content-header .ui-corner-top, .ui-tabs .cms-content-header .ui-corner-left, .ui-tabs .cms-content-header .ui-corner-tl, .cms-dialog .ui-tabs-nav .ui-corner-all, .cms-dialog .ui-tabs-nav .ui-corner-top, .cms-dialog .ui-tabs-nav .ui-corner-left, .cms-dialog .ui-tabs-nav .ui-corner-tl { border-radius: 0; }
/** ------------------------------------------------------- Loading Interface ------------------------------------------------------- */
.cms-content-loading-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: 9998; }
@@ -270,28 +287,33 @@ body.cms { overflow: hidden; }
.cms-add-form #PageType li .description { font-style: italic; }
/** -------------------------------------------- Content toolbar -------------------------------------------- */
-.cms-content-toolbar { display: block; margin: 0 0 15px 0; border-bottom: 1px solid rgba(201, 205, 206, 0.8); -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -o-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); *zoom: 1; }
+.cms-content-toolbar { display: block; margin: 0 0 15px 0; border-bottom: 1px solid rgba(201, 205, 206, 0.8); -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -o-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); *zoom: 1; /* smaller treedropdown */ }
.cms-content-toolbar:after { content: "\0020"; display: block; height: 0; clear: both; overflow: hidden; visibility: hidden; }
-.cms-content-toolbar > * { float: left; }
+.cms-content-toolbar > * { float: right; }
.cms-content-toolbar .cms-tree-view-modes * { display: inline-block; }
+.cms-content-toolbar .cms-tree-view-modes * label { color: #1556b2; }
+.cms-content-toolbar .chzn-container-single .chzn-single { height: 26px; line-height: 26px; padding-left: 25px; color: #576468; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #e6e6e6), color-stop(100%, #cdcdcd)); background-image: -webkit-linear-gradient(#e6e6e6, #cdcdcd); background-image: -moz-linear-gradient(#e6e6e6, #cdcdcd); background-image: -o-linear-gradient(#e6e6e6, #cdcdcd); background-image: -ms-linear-gradient(#e6e6e6, #cdcdcd); background-image: linear-gradient(#e6e6e6, #cdcdcd); font-size: 13px; font-weight: bold; text-shadow: #e6e6e6 0 -1px 1px; box-shadow: none; }
+.cms-content-toolbar .chzn-container-single .chzn-single:hover { -moz-box-shadow: 0 0 5px #b3b3b3; -webkit-box-shadow: 0 0 5px #b3b3b3; -o-box-shadow: 0 0 5px #b3b3b3; box-shadow: 0 0 5px #b3b3b3; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ebebeb), color-stop(100%, #d2d2d2)); background-image: -webkit-linear-gradient(#ebebeb, #d2d2d2); background-image: -moz-linear-gradient(#ebebeb, #d2d2d2); background-image: -o-linear-gradient(#ebebeb, #d2d2d2); background-image: -ms-linear-gradient(#ebebeb, #d2d2d2); background-image: linear-gradient(#ebebeb, #d2d2d2); }
+.cms-content-toolbar .chzn-container-single .chzn-single:active { -moz-box-shadow: inset 0 1px 3px #4d4d4d; -webkit-box-shadow: inset 0 1px 3px #4d4d4d; -o-box-shadow: inset 0 1px 3px #4d4d4d; box-shadow: inset 0 1px 3px #4d4d4d; }
+.cms-content-toolbar .chzn-container-single .chzn-single span { padding-top: 1px; }
+.cms-content-toolbar .chzn-container-single .chzn-single div { background: url(../images/btn_icons/settings.png) 5px 4px no-repeat; border-left: none; width: 100%; }
+.cms-content-toolbar .chzn-container-single .chzn-single div b { background: url(../images/sprites_32x32/menu-arrow-deselected-down.png) no-repeat 9px 11px; float: right; width: 24px; }
/* -------------------------------------------------------- Content Tools is the sidebar on the left of the main content panel */
-.cms-content-tools { background-color: #dde3e7; width: 192px; border-right: 1px solid #bfcad2; overflow-y: auto; overflow-x: hidden; z-index: 70; float: left; position: relative; /* buttons now need to line with with reduced input sizes */ }
+.cms-content-tools { background-color: #dde3e7; width: 192px; border-right: 1px solid #bfcad2; overflow-y: auto; overflow-x: hidden; z-index: 70; -moz-box-shadow: rgba(107, 120, 123, 0.5) 0 0 4px; -webkit-box-shadow: rgba(107, 120, 123, 0.5) 0 0 4px; -o-box-shadow: rgba(107, 120, 123, 0.5) 0 0 4px; box-shadow: rgba(107, 120, 123, 0.5) 0 0 4px; /* buttons now need to line with with reduced input sizes */ }
.cms-content-tools .cms-panel-header { padding: 0; margin: 0 0 7px; line-height: 24px; border-bottom: 1px solid rgba(201, 205, 206, 0.8); -webkit-box-shadow: 0 1px 0 rgba(228, 230, 230, 0.8); -moz-box-shadow: 0 1px 0 rgba(228, 230, 230, 0.8); -o-box-shadow: 0 1px 0 rgba(228, 230, 230, 0.8); box-shadow: 0 1px 0 rgba(228, 230, 230, 0.8); }
.cms-content-tools .cms-panel-content { width: 176px; padding: 8px 8px; overflow-x: hidden; overflow-y: auto; }
.cms-content-tools .cms-content-header { background-color: #748d9d; border-bottom: 2px solid #5c7382; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #b0bec7), color-stop(100%, #748d9d)); background-image: -webkit-linear-gradient(#b0bec7, #748d9d); background-image: -moz-linear-gradient(#b0bec7, #748d9d); background-image: -o-linear-gradient(#b0bec7, #748d9d); background-image: -ms-linear-gradient(#b0bec7, #748d9d); background-image: linear-gradient(#b0bec7, #748d9d); }
.cms-content-tools .cms-content-header h2 { text-shadow: #5c7382 -1px -1px 0; width: 176px; color: white; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; o-text-overflow: ellipsis; }
.cms-content-tools h3, .cms-content-tools h4, .cms-content-tools h5 { font-weight: bold; line-height: 16px; }
.cms-content-tools h3 { font-size: 13px; }
.cms-content-tools .ui-widget-content { background: none; }
-.cms-content-tools .field { /* Fields are more compressed in the sidebar compared to the main content editing window so the below alters the internal spacing of the fields so we can move that spacing to between the form fields rather than padding */ /* smaller treedropdown */ }
+.cms-content-tools .field { /* Fields are more compressed in the sidebar compared to the main content editing window so the below alters the internal spacing of the fields so we can move that spacing to between the form fields rather than padding */ }
.cms-content-tools .field label { float: none; width: auto; font-size: 11px; padding: 0 8px 4px 0; }
.cms-content-tools .field .middleColumn { margin: 0; }
.cms-content-tools .field input.text, .cms-content-tools .field select, .cms-content-tools .field textarea { padding: 5px; font-size: 11px; }
.cms-content-tools .field.checkbox { padding: 0 8px 0; }
.cms-content-tools .field.checkbox input { margin: 2px 0; }
-.cms-content-tools .field .chzn-container-single .chzn-single { height: 24px; line-height: 24px; font-size: 11px; }
-.cms-content-tools .field .chzn-container-single .chzn-single div b { background-position: 4px 0; }
.cms-content-tools .ss-ui-button { padding: 5px 8px; }
.cms-content-tools .fieldgroup .fieldgroup-field { width: auto; padding: 0; }
.cms-content-tools .fieldgroup .fieldgroup-field .field { margin: 0; padding: 0; }
@@ -306,9 +328,10 @@ body.cms { overflow: hidden; }
/** CMS Batch actions */
.cms-content-constructive-actions { float: left; }
-.cms-content-batchactions { float: right; position: relative; display: block; margin-right: 8px; }
+.cms-content-batchactions { float: left; position: relative; display: block; margin-left: 8px; }
.cms-content-batchactions form > * { display: block; float: left; }
.cms-content-batchactions form.cms-batch-actions { float: left; }
+.cms-content-batchactions .Actions { display: none; }
.cms-content-constructive-actions a { display: block; float: right; }
@@ -346,7 +369,7 @@ form.member-profile-form #Groups .middleColumn .TreeDropdownField { width: 90%;
form.member-profile-form #Permissions .optionset li { float: none; width: auto; }
.cms .cms-content { border-right: 1px solid rgba(201, 205, 206, 0.8); -moz-box-shadow: 3px 0 4px rgba(0, 0, 0, 0.15); -webkit-box-shadow: 3px 0 4px rgba(0, 0, 0, 0.15); -o-box-shadow: 3px 0 4px rgba(0, 0, 0, 0.15); box-shadow: 3px 0 4px rgba(0, 0, 0, 0.15); -moz-border-radius: 0; -webkit-border-radius: 0; -o-border-radius: 0; -ms-border-radius: 0; -khtml-border-radius: 0; border-radius: 0; }
-.cms .cms-content-fields { /* always show a y scroll bar as popups like TreeDropdowns can trigger longer pages and the extra scroll bar doesn't fire our sizing bar */ overflow-y: auto; overflow-x: auto; background: none; }
+.cms .cms-content-fields { /* always show a y scroll bar as popups like TreeDropdowns can trigger longer pages and the extra scroll bar doesn't fire our sizing bar */ overflow-y: auto; overflow-x: auto; background: none; -moz-box-shadow: rgba(107, 120, 123, 0.5) 0 0 4px; -webkit-box-shadow: rgba(107, 120, 123, 0.5) 0 0 4px; -o-box-shadow: rgba(107, 120, 123, 0.5) 0 0 4px; box-shadow: rgba(107, 120, 123, 0.5) 0 0 4px; }
/** -------------------------------------------- Panels -------------------------------------------- */
.cms-panel { overflow: hidden; }
@@ -386,7 +409,6 @@ form.member-profile-form #Permissions .optionset li { float: none; width: auto;
.ui-dialog { background: url("../images/textures/bg_cms_main_content.png") repeat left top #f0f3f4; border: 3px solid #000 !important; border-radius: 8px; overflow: visible; padding: 0; }
.ui-dialog .ui-dialog-titlebar.ui-widget-header { font-size: 14px; background-color: #92a5b2; padding: 4px 4px 4px 16px; border-bottom: 2px solid #8399a7; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ced7dc), color-stop(100%, #92a5b2)); background-image: -webkit-linear-gradient(#ced7dc, #92a5b2); background-image: -moz-linear-gradient(#ced7dc, #92a5b2); background-image: -o-linear-gradient(#ced7dc, #92a5b2); background-image: -ms-linear-gradient(#ced7dc, #92a5b2); background-image: linear-gradient(#ced7dc, #92a5b2); }
-.ui-dialog.loading { background-image: url(../images/spinner.gif); background-position: 50% 50%; background-repeat: no-repeat; }
body.cms-dialog { overflow: auto; background: url("../images/textures/bg_cms_main_content.png") repeat left top #f0f3f4; }
@@ -449,7 +471,8 @@ body.cms-dialog { overflow: auto; background: url("../images/textures/bg_cms_mai
.cms .jstree a > ins { height: 16px; width: 16px; }
.cms .jstree a > .jstree-icon { margin-right: 3px; }
.cms .jstree-rtl a > .jstree-icon { margin-left: 3px; margin-right: 0; }
-.cms li.jstree-open > ul { display: block; }
+.cms li.jstree-open > ul { display: block; margin-left: -13px; }
+.cms li.jstree-open > ul li ul { margin-left: 2px; }
.cms li.jstree-closed > ul { display: none; }
.cms #vakata-dragged ins { display: block; text-decoration: none; width: 16px; height: 16px; margin: 0 0 0 0; padding: 0; position: absolute; top: 4px; left: 4px; -moz-border-radius: 4px; border-radius: 4px; -webkit-border-radius: 4px; }
.cms #vakata-dragged .jstree-ok { background: green; }
@@ -474,6 +497,11 @@ body.cms-dialog { overflow: auto; background: url("../images/textures/bg_cms_mai
.cms .jstree-apple.jstree-focused .jstree-apple > ul { background: none; }
.cms .jstree li { line-height: 25px; }
+.jstree-apple li, .jstree-apple .jstree-apple ins { background: none; }
+.jstree-apple .jstree-unchecked > a > .jstree-checkbox { margin-right: 3px; }
+.jstree-apple .jstree-checked > a > .jstree-checkbox { margin-right: 3px; }
+.jstree-apple .jstree-undetermined > a > .jstree-checkbox { margin-right: 3px; }
+
.cms-tree.jstree-apple { /* comment speech bubble - ccs3 only - source: http://nicolasgallagher.com/pure-css-speech-bubbles/demo/ */ }
.cms-tree.jstree-apple li.Root strong { font-weight: bold; padding-left: 1px; }
.cms-tree.jstree-apple li.Root > a .jstree-icon { background-position: -56px -36px; }
@@ -491,6 +519,8 @@ body.cms-dialog { overflow: auto; background: url("../images/textures/bg_cms_mai
.cms-tree.jstree-apple li { padding: 0px; clear: left; }
.cms-tree.jstree-apple ins { background-color: transparent; background-image: url(../images/sitetree_ss_default_icons.png); }
.cms-tree.jstree-apple li.jstree-checked a, .cms-tree.jstree-apple li.jstree-checked a:link { background-color: #efe999; }
+.cms-tree.jstree-apple .jstree-closed > ins { background-position: 0 0; }
+.cms-tree.jstree-apple .jstree-open > ins { background-position: -20px 0; }
.jstree-apple #record-0.jstree-open > ins { display: none; }
@@ -513,7 +543,7 @@ li.class-ErrorPage > a .jstree-pageicon { background-position: 0 -112px; }
.cms-logo { border-bottom: 1px solid #03090c; height: 31px; overflow: hidden; padding: 0 0 0 4px; vertical-align: middle; font-size: 12px; }
.cms-logo .version { display: none; }
-.cms-logo a { display: inline-block; height: 24px; width: 24px; float: left; margin-right: 8px; background: url("../images/logo_small.png") no-repeat; text-indent: -9999em; padding-right: 7px; border-right: 1px solid #19435c; }
+.cms-logo a { display: inline-block; height: 24px; width: 24px; float: left; margin-right: 8px; background: url('../images/logo_small.png') no-repeat; text-indent: -9999em; padding-right: 7px; border-right: 1px solid #19435c; }
.cms-logo span { font-weight: bold; font-size: 14px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; o-text-overflow: ellipsis; }
.cms-login-status { border-top: 1px solid #19435c; height: 24px; padding: 7px 4px 0 4px; overflow: hidden; line-height: 16px; font-size: 11px; }
View
BIN admin/images/content-header-tabs-sprite.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN admin/images/textures/cms_content_header.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
159 admin/scss/_style.scss
@@ -1,4 +1,4 @@
-/**
+ /**
* This file defines most styles of the CMS: Colors, fonts, backgrounds,
* alignments, dimensions.
*
@@ -53,6 +53,16 @@ body.cms {
strong {
font-weight: bold;
}
+
+ .ss-ui-button.cms-page-add-button {
+ margin-left:0px;
+ font-size:13px;
+ @include border-radius(4px);
+ }
+
+ .ss-ui-button.cms-page-add-button:hover {
+ text-decoration:none;
+ }
}
/** --------------------------------------------
@@ -89,17 +99,14 @@ body.cms {
.cms-content-header {
- background-color: darken($color-widget-bg, 20%);
- padding: $grid-vertical $grid-horizontal ($grid-vertical - 2);
+ padding: ($grid-vertical - 8) $grid-horizontal $grid-vertical;
height: $grid-vertical * 4;
z-index: 60;
- border-bottom: 2px solid darken($color-widget-bg, 35%);
- @include box-shadow($color-widget-bg 0 $grid-vertical $grid-vertical*2);
-
- @include background-image(
- linear-gradient(darken($color-widget-bg, 10%), darken($color-widget-bg, 30%))
- );
+ background: {
+ image:url(../images/textures/cms_content_header.png);
+ repeat:repeat;
+ }
h2 {
float: left;
@@ -119,41 +126,85 @@ body.cms {
}
.cms-content-header-tabs {
- float: left;
+ position:fixed;
+ right:40px;
}
}
.ui-tabs .cms-content-header, .cms-dialog .ui-tabs-nav {
.ui-tabs-nav li {
+ margin:0;
a {
font-weight: bold;
line-height: $grid-vertical * 2;
- padding: ($grid-vertical * 2 - 5) $grid-horizontal + 4 $grid-vertical + 1;
- border-bottom: 2px solid darken($color-tab, 15%);
+ padding: ($grid-vertical * 2 - 4) ($grid-horizontal * 2 + 4) $grid-vertical + 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-default,
.ui-widget-content .ui-state-default,
.ui-widget-header .ui-state-default {
- background-color: $color-tab;
+ background-color: $color-base;
@include background-image(
- linear-gradient($color-tab, darken($color-tab, 10%)
- ));
+ linear-gradient($color-base, darken($color-base, 12%))
+ );
- border-color: darken($color-tab, 20%);
+ border: {
+ right-color: darken($color-tab, 20%);
+ left-color: $color-tab;
+ top:none;
+ bottom:none;
+ }
+
text-shadow: lighten($color-tab, 60%) 0 1px 0;
}
.ui-state-active,
.ui-widget-content .ui-state-active,
.ui-widget-header .ui-state-active {
background: $color-widget-bg;
+ border: {
+ right-color: darken($color-tab, 20%);
+ left-color: darken($color-tab, 20%);
+ top:none;
+ }
+ margin-right:-1px;
+ margin-left:-1px;
+ z-index:2;
a {
- border-bottom: 2px solid $color-widget-bg;
+ border-bottom:none;
+
+ &.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;
+ }
+
+ .ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl {
+ border-radius:0;
+ }
}
/** -------------------------------------------------------
@@ -385,11 +436,57 @@ body.cms {
@include legacy-pie-clearfix();
& > * {
- float: left;
+ float: right;
}
.cms-tree-view-modes * {
display: inline-block;
+ label {
+ color:$color-text-blue-link;
+ }
+ }
+
+/* smaller treedropdown */
+ .chzn-container-single .chzn-single {
+ height: 26px;
+ line-height: 26px;
+ padding-left:25px;
+ color: darken($color-dark-grey, 15%);
+ @include background-image(
+ linear-gradient($color-button-generic, darken($color-button-generic, 10%))
+ );
+ font: {
+ size:13px;
+ weight:bold;
+ }
+ text-shadow:darken($color-text-shadow, 10%) 0 -1px 1px;
+ box-shadow:none;
+ &:hover {
+ @include box-shadow(0 0 5px darken($color-button-generic, 20%));
+ @include background-image(
+ linear-gradient(lighten($color-button-generic, 2%), darken($color-button-generic, 8%))
+ );
+ }
+
+ &:active {
+ @include box-shadow(inset 0 1px 3px darken($color-button-generic, 60%));
+ }
+
+ span {
+ padding-top:1px;
+ }
+
+ div {
+ background:url(../images/btn_icons/settings.png) 5px 4px no-repeat;
+ border-left:none;
+ width:100%;
+ }
+
+ div b {
+ background: url(../images/sprites_32x32/menu-arrow-deselected-down.png) no-repeat 9px 11px;
+ float:right;
+ width:24px;
+ }
}
}
@@ -405,8 +502,7 @@ body.cms {
overflow-y: auto;
overflow-x: hidden;
z-index: 70;
- float: left;
- position: relative;
+ @include box-shadow($color-shadow-dark 0 0 ($grid-horizontal / 2));
.cms-panel-header {
padding: 0;
@@ -484,18 +580,9 @@ body.cms {
margin: 2px 0;
}
}
-
- /* smaller treedropdown */
- .chzn-container-single .chzn-single {
- height: 24px;
- line-height: 24px;
- font-size: 11px;
-
- div b {
- background-position: 4px 0;
- }
- }
}
+
+
/* buttons now need to line with with reduced input sizes */
.ss-ui-button {
@@ -562,10 +649,10 @@ body.cms {
}
.cms-content-batchactions {
- float: right;
+ float: left;
position: relative;
display: block;
- margin-right: 8px;
+ margin-left: 8px;
form > * {
display: block;
@@ -575,6 +662,9 @@ body.cms {
form.cms-batch-actions {
float: left;
}
+ .Actions {
+ display:none;
+ }
}
.cms-content-constructive-actions a {
@@ -757,6 +847,7 @@ form.member-profile-form {
overflow-y: auto;
overflow-x: auto;
background: none;
+ @include box-shadow($color-shadow-dark 0 0 ($grid-horizontal / 2));
}
}
@@ -896,8 +987,6 @@ form.member-profile-form {
background-color: #92a5b2;
padding: $grid-vertical/2 $grid-horizontal/2 $grid-vertical/2 $grid-horizontal*2;
border-bottom: 2px solid #8399a7;
- // @include border-radius-top(4px);
- // @include border-radius-bottom(0px);
@include background-image(linear-gradient(#ced7dc, #92a5b2));
}
View
30 admin/scss/_tree.scss
@@ -63,7 +63,6 @@
.jstree-icon {
margin-right: 3px;
}
-
}
}
@@ -241,6 +240,10 @@
}
li.jstree-open > ul {
display: block;
+ margin-left:-13px;
+ li ul {
+ margin-left:2px;
+ }
}
li.jstree-closed > ul {
display: none;
@@ -379,6 +382,21 @@
}
}
+.jstree-apple {
+ li, .jstree-apple ins {
+ background:none;
+ }
+ .jstree-unchecked > a > .jstree-checkbox {
+ margin-right:3px;
+ }
+ .jstree-checked > a > .jstree-checkbox {
+ margin-right:3px;
+ }
+ .jstree-undetermined > a > .jstree-checkbox {
+ margin-right:3px;
+ }
+}
+
.cms-tree.jstree-apple {
& li.Root {
@@ -500,10 +518,18 @@
background-color: transparent;
background-image: url(../images/sitetree_ss_default_icons.png);
}
-
+
& li.jstree-checked a, li.jstree-checked a:link {
background-color: $color-cms-batchactions-menu-selected-background;
}
+
+ & .jstree-closed > ins {
+ background-position:0 0;
+ }
+
+ & .jstree-open > ins {
+ background-position:-20px 0;
+ }
}
.jstree-apple #record-0.jstree-open > ins {
View
2 admin/scss/_uitheme.scss
@@ -39,7 +39,7 @@
.ui-tabs-panel {
background: transparent; // default it's white
- padding: $grid-vertical * 2 $grid-horizontal * 2;
+ padding: $grid-vertical * 2 $grid-horizontal * 5 $grid-vertical * 2 ($grid-horizontal * 3 + 1);
}
}
View
41 admin/scss/ie7.scss
@@ -10,4 +10,45 @@ html {
padding-left: 0;
padding-right: 0;
}
+}
+
+//fix for add one button not positioning properly
+
+.ss-ui-button.cms-page-add-button {
+ float:left;
+}
+
+.ss-ui-button.cms-page-add-button.ui-state-hover, .cms .ss-ui-button.cms-page-add-button:hover {
+ background: #80bf40 url('../images/btn_icons-saaa1989272.png') 5px -49px no-repeat;
+}
+
+//fix for the tree view modes not displaying inline
+
+.cms-tree-view-modes {
+ div {
+ float:left;
+ }
+ span {
+ float:left;
+ padding-top:5px;
+ }
+}
+
+//add line below the cms-content-toolbar
+
+.cms-content-toolbar {
+ border-bottom:1px solid rgb(201, 205, 206);
+ padding-bottom:5px;
+}
+
+//fix for background color on default tabs
+.ui-state-default,
+.ui-widget-content .ui-state-default,
+.ui-widget-header .ui-state-default {
+ background-image:none;
+}
+
+// fix jstree themeroller plugin bug: tree disappear in IE7
+.jstree li a .ui-icon {
+ text-indent: 0px !important;
}
View
22 admin/scss/ie8.scss
@@ -5,4 +5,26 @@
display: none;
}
}
+}
+
+//fix for overlapping of tree view mode checkboxes
+.cms-content-toolbar .cms-tree-view-modes .checkboxAboveTree {
+ margin-right:1px;
+}
+
+//add border below the content toolbar
+.cms-content-toolbar {
+ border-bottom:1px solid rgb(201, 205, 206);
+}
+
+//fix for the button icon shifting on hover
+.ss-ui-button.cms-page-add-button.ui-state-hover, .cms .ss-ui-button.cms-page-add-button:hover {
+ background: #80bf40 url('../images/btn_icons-saaa1989272.png') 5px -49px no-repeat;
+}
+
+//fix for background color on default tabs
+.ui-state-default,
+.ui-widget-content .ui-state-default,
+.ui-widget-header .ui-state-default {
+ background-image:none;
}
View
1 css/GridField.css
@@ -14,6 +14,7 @@
.cms table.ss-gridfield.field tr:first-child { background: transparent; }
.cms table.ss-gridfield.field tr.ss-gridfield-even { background: #f0f4f7; }
.cms table.ss-gridfield.field tr.ss-gridfield-even.ss-gridfield-last { border-bottom: none; }
+.cms table.ss-gridfield.field tr.even { background: #f0f4f7; }
.cms table.ss-gridfield.field tr th { font-weight: bold; font-size: 12px; color: #FFF; padding: 5px; border-right: 1px solid rgba(0, 0, 0, 0.1); }
.cms table.ss-gridfield.field tr th.main:first-child { -moz-border-radius-topleft: 7px; -webkit-border-top-left-radius: 7px; -o-border-top-left-radius: 7px; -ms-border-top-left-radius: 7px; -khtml-border-top-left-radius: 7px; border-top-left-radius: 7px; }
.cms table.ss-gridfield.field tr th.main:last-child { -moz-border-radius-topright: 7px; -webkit-border-top-right-radius: 7px; -o-border-top-right-radius: 7px; -ms-border-top-right-radius: 7px; -khtml-border-top-right-radius: 7px; border-top-right-radius: 7px; }

0 comments on commit 23e7aee

Please sign in to comment.