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

Login page review fixes and login typo

stable
Xavier Julián 2014-07-10 11:47:18 +02:00
parent 8a50d2fa58
commit b5850affe1
8 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/coffee/modules/base.coffee
View File

@ -45,7 +45,7 @@ module.directive("tgMain", ["$rootScope", "$window", TaigaMainDirective])
urls = {
"home": "/",
"logint": "/login",
"login": "/login",
"forgot-password": "/forgot-password",
"change-password": "/change-password/:token",
"register": "/register",

8
app/partials/views/modules/forgot-form.jade
View File

@ -1,7 +1,7 @@
div.forgot-form-container(tg-forgot-Password)
p.forgot-text
strong Don't worry, it happens even in the best families :-) <br />
span Give us your username or email and we'll sent you instructions to get a new one
p.forgot-text.
<strong>Oh! Did you forget your password?</strong><br />
Give us your username or email and we'll sent you instructions to get a new one
form(ng-submit="ctrl.submit()")
fieldset
@ -10,3 +10,5 @@ div.forgot-form-container(tg-forgot-Password)
fieldset
a.button.button-forgot.button-gray(href="", title="Reset Password") Reset Password
input(type="submit", style="display:none")
a(href="", title="Login", tg-nav="login") No, I still keep my password, let's go to login page

1
app/partials/views/modules/invitation-register-form.jade
View File

@ -8,7 +8,6 @@ form.register-form
fieldset
a.button.button-register.button-gray(href="", title="Sign up") Sign up
input(type="submit", style="display:none")
p.register-text
// TODO
span By clicking "Sign up", you agree to our <br />

14
app/partials/views/modules/register-form.jade
View File

@ -1,4 +1,5 @@
div.register-form-container(tg-register)
a.register-text-top(href="", title="Login", tg-nav="login") Are you already registered?
form.register-form
fieldset
input(type="text", placeholder="Pick a username", ng-model="data.username",
@ -11,10 +12,9 @@ div.register-form-container(tg-register)
fieldset
a.button.button-register.button-gray(href="", title="Sign up") Sign up
input(type="submit", class="hidden")
p.register-text
// TODO
span By clicking "Sign up", you agree to our <br />
a(href="", title="See terms of service") terms of service
span and
a(href="", title="See privacy policy") privacy policy.
p.register-text
// TODO
span By clicking "Sign up", you agree to our <br />
a(href="", title="See terms of service") terms of service
span and
a(href="", title="See privacy policy") privacy policy.

8
app/styles/dependencies/forms.scss
View File

@ -32,3 +32,11 @@ input[type="password"] {
textarea {
max-height: 10rem;
}
.checksley-error-list {
margin-bottom: 0;
li {
color: $white;
padding: .2rem;
}
}

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

@ -74,7 +74,6 @@
.button {
color: $white;
display: block;
margin-bottom: .5rem;
text-align: center;
&:hover {
background: $fresh-taiga;

12
app/styles/layout/login.scss
View File

@ -8,6 +8,9 @@
right: 0;
top: 0;
z-index: 999;
fieldset {
margin-bottom: 1rem;
}
.login-container {
@include table-flex-child(0, 400px, 0, 400px);
}
@ -28,7 +31,6 @@
}
input {
background: $white;
margin-bottom: 1rem;
@include placeholder {
color: $gray-light;
}
@ -40,9 +42,6 @@
color: $fresh-taiga;
}
}
.register-text {
@extend %small;
}
.button {
color: $white;
display: block;
@ -52,6 +51,11 @@
background: $fresh-taiga;
}
}
a {
&:hover {
color: $white;
}
}
}
.login-error {

7
app/styles/modules/register-form.scss
View File

@ -1,3 +1,10 @@
.register-form-container {
display: block;
.register-text-top {
display: block;
margin-bottom: 1rem;
}
.register-text {
@extend %small;
}
}