taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #523 from taigaio/issue/2864/spanish-invitation 

Design and code refactor to fit on new code and styles
stable
Juanfran 2015-06-17 22:37:13 -07:00
parent 4ec567b9ce ce17e4cc98
commit 0c8b977903
4 changed files with 31 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/partials/auth/invitation.jade
View File

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

2
app/partials/includes/modules/invitation-login-form.jade
View File

@ -13,7 +13,7 @@ form.login-form
translate="LOGIN_COMMON.LINK_FORGOT_PASSWORD")
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}}",
translate="LOGIN_COMMON.ACTION_ENTER")

2
app/partials/includes/modules/invitation-register-form.jade
View File

@ -20,6 +20,6 @@ form.register-form
placeholder="{{'REGISTER_FORM.PLACEHOLDER_PASSWORD' | translate}}")
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

81
app/styles/layout/invitation.scss
View File

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