beenull/tellform
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fixed verification view

Browse source
This commit is contained in:
David Baldwynn 2016-08-25 18:56:38 -07:00
parent cf39784317
commit 4b1562f96a
3 changed files with 49 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
= Normal file
View file

@ -0,0 +1,7 @@
Merge branch 'stage' of https://github.com/whitef0x0/tellform into stage
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

18
public/modules/users/css/users.css
View file

@ -6,7 +6,7 @@ section.auth {
left: 0;
width: 100%;
color: white;
background-color: #1e5799; /* Old browsers */
background-color: #50B5C1; /* Old browsers */
background: -moz-linear-gradient(137deg, #50B5C1 0%, #6450A0 85%); /* FF3.6-15 */
background: -webkit-linear-gradient(137deg, #50B5C1 0%, #6450A0 85%); /* Chrome10-25,Safari5.1-6 */
background: linear-gradient(137deg, #50B5C1 0%, #6450A0 85%);
@ -58,9 +58,11 @@ section.auth {
section.auth .btn {
border-radius: 100px;
font-size: 14px;
padding: 12px 28px;
padding: 10px 28px;
margin: 0 2px;
margin-top: 1em;
text-transform: uppercase;
text-decoration: none!important;
}
section.auth .btn-signup {
@ -75,6 +77,18 @@ section.auth {
border: 2px #896D0B solid;
}
section.auth .btn-default {
background-color: transparent;
color: white;
border: 2px white solid;
}
section.auth .btn-default:focus, section.auth .btn-default:hover {
color: #6450A0;
background-color: white;
border-color: white;
}
@media (min-width: 992px) {
.nav-users {
position: fixed;

31
public/modules/users/views/verify/verify-account.client.view.html
View file

@ -1,14 +1,35 @@
<section class="auth" data-ng-controller="VerifyController" ng-init="validateVerifyToken()">
<section class="row text-center" ng-if="isResetSent">
<h3 class="col-md-12"></h3>
<a href="/#!/signin" class="col-md-12">{{ 'CONTINUE_TO_LOGIN' | translate }}</a>
<div class="col-md-4 col-md-offset-4">
<div class="col-md-12 text-center" style="padding-bottom: 50px;">
<img src="/static/modules/core/img/logo_white.svg" height="100px">
</div>
<div class="col-md-12">
<a href="/#!/signin" class="btn btn-signup">{{ 'CONTINUE_TO_LOGIN' | translate }}</a>
</div>
</div>
</section>
<section class="row text-center" ng-if="!isResetSent">
<h3 class="col-md-12">{{ 'VERIFY_ERROR' | translate }}</h3>
<a href="/#!/verify" class="col-md-6">{{ 'REVERIFY_ACCOUNT_LINK' | translate }}</a>
<a href="/#!/signin" class="col-md-6">{{ 'SIGNIN_BTN' | translate }}</a>
<div class="col-md-4 col-md-offset-4">
<div class="col-md-12 text-center" style="padding-bottom: 50px;">
<img src="/static/modules/core/img/logo_white.svg" height="100px">
</div>
<h3 class="col-md-12">
{{ 'VERIFY_ERROR' | translate }}
</h3>
<div class="col-md-12">
<a href="/#!/verify" class="btn btn-default">
{{ 'REVERIFY_ACCOUNT_LINK' | translate }}
</a>
</div>
<div class="col-sm-12">
<a href="/#!/signin" class="btn btn-primary">
{{ 'SIGNIN_BTN' | translate }}
</a>
</div>
</div>
</section>
</section>