tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

MINOR Fixed IE6 compat note styling

Browse Source
This commit is contained in:
Ingo Schommer 2011-12-15 16:54:33 +01:00
parent 64f6b460e9
commit 7253746bdc
4 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
admin/css/screen.css
View File

@ -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%; } .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 ------------------------------------------------ */ /** ----------------------------------------------- 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 { 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 .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; z-index: 100001; }
.ss-loading-screen p { width: 100%; text-align: center; position: absolute; bottom: 80px; } .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 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 .loading-animation { display: none; position: absolute; left: 49%; top: 75%; } .ss-loading-screen .loading-animation { display: none; position: absolute; left: 49%; top: 75%; }
/** -------------------------------------------- Actions -------------------------------------------- */ /** -------------------------------------------- Actions -------------------------------------------- */

7
admin/javascript/LeftAndMain.js
View File

@ -51,10 +51,11 @@
// Browser detection // Browser detection
if($.browser.msie && parseInt($.browser.version, 10) < 7) { if($.browser.msie && parseInt($.browser.version, 10) < 7) {
$('.ss-loading-screen').append( $('.ss-loading-screen').append(
'<p><span class="notice">' + '<p class="ss-loading-incompat-warning"><span class="notice">' +
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+.' +
'</span></p>' '</span></p>'
); ).css('z-index', $('.ss-loading-screen').css('z-index')+1);
$('.loading-animation').remove();
return; return;
} }

26
admin/scss/_style.scss
View File

@ -180,41 +180,43 @@ html,body {
/** ----------------------------------------------- /** -----------------------------------------------
* Loading Screen * Loading Screen
* ------------------------------------------------ */ * ------------------------------------------------ */
.ss-loading-screen, .ss-loading-screen {
.ss-loading-screen .loading-logo {
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
position: absolute; position: absolute;
z-index: 100000;
// TODO Convert to compass gradient include // TODO Convert to compass gradient include
background: #fff; background: #fff;
background: -moz-radial-gradient(50% 50% 180deg, circle cover, #FFFFFF, #EFEFEF, #C7C7C7 100%); 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)); 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 { .loading-logo {
background-url: url(../images/logo.gif); width: 100%;
background-repeat: no-repeat; height: 100%;
background-color: transparent; overflow: hidden;
background-position: 50% 50%; position: absolute;
background: transparent url(../images/logo.gif) no-repeat 50% 50%;
} }
p { p {
width: 100%; width: 100%;
text-align: center; text-align: center;
position: absolute; position: absolute;
bottom: 80px; bottom: 80px;
z-index: 100001;
span.notice { span.notice {
display: inline-block; width: 300px;
font-size: 14px; font-size: 14px;
padding: 10px 20px; padding: 10px 20px;
color: #dc7f00; color: #dc7f00;
border: none; border: none;
background: none;
@include border-radius(5px); @include border-radius(5px);
display: inline-block;
zoom: 1;
*display: inline;
} }
} }

3
javascript/lang/en_US.js
View File

@ -14,7 +14,6 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
'FILEIFRAMEFIELD.DELETEFILE': 'Delete File', 'FILEIFRAMEFIELD.DELETEFILE': 'Delete File',
'FILEIFRAMEFIELD.UNATTACHFILE': 'Un-Attach File', 'FILEIFRAMEFIELD.UNATTACHFILE': 'Un-Attach File',
'FILEIFRAMEFIELD.DELETEIMAGE': 'Delete Image', 'FILEIFRAMEFIELD.DELETEIMAGE': 'Delete Image',
'FILEIFRAMEFIELD.CONFIRMDELETE': 'Are you sure you want to delete this file?', '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+.'
}); });
} }