Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Commit d943474

Browse files
author
vikasrohit
committed
SUP-1790, [Login] Apply mobile design
Applied mobile design. Remaining error styles.
1 parent 2dc7d73 commit d943474

File tree

5 files changed

+118
-31
lines changed

5 files changed

+118
-31
lines changed

app/account/login/login.jade

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,21 @@
2727
p ------------ Or Log in With ------------
2828

2929
.social-icons
30-
.github
30+
.network.github
3131
.ico(ng-click="vm.socialLogin('github')")
3232
p Github
33-
.google-plus
33+
.network.google-plus
3434
.ico(ng-click="vm.socialLogin('google-oauth2')")
3535
p Google
36-
.facebook
36+
.network.facebook
3737
.ico(ng-click="vm.socialLogin('facebook')")
3838
p Facebook
39-
.twitter
39+
.network.twitter
4040
.ico(ng-click="vm.socialLogin('twitter')")
4141
p Twitter
4242

43-
.join-topcoder
44-
span Not a member yet?
45-
p.redirect
46-
a(ui-sref="register(vm.$stateParams)") Join now
43+
.join-topcoder
44+
span Not a member yet?
45+
p.redirect
46+
a(ui-sref="register(vm.$stateParams)") Join now
4747

app/account/register/register.jade

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,13 @@
9797
p ------------ Or Register With ------------
9898

9999
.social-icons
100-
.github
100+
.network.github
101101
.ico(ng-click="vm.socialRegister('github')")
102102
p Github
103-
.google-plus
103+
.network.google-plus
104104
.ico(ng-click="vm.socialRegister('google-oauth2')")
105105
p Google
106-
.facebook
106+
.network.facebook
107107
.ico(ng-click="vm.socialRegister('facebook')")
108108
p Facebook
109109

assets/css/account/account.scss

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
display: flex;
77
flex-direction: column;
88
text-align: center;
9-
justify-content: center;
9+
justify-content: flex-start;
1010
@include source-sans-regular;
1111
background-color: white;
1212

@@ -16,7 +16,6 @@
1616
display: flex;
1717
justify-content: center;
1818
align-items: center;
19-
margin-bottom: 30px;
2019

2120
.arrow {
2221
background-image: url(/images/ico-arrow.png);
@@ -32,7 +31,8 @@
3231

3332
// Basic element stylings
3433
h1 {
35-
margin-bottom: 30px;
34+
margin-top: 39px;
35+
margin-bottom: 40px;
3636
@include ui-h1;
3737
color: #3D3D3D;
3838
line-height: 30px;
@@ -106,21 +106,27 @@
106106
justify-content: center;
107107
padding: 0px 10px;
108108

109-
p {
110-
color: #A3A3AE;
111-
font-size: 10px;
112-
line-height: 13px;
113-
@include sofia-pro-medium;
114-
text-transform: uppercase;
115-
cursor: pointer;
116-
}
109+
.network {
110+
display: flex;
111+
flex-direction: column;
112+
align-items: center;
113+
114+
p {
115+
color: #A3A3AE;
116+
font-size: 10px;
117+
line-height: 13px;
118+
@include sofia-pro-medium;
119+
text-transform: uppercase;
120+
cursor: pointer;
121+
margin-top: 10px;
122+
}
117123

118-
.ico {
119-
margin: 7px;
120-
margin-top: 22px;
121-
width: 40px;
122-
height: 40px;
123-
cursor: pointer;
124+
.ico {
125+
margin-top: 22px;
126+
width: 40px;
127+
height: 40px;
128+
cursor: pointer;
129+
}
124130
}
125131

126132
.github {
@@ -131,15 +137,15 @@
131137
}
132138
}
133139
.facebook {
134-
margin-left: 40px;
140+
margin-left: 41px;
135141
.ico {
136142
color: #0D72B9;
137143
background-image: url(/images/svg/facebook.svg);
138144
background-repeat: no-repeat;
139145
}
140146
}
141147
.google-plus {
142-
margin-left: 40px;
148+
margin-left: 43px;
143149
.ico {
144150
border: 1px solid #D1D3D4;
145151
border-radius: 4px;

assets/css/account/login.scss

Lines changed: 64 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
@import '../partials/combined';
22

33
.login-container {
4-
height: 590px;
54

65
box-shadow: 0 1px 6px rgba(0, 0, 0, 0.2);
76

@@ -27,6 +26,10 @@
2726
border: none;
2827
}
2928
}
29+
30+
button {
31+
margin-top: 40px;
32+
}
3033
}
3134

3235
.form-errors {
@@ -48,4 +51,64 @@
4851
font-size: 12px;
4952
}
5053
}
54+
55+
}
56+
57+
.join-topcoder {
58+
.redirect{
59+
width: 111px;
60+
padding: 8px 10px;
61+
}
62+
}
63+
64+
@media (min-width: 768px) {
65+
66+
.login-container {
67+
section.social {
68+
margin-bottom: 60px;
69+
}
70+
}
71+
}
72+
@media (max-width: 767px) {
73+
74+
.login-container {
75+
76+
h1 {
77+
margin-top: 30px;
78+
margin-bottom: 30px;
79+
}
80+
81+
form {
82+
83+
}
84+
85+
section.social {
86+
margin-bottom: 41px;
87+
88+
.social-icons {
89+
.network {
90+
&.github {
91+
92+
}
93+
94+
&.facebook {
95+
margin-left: 30px;
96+
}
97+
98+
&.google-plus {
99+
margin-left: 32px;
100+
}
101+
102+
&.twitter {
103+
margin-left: 30px;
104+
}
105+
}
106+
}
107+
}
108+
}
109+
110+
.join-topcoder {
111+
position: initial;
112+
margin-top: 30px;
113+
}
51114
}

assets/css/account/register.scss

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,20 @@
7575
i {
7676
cursor: pointer;
7777
}
78+
79+
.network {
80+
&.github {
81+
82+
}
83+
84+
&.facebook {
85+
margin-left: 41px;
86+
}
87+
88+
&.google-plus {
89+
margin-left: 43px;
90+
}
91+
}
7892
}
7993
}
8094

@@ -140,6 +154,10 @@
140154
}
141155
}
142156
}
157+
158+
section.social {
159+
margin-bottom: 41px;
160+
}
143161
}
144162

145163
.join-topcoder {

0 commit comments

Comments
 (0)