BUGFIX: IE Colours

Replace hard coded colours in IE with variables, and refactored code
so that shared IE7 and IE8 fixes are in one place.
This commit is contained in:
Naomi Guyer 2012-05-09 18:31:25 +12:00
parent 181ea6cbea
commit 7d5e46cdcf
5 changed files with 193 additions and 249 deletions

View File

@ -1,38 +1,23 @@
html { overflow: hidden; }
/** This file contains the default theme definitions for the admin interface. Please put mostly SCSS variable definitions in here, and leave the actual styling to _style.scss and auxilliary files. */
/** ----------------------------------------------- Colours ------------------------------------------------ */
/** ----------------------------------------------- Textures ----------------------------------------------- */
/** ----------------------------------------------- Typography. ------------------------------------------------ */
/** ----------------------------------------------- Grid Units (px) We have a vertical rhythm that the grid is based off both x (=horizontal) and y (=vertical). All internal padding and margins are scaled to this and accounting for paragraphs ------------------------------------------------ */
/** ----------------------------------------------- Application Logo (CMS Logo) Must be 24px x 24px ------------------------------------------------ */
.cms .ss-ui-button { background-color: #e6e6e6; }
.cms .ss-ui-button.ui-state-hover { background-color: #f3f3f3; }
.cms .ss-ui-button.ss-ui-action-constructive { background-color: #669933; }
.cms .ss-ui-button.ss-ui-action-constructive.ui-state-hover { background-color: #73ac39; }
.cms .ss-ui-button.ss-ui-action-constructive { background-color: #1f9433; }
.cms .ss-ui-button.ss-ui-action-constructive.ui-state-hover { background-color: #23a93a; }
.field input.text, .field textarea, .field .TreeDropdownField { padding-left: 0; padding-right: 0; }
.ss-uploadfield-edit-iframe .field.treedropdown { height: 150px !important; }
.ss-uploadfield-edit-iframe .field .TreeDropdownField ul { min-height: 100px; height: auto; max-height: 150px; }
.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-icon/add.png") 0px 0px no-repeat; }
.cms-tree-view-modes div { float: left; }
.cms-tree-view-modes span { float: left; padding-top: 5px; }
.cms-panel-content .cms-tree li { width: 200px; overflow: hidden; float: left; display: inline; }
.cms-content-toolbar { border-bottom: 1px solid #c9cdce; padding-bottom: 5px; }
.cms-content-toolbar { border-bottom: 1px solid #c9cdce; }
.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; }
.ss-gridfield-button-filter.ss-ui-button { background: #e6e6e6 url(../images/filter-icons.png) no-repeat -40px 6px; filter: none; }
.ss-gridfield-button-filter.ss-ui-button.hover-alike:active { background-color: #2e7ead; background-position: -15px 7px; filter: none; }
.ss-gridfield-button-filter.ss-ui-button.hover-alike { background-color: #338DC1; background-position: -16px 6px; filter: none; }
.cms table.ss-gridfield-table tbody td { width: auto; }
.cms table.ss-gridfield-table tr th.extra span input { height: 23px; }
.ss-gridfield-button-filter.ss-ui-button { margin: -1px -5px; background: #e6e6e6 url(../images/filter-icons.png) no-repeat -40px 6px; filter: none; }
.ss-gridfield-button-filter.ss-ui-button.hover-alike:active { background: #2e7ead url(../images/filter-icons.png) no-repeat -15px 7px; filter: none; }
.ss-gridfield-button-filter.ss-ui-button.hover-alike { background: #338dc1 url(../images/filter-icons.png) no-repeat -16px 6px; filter: none; }
.ss-gridfield-button-reset.ss-ui-button { margin: -1px -5px; background: #e6e6e6 url(../images/filter-icons.png) no-repeat 8px 5px; filter: none; }
.ss-gridfield-button-reset.ss-ui-button { background: #e6e6e6 url(../images/filter-icons.png) no-repeat 8px 5px; filter: none; }
.ss-gridfield-button-reset.ss-ui-button.filtered:hover { background: red url(../images/filter-icons.png) no-repeat 8px -17px; filter: none; }
.ss-gridfield-button-reset.ss-ui-button.filtered:active { background: #e60000 url(../images/filter-icons.png) no-repeat 9px -16px; filter: none; }
@ -42,12 +27,44 @@ html { overflow: hidden; }
.cms table.ss-gridfield-table tr th.extra { border-top: 1px solid #9a9a9a; padding-right: 12px; }
.cms table.ss-gridfield-table td:first-child, .cms table.ss-gridfield-table th:first-child { border-left: 1px solid #9a9a9a; }
.cms .ss-gridfield table.ss-gridfield-table tbody td button { width: 40px; border: 0; background: none; }
.cms .ss-gridfield table.ss-gridfield-table tbody td button { border: 0; background: none; }
.cms .cms-content .cms-content-fields .aligned_right_label { margin-left: 0; }
.ModelAdmin .cms-content-fields .cms-content-tools .cms-panel-content #Form_ImportForm div.file { margin: 0px; }
.ModelAdmin .cms-content-fields .cms-content-tools .cms-panel-content #Form_ImportForm div.file input.file { margin-left: -132px; }
.ModelAdmin .cms-content-fields .cms-content-tools .cms-panel-content #Form_ImportForm div.checkbox { padding: 0px; }
html { overflow: hidden; }
.field input.text, .field textarea, .field .TreeDropdownField { padding-left: 0; padding-right: 0; }
.ss-uploadfield-edit-iframe .field.treedropdown { height: 150px !important; }
.ss-uploadfield-edit-iframe .field .TreeDropdownField ul { min-height: 100px; height: auto; max-height: 150px; }
.ss-ui-button.cms-page-add-button { float: left; }
.cms-tree-view-modes div { float: left; }
.cms-tree-view-modes span { float: left; padding-top: 5px; }
.cms-panel-content .cms-tree li { width: 200px; overflow: hidden; float: left; display: inline; }
.cms-content-toolbar { padding-bottom: 5px; }
.jstree li a .ui-icon { text-indent: 0px !important; }
.cms table.ss-gridfield-table tbody td { width: auto; }
.cms table.ss-gridfield-table tr th.extra span input { height: 23px; }
.ss-gridfield-button-filter.ss-ui-button { margin: -1px -5px; }
.ss-gridfield-button-reset.ss-ui-button { margin: -1px -5px; }
.cms .ss-gridfield table.ss-gridfield-table tbody td button { width: 40px; }
.cms .ss-gridfield table.ss-gridfield-table tbody td button.gridfield-button-delete { display: block; float: left; }
.cms .ss-gridfield table.ss-gridfield-table tbody td button.gridfield-button-unlink { display: block; float: left; }
.cms .ss-gridfield table.ss-gridfield-table tbody td a.edit-link { display: block; float: left; }
.cms .cms-content .cms-content-fields .aligned_right_label { margin-left: 0; }
.cms .cms-content .cms-content-fields .field.dropdown .middleColumn { max-width: 512px; }
.pagination-page-number { position: relative; bottom: 10px; right: 10px; }
@ -60,9 +77,6 @@ table.ss-gridfield-table tr.ss-gridfield-item.even { background: #F0F4F7; }
.ModelAdmin .cms-content-fields .cms-content-tools .cms-panel-content .cms-search-form { overflow: hidden; }
.ModelAdmin .cms-content-fields .cms-content-tools .cms-panel-content .cms-search-form input { width: 160px; }
.ModelAdmin .cms-content-fields .cms-content-tools .cms-panel-content #Form_ImportForm div.file { margin: 0px; }
.ModelAdmin .cms-content-fields .cms-content-tools .cms-panel-content #Form_ImportForm div.file input.file { margin-left: -132px; }
.ModelAdmin .cms-content-fields .cms-content-tools .cms-panel-content #Form_ImportForm div.checkbox { padding: 0px; }
.cms .ss-gridfield table.ss-gridfield-table tbody td.col-listChildrenLink { width: 16px; }
.cms .ss-gridfield table.ss-gridfield-table tbody td.col-listChildrenLink .list-children-link { background: transparent url(../images/sitetree_ss_default_icons.png) no-repeat 4px -4px; display: block; }

View File

@ -1,24 +1,21 @@
/** This file contains the default theme definitions for the admin interface. Please put mostly SCSS variable definitions in here, and leave the actual styling to _style.scss and auxilliary files. */
/** ----------------------------------------------- Colours ------------------------------------------------ */
/** ----------------------------------------------- Textures ----------------------------------------------- */
/** ----------------------------------------------- Typography. ------------------------------------------------ */
/** ----------------------------------------------- Grid Units (px) We have a vertical rhythm that the grid is based off both x (=horizontal) and y (=vertical). All internal padding and margins are scaled to this and accounting for paragraphs ------------------------------------------------ */
/** ----------------------------------------------- Application Logo (CMS Logo) Must be 24px x 24px ------------------------------------------------ */
.cms .ss-ui-button { background-color: #e6e6e6; }
.cms .ss-ui-button.ui-state-hover { background-color: #f3f3f3; }
.cms .ss-ui-button.ss-ui-action-constructive { background-color: #669933; }
.cms .ss-ui-button.ss-ui-action-constructive.ui-state-hover { background-color: #73ac39; }
.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 .ss-ui-button.ss-ui-action-constructive { background-color: #1f9433; }
.cms .ss-ui-button.ss-ui-action-constructive.ui-state-hover { background-color: #23a93a; }
.cms-content-toolbar { border-bottom: 1px solid #c9cdce; }
.cms-content-tools .cms-panel-content .dropdown select { width: 152px; }
.ss-ui-button.cms-page-add-button.ui-state-hover, .cms .ss-ui-button.cms-page-add-button:hover { background: #80bf40 url("../images/btn-icon/add.png") 0px 0px no-repeat; }
.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { background-image: none; }
.ss-gridfield-button-filter.ss-ui-button { background: #e6e6e6 url(../images/filter-icons.png) no-repeat -40px 6px; filter: none; }
.ss-gridfield-button-filter.ss-ui-button.hover-alike:active { background: #2e7ead url(../images/filter-icons.png) no-repeat -15px 7px; filter: none; }
.ss-gridfield-button-filter.ss-ui-button.hover-alike { background: #338dc1 url(../images/filter-icons.png) no-repeat -16px 6px; filter: none; }
.ss-gridfield-button-filter.ss-ui-button.hover-alike:active { background-color: #2e7ead; background-position: -15px 7px; filter: none; }
.ss-gridfield-button-filter.ss-ui-button.hover-alike { background-color: #338DC1; background-position: -16px 6px; filter: none; }
.ss-gridfield-button-reset.ss-ui-button { background: #e6e6e6 url(../images/filter-icons.png) no-repeat 8px 5px; filter: none; }
.ss-gridfield-button-reset.ss-ui-button.filtered:hover { background: red url(../images/filter-icons.png) no-repeat 8px -17px; filter: none; }
@ -27,13 +24,20 @@
.cms table.ss-gridfield-table tr td { border-right: 1px solid #9a9a9a; }
.cms table.ss-gridfield-table tr th { border-right: 1px solid #9a9a9a; }
.cms table.ss-gridfield-table tr th.main { border-top: 1px solid #9a9a9a; border-bottom: none; }
.cms table.ss-gridfield-table tr th.extra { border-top: 1px solid #9a9a9a; }
.cms table.ss-gridfield-table tr th.extra { border-top: 1px solid #9a9a9a; padding-right: 12px; }
.cms table.ss-gridfield-table td:first-child, .cms table.ss-gridfield-table th:first-child { border-left: 1px solid #9a9a9a; }
.cms .cms-content .cms-content-fields .aligned_right_label { margin-left: 0; }
.cms .ss-gridfield table.ss-gridfield-table tbody td button { border: 0; background: none; }
.cms .cms-content .cms-content-fields .aligned_right_label { margin-left: 0; }
.ModelAdmin .cms-content-fields .cms-content-tools .cms-panel-content #Form_ImportForm div.file { margin: 0px; }
.ModelAdmin .cms-content-fields .cms-content-tools .cms-panel-content #Form_ImportForm div.file input.file { margin-left: -132px; }
.ModelAdmin .cms-content-fields .cms-content-tools .cms-panel-content #Form_ImportForm div.checkbox { padding: 0px; }
.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-tools .cms-panel-content .dropdown select { width: 152px; }

110
admin/scss/_ieShared.scss Normal file
View File

@ -0,0 +1,110 @@
//fix for background colors on buttons
.cms .ss-ui-button {
background-color: $color-button-generic;
&.ui-state-hover {
background-color:lighten($color-button-generic, 5%);
}
&.ss-ui-action-constructive {
background-color:$color-button-constructive;
&.ui-state-hover {
background-color:lighten($color-button-constructive, 5%);
}
}
}
.cms-content-toolbar{
//add border below the content toolbar
border-bottom:1px solid rgb(201, 205, 206);
}
//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 for filter and reset icons on datagrid
.ss-gridfield-button-filter.ss-ui-button {
background: $color-button-generic url(../images/filter-icons.png) no-repeat -40px 6px;
filter:none;
&.hover-alike:active {
background-color: darken(#338DC1, 5%);
background-position: -15px 7px;
filter:none;
}
&.hover-alike {
background-color: #338DC1;
background-position: -16px 6px;
filter:none;
}
}
.ss-gridfield-button-reset.ss-ui-button {
background: $color-button-generic url(../images/filter-icons.png) no-repeat 8px 5px;
filter:none;
&.filtered:hover {
background: $color-button-destructive url(../images/filter-icons.png) no-repeat 8px -17px;
filter:none;
}
&.filtered:active {
background: darken($color-button-destructive, 5%) url(../images/filter-icons.png) no-repeat 9px -16px;
filter:none;
}
}
//fix for borders on gridfield table
.cms table.ss-gridfield-table {
tr {
td {
border-right: 1px solid lighten($color-medium-separator, 10%);
}
th {
border-right: 1px solid lighten($color-medium-separator, 10%);
&.main {
border-top: 1px solid lighten($color-medium-separator, 10%);
border-bottom: none;
}
&.extra {
border-top: 1px solid lighten($color-medium-separator, 10%);
padding-right:12px;
}
}
}
td:first-child, th:first-child {
border-left: 1px solid lighten($color-medium-separator, 10%);
}
}
//fix for edit and delete icons - border appears on click.
.cms .ss-gridfield table.ss-gridfield-table tbody {
td {
button {
border:0;
background:none;
}
}
}
//fix for wrong alignment of label on parent groups field in users groups
.cms .cms-content .cms-content-fields {
.aligned_right_label {
margin-left:0;
}
}
//fix for model admin filter styling
.ModelAdmin .cms-content-fields .cms-content-tools .cms-panel-content {
#Form_ImportForm {
div.file {
margin:0px;
input.file {
margin-left: -132px; //hides unnecessary text input field
}
}
div.checkbox {
padding:0px; //stops clear database text from overflowing onto two lines.
}
}
}

View File

@ -1,22 +1,10 @@
@import 'themes/default';
@import 'ieShared';
html {
overflow: hidden;
}
//fix for background colors on buttons
.cms .ss-ui-button {
background-color: #e6e6e6;
&.ui-state-hover {
background-color:lighten(#e6e6e6, 5%);
}
&.ss-ui-action-constructive {
background-color:#669933;
&.ui-state-hover {
background-color:lighten(#669933, 5%);
}
}
}
//
.field {
input.text,
textarea,
@ -43,21 +31,13 @@ html {
}
}
//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-icon/add.png') 0px 0px no-repeat;
}
//fix for the tree view modes not displaying inline
.cms-tree-view-modes {
div {
float:left;
@ -76,22 +56,12 @@ html {
}
}
//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 {
@ -112,57 +82,19 @@ html {
.ss-gridfield-button-filter.ss-ui-button {
margin: -1px -5px;
background: #e6e6e6 url(../images/filter-icons.png) no-repeat -40px 6px; filter:none;
&.hover-alike:active {
background: darken(#338DC1, 5%) url(../images/filter-icons.png) no-repeat -15px 7px; filter:none;
}
&.hover-alike {
background: #338DC1 url(../images/filter-icons.png) no-repeat -16px 6px; filter:none;
}
}
.ss-gridfield-button-reset.ss-ui-button {
margin: -1px -5px;
background: #e6e6e6 url(../images/filter-icons.png) no-repeat 8px 5px; filter:none;
&.filtered:hover {
background: #FF0000 url(../images/filter-icons.png) no-repeat 8px -17px; filter:none;
}
&.filtered:active {
background: darken(#FF0000, 5%) url(../images/filter-icons.png) no-repeat 9px -16px; filter:none;
}
}
//fix for borders on gridfield table
.cms table.ss-gridfield-table {
tr {
td {
border-right: 1px solid lighten(#808080, 10%);
}
th {
border-right: 1px solid lighten(#808080, 10%);
&.main {
border-top: 1px solid lighten(#808080, 10%);
border-bottom: none;
}
&.extra {
border-top: 1px solid lighten(#808080, 10%);
padding-right:12px;
}
}
}
td:first-child, th:first-child {
border-left: 1px solid lighten(#808080, 10%);
}
}
//fix for edit and delete icons
.cms .ss-gridfield table.ss-gridfield-table tbody {
td {
button {
width:40px;
border:0;
background:none;
&.gridfield-button-delete {
display:block;
float:left;
@ -180,18 +112,13 @@ html {
}
//fix for wrong alignment of label on parent groups field in users groups and fix for width of parent group dropdown field
.cms .cms-content .cms-content-fields {
.aligned_right_label {
margin-left:0;
}
.field.dropdown .middleColumn {
max-width:512px;
}
}
//fix for input on datagrid pagination
.pagination-page-number {
position:relative;
bottom:10px;
@ -205,13 +132,11 @@ html {
}
//fix for wrong height on users groups gridfield table header
table.ss-gridfield-table tr.title th h2 {
float:left;
}
//fix for alternate colors on rows in datagrid
table.ss-gridfield-table {
tr {
&.ss-gridfield-item.odd {
@ -231,17 +156,6 @@ table.ss-gridfield-table {
width:160px;
}
}
#Form_ImportForm {
div.file {
margin:0px;
input.file {
margin-left: -132px; //hides unnecessary text input field
}
}
div.checkbox {
padding:0px; //stops clear database text from overflowing onto two lines.
}
}
}
//fix for view children arrow in pages list view

View File

@ -1,16 +1,6 @@
//fix for background colors on buttons
.cms .ss-ui-button {
background-color: #e6e6e6;
&.ui-state-hover {
background-color:lighten(#e6e6e6, 5%);
}
&.ss-ui-action-constructive {
background-color:#669933;
&.ui-state-hover {
background-color:lighten(#669933, 5%);
}
}
}
@import 'themes/default';
@import 'ieShared';
.cms-panel {
.cms-panel-content-collapsed {
@ -22,104 +12,16 @@
}
//fix for overlapping of tree view mode checkboxes
.cms-content-toolbar .cms-tree-view-modes .checkboxAboveTree {
margin-right:1px;
.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 width of dropdowns in filter panel
.cms-content-tools .cms-panel-content .dropdown select {
width:152px;
}
//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-icon/add.png') 0px 0px 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;
}
//fix for filter and reset icons on datagrid
.ss-gridfield-button-filter.ss-ui-button{
background: #e6e6e6 url(../images/filter-icons.png) no-repeat -40px 6px; filter:none;
&.hover-alike:active {
background: darken(#338DC1, 5%) url(../images/filter-icons.png) no-repeat -15px 7px; filter:none;
}
&.hover-alike {
background: #338DC1 url(../images/filter-icons.png) no-repeat -16px 6px; filter:none;
}
}
.ss-gridfield-button-reset.ss-ui-button{
background: #e6e6e6 url(../images/filter-icons.png) no-repeat 8px 5px; filter:none;
&.filtered:hover {
background: #FF0000 url(../images/filter-icons.png) no-repeat 8px -17px; filter:none;
}
&.filtered:active {
background: darken(#FF0000, 5%) url(../images/filter-icons.png) no-repeat 9px -16px; filter:none;
}
}
//fix for borders on gridfield table
.cms table.ss-gridfield-table {
tr {
td {
border-right: 1px solid lighten(#808080, 10%);
}
th {
border-right: 1px solid lighten(#808080, 10%);
&.main {
border-top: 1px solid lighten(#808080, 10%);
border-bottom: none;
}
&.extra {
border-top: 1px solid lighten(#808080, 10%);
}
}
}
td:first-child, th:first-child {
border-left: 1px solid lighten(#808080, 10%);
}
}
//fix for wrong alignment of label on parent groups field in users groups
.cms .cms-content .cms-content-fields .aligned_right_label {
margin-left:0;
}
//fix for edit and delete icons - border appears on click.
.cms .ss-gridfield table.ss-gridfield-table tbody {
td {
button {
border:0;
background:none;
}
}
}
//fix for model admin filter styling
.ModelAdmin .cms-content-fields .cms-content-tools .cms-panel-content {
#Form_ImportForm {
div.file {
margin:0px;
input.file {
margin-left: -132px; //hides unnecessary text input field
}
}
div.checkbox {
padding:0px; //stops clear database text from overflowing onto two lines.
}
}
}
width:152px;
}