Skip to content

Commit df7d396

Browse files
cdvxcdvx
authored
Merge pull request #28 from cdvx/gh-pages
Challenge one output
2 parents 7f3a93f + a2876b7 commit df7d396

File tree

10 files changed

+181
-89
lines changed

10 files changed

+181
-89
lines changed

‎UI/css/login.css‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ body {
1010
/*background-color: #35424a;*/
1111
background-color: #f4f4f4;
1212

13-
1413
}
1514

1615
/*Global*/
@@ -67,6 +66,11 @@ head #branding{
6766
float: left;
6867
}
6968

69+
header #branding a{
70+
text-decoration: none;
71+
text-transform: none;
72+
font-size: 20px;
73+
}
7074
header #branding h1{
7175
margin:0;
7276
}
@@ -109,17 +113,20 @@ header a:hover{
109113
margin-bottom: 10px;
110114
}
111115

116+
#login{
117+
min-height: 500px;
118+
}
119+
112120
#register{
113-
background:url("../img/kybrd.jpeg") ;
121+
background:url("../img/kybrd.jpeg") round;
114122
/*background-color: #35424a;*/
115123
/*border: #35424a 2px solid;*/
116124
margin-left:30%;
117-
margin-right: 30%
118-
min-height:50%;
119-
125+
margin-right: 30%;
126+
min-height:60%;
120127
padding-top: 20px;
121128
padding-bottom: 10px;
122-
width :40%;
129+
width :35%;
123130

124131
}
125132

@@ -157,6 +164,17 @@ header a:hover{
157164
/*border: #e8491d 2px solid;*/
158165
}
159166

167+
#register form a {
168+
text-decoration: none;
169+
border-top: 2px solid #35424a;
170+
border-left: 2px solid #35424a;
171+
border-right: 2px solid black;
172+
border-bottom: 2px solid black;
173+
color: white;
174+
padding: 2%;
175+
background-color: #e8491d;
176+
}
177+
160178

161179
/*footer */
162180
footer{

‎UI/css/question.css‎

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ ul{
2828
.button_1{
2929
height: 30px;
3030
margin :20px;
31-
color: #ffffff
31+
color: #ffffff;
3232
padding-left: 20px;
3333
padding-right: 20px;
3434
background: #e8491d;
@@ -65,6 +65,12 @@ head #branding{
6565
float: left;
6666
}
6767

68+
header #branding a{
69+
text-decoration: none;
70+
text-transform: none;
71+
font-size: 20px;
72+
}
73+
6874
header #branding h1{
6975
margin:0;
7076
}
@@ -97,6 +103,20 @@ header a:hover{
97103

98104
#showcase h3{
99105
text-decoration: none;
106+
/* border-bottom : 2px solid #35424a; */
107+
padding: 3px 10px 3px 10px;
108+
}
109+
110+
#showcase h4{
111+
margin:0;
112+
font-weight: bold;
113+
/* background-color: #35424a; */
114+
padding: 0;
115+
border : 2px solid #e8491d ;
116+
/* border-bottom : 2px solid #e8491d; */
117+
}
118+
#showcase hr{
119+
size: 2px solid #35424a;
100120
}
101121

102122
/*content*/
@@ -115,8 +135,8 @@ header a:hover{
115135
/*background: grey;*/
116136
align-self: center;
117137
margin-left: 22.5%;
118-
width:50%;
119-
background:url("../img/kybrd.jpeg") repeat ;
138+
width:40%;
139+
background:url("../img/kybrd.jpeg")no-repeat ;
120140
/*background-color: #35424a;*/
121141
/*border-top: #35424a 4px solid;*/
122142
margin-bottom: 10px;

‎UI/css/signUp.css‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,11 @@ header li{
6565
head #branding{
6666
float: left;
6767
}
68+
header #branding a{
69+
text-decoration: none;
70+
text-transform: none;
71+
font-size: 20px;
72+
}
6873

