Merge branch 'master' of https://github.com/node-girls-australia/js-intro-workshop

# 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

Author: Ticiana Andrade

css/main.css

@@ -8,32 +8,34 @@ body{
     flex-direction: column;
     justify-content: center;
     align-items: center;
-    background: #fee13d;
+    background: #fee13d url(../img/woman.jpg) no-repeat bottom right;
     height: 100vh;
     min-height: 575px;
     font-family: 'Source Sans Pro', sans-serif;
+    font-size: 16px;
+}
+@media only screen and (max-width: 1024px) {
+    body{
+        background: #fee13d;
+    }
 }
 
 header{
     box-sizing: border-box;
     flex: 0 1 auto;
-    background-color: #fee13d;
-    color: white;
 }
 
 section{
     width: 100%;
     box-sizing: border-box;
     flex: 2 auto;
-    display: flex;
+    /*display: flex;
     flex-direction: column;
     justify-content: center;
-    align-items: center;
-    padding-bottom: 150px;
-    background: url(../img/woman.jpg) no-repeat bottom right;
+    align-items: center;*/
 }
 
-footer{
+footer {
     width: calc( 100% - 60px);
     background-color: #000000;
     font-family: Georgia,serif;
@@ -49,7 +51,7 @@ footer{
 
 img {
     width: 100%;
-    max-width: 800px;
+    max-width: 500px;
 }
 h1, #logo{
     text-align: center;
@@ -62,7 +64,7 @@ h1{
 
 .settings {
     margin: 0 auto;
-    max-width: 900px;
+    max-width: 600px;
 }
 
 .settings > p {

index.html

@@ -28,18 +28,17 @@ <h1>Hello everyone. Let's do some interactive coding today! </h1>
     </p>
   </div>
 </section>
-
 <footer>
-  <ul class="float-left">
+  <ul>
     <li class="twitter">
-      Twitter: <a href="https://twitter.com/NodeGirlsSydney" target="_blank">@NodeGirlsSydney</a>
-      <a href="https://twitter.com/NodeGirlsMelb" target="_blank">@NodeGirlsMelb</a>
+      Twitter: <a href="https://twitter.com/NodeGirlsSydney" target="_blank" rel="noopener noreferrer">@NodeGirlsSydney</a>
+      <a href="https://twitter.com/NodeGirlsMelb" target="_blank" rel="noopener noreferrer">@NodeGirlsMelb</a>
     </li>
-    <li class="facebook">Facebook: <a href="https://www.facebook.com/NodeGirlsAustralia" target="_blank">NodeGirlsAustralia</a></li>
+    <li class="facebook">Facebook: <a href="https://www.facebook.com/NodeGirlsAustralia" target="_blank" rel="noopener noreferrer">NodeGirlsAustralia</a></li>
   </ul>
-  <ul class="float-right">
-    <li class="website">Website: <a href="http://nodegirls.com.au" target="_blank">nodegirls.com.au</a></li>
-    <li class="email">e-mail: <a href="mailto:info@nodegirls.com.au" target="_blank">info@nodegirls.com.au</a></li>
+  <ul>
+    <li class="website">Website: <a href="http://nodegirls.com.au" target="_blank" rel="noopener noreferrer">nodegirls.com.au</a></li>
+    <li class="email">e-mail: <a href="mailto:info@nodegirls.com.au" target="_blank" rel="noopener noreferrer">info@nodegirls.com.au</a></li>
   </ul>
 </footer>