From 6649d69b397aca3d4d4e3ed7c477f99eeae5924a Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Fri, 13 May 2011 17:10:50 +1200 Subject: [PATCH] MINOR Updated menu icons --- admin/css/screen.css | 12 +++++++++--- admin/scss/_menu.scss | 21 +++++++++++++++++++-- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/admin/css/screen.css b/admin/css/screen.css index 3d19ab669..2a0c09228 100755 --- a/admin/css/screen.css +++ b/admin/css/screen.css @@ -144,18 +144,24 @@ li.jstree-closed > ul { display: none; } .cms-menu-list li { background-color: #b0bfc6; background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(0%, #b0bfc6), color-stop(100%, #758f9b)); background-image: -moz-linear-gradient(top, #b0bfc6 0%, #758f9b 100%); background-image: linear-gradient(top, #b0bfc6 0%, #758f9b 100%); border-bottom: 1px solid #aaaaaa; } .cms-menu-list li a { display: block; height: 32px; vertical-align: middle; font-size: 14px; text-shadow: #aaaaaa 1px 1px 1px; color: #333333; padding: 5px; } -.cms-menu-list li a .icon { display: block; float: left; margin-right: 5px; background: url('../images/icons-32.png?1305180670') no-repeat; width: 32px; height: 32px; overflow: hidden; background-position: 0px 0px; } +.cms-menu-list li a .icon { display: block; float: left; margin-right: 5px; background: url('../images/icons-32.png?1305262748') no-repeat; width: 32px; height: 32px; overflow: hidden; background-position: 0px 0px; } +.cms-menu-list li a:hover .icon { background-position: -32px 0px; } .cms-menu-list li a .text { display: block; padding-top: 10px; } .cms-menu-list li.current { background-color: #338dc1; background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(0%, #338dc1), color-stop(100%, #1e5270)); background-image: -moz-linear-gradient(top, #338dc1 0%, #1e5270 100%); background-image: linear-gradient(top, #338dc1 0%, #1e5270 100%); } .cms-menu-list li.current li { background-color: #2e7ead; background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(0%, #2e7ead), color-stop(100%, #287099)); background-image: -moz-linear-gradient(top, #2e7ead 0%, #287099 100%); background-image: linear-gradient(top, #2e7ead 0%, #287099 100%); } .cms-menu-list li.current a { color: white; text-shadow: #333333 1px 1px 1px; } +.cms-menu-list li.current a .icon { background-position: -32px 0px; } .cms-menu-list li li:first { -moz-box-shadow: #333333 0 4px 4px 0; -webkit-box-shadow: #333333 0 4px 4px 0; -o-box-shadow: #333333 0 4px 4px 0; box-shadow: #333333 0 4px 4px 0; } .cms-menu-list li li a { font-size: 12px; text-shadow: #333333 1px 1px 1px; margin: 0; padding-left: 30px; color: white; } .cms-menu-list li li.current a { font-weight: bold; } .cms-menu-list li#Menu-CMSMain a .icon { background-position: 0px 0px; } .cms-menu-list li#Menu-CMSMain.current a .icon, .cms-menu-list li#Menu-CMSMain a:hover .icon { background-position: -32px 0px; } -.cms-menu-list li#Menu-AssetAdmin a .icon { background-position: 0px -32px; } -.cms-menu-list li#Menu-AssetAdmin.current a .icon, .cms-menu-list li#Menu-AssetAdmin a:hover .icon { background-position: -32px -32px; } +.cms-menu-list li#Menu-AssetAdmin a .icon { background-position: 0px -96px; } +.cms-menu-list li#Menu-AssetAdmin.current a .icon, .cms-menu-list li#Menu-AssetAdmin a:hover .icon { background-position: -32px -96px; } +.cms-menu-list li#Menu-SecurityAdmin a .icon { background-position: 0px -128px; } +.cms-menu-list li#Menu-SecurityAdmin.current a .icon, .cms-menu-list li#Menu-SecurityAdmin a:hover .icon { background-position: -32px -128px; } +.cms-menu-list li#Menu-CMSPagesController a .icon { background-position: 0px -32px; } +.cms-menu-list li#Menu-CMSPagesController.current a .icon, .cms-menu-list li#Menu-CMSPagesController a:hover .icon { background-position: -32px -32px; } .cms-menu-list.collapsed li .text { display: none; } .cms-menu-list.collapsed li > li { display: none; } diff --git a/admin/scss/_menu.scss b/admin/scss/_menu.scss index 101b5c76c..9b75e516b 100755 --- a/admin/scss/_menu.scss +++ b/admin/scss/_menu.scss @@ -103,6 +103,10 @@ @include sprite-position(1, 1); } + &:hover .icon { + @include sprite-position(2, 1); + } + .text { display: block; } @@ -125,6 +129,15 @@ border-top: 1px solid darken($color-menu-button, 20%); } + a .icon { + @include sprite-position(2, 1); + } + } + + // nested elements + li { + + li { background-color: darken($color-menu-button, 10%); @@ -167,8 +180,12 @@ li#Menu-CMSMain a .icon {@include sprite-position(1, 1);} li#Menu-CMSMain.current a .icon, li#Menu-CMSMain a:hover .icon {@include sprite-position(2, 1);} - li#Menu-AssetAdmin a .icon {@include sprite-position(1, 2);} - li#Menu-AssetAdmin.current a .icon, li#Menu-AssetAdmin a:hover .icon {@include sprite-position(2, 2);} + li#Menu-AssetAdmin a .icon {@include sprite-position(1, 4);} + li#Menu-AssetAdmin.current a .icon, li#Menu-AssetAdmin a:hover .icon {@include sprite-position(2, 4);} + li#Menu-SecurityAdmin a .icon {@include sprite-position(1, 5);} + li#Menu-SecurityAdmin.current a .icon, li#Menu-SecurityAdmin a:hover .icon {@include sprite-position(2, 5);} + li#Menu-CMSPagesController a .icon {@include sprite-position(1, 2);} + li#Menu-CMSPagesController.current a .icon, li#Menu-CMSPagesController a:hover .icon {@include sprite-position(2, 2);} &.collapsed { li .text {