Skip to content

Commit 04af3ca

Browse files
modularcodermodularcoder
committed
Merge branch 'develop'
2 parents 35a4ac2 + 9eb60d7 commit 04af3ca

10 files changed

Lines changed: 96 additions & 84 deletions

File tree

‎src/_common/logo/logo.hbs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<div class="logo">
2+
<span class="l l1"></span>
3+
<span class="l l2"></span>
4+
<span class="l l3"></span>
5+
<span class="l l4"></span>
6+
<span class="l l5"></span>
7+
</div>

‎src/_common/logo/logo.scss‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
.logo {
2+
display: inline-block;
3+
width: 45px;
4+
height: 25px;
5+
vertical-align: middle;
6+
margin-right: 5px;
7+
// background-color: fade(#fff, 10%);
8+
position: relative;
9+
10+
.l {
11+
width: 11px;
12+
height: 11px;
13+
border-radius: 50%;
14+
background-color: $color-primary;
15+
position: absolute;
16+
17+
&.l1 {
18+
bottom: 0;
19+
left: 0;
20+
}
21+
22+
&.l2 {
23+
width: 7px;
24+
height: 7px;
25+
bottom: 13px;
26+
left: 10px;
27+
}
28+
29+
&.l3 {
30+
width: 7px;
31+
height: 7px;
32+
bottom: 4px;
33+
left: 17px;
34+
}
35+
36+
&.l4 {
37+
bottom: 13px;
38+
left: 25px;
39+
}
40+
41+
&.l5 {
42+
bottom: 0;
43+
left: 34px;
44+
}
45+
}
46+
}

‎src/app/_common/sidebar/header/header.hbs‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
<div class="sidebar-header">
22
<div class="brand">
3-
<div class="logo">
4-
<span class="l l1"></span>
5-
<span class="l l2"></span>
6-
<span class="l l3"></span>
7-
<span class="l l4"></span>
8-
<span class="l l5"></span>
9-
</div>
3+
{{> _common/logo/logo}}
104
{{themeTitle}}
115
</div>
126
</div>

‎src/app/_common/sidebar/header/header.scss‎

