From d407f4c613f7bac4e9cf0b799d368d4a2eabdf28 Mon Sep 17 00:00:00 2001 From: = <=> Date: Sat, 17 Dec 2011 15:56:34 +1300 Subject: [PATCH] MINOR: Revert special formatting of preview button, fix Action button icons in IE8 --- admin/css/screen.css | 40 +++++++++---------- admin/scss/_forms.scss | 34 +++++++++------- admin/scss/_style.scss | 1 - .../Includes/LeftAndMain_EditForm.ss | 2 +- .../LeftAndMain_SilverStripeNavigator.ss | 2 +- 5 files changed, 42 insertions(+), 37 deletions(-) diff --git a/admin/css/screen.css b/admin/css/screen.css index ec6a3153d..47e9db334 100755 --- a/admin/css/screen.css +++ b/admin/css/screen.css @@ -115,27 +115,27 @@ form.nostyle .middleColumn { margin-left: 0; } .Actions { margin-right: 80px; min-height: 30px; } .Actions > div { overflow: auto; } -.cms-preview-toggle-link { display: block; float: right; font-size: 11px; } +.cms-preview-toggle-link { display: block; float: right; font-size: 12px; text-decoration: none; } .cms input.loading, .cms input.ui-state-default.loading, .cms .ui-widget-content input.ui-state-default.loading, .cms .ui-widget-header input.ui-state-default.loading { padding-left: 24px; color: #525252; background: #eeeded url(../../images/network-save.gif) no-repeat 4px center; border-color: #d5d3d3; cursor: default; text-shadow: none; -moz-box-shadow: none; -webkit-box-shadow: none; -o-box-shadow: none; box-shadow: none; } -.cms .ss-ui-button { /* all buttons */ padding: 7px 12px; font-weight: bold; text-decoration: none; margin: 0; line-height: 16px; color: #393939; background-color: #e6e6e6; border: 1px solid #c0c0c2; text-shadow: white 0 1px 1px; -moz-box-shadow: #ced7dc 0 1px 2px; -webkit-box-shadow: #ced7dc 0 1px 2px; -o-box-shadow: #ced7dc 0 1px 2px; box-shadow: #ced7dc 0 1px 2px; background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 999px 999px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #d9d9d9)); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 999px 999px, -webkit-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 999px 999px, -moz-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 999px 999px, -o-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 999px 999px, -ms-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 999px 999px, linear-gradient(#ffffff, #d9d9d9); /* constructive */ /* destructive */ /* generic action buttons */ } -.cms .ss-ui-button.ui-state-hover { border: 1px solid #a6a6a9; text-shadow: white 0 1px 1px; -moz-box-shadow: #b0bec7 0 1px 2px; -webkit-box-shadow: #b0bec7 0 1px 2px; -o-box-shadow: #b0bec7 0 1px 2px; box-shadow: #b0bec7 0 1px 2px; background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 999px 999px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #d9d9d9)); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 999px 999px, -webkit-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 999px 999px, -moz-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 999px 999px, -o-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 999px 999px, -ms-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 999px 999px, linear-gradient(#ffffff, #d9d9d9); } -.cms .ss-ui-button:focus, .cms .ss-ui-button:active { border: 1px solid #b3b3b5; -moz-box-shadow: #b0bec7 0 1px 2px; -webkit-box-shadow: #b0bec7 0 1px 2px; -o-box-shadow: #b0bec7 0 1px 2px; box-shadow: #b0bec7 0 1px 2px; background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 999px 999px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #e6e6e6), color-stop(100%, #ffffff)); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 999px 999px, -webkit-linear-gradient(#e6e6e6, #ffffff); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 999px 999px, -moz-linear-gradient(#e6e6e6, #ffffff); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 999px 999px, -o-linear-gradient(#e6e6e6, #ffffff); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 999px 999px, -ms-linear-gradient(#e6e6e6, #ffffff); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 999px 999px, linear-gradient(#e6e6e6, #ffffff); } -.cms .ss-ui-button.ss-ui-action-constructive { background-image: none; padding-left: 24px; padding-right: 6px; font-weight: bold; margin-left: 8px; color: white; border-color: #78a127; background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 5px 5px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #80bf40), color-stop(100%, #59862d)); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 5px 5px, -webkit-linear-gradient(#80bf40, #59862d); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 5px 5px, -moz-linear-gradient(#80bf40, #59862d); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 5px 5px, -o-linear-gradient(#80bf40, #59862d); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 5px 5px, -ms-linear-gradient(#80bf40, #59862d); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 5px 5px, linear-gradient(#80bf40, #59862d); background-color: #669933; text-shadow: #4d7326 0 1px 1px; -moz-box-shadow: #748d9d 1px 1px 2px; -webkit-box-shadow: #748d9d 1px 1px 2px; -o-box-shadow: #748d9d 1px 1px 2px; box-shadow: #748d9d 1px 1px 2px; } -.cms .ss-ui-button.ss-ui-action-constructive.ui-state-hover { border-color: #59781d; background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 5px 5px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #8cc653), color-stop(100%, #669933)); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 5px 5px, -webkit-linear-gradient(#8cc653, #669933); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 5px 5px, -moz-linear-gradient(#8cc653, #669933); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 5px 5px, -o-linear-gradient(#8cc653, #669933); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 5px 5px, -ms-linear-gradient(#8cc653, #669933); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 5px 5px, linear-gradient(#8cc653, #669933); background-color: #4d7326; } +.cms .ss-ui-button { /* all buttons */ padding: 7px 12px; font-weight: bold; text-decoration: none; margin: 0; line-height: 16px; color: #393939; background-color: #e6e6e6; border: 1px solid #c0c0c2; text-shadow: white 0 1px 1px; -moz-box-shadow: #ced7dc 0 1px 2px; -webkit-box-shadow: #ced7dc 0 1px 2px; -o-box-shadow: #ced7dc 0 1px 2px; box-shadow: #ced7dc 0 1px 2px; background: #e6e6e6 url('../images/btn_icons_sprite.png?1324073872') no-repeat 999px 999px; background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 999px 999px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #d9d9d9)); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 999px 999px, -webkit-linear-gradient(#ffffff, #d9d9d9); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 999px 999px, -moz-linear-gradient(#ffffff, #d9d9d9); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 999px 999px, -o-linear-gradient(#ffffff, #d9d9d9); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 999px 999px, -ms-linear-gradient(#ffffff, #d9d9d9); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 999px 999px, linear-gradient(#ffffff, #d9d9d9); /* constructive */ /* destructive */ /* generic action buttons */ } +.cms .ss-ui-button.ui-state-hover { border: 1px solid #a6a6a9; text-shadow: white 0 1px 1px; -moz-box-shadow: #b0bec7 0 1px 2px; -webkit-box-shadow: #b0bec7 0 1px 2px; -o-box-shadow: #b0bec7 0 1px 2px; box-shadow: #b0bec7 0 1px 2px; background: white url('../images/btn_icons_sprite.png?1324073872') no-repeat 999px 999px; background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 999px 999px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #d9d9d9)); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 999px 999px, -webkit-linear-gradient(#ffffff, #d9d9d9); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 999px 999px, -moz-linear-gradient(#ffffff, #d9d9d9); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 999px 999px, -o-linear-gradient(#ffffff, #d9d9d9); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 999px 999px, -ms-linear-gradient(#ffffff, #d9d9d9); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 999px 999px, linear-gradient(#ffffff, #d9d9d9); } +.cms .ss-ui-button:focus, .cms .ss-ui-button:active { border: 1px solid #b3b3b5; -moz-box-shadow: #b0bec7 0 1px 2px; -webkit-box-shadow: #b0bec7 0 1px 2px; -o-box-shadow: #b0bec7 0 1px 2px; box-shadow: #b0bec7 0 1px 2px; background: white url('../images/btn_icons_sprite.png?1324073872') no-repeat 999px 999px; background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 999px 999px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #e6e6e6), color-stop(100%, #ffffff)); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 999px 999px, -webkit-linear-gradient(#e6e6e6, #ffffff); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 999px 999px, -moz-linear-gradient(#e6e6e6, #ffffff); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 999px 999px, -o-linear-gradient(#e6e6e6, #ffffff); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 999px 999px, -ms-linear-gradient(#e6e6e6, #ffffff); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 999px 999px, linear-gradient(#e6e6e6, #ffffff); } +.cms .ss-ui-button.ss-ui-action-constructive { background-image: none; padding-left: 24px; padding-right: 6px; font-weight: bold; margin-left: 8px; color: white; border-color: #78a127; background: #669933 url('../images/btn_icons_sprite.png?1324073872') no-repeat 5px 5px; background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 5px 5px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #80bf40), color-stop(100%, #59862d)); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 5px 5px, -webkit-linear-gradient(#80bf40, #59862d); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 5px 5px, -moz-linear-gradient(#80bf40, #59862d); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 5px 5px, -o-linear-gradient(#80bf40, #59862d); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 5px 5px, -ms-linear-gradient(#80bf40, #59862d); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 5px 5px, linear-gradient(#80bf40, #59862d); text-shadow: #4d7326 0 1px 1px; -moz-box-shadow: #748d9d 1px 1px 2px; -webkit-box-shadow: #748d9d 1px 1px 2px; -o-box-shadow: #748d9d 1px 1px 2px; box-shadow: #748d9d 1px 1px 2px; } +.cms .ss-ui-button.ss-ui-action-constructive.ui-state-hover { border-color: #59781d; background: #80bf40 url('../images/btn_icons_sprite.png?1324073872') no-repeat 5px 5px; background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 5px 5px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #8cc653), color-stop(100%, #669933)); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 5px 5px, -webkit-linear-gradient(#8cc653, #669933); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 5px 5px, -moz-linear-gradient(#8cc653, #669933); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 5px 5px, -o-linear-gradient(#8cc653, #669933); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 5px 5px, -ms-linear-gradient(#8cc653, #669933); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 5px 5px, linear-gradient(#8cc653, #669933); } .cms .ss-ui-button.ss-ui-action-destructive { color: red; background-color: #e6e6e6; } -.cms .ss-ui-button.ss-ui-action-destructive.delete { padding-left: 24px; padding-right: 6px; background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -26px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #d9d9d9)); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -26px, -webkit-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -26px, -moz-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -26px, -o-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -26px, -ms-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -26px, linear-gradient(#ffffff, #d9d9d9); } -.cms .ss-ui-button.ss-ui-action-destructive.delete.ui-state-hover { background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -26px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #e6e6e6)); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -26px, -webkit-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -26px, -moz-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -26px, -o-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -26px, -ms-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -26px, linear-gradient(#ffffff, #e6e6e6); } -.cms .ss-ui-button.ss-ui-action-destructive.delete.ui-state-disabled { background-image: none; background: url('../images/../images/btn_icons_sprite_disabled.png?1323768771') no-repeat 6px -26px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #e6e6e6)); background: url('../images/../images/btn_icons_sprite_disabled.png?1323768771') no-repeat 6px -26px, -webkit-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1323768771') no-repeat 6px -26px, -moz-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1323768771') no-repeat 6px -26px, -o-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1323768771') no-repeat 6px -26px, -ms-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1323768771') no-repeat 6px -26px, linear-gradient(#ffffff, #e6e6e6); } -.cms .ss-ui-button.ss-ui-action-destructive.unpublish { padding-left: 24px; padding-right: 6px; background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -58px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #d9d9d9)); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -58px, -webkit-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -58px, -moz-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -58px, -o-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -58px, -ms-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -58px, linear-gradient(#ffffff, #d9d9d9); } -.cms .ss-ui-button.ss-ui-action-destructive.unpublish.ui-state-hover { background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -58px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #e6e6e6)); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -58px, -webkit-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -58px, -moz-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -58px, -o-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -58px, -ms-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -58px, linear-gradient(#ffffff, #e6e6e6); } -.cms .ss-ui-button.ss-ui-action-destructive.unpublish.ui-state-disabled { background-image: none; background: url('../images/../images/btn_icons_sprite_disabled.png?1323768771') no-repeat 6px -58px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #e6e6e6)); background: url('../images/../images/btn_icons_sprite_disabled.png?1323768771') no-repeat 6px -58px, -webkit-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1323768771') no-repeat 6px -58px, -moz-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1323768771') no-repeat 6px -58px, -o-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1323768771') no-repeat 6px -58px, -ms-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1323768771') no-repeat 6px -58px, linear-gradient(#ffffff, #e6e6e6); } -.cms .ss-ui-button.save-draft { padding-left: 24px; padding-right: 6px; background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -90px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #d9d9d9)); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -90px, -webkit-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -90px, -moz-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -90px, -o-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -90px, -ms-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -90px, linear-gradient(#ffffff, #d9d9d9); } -.cms .ss-ui-button.save-draft.ui-state-hover { background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -90px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #e6e6e6)); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -90px, -webkit-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -90px, -moz-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -90px, -o-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -90px, -ms-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -90px, linear-gradient(#ffffff, #e6e6e6); } -.cms .ss-ui-button.save-draft.ui-state-disabled { background-image: none; background: url('../images/../images/btn_icons_sprite_disabled.png?1323768771') no-repeat 6px -90px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #e6e6e6)); background: url('../images/../images/btn_icons_sprite_disabled.png?1323768771') no-repeat 6px -90px, -webkit-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1323768771') no-repeat 6px -90px, -moz-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1323768771') no-repeat 6px -90px, -o-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1323768771') no-repeat 6px -90px, -ms-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1323768771') no-repeat 6px -90px, linear-gradient(#ffffff, #e6e6e6); } -.cms .ss-ui-button.cms-preview-toggle-link { padding-left: 24px !important; margin-left: 4px !important; padding-left: 24px; padding-right: 6px; background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -124px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #d9d9d9)); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -124px, -webkit-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -124px, -moz-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -124px, -o-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -124px, -ms-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -124px, linear-gradient(#ffffff, #d9d9d9); } -.cms .ss-ui-button.cms-preview-toggle-link.ui-state-hover { background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -124px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #e6e6e6)); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -124px, -webkit-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -124px, -moz-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -124px, -o-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -124px, -ms-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite.png?1323768771') no-repeat 6px -124px, linear-gradient(#ffffff, #e6e6e6); } -.cms .ss-ui-button.cms-preview-toggle-link.ui-state-disabled { background-image: none; background: url('../images/../images/btn_icons_sprite_disabled.png?1323768771') no-repeat 6px -124px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #e6e6e6)); background: url('../images/../images/btn_icons_sprite_disabled.png?1323768771') no-repeat 6px -124px, -webkit-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1323768771') no-repeat 6px -124px, -moz-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1323768771') no-repeat 6px -124px, -o-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1323768771') no-repeat 6px -124px, -ms-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1323768771') no-repeat 6px -124px, linear-gradient(#ffffff, #e6e6e6); } +.cms .ss-ui-button.ss-ui-action-destructive.delete { padding-left: 24px; padding-right: 6px; background: #e6e6e6 url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -26px; background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -26px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #d9d9d9)); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -26px, -webkit-linear-gradient(#ffffff, #d9d9d9); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -26px, -moz-linear-gradient(#ffffff, #d9d9d9); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -26px, -o-linear-gradient(#ffffff, #d9d9d9); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -26px, -ms-linear-gradient(#ffffff, #d9d9d9); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -26px, linear-gradient(#ffffff, #d9d9d9); } +.cms .ss-ui-button.ss-ui-action-destructive.delete.ui-state-hover { background: white url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -26px; background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -26px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #e6e6e6)); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -26px, -webkit-linear-gradient(#ffffff, #e6e6e6); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -26px, -moz-linear-gradient(#ffffff, #e6e6e6); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -26px, -o-linear-gradient(#ffffff, #e6e6e6); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -26px, -ms-linear-gradient(#ffffff, #e6e6e6); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -26px, linear-gradient(#ffffff, #e6e6e6); } +.cms .ss-ui-button.ss-ui-action-destructive.delete.ui-state-disabled { background-image: none; background: white url('../images/btn_icons_sprite_disabled.png?1324073872') no-repeat 6px -26px; background: url('../images/btn_icons_sprite_disabled.png?1324073872') no-repeat 6px -26px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #e6e6e6)); background: url('../images/btn_icons_sprite_disabled.png?1324073872') no-repeat 6px -26px, -webkit-linear-gradient(#ffffff, #e6e6e6); background: url('../images/btn_icons_sprite_disabled.png?1324073872') no-repeat 6px -26px, -moz-linear-gradient(#ffffff, #e6e6e6); background: url('../images/btn_icons_sprite_disabled.png?1324073872') no-repeat 6px -26px, -o-linear-gradient(#ffffff, #e6e6e6); background: url('../images/btn_icons_sprite_disabled.png?1324073872') no-repeat 6px -26px, -ms-linear-gradient(#ffffff, #e6e6e6); background: url('../images/btn_icons_sprite_disabled.png?1324073872') no-repeat 6px -26px, linear-gradient(#ffffff, #e6e6e6); } +.cms .ss-ui-button.ss-ui-action-destructive.unpublish { padding-left: 24px; padding-right: 6px; background: #e6e6e6 url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -58px; background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -58px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #d9d9d9)); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -58px, -webkit-linear-gradient(#ffffff, #d9d9d9); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -58px, -moz-linear-gradient(#ffffff, #d9d9d9); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -58px, -o-linear-gradient(#ffffff, #d9d9d9); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -58px, -ms-linear-gradient(#ffffff, #d9d9d9); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -58px, linear-gradient(#ffffff, #d9d9d9); } +.cms .ss-ui-button.ss-ui-action-destructive.unpublish.ui-state-hover { background: white url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -58px; background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -58px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #e6e6e6)); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -58px, -webkit-linear-gradient(#ffffff, #e6e6e6); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -58px, -moz-linear-gradient(#ffffff, #e6e6e6); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -58px, -o-linear-gradient(#ffffff, #e6e6e6); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -58px, -ms-linear-gradient(#ffffff, #e6e6e6); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -58px, linear-gradient(#ffffff, #e6e6e6); } +.cms .ss-ui-button.ss-ui-action-destructive.unpublish.ui-state-disabled { background-image: none; background: white url('../images/btn_icons_sprite_disabled.png?1324073872') no-repeat 6px -58px; background: url('../images/btn_icons_sprite_disabled.png?1324073872') no-repeat 6px -58px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #e6e6e6)); background: url('../images/btn_icons_sprite_disabled.png?1324073872') no-repeat 6px -58px, -webkit-linear-gradient(#ffffff, #e6e6e6); background: url('../images/btn_icons_sprite_disabled.png?1324073872') no-repeat 6px -58px, -moz-linear-gradient(#ffffff, #e6e6e6); background: url('../images/btn_icons_sprite_disabled.png?1324073872') no-repeat 6px -58px, -o-linear-gradient(#ffffff, #e6e6e6); background: url('../images/btn_icons_sprite_disabled.png?1324073872') no-repeat 6px -58px, -ms-linear-gradient(#ffffff, #e6e6e6); background: url('../images/btn_icons_sprite_disabled.png?1324073872') no-repeat 6px -58px, linear-gradient(#ffffff, #e6e6e6); } +.cms .ss-ui-button.save-draft { padding-left: 24px; padding-right: 6px; background: #e6e6e6 url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -90px; background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -90px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #d9d9d9)); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -90px, -webkit-linear-gradient(#ffffff, #d9d9d9); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -90px, -moz-linear-gradient(#ffffff, #d9d9d9); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -90px, -o-linear-gradient(#ffffff, #d9d9d9); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -90px, -ms-linear-gradient(#ffffff, #d9d9d9); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -90px, linear-gradient(#ffffff, #d9d9d9); } +.cms .ss-ui-button.save-draft.ui-state-hover { background: white url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -90px; background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -90px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #e6e6e6)); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -90px, -webkit-linear-gradient(#ffffff, #e6e6e6); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -90px, -moz-linear-gradient(#ffffff, #e6e6e6); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -90px, -o-linear-gradient(#ffffff, #e6e6e6); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -90px, -ms-linear-gradient(#ffffff, #e6e6e6); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -90px, linear-gradient(#ffffff, #e6e6e6); } +.cms .ss-ui-button.save-draft.ui-state-disabled { background-image: none; background: white url('../images/btn_icons_sprite_disabled.png?1324073872') no-repeat 6px -90px; background: url('../images/btn_icons_sprite_disabled.png?1324073872') no-repeat 6px -90px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #e6e6e6)); background: url('../images/btn_icons_sprite_disabled.png?1324073872') no-repeat 6px -90px, -webkit-linear-gradient(#ffffff, #e6e6e6); background: url('../images/btn_icons_sprite_disabled.png?1324073872') no-repeat 6px -90px, -moz-linear-gradient(#ffffff, #e6e6e6); background: url('../images/btn_icons_sprite_disabled.png?1324073872') no-repeat 6px -90px, -o-linear-gradient(#ffffff, #e6e6e6); background: url('../images/btn_icons_sprite_disabled.png?1324073872') no-repeat 6px -90px, -ms-linear-gradient(#ffffff, #e6e6e6); background: url('../images/btn_icons_sprite_disabled.png?1324073872') no-repeat 6px -90px, linear-gradient(#ffffff, #e6e6e6); } +.cms .ss-ui-button.cms-preview-toggle-link { padding-left: 24px !important; margin-left: 4px !important; text-decoration: none; padding-left: 24px; padding-right: 6px; background: #e6e6e6 url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -122px; background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -122px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #d9d9d9)); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -122px, -webkit-linear-gradient(#ffffff, #d9d9d9); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -122px, -moz-linear-gradient(#ffffff, #d9d9d9); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -122px, -o-linear-gradient(#ffffff, #d9d9d9); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -122px, -ms-linear-gradient(#ffffff, #d9d9d9); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -122px, linear-gradient(#ffffff, #d9d9d9); } +.cms .ss-ui-button.cms-preview-toggle-link.ui-state-hover { background: white url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -122px; background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -122px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #e6e6e6)); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -122px, -webkit-linear-gradient(#ffffff, #e6e6e6); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -122px, -moz-linear-gradient(#ffffff, #e6e6e6); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -122px, -o-linear-gradient(#ffffff, #e6e6e6); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -122px, -ms-linear-gradient(#ffffff, #e6e6e6); background: url('../images/btn_icons_sprite.png?1324073872') no-repeat 6px -122px, linear-gradient(#ffffff, #e6e6e6); } +.cms .ss-ui-button.cms-preview-toggle-link.ui-state-disabled { background-image: none; background: white url('../images/btn_icons_sprite_disabled.png?1324073872') no-repeat 6px -122px; background: url('../images/btn_icons_sprite_disabled.png?1324073872') no-repeat 6px -122px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #e6e6e6)); background: url('../images/btn_icons_sprite_disabled.png?1324073872') no-repeat 6px -122px, -webkit-linear-gradient(#ffffff, #e6e6e6); background: url('../images/btn_icons_sprite_disabled.png?1324073872') no-repeat 6px -122px, -moz-linear-gradient(#ffffff, #e6e6e6); background: url('../images/btn_icons_sprite_disabled.png?1324073872') no-repeat 6px -122px, -o-linear-gradient(#ffffff, #e6e6e6); background: url('../images/btn_icons_sprite_disabled.png?1324073872') no-repeat 6px -122px, -ms-linear-gradient(#ffffff, #e6e6e6); background: url('../images/btn_icons_sprite_disabled.png?1324073872') no-repeat 6px -122px, linear-gradient(#ffffff, #e6e6e6); } .cms .ss-ui-button.ss-ui-button-small { padding: 4px 4px; } .cms .ss-ui-button.ui-state-highlight { background-color: #e6e6e6; border: 1px solid #708284; } .cms .ss-ui-button.ss-ui-action-minor { background: none; padding: 0; border: 0; color: #393939; text-decoration: underline; -moz-box-shadow: none; -webkit-box-shadow: none; -o-box-shadow: none; box-shadow: none; } @@ -298,7 +298,7 @@ html article, html aside, html details, html figcaption, html figure, html foote .cms-preview .cms-preview-controls .cms-navigator * { display: inline-block; } .cms-preview .cms-preview-controls .cms-preview-states { margin-right: 10px; } .cms-preview .cms-preview-controls .cms-preview-popup-link { display: inline-block; } -.cms-preview .cms-preview-controls .cms-preview-toggle-link { float: right; font-size: 11px; } +.cms-preview .cms-preview-controls .cms-preview-toggle-link { float: right; } .cms-preview-header { background-color: #FFBE66; padding: 10px; font-weight: bold; } @@ -471,7 +471,7 @@ li.class-ErrorPage > a .jstree-pageicon { background-position: 0 -112px; } .cms-logo { border-bottom: 1px solid #03090c; height: 31px; overflow: hidden; padding: 0 0 0 4px; vertical-align: middle; font-size: 12px; } .cms-logo .version { display: none; } -.cms-logo a { display: inline-block; height: 24px; width: 24px; float: left; margin-right: 8px; background: url('../images/logo_small.png?1323768771') no-repeat; text-indent: -9999em; padding-right: 7px; border-right: 1px solid #19435c; } +.cms-logo a { display: inline-block; height: 24px; width: 24px; float: left; margin-right: 8px; background: url('../images/logo_small.png?1324073872') no-repeat; text-indent: -9999em; padding-right: 7px; border-right: 1px solid #19435c; } .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; } diff --git a/admin/scss/_forms.scss b/admin/scss/_forms.scss index 767d60132..6cf03a894 100644 --- a/admin/scss/_forms.scss +++ b/admin/scss/_forms.scss @@ -14,14 +14,16 @@ @mixin actionButtonSprite($horizontalOffset, $verticalOffset) { padding-left: 24px; padding-right: 6px; - @include background(image-url("../images/btn_icons_sprite.png") no-repeat $horizontalOffset $verticalOffset, + @include background($color-button-generic image-url("btn_icons_sprite.png") no-repeat $horizontalOffset $verticalOffset); + @include background(image-url("btn_icons_sprite.png") no-repeat $horizontalOffset $verticalOffset, linear-gradient(color-stops( lighten($color-button-generic, 10%), darken($color-button-generic, 5%) )) ); &.ui-state-hover { - @include background(image-url("../images/btn_icons_sprite.png") no-repeat $horizontalOffset $verticalOffset, + @include background(lighten($color-button-generic, 10%) image-url("btn_icons_sprite.png") no-repeat $horizontalOffset $verticalOffset); + @include background(image-url("btn_icons_sprite.png") no-repeat $horizontalOffset $verticalOffset, linear-gradient(color-stops( lighten($color-button-generic, 20%), $color-button-generic @@ -30,7 +32,8 @@ } &.ui-state-disabled { background-image: none; - @include background(image-url("../images/btn_icons_sprite_disabled.png") no-repeat $horizontalOffset $verticalOffset, + @include background(lighten($color-button-generic, 20%) image-url("btn_icons_sprite_disabled.png") no-repeat $horizontalOffset $verticalOffset); + @include background(image-url("btn_icons_sprite_disabled.png") no-repeat $horizontalOffset $verticalOffset, linear-gradient(color-stops( lighten($color-button-generic, 20%), $color-button-generic @@ -234,7 +237,8 @@ form.nostyle { .cms-preview-toggle-link { display: block; float: right; - font-size: 11px; + font-size: 12px; + text-decoration: none; } .cms { @@ -264,7 +268,8 @@ form.nostyle { @include text-shadow(lighten($color-button-generic, 20%) 0 1px 1px); @include box-shadow(lighten($color-base, 10%) 0 1px 2px); - @include background(image-url("../images/btn_icons_sprite.png") no-repeat 999px 999px, + @include background($color-button-generic image-url("btn_icons_sprite.png") no-repeat 999px 999px); + @include background(image-url("btn_icons_sprite.png") no-repeat 999px 999px, linear-gradient(color-stops( lighten($color-button-generic, 10%), darken($color-button-generic, 5%) @@ -275,7 +280,8 @@ form.nostyle { @include text-shadow(lighten($color-button-generic, 30%) 0 1px 1px); @include box-shadow($color-base 0 1px 2px); - @include background(image-url("../images/btn_icons_sprite.png") no-repeat 999px 999px, + @include background(lighten($color-button-generic, 10%) image-url("btn_icons_sprite.png") no-repeat 999px 999px); + @include background(image-url("btn_icons_sprite.png") no-repeat 999px 999px, linear-gradient(color-stops( lighten($color-button-generic, 20%), darken($color-button-generic, 5%) @@ -287,7 +293,8 @@ form.nostyle { border: 1px solid darken($color-button-generic-border, 5%); @include box-shadow($color-base 0 1px 2px); - @include background(image-url("../images/btn_icons_sprite.png") no-repeat 999px 999px, + @include background(lighten($color-button-generic, 10%) image-url("btn_icons_sprite.png") no-repeat 999px 999px); + @include background(image-url("btn_icons_sprite.png") no-repeat 999px 999px, linear-gradient(color-stops( $color-button-generic, lighten($color-button-generic, 20%) @@ -304,28 +311,26 @@ form.nostyle { margin-left: $grid-horizontal; color: $color-text-light; border-color: $color-button-constructive-border; - @include background(image-url("../images/btn_icons_sprite.png") no-repeat 5px 5px, + @include background($color-button-constructive image-url("btn_icons_sprite.png") no-repeat 5px 5px); + @include background(image-url("btn_icons_sprite.png") no-repeat 5px 5px, linear-gradient(color-stops( lighten($color-button-constructive, 10%), darken($color-button-constructive, 5%) )) ); - - background-color: $color-button-constructive; @include text-shadow(darken($color-button-constructive, 10%) 0 1px 1px); @include box-shadow(darken($color-base, 20%) 1px 1px 2px); &.ui-state-hover { border-color: darken($color-button-constructive-border, 10%); - @include background(image-url("../images/btn_icons_sprite.png") no-repeat 5px 5px, + @include background(lighten($color-button-constructive, 10%) image-url("btn_icons_sprite.png") no-repeat 5px 5px); + @include background(image-url("btn_icons_sprite.png") no-repeat 5px 5px, linear-gradient(color-stops( lighten($color-button-constructive, 15%), $color-button-constructive )) ); - - background-color: darken($color-button-constructive, 10%); } } @@ -351,7 +356,8 @@ form.nostyle { &.cms-preview-toggle-link { padding-left: 24px !important; margin-left: 4px !important; - @include actionButtonSprite(6px, -124px); + text-decoration: none; + @include actionButtonSprite(6px, -122px); } &.ss-ui-button-small { diff --git a/admin/scss/_style.scss b/admin/scss/_style.scss index 0c0abb14c..83080f5dd 100644 --- a/admin/scss/_style.scss +++ b/admin/scss/_style.scss @@ -646,7 +646,6 @@ html,body { .cms-preview-toggle-link { float: right; - font-size: 11px; } } diff --git a/admin/templates/Includes/LeftAndMain_EditForm.ss b/admin/templates/Includes/LeftAndMain_EditForm.ss index d1ce603c6..ffbaeb2b7 100644 --- a/admin/templates/Includes/LeftAndMain_EditForm.ss +++ b/admin/templates/Includes/LeftAndMain_EditForm.ss @@ -44,7 +44,7 @@
<% if CurrentPage.PreviewLink %> - + <% _t('LeftAndMain.PreviewButton', 'Preview') %> » diff --git a/admin/templates/Includes/LeftAndMain_SilverStripeNavigator.ss b/admin/templates/Includes/LeftAndMain_SilverStripeNavigator.ss index 14a659da3..374ddeb3d 100644 --- a/admin/templates/Includes/LeftAndMain_SilverStripeNavigator.ss +++ b/admin/templates/Includes/LeftAndMain_SilverStripeNavigator.ss @@ -1,5 +1,5 @@
- + « <% _t('SilverStripeNavigator.Edit', 'Edit') %>