Merge branch 'master' into readable-without-grid

css/main.css

@@ -387,7 +387,32 @@ header nav a {
   color: white;
 }
 
-#subscribe input {
+#subscribe .email:focus {
+  outline: none;
+  border-bottom: 1px solid #FFFFFF;
+
+}
+
+#subscribe input:focus::-webkit-input-placeholder {
+  color: #A8A8A8;
+}
+
+/* Firefox < 19 */
+#subscribe input:focus:-moz-placeholder {
+  color: #A8A8A8;
+}
+
+/* Firefox > 19 */
+#subscribe input:focus::-moz-placeholder {
+  color: #A8A8A8;
+}
+
+/* Internet Explorer 10 */
+#subscribe input:focus:-ms-input-placeholder {
+  color: #A8A8A8;
+}
+
+#subscribe .email{
   background: none;
   border: 0;
   border-bottom: 1px solid #979797;
@@ -402,12 +427,18 @@ header nav a {
   background-color: #1BC4A6;
   font-family: Futura;
   font-size: 22px;
-  display: flex;
-  justify-content: center;
-  flex-direction: column;
-  text-align: center;
+  border-width: 0;
+}
+
+#subscribe .button:focus {
+  outline: none;
+  background-color: #4F6A7B;
 }
 
+
+
+
+
 #subscribe input, #subscribe .button {
   margin-top: 40px;
 }

index.html

@@ -162,8 +162,19 @@
   <div id="footer-grid">
     <div id="subscribe" class="dark">
       <span class="big-text">Discover + Connect</span>
-      <input type="email" placeholder="Email address" disabled/>
-      <div class="button">Subscribe</div>
+      <div id="mc_embed_signup">
+        <form action="//makerdao.us16.list-manage.com/subscribe/post?u=f717b15a4a763e79ee910dbe6&amp;id=86313139e4" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate" target="_blank" novalidate>
+          <div id="mc_embed_signup_scroll">
+
+            <input type="email" value="" name="EMAIL" class="email" id="mce-EMAIL" placeholder="Email address" required>
+            <!-- real people should not fill this in and expect good things - do not remove this or risk form bot signups-->
+            <div style="position: absolute; left: -5000px;" aria-hidden="true"><input type="text" name="b_f717b15a4a763e79ee910dbe6_86313139e4" tabindex="-1" value=""></div>
+              <input type="submit" value="Subscribe" name="subscribe" class="button">
+
+          </div>
+        </form>
+      </div>
+
     </div>
     <div id="dai-foundation-text" class="dark">
       <p>

js/main.js

@@ -67,8 +67,14 @@ $(document).ready(function () {
     $("#logo").attr("src", "assets/img/MKR-logo-rounded.png");
   }
 
+
   // Old browser warning
   $('.close-warning-btn').click(function() {
     $('.browserupgrade-grid').hide();
   })
+
+  $("#subscribe .button").click(function() {
+    // Removes focus of the button.
+    $(this).blur();
+  });
 });

js/team.js

@@ -3,47 +3,47 @@ $(function () {
     {
       name: 'Rune Christensen',
       role: 'Founder',
-      pic: 'Rune-Christensen.png'
+      pic: 'Rune.png'
     },
     {
       name: 'Andy Milenius',
       role: 'Technical Project Manager',
-      pic: 'Andy-Milenius.jpeg'
+      pic: 'Andy.png'
     },
     {
       name: 'Nikolai Mushegian',
       role: 'Lead Architect',
-      pic: 'nikolai.jpeg'
+      pic: 'Nikolai.png'
     },
     {
       name: 'Kenny Rowe',
       role: 'Head of Operations',
-      pic: 'Kenny.jpg'
+      pic: 'Kenny.png'
     },
     {
       name: 'Matt Richards',
       role: 'Head of Marketing',
-      pic: 'matt.png'
+      pic: 'Matt.png'
     },
     {
       name: 'James Reidy',
       role: 'IT Lead',
-      pic: 'James.jpeg'
+      pic: 'James.png'
     },
     {
       name: 'Daniel Brockman',
       role: 'Software Engineer',
-      pic: 'Daniel.jpeg'
+      pic: 'Daniel.png'
     },
     {
       name: 'Mariano Conti',
       role: 'Software Engineer',
-      pic: 'Mariano.jpeg'
+      pic: 'Mariano.png'
     },
     {
       name: 'Fernando Tiberti',
       role: 'Software Engineer',
-      pic: 'Ferni.jpeg'
+      pic: 'Ferni.png'
     },
     {
       name: 'Gonzalo Balabasquer',
@@ -58,7 +58,7 @@ $(function () {
     {
       name: 'Michael Brockman',
       role: 'Software Engineer',
-      pic: 'Mikael.jpeg'
+      pic: 'Mikael.png'
     },
     {
       name: 'Ryan Casey',
@@ -68,22 +68,22 @@ $(function () {
     {
       name: 'Rain Beam',
       role: 'Software Engineer',
-      pic: 'rain.png'
+      pic: 'Rain.png'
     },
     {
       name: 'Paweł Grajewski',
       role: 'Software Engineer',
-      pic: 'Paweł-Grajewski.jpg'
+      pic: 'Pawel.png'
     },
     {
       name: 'Robert Horvath',
       role: 'Software Engineer',
-      pic: 'r001.jpeg'
+      pic: 'Robert.png'
     },
     {
       name: 'Thomas Pulber',
       role: 'Software Engineer',
-      pic: 'Thomas.jpeg'
+      pic: 'Thomas.png'
     }
   ];
 

team.html

@@ -91,8 +91,18 @@
   <div id="footer-grid">
     <div id="subscribe" class="dark">
       <span class="big-text">Discover + Connect</span>
-      <input type="email" placeholder="Email address" disabled/>
-      <div class="button">Subscribe</div>
+      <div id="mc_embed_signup">
+        <form action="//makerdao.us16.list-manage.com/subscribe/post?u=f717b15a4a763e79ee910dbe6&amp;id=86313139e4" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate" target="_blank" novalidate>
+          <div id="mc_embed_signup_scroll">
+
+            <input type="email" value="" name="EMAIL" class="email" id="mce-EMAIL" placeholder="Email address" required>
+            <!-- real people should not fill this in and expect good things - do not remove this or risk form bot signups-->
+            <div style="position: absolute; left: -5000px;" aria-hidden="true"><input type="text" name="b_f717b15a4a763e79ee910dbe6_86313139e4" tabindex="-1" value=""></div>
+              <input type="submit" value="Subscribe" name="subscribe" class="button">
+
+          </div>
+        </form>
+      </div>
     </div>
     <div id="dai-foundation-text" class="dark">
       <p>