6974
header #branding h1{
7075
margin:0;
@@ -87,13 +92,13 @@ header a:hover{
8792

8893

8994
#register{
90-
background:url("../img/kybrd.jpeg") ;
95+
background:url("../img/kybrd.jpeg") round ;
9196
/*border: #35424a 4px solid;*/
9297
margin-left:30%;
93-
margin-right: 30%
98+
margin-right: 30%;
9499
padding-top: 20px;
95-
padding-bottom: 10px;
96-
width :40%;
100+
padding-bottom : 10px;
101+
width :35%;
97102

98103
}
99104

@@ -131,6 +136,16 @@ h3{
131136
/*border: #e8491d 2px solid;*/
132137
}
133138

139+
#register #signUp a {
140+
text-decoration: none;
141+
border-top: 2px solid #35424a;
142+
border-left: 2px solid #35424a;
143+
border-right: 2px solid black;
144+
border-bottom: 2px solid black;
145+
color: white;
146+
padding: 2%;
147+
background-color: #e8491d;
148+
}
134149

135150
/*footer */
136151
footer{

‎UI/css/style2.css‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ body {
99
margin: 0;
1010
background-color: #f4f4f4;
1111

12-
1312
}
1413

1514
/*Global*/
@@ -25,10 +24,11 @@ ul{
2524

2625
}
2726

27+
2828
.button_1{
2929
height: 30px;
3030
margin :20px;
31-
color: #ffffff
31+
color: #ffffff;
3232
/*padding-left: 20px;
3333
padding-right: 20px;*/
3434
padding: 5px 20px 5px 20px;
@@ -66,6 +66,12 @@ head #branding{
6666
float: left;
6767
}
6868

69+
header #branding a{
70+
text-decoration: none;
71+
text-transform: none;
72+
font-size: 20px;
73+
}
74+
6975
header #branding h1{
7076
margin:0;
7177
}
@@ -96,6 +102,11 @@ header a:hover{
96102
float: left;
97103
}
98104

105+
#showcase a{
106+
text-decoration: none;
107+
color: black;
108+
}
109+
99110
#showcase h3{
100111
text-decoration: none;
101112
}
@@ -104,6 +115,7 @@ header a:hover{
104115
/*question box*/
105116
#content {
106117
width: 100%;
118+
min-height: 800px;
107119
}
108120

109121

‎UI/css/user.css‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,13 @@ head #branding{
6565
float: left;
6666
}
6767

68+
header #branding a{
69+
text-decoration: none;
70+
text-transform: none;
71+
font-size: 20px;
72+
}
73+
74+
6875
header #branding h1{
6976
margin:0;
7077
}
@@ -139,6 +146,12 @@ aside h2{
139146
margin-left: 0;
140147
}
141148

149+
#activity a{
150+
text-decoration: none;
151+
color: black;
152+
}
153+
154+
142155

