diff --git a/resources/static/css/style.css b/resources/static/css/style.css index 50d50a8d51f8bdb960fac40bd644356f7463671f..4434ee3332175b3c70eee13e490bec45a169685a 100644 --- a/resources/static/css/style.css +++ b/resources/static/css/style.css @@ -21,6 +21,7 @@ noscript { right: 0; bottom: 0; left: 0; + -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; opacity: 0; z-index: -2; background: #000; @@ -42,6 +43,7 @@ noscript { #error, #wait, #delay { z-index: -2; + -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; opacity: 0; -webkit-transition: opacity 750ms; -moz-transition: opacity 750ms; @@ -61,16 +63,19 @@ noscript { .waiting #wait { z-index: 1002; + -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; opacity: 1; } .delay #delay { z-index: 1003; + -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; opacity: 1; } .error #error { z-index: 1004; + -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; opacity: 1; } diff --git a/resources/views/layout.ejs b/resources/views/layout.ejs index c6d9ce48f8383cd549eee34e5ae3d84b98f47342..cd2818b7a7a90eb99d37dc768406fe7351289c3a 100644 --- a/resources/views/layout.ejs +++ b/resources/views/layout.ejs @@ -23,9 +23,9 @@ <script src="/lib/jquery-1.7.1.min.js"></script> <script src="/lib/underscore-min.js"></script> <script src="/lib/ejs.js"></script> + <script src="/shared/javascript-extensions.js"></script> <script src="/i18n/<%= locale %>/client.json"></script> <script src="/shared/gettext.js"></script> - <script src="/shared/javascript-extensions.js"></script> <script src="/shared/browserid.js"></script> <script src="/lib/dom-jquery.js"></script> <script src="/lib/module.js"></script> diff --git a/scripts/compress.sh b/scripts/compress.sh index 5dec0f68bbe2480b4146012d676a0c7d796638cb..6195ff5edd11c6ec4443407f337be9e5e2602191 100755 --- a/scripts/compress.sh +++ b/scripts/compress.sh @@ -64,7 +64,7 @@ echo $locales for locale in $locales; do mkdir -p $BUILD_PATH/$locale - cat lib/jquery-1.7.1.min.js lib/winchan.js lib/underscore-min.js lib/vepbundle.js lib/ejs.js i18n/${locale}/client.json shared/gettext.js shared/browserid.js shared/javascript-extensions.js lib/hub.js lib/dom-jquery.js lib/module.js lib/jschannel.js $BUILD_PATH/templates.js shared/renderer.js shared/class.js shared/mediator.js shared/tooltip.js shared/validation.js shared/helpers.js shared/screens.js shared/browser-support.js shared/wait-messages.js shared/error-messages.js shared/error-display.js shared/storage.js shared/xhr.js shared/network.js shared/provisioning.js shared/user.js shared/modules/page_module.js shared/modules/xhr_delay.js shared/modules/xhr_disable_form.js shared/modules/code_check.js shared/modules/cookie_check.js dialog/resources/internal_api.js dialog/resources/helpers.js dialog/resources/state_machine.js dialog/controllers/actions.js dialog/controllers/dialog.js dialog/controllers/authenticate.js dialog/controllers/forgot_password.js dialog/controllers/check_registration.js dialog/controllers/pick_email.js dialog/controllers/add_email.js dialog/controllers/required_email.js dialog/controllers/verify_primary_user.js dialog/controllers/provision_primary_user.js dialog/controllers/primary_user_provisioned.js dialog/controllers/email_chosen.js dialog/start.js > $BUILD_PATH/$locale/dialog.uncompressed.js + cat lib/jquery-1.7.1.min.js lib/winchan.js lib/underscore-min.js lib/vepbundle.js lib/ejs.js shared/javascript-extensions.js i18n/${locale}/client.json shared/gettext.js shared/browserid.js lib/hub.js lib/dom-jquery.js lib/module.js lib/jschannel.js $BUILD_PATH/templates.js shared/renderer.js shared/class.js shared/mediator.js shared/tooltip.js shared/validation.js shared/helpers.js shared/screens.js shared/browser-support.js shared/wait-messages.js shared/error-messages.js shared/error-display.js shared/storage.js shared/xhr.js shared/network.js shared/provisioning.js shared/user.js shared/modules/page_module.js shared/modules/xhr_delay.js shared/modules/xhr_disable_form.js shared/modules/code_check.js shared/modules/cookie_check.js dialog/resources/internal_api.js dialog/resources/helpers.js dialog/resources/state_machine.js dialog/controllers/actions.js dialog/controllers/dialog.js dialog/controllers/authenticate.js dialog/controllers/forgot_password.js dialog/controllers/check_registration.js dialog/controllers/pick_email.js dialog/controllers/add_email.js dialog/controllers/required_email.js dialog/controllers/verify_primary_user.js dialog/controllers/provision_primary_user.js dialog/controllers/primary_user_provisioned.js dialog/controllers/email_chosen.js dialog/start.js > $BUILD_PATH/$locale/dialog.uncompressed.js done # produce the dialog css