Skip to content

Commit

Permalink
refactor(pages): restyle auth and reg
Browse files Browse the repository at this point in the history
  • Loading branch information
SashaSkywalker committed Feb 23, 2016
1 parent 0f5a718 commit da2df38
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 26 deletions.
1 change: 1 addition & 0 deletions src/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<title>Blur Admin</title>

<link href='http://fonts.googleapis.com/css?family=Lato:300,400' rel='stylesheet' type='text/css'>
<link href='https://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900italic,900&subset=latin,greek,greek-ext,vietnamese,cyrillic-ext,latin-ext,cyrillic' rel='stylesheet' type='text/css'>

<link rel="icon" type="image/png" sizes="32x32" href="img/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="96x96" href="img/favicon-96x96.png">
Expand Down
4 changes: 2 additions & 2 deletions src/auth.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Blur Admin</title>

<link href='http://fonts.googleapis.com/css?family=Lato:300,400' rel='stylesheet' type='text/css'>
<link href='https://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900italic,900&subset=latin,greek,greek-ext,vietnamese,cyrillic-ext,latin-ext,cyrillic' rel='stylesheet' type='text/css'>

<link rel="icon" type="image/png" sizes="32x32" href="img/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="96x96" href="img/favicon-96x96.png">
Expand Down Expand Up @@ -43,12 +43,12 @@ <h1>Sign in to Blur Admin</h1>

<div class="col-sm-10">
<input type="password" class="form-control" id="inputPassword3" placeholder="Password">
<a href class="forgot-pass">Forgot password?</a>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<button type="submit" class="btn btn-default btn-auth">Sign in</button>
<a href class="forgot-pass">Forgot password?</a>
</div>
</div>
</form>
Expand Down
2 changes: 1 addition & 1 deletion src/reg.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Blur Admin</title>

<link href='http://fonts.googleapis.com/css?family=Lato:300,400' rel='stylesheet' type='text/css'>
<link href='https://fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,400italic,500,500italic,700,700italic,900italic,900&subset=latin,greek,greek-ext,vietnamese,cyrillic-ext,latin-ext,cyrillic' rel='stylesheet' type='text/css'>

<link rel="icon" type="image/png" sizes="32x32" href="img/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="96x96" href="img/favicon-96x96.png">
Expand Down
8 changes: 5 additions & 3 deletions src/sass/404.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ body {
.page-not-found-modal {
width: 638px;
margin: 0 auto;
@include bg-translucent-dark(0.7);
@include bg-translucent-dark(0.5);
border-radius: 5px;
font-weight: $font-light;
color: #ffffff;
padding: 32px;
text-align: center;
Expand All @@ -37,11 +39,11 @@ body {
a {
text-decoration: none;
outline: none;
transition: all 0.5s ease;
transition: all 0.2s ease;
color: $primary;
display: inline-block;
&:hover {
color: $warning;
color: $primary-dark;
}
}
}
Expand Down
40 changes: 20 additions & 20 deletions src/sass/auth.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
@import "common.scss";
@import "theme/_socicon.scss";
@import "theme/_layout.scss";
@import 'theme/buttons.scss';
@import 'app/form.scss';

html, body {
height: 100%;
Expand All @@ -10,6 +12,16 @@ html {
min-height: 520px;
}

.form-control, .form-control:focus {
@include placeholderStyle($default, 0.9);
background-color: rgba(0, 0, 0, .4);
border-radius: 5px;
color: $default;
}
.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control {
@include placeholderStyle($default, 0.6);
}

.auth-main {
display: flex;
align-items: center;
Expand All @@ -20,7 +32,8 @@ html {
.auth-block {
width: 540px;
margin: 0 auto;
@include bg-translucent-dark(0.7);
border-radius: 5px;
@include bg-translucent-dark(0.55);
color: #fff;
padding: 32px;
h1 {
Expand All @@ -34,26 +47,16 @@ html {
a {
text-decoration: none;
outline: none;
transition: all 0.5s ease;
transition: all 0.2s ease;
color: $primary;
&:hover {
color: $warning;
color: $primary-dark;
}
}

input[type="text"] {
outline: none;
border-radius: 0;
}

.form-control {
border-radius: 0;
height: 36px;
outline: none;
}

.control-label {
padding-top: 11px;
color: $default;
}

.form-group {
Expand All @@ -68,8 +71,6 @@ html {
display: block;
width: 100%;
border: none;
background: rgba(255, 255, 255, 1);;
color: $default-text;
font-size: 16px;
padding: 4px 10px;
outline: none;
Expand All @@ -79,7 +80,6 @@ html {
a.forgot-pass {
display: block;
text-align: right;
margin-top: 4px;
margin-bottom: -20px;
float: right;
z-index: 2;
Expand All @@ -106,14 +106,14 @@ a.forgot-pass {
width: 30%;
white-space: nowrap;
padding: 0 24px;
color: $help-text;
color: $default;
& > span {
margin-top: -12px;
display: block;
}
}
&:before, &:after {
border-top: solid 1px #949494;
border-top: solid 1px $default;
content: "";
height: 1px;
width: 35%;
Expand Down Expand Up @@ -143,7 +143,7 @@ a.forgot-pass {
.btn-auth {
background: $primary;
color: #ffffff;
border-radius: 0;
border-radius: 5px;
border-color: $primary;
padding: 7px 12px;
transition: all 0.1s ease;
Expand Down

0 comments on commit da2df38

Please sign in to comment.