From d378a86c495e3a5b73310cc3588c1d7a7a5a05e7 Mon Sep 17 00:00:00 2001 From: Julian Seidenberg Date: Fri, 30 Sep 2011 16:08:32 +1300 Subject: [PATCH] BUGFIX: using Will's grid variables for spacing of dialog --- admin/css/screen.css | 10 +++++----- admin/scss/_style.scss | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/admin/css/screen.css b/admin/css/screen.css index cb66aef83..40e0b39f6 100644 --- a/admin/css/screen.css +++ b/admin/css/screen.css @@ -230,16 +230,16 @@ form.nostyle .middleColumn { margin-left: 0; } .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?1314743735') 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?1314743735') no-repeat 6px -26px, -webkit-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1314743735') no-repeat 6px -26px, -moz-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1314743735') no-repeat 6px -26px, -o-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1314743735') no-repeat 6px -26px, -ms-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1314743735') 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?1314743735') 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?1314743735') no-repeat 6px -26px, -webkit-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite.png?1314743735') no-repeat 6px -26px, -moz-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite.png?1314743735') no-repeat 6px -26px, -o-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite.png?1314743735') no-repeat 6px -26px, -ms-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite.png?1314743735') 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?1317345241') 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?1317345241') no-repeat 6px -26px, -webkit-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1317345241') no-repeat 6px -26px, -moz-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1317345241') no-repeat 6px -26px, -o-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1317345241') no-repeat 6px -26px, -ms-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1317345241') 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?1317346079') 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?1317346079') no-repeat 6px -26px, -webkit-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1317346079') no-repeat 6px -26px, -moz-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1317346079') no-repeat 6px -26px, -o-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1317346079') no-repeat 6px -26px, -ms-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1317346079') 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?1314743735') 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?1314743735') no-repeat 6px -58px, -webkit-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1314743735') no-repeat 6px -58px, -moz-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1314743735') no-repeat 6px -58px, -o-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1314743735') no-repeat 6px -58px, -ms-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1314743735') 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?1314743735') 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?1314743735') no-repeat 6px -58px, -webkit-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite.png?1314743735') no-repeat 6px -58px, -moz-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite.png?1314743735') no-repeat 6px -58px, -o-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite.png?1314743735') no-repeat 6px -58px, -ms-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite.png?1314743735') 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?1317345241') 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?1317345241') no-repeat 6px -58px, -webkit-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1317345241') no-repeat 6px -58px, -moz-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1317345241') no-repeat 6px -58px, -o-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1317345241') no-repeat 6px -58px, -ms-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1317345241') 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?1317346079') 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?1317346079') no-repeat 6px -58px, -webkit-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1317346079') no-repeat 6px -58px, -moz-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1317346079') no-repeat 6px -58px, -o-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1317346079') no-repeat 6px -58px, -ms-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1317346079') 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?1314743735') 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?1314743735') no-repeat 6px -90px, -webkit-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1314743735') no-repeat 6px -90px, -moz-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1314743735') no-repeat 6px -90px, -o-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1314743735') no-repeat 6px -90px, -ms-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1314743735') 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?1314743735') 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?1314743735') no-repeat 6px -90px, -webkit-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite.png?1314743735') no-repeat 6px -90px, -moz-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite.png?1314743735') no-repeat 6px -90px, -o-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite.png?1314743735') no-repeat 6px -90px, -ms-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite.png?1314743735') 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?1317345241') 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?1317345241') no-repeat 6px -90px, -webkit-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1317345241') no-repeat 6px -90px, -moz-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1317345241') no-repeat 6px -90px, -o-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1317345241') no-repeat 6px -90px, -ms-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1317345241') 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?1317346079') 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?1317346079') no-repeat 6px -90px, -webkit-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1317346079') no-repeat 6px -90px, -moz-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1317346079') no-repeat 6px -90px, -o-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1317346079') no-repeat 6px -90px, -ms-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1317346079') 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?1314743735') 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?1314743735') no-repeat 6px -124px, -webkit-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1314743735') no-repeat 6px -124px, -moz-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1314743735') no-repeat 6px -124px, -o-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1314743735') no-repeat 6px -124px, -ms-linear-gradient(#ffffff, #d9d9d9); background: url('../images/../images/btn_icons_sprite.png?1314743735') 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?1314743735') 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?1314743735') no-repeat 6px -124px, -webkit-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite.png?1314743735') no-repeat 6px -124px, -moz-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite.png?1314743735') no-repeat 6px -124px, -o-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite.png?1314743735') no-repeat 6px -124px, -ms-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite.png?1314743735') 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?1317345241') 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?1317345241') no-repeat 6px -124px, -webkit-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1317345241') no-repeat 6px -124px, -moz-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1317345241') no-repeat 6px -124px, -o-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1317345241') no-repeat 6px -124px, -ms-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1317345241') 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?1317346079') 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?1317346079') no-repeat 6px -124px, -webkit-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1317346079') no-repeat 6px -124px, -moz-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1317346079') no-repeat 6px -124px, -o-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1317346079') no-repeat 6px -124px, -ms-linear-gradient(#ffffff, #e6e6e6); background: url('../images/../images/btn_icons_sprite_disabled.png?1317346079') no-repeat 6px -124px, 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; } @@ -481,4 +481,4 @@ form.member-profile-form .formattingHelpText li { font-size: 11px; color: #333; /** ------------------------------------------------------------------ * Titlebar for pop-up dialog. * ----------------------------------------------------------------- */ -.ui-dialog-titlebar.ui-widget-header { font-size: 14px; background-color: #92a5b2; padding: 4px 4px 3px 16px; border-bottom: 2px solid #8399a7; -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -o-border-top-left-radius: 4px; -ms-border-top-left-radius: 4px; -khtml-border-top-left-radius: 4px; border-top-left-radius: 4px; /* /2 need to eliminate visual artifact */ -moz-border-radius-topright: 8px; -webkit-border-top-right-radius: 8px; -o-border-top-right-radius: 8px; -ms-border-top-right-radius: 8px; -khtml-border-top-right-radius: 8px; border-top-right-radius: 8px; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ced7dc), color-stop(100%, #92a5b2)); background-image: -webkit-linear-gradient(#ced7dc, #92a5b2); background-image: -moz-linear-gradient(#ced7dc, #92a5b2); background-image: -o-linear-gradient(#ced7dc, #92a5b2); background-image: -ms-linear-gradient(#ced7dc, #92a5b2); background-image: linear-gradient(#ced7dc, #92a5b2); margin-bottom: 12px; } +.ui-dialog-titlebar.ui-widget-header { font-size: 14px; background-color: #92a5b2; padding: 4px 4px 4px 16px; border-bottom: 2px solid #8399a7; -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -o-border-top-left-radius: 4px; -ms-border-top-left-radius: 4px; -khtml-border-top-left-radius: 4px; border-top-left-radius: 4px; /* /2 need to eliminate visual artifact */ -moz-border-radius-topright: 8px; -webkit-border-top-right-radius: 8px; -o-border-top-right-radius: 8px; -ms-border-top-right-radius: 8px; -khtml-border-top-right-radius: 8px; border-top-right-radius: 8px; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ced7dc), color-stop(100%, #92a5b2)); background-image: -webkit-linear-gradient(#ced7dc, #92a5b2); background-image: -moz-linear-gradient(#ced7dc, #92a5b2); background-image: -o-linear-gradient(#ced7dc, #92a5b2); background-image: -ms-linear-gradient(#ced7dc, #92a5b2); background-image: linear-gradient(#ced7dc, #92a5b2); margin-bottom: 12px; } diff --git a/admin/scss/_style.scss b/admin/scss/_style.scss index 55275c14c..6da66a5af 100644 --- a/admin/scss/_style.scss +++ b/admin/scss/_style.scss @@ -935,7 +935,7 @@ $DialogLabelColor: #7B8C91; /* Exception for a label that is inline with the selector dropdown box */ #ParentID { label.left { - padding: 8px 0 8px 0; + padding: $grid-vertical 0 $grid-vertical 0; float: left !important; width: 125px; } @@ -957,11 +957,11 @@ $DialogLabelColor: #7B8C91; .ui-dialog-titlebar.ui-widget-header { font-size: $DialogHeaderFontSize; background-color: #92a5b2; - padding: 4px 4px 3px 16px; + padding: $grid-vertical/2 $grid-horizontal/2 $grid-vertical/2 $grid-horizontal*2; border-bottom: 2px solid #8399a7; @include border-top-left-radius($DialogBorderRadius/2); /* /2 need to eliminate visual artifact */ @include border-top-right-radius($DialogBorderRadius); @include background-image(linear-gradient(#ced7dc, #92a5b2)); - margin-bottom: 12px; + margin-bottom: $grid-vertical*1.5; }