From fb51d40cb4d2340740778708fb86c658c311a44b Mon Sep 17 00:00:00 2001 From: Scott Erickson Date: Wed, 28 Oct 2015 14:37:59 -0700 Subject: [PATCH] Switch AuthModal buttons to use btn-illustrated classes, for browser compatibility They were white boxes in IE9 with their custom setup. --- app/styles/modal/auth-modal.sass | 51 +++++++++++--------------------- app/templates/core/auth.jade | 8 ++--- 2 files changed, 21 insertions(+), 38 deletions(-) diff --git a/app/styles/modal/auth-modal.sass b/app/styles/modal/auth-modal.sass index fa1388bf0..541a82e33 100644 --- a/app/styles/modal/auth-modal.sass +++ b/app/styles/modal/auth-modal.sass @@ -146,22 +146,22 @@ height: 70px font-size: 32px line-height: 42px - border-style: solid - border-image: url(/images/level/code_toolbar_submit_button_active.png) 14 20 20 20 fill round - border-width: 14px 20px 20px 20px - color: white - - span - pointer-events: none - - &:hover - border-image: url(/images/level/code_toolbar_submit_button_zazz.png) 14 20 20 20 fill round - color: white - - &:active - border-image: url(/images/level/code_toolbar_submit_button_zazz_pressed.png) 14 20 20 20 fill round - padding: 2px 0 0 2px - color: white + //border-style: solid + //border-image: url(/images/level/code_toolbar_submit_button_active.png) 14 20 20 20 fill round + //border-width: 14px 20px 20px 20px + //color: white + // + //span + // pointer-events: none + // + //&:hover + // border-image: url(/images/level/code_toolbar_submit_button_zazz.png) 14 20 20 20 fill round + // color: white + // + //&:active + // border-image: url(/images/level/code_toolbar_submit_button_zazz_pressed.png) 14 20 20 20 fill round + // padding: 2px 0 0 2px + // color: white //- Footer area @@ -263,24 +263,7 @@ .extra-pane top: 408px - - -html.no-borderimage #auth-modal - #login-button, #signup-button - border: 0 - background-image: url(/images/level/code_toolbar_submit_button_active.png) - background-size: 100% 100% - padding: 7px 10px 10px 10px - - &:hover - background-image: url(/images/level/code_toolbar_submit_button_zazz.png) - border: 0 - - &:active - background-image: url(/images/level/code_toolbar_submit_button_zazz_pressed.png) - padding: 9px 8px 8px 12px - border: 0 -.ie10 #auth-modal .auth-network-logins .btn.btn-lg.network-login .network-logo +.ie10 #auth-modal .auth-network-logins .btn.btn-lg.network-login .network-logo, .lt-ie10 #auth-modal .auth-network-logins .btn.btn-lg.network-login .network-logo left: 15px top: 15px diff --git a/app/templates/core/auth.jade b/app/templates/core/auth.jade index 3f5ff3221..cf8f28f72 100644 --- a/app/templates/core/auth.jade +++ b/app/templates/core/auth.jade @@ -60,9 +60,9 @@ span(data-i18n="signup.email_announcements") Receive announcements by email if mode === 'login' - input.btn.btn-lg.btn-illustrated.btn-block#login-button(value=translate("login.log_in"), type="submit") + input.btn.btn-lg.btn-illustrated.btn-block.btn-success#login-button(value=translate("login.log_in"), type="submit") else if mode === 'signup' - input.btn.btn-lg.btn-illustrated.btn-block#signup-button(value=translate("signup.sign_up"), type="submit") + input.btn.btn-lg.btn-illustrated.btn-block.btn-success#signup-button(value=translate("signup.sign_up"), type="submit") .wait.secret if mode === 'login' @@ -90,7 +90,7 @@ .extra-pane if mode === 'login' .switch-explanation(data-i18n="login.signup_switch") Want to create an account? - .btn.btn-default.btn-lg.btn-illustrated#switch-to-signup-button(data-i18n="login.sign_up") Create Account + .btn.btn-lg.btn-illustrated.btn-warning#switch-to-signup-button(data-i18n="login.sign_up") Create Account else if mode === 'signup' .switch-explanation(data-i18n="signup.login_switch") Already have an account? - .btn.btn-default.btn-lg.btn-illustrated#switch-to-login-button(data-i18n="login.log_in") + .btn.btn-lg.btn-illustrated.btn-warning#switch-to-login-button(data-i18n="login.log_in")