From 7253746bdca506711541c87f80870c0a7d3ba755 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Thu, 15 Dec 2011 16:54:33 +0100 Subject: [PATCH] MINOR Fixed IE6 compat note styling --- admin/css/screen.css | 9 ++++----- admin/javascript/LeftAndMain.js | 7 ++++--- admin/scss/_style.scss | 26 ++++++++++++++------------ javascript/lang/en_US.js | 3 +-- 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/admin/css/screen.css b/admin/css/screen.css index c4a2f5fa0ab..ec6a3153d97 100755 --- a/admin/css/screen.css +++ b/admin/css/screen.css @@ -205,11 +205,10 @@ html article, html aside, html details, html figcaption, html figure, html foote .cms-content-loading-spinner { position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: 9999; background: url(../images/spinner.gif) no-repeat 50% 50%; } /** ----------------------------------------------- Loading Screen ------------------------------------------------ */ -.ss-loading-screen, .ss-loading-screen .loading-logo { width: 100%; height: 100%; overflow: hidden; position: absolute; background: #fff; background: -moz-radial-gradient(50% 50% 180deg, circle cover, white, #efefef, #c7c7c7 100%); background: -webkit-gradient(radial, 50% 50%, 350, 50% 50%, 0, from(#e3e3e3), to(white)); z-index: 100000; margin: 0; padding: 0; } - -.ss-loading-screen .loading-logo { background-url: url(../images/logo.gif); background-repeat: no-repeat; background-color: transparent; background-position: 50% 50%; } -.ss-loading-screen p { width: 100%; text-align: center; position: absolute; bottom: 80px; } -.ss-loading-screen p span.notice { display: inline-block; font-size: 14px; padding: 10px 20px; color: #dc7f00; border: none; -moz-border-radius: 5px; -webkit-border-radius: 5px; -o-border-radius: 5px; -ms-border-radius: 5px; -khtml-border-radius: 5px; border-radius: 5px; } +.ss-loading-screen { width: 100%; height: 100%; overflow: hidden; position: absolute; z-index: 100000; background: #fff; background: -moz-radial-gradient(50% 50% 180deg, circle cover, white, #efefef, #c7c7c7 100%); background: -webkit-gradient(radial, 50% 50%, 350, 50% 50%, 0, from(#e3e3e3), to(white)); } +.ss-loading-screen .loading-logo { width: 100%; height: 100%; overflow: hidden; position: absolute; background: transparent url(../images/logo.gif) no-repeat 50% 50%; } +.ss-loading-screen p { width: 100%; text-align: center; position: absolute; bottom: 80px; z-index: 100001; } +.ss-loading-screen p span.notice { width: 300px; font-size: 14px; padding: 10px 20px; color: #dc7f00; border: none; background: none; -moz-border-radius: 5px; -webkit-border-radius: 5px; -o-border-radius: 5px; -ms-border-radius: 5px; -khtml-border-radius: 5px; border-radius: 5px; display: inline-block; zoom: 1; *display: inline; } .ss-loading-screen .loading-animation { display: none; position: absolute; left: 49%; top: 75%; } /** -------------------------------------------- Actions -------------------------------------------- */ diff --git a/admin/javascript/LeftAndMain.js b/admin/javascript/LeftAndMain.js index 3fe74ee836f..0d071edb082 100644 --- a/admin/javascript/LeftAndMain.js +++ b/admin/javascript/LeftAndMain.js @@ -51,10 +51,11 @@ // Browser detection if($.browser.msie && parseInt($.browser.version, 10) < 7) { $('.ss-loading-screen').append( - '

' + - ss.i18n._t('LeftAndMain.IncompatBrowserWarning') + + '

' + + 'Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.' + '

' - ); + ).css('z-index', $('.ss-loading-screen').css('z-index')+1); + $('.loading-animation').remove(); return; } diff --git a/admin/scss/_style.scss b/admin/scss/_style.scss index 077aef8bcf9..0c0abb14c17 100644 --- a/admin/scss/_style.scss +++ b/admin/scss/_style.scss @@ -180,41 +180,43 @@ html,body { /** ----------------------------------------------- * Loading Screen * ------------------------------------------------ */ -.ss-loading-screen, -.ss-loading-screen .loading-logo { +.ss-loading-screen { width: 100%; height: 100%; overflow: hidden; position: absolute; + z-index: 100000; // TODO Convert to compass gradient include background: #fff; background: -moz-radial-gradient(50% 50% 180deg, circle cover, #FFFFFF, #EFEFEF, #C7C7C7 100%); background: -webkit-gradient(radial, 50% 50%, 350, 50% 50%, 0, from(#E3E3E3), to(white)); - z-index: 100000; - margin: 0; - padding: 0; -} -.ss-loading-screen { .loading-logo { - background-url: url(../images/logo.gif); - background-repeat: no-repeat; - background-color: transparent; - background-position: 50% 50%; + width: 100%; + height: 100%; + overflow: hidden; + position: absolute; + background: transparent url(../images/logo.gif) no-repeat 50% 50%; } + p { width: 100%; text-align: center; position: absolute; bottom: 80px; + z-index: 100001; span.notice { - display: inline-block; + width: 300px; font-size: 14px; padding: 10px 20px; color: #dc7f00; border: none; + background: none; @include border-radius(5px); + display: inline-block; + zoom: 1; + *display: inline; } } diff --git a/javascript/lang/en_US.js b/javascript/lang/en_US.js index 8a97805a29e..528b79735c1 100644 --- a/javascript/lang/en_US.js +++ b/javascript/lang/en_US.js @@ -14,7 +14,6 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') { 'FILEIFRAMEFIELD.DELETEFILE': 'Delete File', 'FILEIFRAMEFIELD.UNATTACHFILE': 'Un-Attach File', 'FILEIFRAMEFIELD.DELETEIMAGE': 'Delete Image', - 'FILEIFRAMEFIELD.CONFIRMDELETE': 'Are you sure you want to delete this file?', - 'LeftAndMain.IncompatBrowserWarning': 'Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.' + 'FILEIFRAMEFIELD.CONFIRMDELETE': 'Are you sure you want to delete this file?' }); }