Permalink
Browse files

ChangedBUG FIX: IE filter buttons (fixes #7501)

* Changed spacing of IE filter buttons

Conflicts:

	admin/css/ie7.css
	admin/css/ie8.css
	admin/scss/ie7.scss
  • Loading branch information...
1 parent 42d40a7 commit 3eff92ad406ebb7a0ea5432640bd9c407f700057 @adrexia adrexia committed with chillu Jun 19, 2012
Showing with 55 additions and 6 deletions.
  1. +5 −2 admin/css/ie7.css
  2. +9 −2 admin/css/ie8.css
  3. +8 −0 admin/scss/_ieShared.scss
  4. +19 −2 admin/scss/ie7.scss
  5. +14 −0 admin/scss/ie8.scss
View
@@ -38,6 +38,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; }
@@ -56,6 +58,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; }
@@ -94,5 +98,4 @@ table.ss-gridfield-table tr.ss-gridfield-item.even { background: #F0F4F7; }
.cms-content-header h2 .section-icon { display: none; }
.cms-content-header .cms-content-header-tabs { position: absolute; right: 0; }
-.cms-panel-content-collapsed { position: relative; width: 40px; }
-.cms-panel-content-collapsed h2.cms-panel-header, .cms-panel-content-collapsed h3.cms-panel-header { zoom: 1; position: absolute; top: 10px; right: 10px; writing-mode: tb-rl; float: right; z-index: 5000; }
+.ss-ui-button.ss-gridfield-button-filter { border: none !important; }
View
@@ -38,10 +38,17 @@
.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 { position: relative; width: 40px; }
-.cms-panel .cms-panel-content-collapsed h2.cms-panel-header, .cms-panel .cms-panel-content-collapsed h3.cms-panel-header { zoom: 1; position: absolute; top: 10px; right: 10px; writing-mode: tb-rl; float: right; z-index: 5000; }
+.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; }
.cms-content-toolbar .cms-tree-view-modes .checkboxAboveTree { margin-right: 1px; }
.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; }
@@ -136,3 +136,11 @@
}
}
}
+
+.filter-buttons{
+ button{
+ &.ss-gridfield-button-filter{
+ background-position: -18px 4px !important;
+ }
+ }
+}
View
@@ -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,6 +211,10 @@ table.ss-gridfield-table {
right: 0;
}
}
-
+
-@include IEVerticalPanelText; //IE7 needs this defined outside .cms-panel
+.ss-ui-button{
+ &.ss-gridfield-button-filter{
+ border:none !important;
+ }
+}
View
@@ -25,4 +25,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;
}

0 comments on commit 3eff92a

Please sign in to comment.