Skip to content

Modified the initial login form, have yet to implement the functionalites #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Modified the initial login form, have yet to implement the functionalites #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions app/styles/pages/login.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,32 @@
border-width: 0 1px;
margin-top: $nav-bar-height;
padding-top: $padding-m;
text-align: center;
}

.login-thumbnail {
height: 150px;
width: 150px;
margin-bottom: 10px;
}

.login-input-group-addon {
background-color: $white;
width: 0%;
}

.login-input-group-addon:hover {
background-color: $black;
color: $white;
}

.login-form-control {
display: inline-block;
margin-bottom: 10px;
text-align: center;
width: 50%;
}

.password-margin-left {
margin-left: 64px;
}
18 changes: 13 additions & 5 deletions app/templates/login.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,27 @@
<div class="container login-form">
<form class="form-inline">
{{input class="form-control email"
<img src="" alt="This image should load when the e-mail field is filled" class="login-thumbnail img-thumbnail">
<form class="form-group has-warning has-feedback">
{{input class="login-form-control form-control email"
data-auto-id="login-email"
insert-newline="login"
placeholder="Email"
aria-describedby="login-email"
type="email"
value=email}}

{{input class="form-control password"
<!--<span class="glyphicon glyphicon-ok form-control-feedback" aria-hidden="true"></span>
<span id="login-email" class="sr-only">(error)</span>-->
<div class="form-group">
{{input class="password-margin-left login-form-control form-control password"
data-auto-id="login-password"
insert-newline="login"
placeholder="Password"
type="password"
value=password}}

<button {{action 'login'}} type="submit" class="btn btn-default submit">Login</button>
<div class="btn btn-primary btn-md">
<div {{action 'login'}} type="submit">Login</div>
</div>
</div>

</form>
</div>