diff --git a/admin/css/screen.css b/admin/css/screen.css index e4999d09a..e1fb6a564 100755 --- a/admin/css/screen.css +++ b/admin/css/screen.css @@ -74,8 +74,8 @@ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, .cms .ui-widget-header .ui-dialog-title { padding: 6px 0; text-shadow: #ced7dc 1px 1px 0; } .cms .ui-widget-header a.ui-dialog-titlebar-close { position: absolute; top: -8px; right: -15px; width: 30px; height: 30px; z-index: 100000; } .cms .ui-widget-header a.ui-state-hover { border-color: transparent; background: transparent; } -.cms .ui-widget-header a.ui-state-hover .ui-icon-closethick { background-position: 0 -30px; } -.cms .ui-widget-header .ui-icon-closethick { background-image: url(../images/dialog_close.png); background-position: 0 0; width: 30px; height: 30px; } +.cms .ui-widget-header a.ui-state-hover .ui-icon-closethick { background: url('../images/sprites_32x32-s98eda4974b.png') 0 0 no-repeat; } +.cms .ui-widget-header .ui-icon-closethick { background: url('../images/sprites_32x32-s98eda4974b.png') 0 -40px no-repeat; width: 30px; height: 30px; } .cms .ui-state-hover { cursor: pointer; } .cms .ui-widget input, .cms .ui-widget select, .cms .ui-widget textarea, .cms .ui-widget button { color: #444444; font-size: 12px; font-family: Arial, sans-serif; } @@ -385,7 +385,7 @@ body.cms-dialog { overflow: auto; background: url("../images/textures/bg_cms_mai /** -------------------------------------------- Step labels -------------------------------------------- */ .step-label > * { display: inline-block; vertical-align: top; } .step-label .flyout { height: 18px; font-size: 14px; font-weight: bold; -moz-border-radius-topleft: 3px; -webkit-border-top-left-radius: 3px; -o-border-top-left-radius: 3px; -ms-border-top-left-radius: 3px; -khtml-border-top-left-radius: 3px; border-top-left-radius: 3px; -moz-border-radius-bottomleft: 3px; -webkit-border-bottom-left-radius: 3px; -o-border-bottom-left-radius: 3px; -ms-border-bottom-left-radius: 3px; -khtml-border-bottom-left-radius: 3px; border-bottom-left-radius: 3px; background-color: #667980; padding: 4px 3px 4px 6px; text-align: center; text-shadow: none; color: #fff; } -.step-label .arrow { height: 26px; width: 10px; background: url('../images/sprites/32x32-s517e471e4e.png') 0 -64px no-repeat; margin-right: 4px; } +.step-label .arrow { height: 26px; width: 10px; background: url('../images/sprites_32x32-s98eda4974b.png') 0 -171px no-repeat; margin-right: 4px; } .step-label .title { height: 18px; padding: 4px; } /** This file defines the jstree base styling (see http://jstree.com), as well as any customizations (see bottom of file). The styles are usually added through jstree.js on DOM load, but we need it earlier in order to correctly display the uninitialized tree. */ @@ -494,7 +494,7 @@ li.class-ErrorPage > a .jstree-pageicon { background-position: 0 -112px; } .cms-logo span { font-weight: bold; font-size: 14px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; o-text-overflow: ellipsis; } .cms-login-status { border-top: 1px solid #19435c; height: 24px; padding: 7px 4px 0 4px; overflow: hidden; line-height: 16px; font-size: 11px; } -.cms-login-status .logout-link { display: inline-block; height: 16px; width: 16px; float: left; margin: 0 8px 0 3px; background: url(../images/logout.png) no-repeat; text-indent: -9999em; } +.cms-login-status .logout-link { display: inline-block; height: 16px; width: 16px; float: left; margin: 0 8px 0 3px; background: url('../images/sprites_32x32-s98eda4974b.png') 0 -81px no-repeat; text-indent: -9999em; } .cms-menu { z-index: 80; background: #c6d7df; border-right: 1px solid #8c99a1; width: 191px; /* 8x24 - 1 */ -moz-box-shadow: rgba(107, 120, 123, 0.5) 0 0 8px; -webkit-box-shadow: rgba(107, 120, 123, 0.5) 0 0 8px; -o-box-shadow: rgba(107, 120, 123, 0.5) 0 0 8px; box-shadow: rgba(107, 120, 123, 0.5) 0 0 8px; } .cms-menu a { text-decoration: none; } @@ -514,12 +514,12 @@ li.class-ErrorPage > a .jstree-pageicon { background-position: 0 -112px; } .cms-menu-list li a .icon { display: inline-block; float: left; margin: 4px 10px 0 4px; filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=70); opacity: 0.7; } .cms-menu-list li a .text { display: inline-block; float: left; } .cms-menu-list li a .toggle-children { display: inline-block; float: right; width: 20px; height: 100%; cursor: pointer; } -.cms-menu-list li a .toggle-children .toggle-children-icon { display: inline-block; width: 8px; height: 8px; background: url('../images/sprites/32x32-s517e471e4e.png') 0 0 no-repeat; vertical-align: middle; } -.cms-menu-list li a .toggle-children.opened .toggle-children-icon { background: url('../images/sprites/32x32-s517e471e4e.png') 0 -16px no-repeat; } +.cms-menu-list li a .toggle-children .toggle-children-icon { display: inline-block; width: 8px; height: 8px; background: url('../images/sprites_32x32-s98eda4974b.png') 0 -107px no-repeat; vertical-align: middle; } +.cms-menu-list li a .toggle-children.opened .toggle-children-icon { background: url('../images/sprites_32x32-s98eda4974b.png') 0 -123px no-repeat; } .cms-menu-list li ul { display: none; } .cms-menu-list li.current a { color: white; text-shadow: #1e5270 0 -1px 0; border-top: 1px solid #55a4d2; border-bottom: 1px solid #1e5270; background-color: #338dc1; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #338dc1), color-stop(100%, #287099)); background-image: -webkit-linear-gradient(#338dc1, #287099); background-image: -moz-linear-gradient(#338dc1, #287099); background-image: -o-linear-gradient(#338dc1, #287099); background-image: -ms-linear-gradient(#338dc1, #287099); background-image: linear-gradient(#338dc1, #287099); } -.cms-menu-list li.current a .toggle-children .toggle-children-icon { background: url('../images/sprites/32x32-s517e471e4e.png') 0 -32px no-repeat; } -.cms-menu-list li.current a .toggle-children.opened .toggle-children-icon { background: url('../images/sprites/32x32-s517e471e4e.png') 0 -48px no-repeat; } +.cms-menu-list li.current a .toggle-children .toggle-children-icon { background: url('../images/sprites_32x32-s98eda4974b.png') 0 -139px no-repeat; } +.cms-menu-list li.current a .toggle-children.opened .toggle-children-icon { background: url('../images/sprites_32x32-s98eda4974b.png') 0 -155px no-repeat; } .cms-menu-list li.current ul { border-top: none; display: block; } .cms-menu-list li.current li { background-color: #287099; } .cms-menu-list li.current li a { font-size: 11px; padding: 0 10px 0 40px; height: 32px; line-height: 32px; color: #e2f0f7; background: none; border-top: 1px solid #338dc1; border-bottom: 1px solid #1e5270; } diff --git a/admin/images/dialog_close.png b/admin/images/dialog_close.png deleted file mode 100644 index 439adaf9b..000000000 Binary files a/admin/images/dialog_close.png and /dev/null differ diff --git a/admin/images/sprites/32x32-s517e471e4e.png b/admin/images/sprites/32x32-s517e471e4e.png deleted file mode 100644 index 998c453ca..000000000 Binary files a/admin/images/sprites/32x32-s517e471e4e.png and /dev/null differ diff --git a/admin/images/sprites_32x32-s98eda4974b.png b/admin/images/sprites_32x32-s98eda4974b.png new file mode 100644 index 000000000..d9e1b7017 Binary files /dev/null and b/admin/images/sprites_32x32-s98eda4974b.png differ diff --git a/admin/images/sprites_32x32/dialog-close-over.png b/admin/images/sprites_32x32/dialog-close-over.png new file mode 100644 index 000000000..adf7b4ab6 Binary files /dev/null and b/admin/images/sprites_32x32/dialog-close-over.png differ diff --git a/admin/images/sprites_32x32/dialog-close.png b/admin/images/sprites_32x32/dialog-close.png new file mode 100644 index 000000000..8d47befd5 Binary files /dev/null and b/admin/images/sprites_32x32/dialog-close.png differ diff --git a/admin/images/logout.png b/admin/images/sprites_32x32/logout.png similarity index 100% rename from admin/images/logout.png rename to admin/images/sprites_32x32/logout.png diff --git a/admin/images/sprites/32x32/menu-arrow-deselected-down.png b/admin/images/sprites_32x32/menu-arrow-deselected-down.png similarity index 100% rename from admin/images/sprites/32x32/menu-arrow-deselected-down.png rename to admin/images/sprites_32x32/menu-arrow-deselected-down.png diff --git a/admin/images/sprites/32x32/menu-arrow-deselected-up.png b/admin/images/sprites_32x32/menu-arrow-deselected-up.png similarity index 100% rename from admin/images/sprites/32x32/menu-arrow-deselected-up.png rename to admin/images/sprites_32x32/menu-arrow-deselected-up.png diff --git a/admin/images/sprites/32x32/menu-arrow-down.png b/admin/images/sprites_32x32/menu-arrow-down.png similarity index 100% rename from admin/images/sprites/32x32/menu-arrow-down.png rename to admin/images/sprites_32x32/menu-arrow-down.png diff --git a/admin/images/sprites/32x32/menu-arrow-up.png b/admin/images/sprites_32x32/menu-arrow-up.png similarity index 100% rename from admin/images/sprites/32x32/menu-arrow-up.png rename to admin/images/sprites_32x32/menu-arrow-up.png diff --git a/admin/images/sprites/32x32/numeric-label.png b/admin/images/sprites_32x32/numeric-label.png similarity index 100% rename from admin/images/sprites/32x32/numeric-label.png rename to admin/images/sprites_32x32/numeric-label.png diff --git a/admin/scss/_menu.scss b/admin/scss/_menu.scss index 386e9edec..de42a5a77 100644 --- 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 index 8b8a11261..813751bc3 100644 --- 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 index f9f4f42e4..80662e4dd 100644 --- 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; }