diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json index f29ba12f..bfb1cdcc 100644 --- a/app/locales/taiga/locale-en.json +++ b/app/locales/taiga/locale-en.json @@ -290,7 +290,8 @@ "TITLE_LINK_FORGOT_PASSWORD": "Did you forget your password?", "ACTION_ENTER": "Enter", "ACTION_SIGN_IN": "Login", - "PLACEHOLDER_AUTH_PASSWORD": "Password (case sensitive)" + "PLACEHOLDER_AUTH_PASSWORD": "Password (case sensitive)", + "ALT_LOGIN": "Or login with" }, "LOGIN_FORM": { "ERROR_AUTH_INCORRECT": "According to our Oompa Loompas, your username/email or password are incorrect.", diff --git a/app/partials/includes/modules/invitation-login-form.jade b/app/partials/includes/modules/invitation-login-form.jade index 816854c2..f9effc25 100644 --- a/app/partials/includes/modules/invitation-login-form.jade +++ b/app/partials/includes/modules/invitation-login-form.jade @@ -30,10 +30,15 @@ form.login-form ) fieldset - a.button-login.button-blackish.submit-button( + button.button-green.submit-button( type="submit" - title="{{'LOGIN_COMMON.ACTION_ENTER' | translate}}" translate="LOGIN_COMMON.ACTION_ENTER" ) + + .contrib-plugins-wrapper(ng-if="contribPlugins.length") + label(translate="LOGIN_COMMON.ALT_LOGIN") - fieldset(ng-repeat="plugin in contribPlugins|filter:{type: 'auth'}", ng-include="plugin.template") + fieldset( + ng-repeat="plugin in contribPlugins|filter:{type: 'auth'}" + ng-include="plugin.template" + ) diff --git a/app/partials/includes/modules/invitation-register-form.jade b/app/partials/includes/modules/invitation-register-form.jade index 227f9c28..00b7611e 100644 --- a/app/partials/includes/modules/invitation-register-form.jade +++ b/app/partials/includes/modules/invitation-register-form.jade @@ -44,11 +44,11 @@ form.register-form ) fieldset - a.button-register.button-blackish.submit-button( + button.button-register.button-green.submit-button( type="submit" title="{{'REGISTER_FORM.ACTION_SIGN_UP' | translate}}" translate="REGISTER_FORM.ACTION_SIGN_UP" ) - + //- Only displays terms notice when terms plugin is loaded. tg-terms-of-service-and-privacy-policy-notice diff --git a/app/partials/includes/modules/login-form.jade b/app/partials/includes/modules/login-form.jade index 96927f3b..a1582f24 100644 --- a/app/partials/includes/modules/login-form.jade +++ b/app/partials/includes/modules/login-form.jade @@ -38,9 +38,12 @@ translate="LOGIN_COMMON.ACTION_SIGN_IN" ) - fieldset( - ng-repeat="plugin in contribPlugins|filter:{type: 'auth'}" - ng-include="plugin.template" - ) + .contrib-plugins-wrapper(ng-if="contribPlugins.length") + label(translate="LOGIN_COMMON.ALT_LOGIN") + + fieldset( + ng-repeat="plugin in contribPlugins|filter:{type: 'auth'}" + ng-include="plugin.template" + ) tg-public-register-message diff --git a/app/partials/includes/modules/register-form.jade b/app/partials/includes/modules/register-form.jade index e5aa9b6b..2c58fdff 100644 --- a/app/partials/includes/modules/register-form.jade +++ b/app/partials/includes/modules/register-form.jade @@ -51,11 +51,14 @@ div.register-form-container(tg-register) title="{{'REGISTER_FORM.ACTION_SIGN_UP' | translate}}" translate="REGISTER_FORM.ACTION_SIGN_UP" ) + + .contrib-plugins-wrapper(ng-if="contribPlugins.length") + label(translate="LOGIN_COMMON.ALT_LOGIN") - fieldset( - ng-repeat="plugin in contribPlugins|filter:{type: 'auth'}" - ng-include="plugin.template" - ) + fieldset( + ng-repeat="plugin in contribPlugins|filter:{type: 'auth'}" + ng-include="plugin.template" + ) //- Only displays terms notice when terms plugin is loaded. tg-terms-of-service-and-privacy-policy-notice diff --git a/app/styles/components/buttons.scss b/app/styles/components/buttons.scss index 071feaf8..388bd258 100755 --- a/app/styles/components/buttons.scss +++ b/app/styles/components/buttons.scss @@ -8,7 +8,7 @@ color: $white; cursor: pointer; display: inline-block; - padding: .4rem 2rem; + padding: .6rem 2rem; text-align: center; text-transform: uppercase; transition: all .2s linear; diff --git a/app/styles/core/base.scss b/app/styles/core/base.scss index 7b4af1d2..e8761df4 100644 --- a/app/styles/core/base.scss +++ b/app/styles/core/base.scss @@ -47,6 +47,7 @@ body { .wrapper { display: flex; + height: 100%; min-height: $main-height; } diff --git a/app/styles/layout/auth.scss b/app/styles/layout/auth.scss index de95a0c5..aa2a972a 100644 --- a/app/styles/layout/auth.scss +++ b/app/styles/layout/auth.scss @@ -23,7 +23,7 @@ } .logo { @include font-size(xxlarge); - @include font-type(text); + @include font-type(light); color: $white; margin-bottom: 1rem; text-align: center; diff --git a/app/styles/layout/invitation.scss b/app/styles/layout/invitation.scss index cbdf801c..f2d23cdb 100644 --- a/app/styles/layout/invitation.scss +++ b/app/styles/layout/invitation.scss @@ -5,6 +5,7 @@ background-size: cover; display: flex; flex: 1; + height: 100vh; justify-content: center; z-index: 999; .invitation-container { @@ -107,4 +108,10 @@ border-right: 0; } } + + .contrib-plugins-wrapper { + label { + color: $whitish; + } + } } diff --git a/app/styles/modules/auth/login-form.scss b/app/styles/modules/auth/login-form.scss index 03e5e556..1fabdf05 100644 --- a/app/styles/modules/auth/login-form.scss +++ b/app/styles/modules/auth/login-form.scss @@ -10,6 +10,7 @@ } } } + .forgot-pass { @include font-size(small); color: $gray; diff --git a/app/styles/modules/common/contrib-plugins.scss b/app/styles/modules/common/contrib-plugins.scss new file mode 100644 index 00000000..26f0d09a --- /dev/null +++ b/app/styles/modules/common/contrib-plugins.scss @@ -0,0 +1,8 @@ +.contrib-plugins-wrapper { + margin: 1rem 0 2rem; + label { + @include font-size(small); + display: block; + margin-bottom: .5rem; + } +}