Skip to content

Commit

Permalink
BUGFIX:SSF-53 - fixed filter and reset buttons in ie7 and ie8 plus fi…
Browse files Browse the repository at this point in the history 
…xed an array of other ie7/8 styling bugs
  • Loading branch information
jbridson committed Mar 8, 2012
1 parent c5a4279 commit 292bd79
Show file tree
Hide file tree
Showing 5 changed files with 205 additions and 12 deletions.
31 changes: 30 additions & 1 deletion admin/css/ie7.css
View file
Expand Up @@ -15,4 +15,33 @@ html { overflow: hidden; }

.jstree li a .ui-icon { text-indent: 0px !important; }

.cms table.ss-gridfield-table tbody td button span.ui-button-text { zoom: 1; }
.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.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; }

.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; 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.gridfield-button-delete { display: block; float: left; }
.cms .ss-gridfield table.ss-gridfield-table tbody td button.gridfield-button-unlink.ui-state-hover { 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; }
.pagination-page-number input { width: 45px; padding: 0px; }

table.ss-gridfield-table tr.title th h2 { float: left; }

table.ss-gridfield-table tr.ss-gridfield-item.odd { background: white; }
table.ss-gridfield-table tr.ss-gridfield-item.even { background: #F0F4F7; }
16 changes: 16 additions & 0 deletions admin/css/ie8.css
View file
Expand Up @@ -8,3 +8,19 @@
.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-saaa1989272.png") 5px -49px 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-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; }

.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 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; }
Binary file added admin/images/filter-icons.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
118 changes: 108 additions & 10 deletions admin/scss/ie7.scss
View file
Expand Up @@ -53,16 +53,114 @@ html {
text-indent: 0px !important;
}

.cms {
table.ss-gridfield-table {
tbody {
td {
button {
span.ui-button-text {
zoom:1;
}
}
//fix for filter and reset icons on datagrid

.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;
&.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 in IE7

.cms .ss-gridfield table.ss-gridfield-table tbody {
td {
button {
&.gridfield-button-delete {
display:block;
float:left;
}
&.gridfield-button-unlink.ui-state-hover {
display:block;
float:left;
}
}
a.edit-link {
display:block;
float:left;
}
}
}

//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;
right:10px;
input {
width:45px;
padding:0px;
}
}

//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 {
background: white;
}
&.ss-gridfield-item.even {
background: #F0F4F7;
}
}
52 changes: 51 additions & 1 deletion admin/scss/ie8.scss
View file
Expand Up @@ -27,4 +27,54 @@
.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;
}

0 comments on commit 292bd79

Please sign in to comment.