tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '7471-ie-filter-nav' of https://github.com/adrexia/sapphire into adrexia-7471-ie-filter-nav

Browse Source 
Conflicts:
	admin/scss/_ieShared.scss
This commit is contained in:
Ingo Schommer 2012-06-20 14:10:08 +02:00
commit 1016c36d33
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/css/ie7.css
View File

@ -32,6 +32,8 @@
.cms .cms-content .cms-content-fields .aligned_right_label { margin-left: 0; }
.cms-menu-list li a .icon { filter: none; }
.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; }

2
admin/css/ie8.css
View File

@ -32,6 +32,8 @@
.cms .cms-content .cms-content-fields .aligned_right_label { margin-left: 0; }
.cms-menu-list li a .icon { filter: none; }
.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; }

5
admin/scss/_ieShared.scss
View File

@ -117,6 +117,11 @@
}
}
.cms-menu-list li a .icon{
filter:none;
}
//fix for model admin filter styling
.ModelAdmin .cms-content-fields .cms-content-tools .cms-panel-content {
#Form_ImportForm {