tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-01 21:58:51 +02:00
Code Issues Projects Releases Wiki Activity

ENHANCEMENT: adding an additional overlay-light div that is used when switching between pages by ajax. The dialog pop-up uses the default "ui-widget-overlay", but that overlay is darker than "ui-widget-overlay-light". Having two overlays prevents weird graphic effects when switching pages using the darker overlay (SSO-12)

Browse Source
This commit is contained in:
Julian Seidenberg 2011-09-29 17:09:36 +13:00
parent f50a281759
commit 90d4321c52
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
admin/css/screen.css
View File

@ -456,8 +456,10 @@ form.member-profile-form .formattingHelpText li { font-size: 11px; color: #333;
/** ------------------------------------------------------------------ /** ------------------------------------------------------------------
* Modal - JQuery UI Dialog pop-up * Modal - JQuery UI Dialog pop-up
* ----------------------------------------------------------------- */ * ----------------------------------------------------------------- */
/* default overlay for the CMS */ /* overlay for switching between CMS panes */
/* Adjusting the color of the background overlay to be darker. */ .cms .ui-widget-overlay-light { background: #aaaaaa url(../../thirdparty/jquery-ui-themes/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: 0.3; }
/* Adjusting the color of the background overlay to be darker for pop-up dialogs (created by jQuery-UI) */
.cms .ui-widget-overlay { background-color: #000; background-image: none; } .cms .ui-widget-overlay { background-color: #000; background-image: none; }
.ui-dialog { background: url("../images/textures/bg_cms_main_content.png") repeat left top #f0f3f4; border: 3px solid #000 !important; border-radius: 8px; overflow: visible; padding: 0; /* Labels for all the Dialogs of the pop-up form */ /* Exception for a label that is inline with the selector dropdown box */ } .ui-dialog { background: url("../images/textures/bg_cms_main_content.png") repeat left top #f0f3f4; border: 3px solid #000 !important; border-radius: 8px; overflow: visible; padding: 0; /* Labels for all the Dialogs of the pop-up form */ /* Exception for a label that is inline with the selector dropdown box */ }

2
admin/javascript/LeftAndMain.Content.js
View File

@ -266,7 +266,7 @@
$('.cms-content.loading').entwine({ $('.cms-content.loading').entwine({
onmatch: function() { onmatch: function() {
this.append('<div class="cms-content-loading-overlay ui-widget-overlay"></div>'); this.append('<div class="cms-content-loading-overlay ui-widget-overlay-light"></div>');
}, },
onunmatch: function() { onunmatch: function() {
this.find('.cms-content-loading-overlay').remove(); this.find('.cms-content-loading-overlay').remove();

4
admin/javascript/LeftAndMain.Preview.js
View File

@ -71,8 +71,8 @@
else this.collapse(); else this.collapse();
// Preview might not be available in all admin interfaces - block/disable when necessary // Preview might not be available in all admin interfaces - block/disable when necessary
this.append('<div class="cms-preview-overlay ui-widget-overlay"></div>'); this.append('<div class="cms-preview-overlay ui-widget-overlay-light"></div>');
this.find('.cms-preview-overlay').hide(); this.find('.cms-preview-overlay-light').hide();
this._super(); this._super();
}, },

9
admin/scss/_style.scss
View File

@ -843,12 +843,13 @@ form.member-profile-form {
* Modal - JQuery UI Dialog pop-up * Modal - JQuery UI Dialog pop-up
* ----------------------------------------------------------------- */ * ----------------------------------------------------------------- */
/* default overlay for the CMS */ /* overlay for switching between CMS panes */
.cms .ui-widget-overlay-default { .cms .ui-widget-overlay-light {
background: #aaaaaa url(../../thirdparty/jquery-ui-themes/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x;
opacity: 0.3;
} }
/* Adjusting the color of the background overlay to be darker. */ /* Adjusting the color of the background overlay to be darker for pop-up dialogs (created by jQuery-UI) */
.cms .ui-widget-overlay { .cms .ui-widget-overlay {
background-color: #000; background-color: #000;
background-image: none; background-image: none;