143156
/*footer */
144157
footer{

‎UI/index.html‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@
1212
<header>
1313
<div class='container' id="container">
1414
<div id="branding">
15-
<h1><span class="highlight">Stack</span>Overflow-lite</h1>
15+
<a href="index.html"><h1><span class="highlight">Stack</span>Overflow-lite</h1></a>
1616
</div>
1717
<nav>
1818
<ul>
1919
<li class="current"><a href="index.html">Home</a></li>
2020
<li><a href="login.html">Log in</a></li>
21+
<li><a href="user.html">Profile</a></li>
2122
<li><a href="signUp.html">Sign Up</a></li>
2223
</ul>
2324
</nav>
@@ -27,32 +28,35 @@ <h1><span class="highlight">Stack</span>Overflow-lite</h1>
2728
<section id="showcase">
2829
<div class="container">
2930
<h3>Recent questions</h3>
30-
<p>What is Python?</p>s
31-
<p>What's programming?</p>
32-
<p>What are data structures?
31+
<a href="question.html">
32+
<p>&bull; What is Python?</p>
33+
<p>&bull; What is computer science?</p>
34+
<p>&bull; What's programming?</p>
35+
<p>&bull; What are data structures?
3336
Lorem ipsum dolor sit amet, consectetur adipiscing elit.
3437
Vivamus nec tortor ac purus luctus lobortis id et magna.
3538
Pellentesque id odio volutpat, fermentum neque non, vestibulum enim.
3639
Vivamus aliquet libero quis orci mattis tincidunt.
3740
</p>
38-
<p>what is a program?</p>
39-
<p>What is a web service?</p>
40-
<p>How to write a restful API
41+
<p>&bull; what is a program?</p>
42+
<p>&bull; What is a web service?</p>
43+
<p>&bull; How to write a restful API
4144
Lorem ipsum dolor sit amet, consectetur adipiscing elit.
4245
Vivamus nec tortor ac purus luctus lobortis id et magna.
4346
Pellentesque id odio volutpat, fermentum neque non, vestibulum enim.
4447
Vivamus aliquet libero quis orci mattis tincidunt.
4548
</p>
46-
<p>What is django
49+
<p>&bull; What is django
4750
Lorem ipsum dolor sit amet, consectetur adipiscing elit.
4851
Vivamus nec tortor ac purus luctus lobortis id et magna.
4952
Pellentesque id odio volutpat, fermentum neque non, vestibulum enim.
5053
Vivamus aliquet libero quis orci mattis tincidunt.
5154
</p>
55+
</a>
5256
</div>
53-
</section>
57+
</section>
5458

55-
<aside id="question">
59+
<aside id="question">
5660
<div class="box">
5761
<div class="container">
5862
<h2>Ask Question</h2>
@@ -65,6 +69,8 @@ <h2>Ask Question</h2>
6569
</div>
6670

6771
</aside>
72+
73+
</section>
6874

6975
<footer>
7076
<p>StackOverflow-lite &copy; 2018</p>

‎UI/login.html‎

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<header>
1313
<div class='container' id="container">
1414
<div id="branding">
15-
<h1><span class="highlight">Stack</span>Overflow-lite</h1>
15+
<a href="index.html"><h1><span class="highlight">Stack</span>Overflow-lite</h1></a>
1616
</div>
1717
<nav>
1818
<ul>
@@ -24,34 +24,31 @@ <h1><span class="highlight">Stack</span>Overflow-lite</h1>
2424
</div>
2525
</header>
2626

27-
<section id="register">
28-
<div class="box">
29-
<div class="container">
27+
<section id="login">
28+
<section id="register">
29+
<div class="box">
30+
<div class="container">
31+
<strong><h2>Sign in</h2></strong>
32+
<form>
33+
<p><label for="Username"><strong><h3>Username</h3></strong></label></p>
34+
<p><input type="Username" placeholder="Enter Username or Email"></p>
3035

31-
<strong><h2>Sign in</h2></strong>
32-
<form>
33-
<p><label for="Username"><strong><h3>Username</h3></strong></label></p>
34-
<p><input type="Username" placeholder="Enter Username"></p>
36+
<p><label for="Password"><strong><h3>Password</h3></strong></label></p>
37+
<p><input type="password" placeholder="Enter Password"></p>
38+
39+
<p><a href="index.html">Log in</a></p>
40+
<div id="container2">
41+
<p><label>
42+
<input id="remember" type="checkbox" checked="checked" name="remember"><h3>Remember me</h3>
43+
</label></p>
44+
</div>
3545

36-
<p><label for="Email"><strong><h3>Email</h3></strong></label></p>
37-
<p><input type="Email" placeholder="Enter Email"></p>
38-
39-
<p><label for="Password"><strong><h3>Password</h3></strong></label></p>
40-
<p><input type="password" placeholder="Enter Password"></p>
41-
42-
<button type="submit" class="button_1" />Log in</button></p>
43-
<div id="container2">
44-
<p><label>
45-
<input id="remember" type="checkbox" checked="checked" name="remember"><h3>Remember me</h3>
46-
</label></p>
47-
</div>
48-
49-
</form>
50-
</div>
51-
</div>
52-
46+
</form>
47+
</div>
48+
</div>
49+
50+
</section>
5351
</section>
54-
5552
<footer>
5653
<p>StackOverflow-lite &copy; 2018</p>
5754
</footer>

0 commit comments

Comments
 (0)