MINOR More spriting in CMS styles

silverstripe · Jan 6, 2012 · fcc01a3 · fcc01a3
1 parent 850ea4c
commit fcc01a3
Show file tree

Hide file tree

Showing 15 changed files with 12 additions and 13 deletions.
diff --git a/admin/css/screen.css b/admin/css/screen.css
diff --git a/admin/images/dialog_close.png b/admin/images/dialog_close.png
diff --git a/admin/images/sprites/32x32-s517e471e4e.png b/admin/images/sprites/32x32-s517e471e4e.png
diff --git a/admin/images/sprites_32x32-s98eda4974b.png b/admin/images/sprites_32x32-s98eda4974b.png
diff --git a/admin/images/sprites_32x32/dialog-close-over.png b/admin/images/sprites_32x32/dialog-close-over.png
diff --git a/admin/images/sprites_32x32/dialog-close.png b/admin/images/sprites_32x32/dialog-close.png
diff --git a/admin/images/logout.png → admin/images/sprites_32x32/logout.png b/admin/images/logout.png → admin/images/sprites_32x32/logout.png
diff --git a/...ites/32x32/menu-arrow-deselected-down.png → ...ites_32x32/menu-arrow-deselected-down.png b/...ites/32x32/menu-arrow-deselected-down.png → ...ites_32x32/menu-arrow-deselected-down.png
diff --git a/...prites/32x32/menu-arrow-deselected-up.png → ...prites_32x32/menu-arrow-deselected-up.png b/...prites/32x32/menu-arrow-deselected-up.png → ...prites_32x32/menu-arrow-deselected-up.png
diff --git a/.../images/sprites/32x32/menu-arrow-down.png → .../images/sprites_32x32/menu-arrow-down.png b/.../images/sprites/32x32/menu-arrow-down.png → .../images/sprites_32x32/menu-arrow-down.png
diff --git a/admin/images/sprites/32x32/menu-arrow-up.png → admin/images/sprites_32x32/menu-arrow-up.png b/admin/images/sprites/32x32/menu-arrow-up.png → admin/images/sprites_32x32/menu-arrow-up.png
diff --git a/admin/images/sprites/32x32/numeric-label.png → admin/images/sprites_32x32/numeric-label.png b/admin/images/sprites/32x32/numeric-label.png → admin/images/sprites_32x32/numeric-label.png
diff --git a/admin/scss/_menu.scss b/admin/scss/_menu.scss
@@ -75,7 +75,7 @@
 		width: 16px;
 		float: left;
 		margin: 0 8px 0 3px;
-		background: url(../images/logout.png) no-repeat;
+		background: sprite($sprites32, logout) no-repeat;
 		text-indent: -9999em;
 	}
 }

diff --git a/admin/scss/_sprites.scss b/admin/scss/_sprites.scss
@@ -9,7 +9,7 @@ $icon24: sprite-map("menu_icons/24x24/*.png");
 $icon16: sprite-map("menu_icons/16x16/*.png");
 
 $btn_icons: sprite-map("btn_icons/*.png", $spacing: 10px);
-$sprites32: sprite-map("sprites/32x32/*.png", $spacing: 10px);
+$sprites32: sprite-map("sprites_32x32/*.png", $spacing: 10px);
 
 @mixin icons($sprite) {
 	background: $sprite;

diff --git a/admin/scss/_uitheme.scss b/admin/scss/_uitheme.scss
@@ -84,13 +84,12 @@
 			background: transparent;
 
 			& .ui-icon-closethick {
-				background-position: 0 -30px;
+				background: sprite($sprites32, dialog-close-over) no-repeat;
 			}
 		}
 
 		& .ui-icon-closethick {
-			background-image: url(../images/dialog_close.png);
-			background-position: 0 0;
+			background: sprite($sprites32, dialog-close) no-repeat;
 			width: 30px;
 			height:  30px;
 		}