Lines changed: 1 addition & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -5,54 +5,7 @@
55
padding-left: 25px;
66
line-height: $header-height;
77
font-size: 16px;
8-
9-
.logo {
10-
display: inline-block;
11-
width: 45px;
12-
height: 25px;
13-
vertical-align: middle;
14-
margin-right: 5px;
15-
// background-color: fade(#fff, 10%);
16-
position: relative;
17-
18-
.l {
19-
width: 11px;
20-
height: 11px;
21-
border-radius: 50%;
22-
background-color: $color-primary;
23-
position: absolute;
24-
25-
&.l1 {
26-
bottom: 0;
27-
left: 0;
28-
}
29-
30-
&.l2 {
31-
width: 7px;
32-
height: 7px;
33-
bottom: 13px;
34-
left: 10px;
35-
}
36-
37-
&.l3 {
38-
width: 7px;
39-
height: 7px;
40-
bottom: 4px;
41-
left: 17px;
42-
}
43-
44-
&.l4 {
45-
bottom: 13px;
46-
left: 25px;
47-
}
48-
49-
&.l5 {
50-
bottom: 0;
51-
left: 34px;
52-
}
53-
}
54-
}
55-
8+
569
@include media-down(sm) {
5710
line-height: $header-height-xs;
5811
font-size: 16px;

‎src/auth/auth-layout.hbs‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,12 @@
2828
</script>
2929
</head>
3030
<body>
31-
<div class="main-wrapper">
32-
<div class="app" id="app">
33-
34-
{{!-- Content section --}}
35-
<article class="container">
36-
{{#block "body"}}
3731

38-
{{/block}}
39-
</article>
40-
</div>
32+
<div class="auth">
33+
{{#block "body"}}
34+
{{/block}}
4135
</div>
36+
4237
<!-- Reference block for JS -->
4338
<div class="ref" id="ref">
4439
<div class="color-primary"></div>

‎src/auth/auth.js‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎src/auth/auth.scss‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,33 @@
1+
.auth {
2+
position: absolute;
3+
width: 100%;
4+
height: 100%;
5+
left: 0;
6+
background-color: #667380;
7+
overflow-x: hidden;
8+
overflow-y: auto;
9+
}
10+
111
.auth-container {
212
width: 450px;
313
min-height: 330px;
4-
position: fixed;
14+
position: absolute;
515
top: 50%;
616
left: 50%;
717
transform: translateY(-50%) translateX(-50%);
818

919
.auth-header {
10-
background-color: $color-primary;
20+
//background-color: $color-primary;
1121
text-align: center;
22+
border-bottom: 1px solid $color-primary;
1223
}
1324

1425
.auth-title {
15-
color: $color-text-inverse;
26+
color: #97A4B1;
1627
padding: 20px;
1728
line-height: 30px;
18-
font-size: 30px;
29+
font-size: 26px;
30+
font-weight: 600;
1931
margin: 0;
2032
}
2133

@@ -48,8 +60,10 @@
4860
width: 100%;
4961
position: relative;
5062
left: 0;
63+
top: 0;
5164
transform: inherit;
52-
margin: 40px auto;
65+
margin: 0;
66+
margin-bottom: 10px;
5367

5468
.auth-content {
5569
padding: 30px 25px;

‎src/auth/login/login-page.hbs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44
<div class="auth-container">
55
<div class="card">
66
<header class="auth-header">
7-
<h1 class="auth-title">{{themeTitle}}</h1>
7+
<h1 class="auth-title">
8+
{{> _common/logo/logo}}
9+
{{themeTitle}}
10+
</h1>
811
</header>
912
<div class="auth-content">
1013
<p class="text-center">LOGIN TO CONTINUE</p>
@@ -26,15 +29,15 @@
2629
<a href="reset.html" class="forgot-btn pull-right">Forgot password?</a>
2730
</div>
2831
<div class="form-group">
29-
<button type="submit" class="btn btn-block btn-primary">Sign in</button>
32+
<button type="submit" class="btn btn-block btn-primary">Login</button>
3033
</div>
3134
<div class="form-group">
3235
<p class="text-muted text-center">Do not have an account? <a href="signup.html">Sign Up!</a></p>
3336
</div>
3437
</form>
3538
</div>
3639
</div>
37-
<div class="text-center">
40+
<div class="text-xs-center">
3841
<a href="index.html">
3942
Back to dashboard
4043
</a>

‎src/auth/reset/reset-page.hbs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44
<div class="auth-container">
55
<div class="card">
66
<header class="auth-header">
7-
<h1 class="auth-title">{{themeTitle}}</h1>
7+
<h1 class="auth-title">
8+
{{> _common/logo/logo}}
9+
{{themeTitle}}
10+
</h1>
811
</header>
912
<div class="auth-content">
1013
<p class="text-center">PASSWORD RECOVER</p>
@@ -17,14 +20,14 @@
1720
<div class="form-group">
1821
<button type="submit" class="btn btn-block btn-primary">Reset</button>
1922
</div>
20-
<div class="form-group">
23+
<div class="form-group clearfix">
2124
<a class="pull-left" href="login.html">return to Login</a>
2225
<a class="pull-right" href="signup.html">Sign Up!</a>
2326
</div>
2427
</form>
2528
</div>
2629
</div>
27-
<div class="text-center">
30+
<div class="text-xs-center">
2831
<a href="index.html">
2932
Back to dashboard
3033
</a>

‎src/auth/signup/signup-page.hbs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44
<div class="auth-container">
55
<div class="card">
66
<header class="auth-header">
7-
<h1 class="auth-title">{{themeTitle}}</h1>
7+
<h1 class="auth-title">
8+
{{> _common/logo/logo}}
9+
{{themeTitle}}
10+
</h1>
811
</header>
912
<div class="auth-content">
1013
<p class="text-center">SIGNUP TO GET INSTANT ACCESS</p>
@@ -48,15 +51,15 @@
4851
</label>
4952
</div>
5053
<div class="form-group">
51-
<button type="submit" class="btn btn-block btn-primary">Sign in</button>
54+
<button type="submit" class="btn btn-block btn-primary">Sign Up</button>
5255
</div>
5356
<div class="form-group">
5457
<p class="text-muted text-center">Already have an account? <a href="login.html">Login!</a></p>
5558
</div>
5659
</form>
5760
</div>
5861
</div>
59-
<div class="text-center">
62+
<div class="text-xs-center">
6063
<a href="index.html">
6164
Back to dashboard
6265
</a>

0 commit comments

Comments
 (0)