From 9f41ffd6e1399db412692c19915deae09f187f8d Mon Sep 17 00:00:00 2001 From: Naomi Guyer Date: Tue, 19 Jun 2012 17:52:09 +1200 Subject: [PATCH] ChangedBUG FIX: IE filter buttons (fixes #7501) * Changed spacing of IE filter buttons --- admin/css/ie7.css | 6 ++++++ admin/css/ie8.css | 7 +++++++ admin/scss/_ieShared.scss | 8 ++++++++ admin/scss/ie7.scss | 21 ++++++++++++++++++++- admin/scss/ie8.scss | 14 ++++++++++++++ 5 files changed, 55 insertions(+), 1 deletion(-) diff --git a/admin/css/ie7.css b/admin/css/ie7.css index a4bc9e3d9..385a393b4 100644 --- a/admin/css/ie7.css +++ b/admin/css/ie7.css @@ -36,6 +36,8 @@ .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; } +.filter-buttons button.ss-gridfield-button-filter { background-position: -18px 4px !important; } + html { overflow: hidden; } .field input.text, .field textarea, .field .TreeDropdownField { padding-left: 0; padding-right: 0; } @@ -54,6 +56,8 @@ html { overflow: hidden; } .cms-content-toolbar { padding-bottom: 5px; } +.cms-menu-list li { list-style-type: none; width: 100%; float: left; margin: 0px; padding: 0px; } + .jstree li a .ui-icon { text-indent: 0px !important; } .cms table.ss-gridfield-table tbody td { width: auto; } @@ -91,3 +95,5 @@ table.ss-gridfield-table tr.ss-gridfield-item.even { background: #F0F4F7; } .cms-content-header h2 { float: left; } .cms-content-header h2 .section-icon { display: none; } .cms-content-header .cms-content-header-tabs { position: absolute; right: 0; } + +.ss-ui-button.ss-gridfield-button-filter { border: none !important; } diff --git a/admin/css/ie8.css b/admin/css/ie8.css index 5787429b3..cf8f53ea1 100644 --- a/admin/css/ie8.css +++ b/admin/css/ie8.css @@ -36,6 +36,8 @@ .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; } +.filter-buttons button.ss-gridfield-button-filter { background-position: -18px 4px !important; } + .cms-panel .cms-panel-content-collapsed { width: 40px; } .cms-panel .cms-panel-content-collapsed h2, .cms-panel .cms-panel-content-collapsed h3 { display: none; } @@ -43,3 +45,8 @@ .cms .cms-content-tools { border-right: 1px solid #CCC; } .cms .cms-content-tools .cms-panel-content .dropdown select { width: 152px; } + +.filter-buttons button { width: 23px !important; height: 23px !important; } +.filter-buttons button.ss-gridfield-button-close { margin-right: -7px !important; } + +.col-buttons { width: 18px; } diff --git a/admin/scss/_ieShared.scss b/admin/scss/_ieShared.scss index b3e7054c1..4e68614aa 100644 --- a/admin/scss/_ieShared.scss +++ b/admin/scss/_ieShared.scss @@ -112,3 +112,11 @@ } } } + +.filter-buttons{ + button{ + &.ss-gridfield-button-filter{ + background-position: -18px 4px !important; + } + } +} diff --git a/admin/scss/ie7.scss b/admin/scss/ie7.scss index 07e1f0f28..fb678a98e 100644 --- a/admin/scss/ie7.scss +++ b/admin/scss/ie7.scss @@ -40,6 +40,8 @@ html { } + + //fix for the tree view modes not displaying inline .cms-tree-view-modes { div { @@ -64,6 +66,17 @@ html { padding-bottom:5px; } +.cms-menu-list{ + li{ + list-style-type: none; + width: 100%; + float: left; + margin: 0px; + padding: 0px; + } +} + + // fix jstree themeroller plugin bug: tree disappear in IE7 @@ -198,4 +211,10 @@ table.ss-gridfield-table { right: 0; } } - + + +.ss-ui-button{ + &.ss-gridfield-button-filter{ + border:none !important; + } +} diff --git a/admin/scss/ie8.scss b/admin/scss/ie8.scss index f3f45dae9..6d84f5732 100644 --- a/admin/scss/ie8.scss +++ b/admin/scss/ie8.scss @@ -30,4 +30,18 @@ .cms-panel-content .dropdown select { width:152px; } +} + +.filter-buttons{ + button{ + width:23px !important; + height:23px !important; + &.ss-gridfield-button-close{ + margin-right:-7px !important; + } + } +} + +.col-buttons{ + width:18px; } \ No newline at end of file