Permalink
Browse files

MINOR Fixed IE6 compat note styling

  • Loading branch information...
1 parent 64f6b46 commit 7253746bdca506711541c87f80870c0a7d3ba755 @chillu chillu committed Dec 15, 2011
Showing with 23 additions and 22 deletions.
  1. +4 −5 admin/css/screen.css
  2. +4 −3 admin/javascript/LeftAndMain.js
  3. +14 −12 admin/scss/_style.scss
  4. +1 −2 javascript/lang/en_US.js
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -51,10 +51,11 @@
// Browser detection
if($.browser.msie && parseInt($.browser.version, 10) < 7) {
$('.ss-loading-screen').append(
- '<p><span class="notice">' +
- ss.i18n._t('LeftAndMain.IncompatBrowserWarning') +
+ '<p class="ss-loading-incompat-warning"><span class="notice">' +
+ 'Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.' +
'</span></p>'
- );
+ ).css('z-index', $('.ss-loading-screen').css('z-index')+1);
+ $('.loading-animation').remove();
return;
}
View
@@ -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;
}
}
View
@@ -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?'
});
}

0 comments on commit 7253746

Please sign in to comment.