8000 Merge branch 'master' of https://github.com/node-girls-australia/js-i… · muses-code-js/js-intro-workshop@5855037 · GitHub
[go: up one dir, main page]
Skip to content

Commit 5855037

Browse files
Ticiana AndradeTiciana Andrade
Ticiana Andrade
authored and
Ticiana Andrade
committed
# By Ticiana # Via Ticiana * 'master' of https://github.com/node-girls-australia/js-intro-workshop: Change style for 25th Feb worship Conflicts: css/main.css index.html
2 parents b8675bb + 59946a0 commit 5855037

File tree

2 files changed

+19
-18
lines changed

2 files changed

+19
-18
lines changed

‎css/main.css

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,32 +8,34 @@ body{
88
flex-direction: column;
99
justify-content: center;
1010
align-items: center;
11-
background: #fee13d;
11+
background: #fee13d url(../img/woman.jpg) no-repeat bottom right;
1212
height: 100vh;
1313
min-height: 575px;
1414
font-family: 'Source Sans Pro', sans-serif;
15+
font-size: 16px;
16+
}
17+
@media only screen and (max-width: 1024px) {
18+
body{
19+
background: #fee13d;
20+
}
1521
}
1622

1723
header{
1824
box-sizing: border-box;
1925
flex: 0 1 auto;
20-
background-color: #fee13d;
21-
color: white;
2226
}
2327

2428
section{
2529
width: 100%;
2630
box-sizing: border-box;
2731
flex: 2 auto;
28-
display: flex;
32+
/*display: flex;
2933
flex-direction: column;
3034
justify-content: center;
31-
align-items: center;
32-
padding-bottom: 150px;
33-
background: url(../img/woman.jpg) no-repeat bottom right;
35+
align-items: center;*/
3436
}
3537

36-
footer{
38+
footer {
3739
width: calc( 100% - 60px);
3840
background-color: #000000;
3941
font-family: Georgia,serif;
@@ -49,7 +51,7 @@ footer{
4951

5052
img {
5153
width: 100%;
52-
max-width: 800px;
54+
max-width: 500px;
5355
}
5456
h1, #logo{
5557
text-align: center;
@@ -62,7 +64,7 @@ h1{
6264

6365
.settings {
6466
margin: 0 auto;
65-
max-width: 900px;
67+
max-width: 600px;
6668
}
6769

6870
.settings > p {

‎index.html

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,17 @@ <h1>Hello everyone. Let's do some interactive coding today! </h1>
2828
</p>
2929
</div>
3030
</section>
31-
3231
<footer>
33-
<ul class="float-left">
32+
<ul>
3433
<li class="twitter">
35-
Twitter: <a href="https://twitter.com/NodeGirlsSydney" target="_blank">@NodeGirlsSydney</a>
36-
<a href="https://twitter.com/NodeGirlsMelb" target="_blank">@NodeGirlsMelb</a>
34+
Twitter: <a href="https://twitter.com/NodeGirlsSydney" target="_blank" rel="noopener noreferrer">@NodeGirlsSydney</a>
35+
<a href="https://twitter.com/NodeGirlsMelb" target="_blank" rel="noopener noreferrer">@NodeGirlsMelb</a>
3736
</li>
38-
<li class="facebook">Facebook: <a href="https://www.facebook.com/NodeGirlsAustralia" target="_blank">NodeGirlsAustralia</a></li>
37+
<li class="facebook">Facebook: <a href="https://www.facebook.com/NodeGirlsAustralia" target="_blank" rel="noopener noreferrer">NodeGirlsAustralia</a></li>
3938
</ul>
40-
<ul class="float-right">
41-
<li class="website">Website: <a href="http://nodegirls.com.au" target="_blank">nodegirls.com.au</a></li>
42-
<li class="email">e-mail: <a href="mailto:info@nodegirls.com.au" target="_blank">info@nodegirls.com.au</a></li>
39+
<ul>
40+
<li class="website">Website: <a href="http://nodegirls.com.au" target="_blank" rel="noopener noreferrer">nodegirls.com.au</a></li>
41+
<li class="email">e-mail: <a href="mailto:info@nodegirls.com.au" target="_blank" rel="noopener noreferrer">info@nodegirls.com.au</a></li>
4342
</ul>
4443
</footer>
4544

0 commit comments

Comments
 (0)
0