Design and code refactor to fit on new code and styles

stable
Xavier Julián 2015-06-16 12:27:25 +02:00 committed by Juanfran
parent 4ec567b9ce
commit ce17e4cc98
4 changed files with 31 additions and 67 deletions

View File

@ -1,11 +1,8 @@
doctype html
div.wrapper div.wrapper
div.invitation-main div.invitation-main
div.invitation-container(tg-invitation) div.centered.invitation-container(tg-invitation)
figure.avatar a.avatar(href="", tg-bo-title="invitation.invited_by.full_name_display")
a(href="", tg-bo-title="invitation.invited_by.full_name_display") img(tg-bo-src="invitation.invited_by.photo",
img.avatar(tg-bo-src="invitation.invited_by.photo",
tg-bo-alt="invitation.invited_by.full_name_display") tg-bo-alt="invitation.invited_by.full_name_display")
span.person-name(tg-bo-bind="invitation.invited_by.full_name_display") span.person-name(tg-bo-bind="invitation.invited_by.full_name_display")

View File

@ -13,7 +13,7 @@ form.login-form
translate="LOGIN_COMMON.LINK_FORGOT_PASSWORD") translate="LOGIN_COMMON.LINK_FORGOT_PASSWORD")
fieldset fieldset
button.button-login.button-gray.submit-button(type="submit", a.button-login.button-blackish.submit-button(type="submit",
title="{{'LOGIN_COMMON.ACTION_ENTER' | translate}}", title="{{'LOGIN_COMMON.ACTION_ENTER' | translate}}",
translate="LOGIN_COMMON.ACTION_ENTER") translate="LOGIN_COMMON.ACTION_ENTER")

View File

@ -20,6 +20,6 @@ form.register-form
placeholder="{{'REGISTER_FORM.PLACEHOLDER_PASSWORD' | translate}}") placeholder="{{'REGISTER_FORM.PLACEHOLDER_PASSWORD' | translate}}")
fieldset fieldset
button.button-register.button-gray.submit-button(type="submit", title="{{'REGISTER_FORM.ACTION_SIGN_UP' | translate}}", translate="REGISTER_FORM.ACTION_SIGN_UP") a.button-register.button-blackish.submit-button(type="submit", title="{{'REGISTER_FORM.ACTION_SIGN_UP' | translate}}", translate="REGISTER_FORM.ACTION_SIGN_UP")
tg-terms-notice tg-terms-notice

View File

@ -2,63 +2,48 @@
@extend %background-taiga; @extend %background-taiga;
align-content: center; align-content: center;
align-items: center; align-items: center;
bottom: 0; background-size: cover;
display: flex; display: flex;
flex: 1;
justify-content: center; justify-content: center;
left: 0;
position: fixed;
right: 0;
top: 0;
z-index: 999; z-index: 999;
.invitation-container { .invitation-container {
flex-basis: 650px; align-items: center;
width: 650px; display: flex;
} flex-direction: column;
.logo {
margin: 1rem auto;
width: 150px;
} }
.avatar { .avatar {
margin: 0 auto 1rem; align-items: center;
text-align: center; display: flex;
width: 250px; flex-direction: column;
.person-name { .person-name {
@extend %xlarge; @extend %large;
@extend %title; @extend %light;
color: $white; color: $white;
text-transform: uppercase;
} }
img { img {
display: block; margin-bottom: .5rem;
text-align: center;
width: 50px; width: 50px;
} }
} }
.invitation-text { .invitation-text {
@extend %xlarge; @extend %larger;
@extend %title; @extend %light;
color: $white; color: $white;
line-height: 2rem;
text-align: center; text-align: center;
text-transform: uppercase;
.project-name { .project-name {
@extend %xxlarge; @extend %xxlarge;
display: block; display: block;
text-transform: uppercase;
} }
} }
.invitation-form { .invitation-form {
display: flex; display: flex;
flex-basis: 100%;
width: 100%;
fieldset { fieldset {
margin-bottom: .5rem; margin-bottom: .5rem;
} }
input {
background: $white;
color: $gray;
position: relative;
@include placeholder {
color: $gray-light;
}
}
input:focus { input:focus {
+.forgot-pass { +.forgot-pass {
opacity: 0; opacity: 0;
@ -78,29 +63,16 @@
transition: color .3s linear; transition: color .3s linear;
} }
} }
.button {
color: $white;
display: block;
text-align: center;
&:hover {
background: $fresh-taiga;
}
}
.button-github {
&:hover {
background: $black;
}
}
} }
.login-form, .login-form,
.register-form { .register-form {
flex-basis: 200px; flex: 1;
flex-grow: 1; padding: 1rem 3rem;
padding: 1rem;
text-align: center; text-align: center;
width: 200px;
.form-header { .form-header {
color: $gray-light; @extend %large;
@extend %light;
color: $white;
} }
} }
.register-form { .register-form {
@ -110,17 +82,12 @@
} }
} }
} }
.register-text { .button-blackish {
@extend %small;
color: $white;
a {
color: $green-taiga;
&:hover { &:hover {
color: $fresh-taiga; background: $green-taiga;
}
} }
} }
.login-form { .login-form {
border-right: 1px solid $white; border-right: 1px solid rgba($white, .3);
} }
} }