changed titles of pages

_includes/extended_footer.html

@@ -1,28 +1,19 @@
 <section class="site-album">
   <div class="album-row">
-    <img src="img/home/usds-logo-written-in-marker.jpg" alt="the usds logo written in marker" />
-    <img src="img/home/usds-staff-meeting.jpg" alt="a picture of the usds team at a staff meeting" />
-    <img src="img/home/usds-emoji-logo-on-whiteboard.jpg" alt="the usds emoji logo written on a whiteboard" />
-    <img src="img/home/usds-talent-team-selfie-at-white-house.jpg" alt="the usds talent team taking a selfie at the white house" />
+    <img src="img/home/usds-logo-written-in-marker.jpg" alt="the USDS logo written in marker" />
+    <img src="img/home/usds-staff-meeting.jpg" alt="a picture of the USDS team at a staff meeting" />
+    <img src="img/home/usds-emoji-logo-on-whiteboard.jpg" alt="the USDS emoji logo written on a whiteboard" />
+    <img src="img/home/usds-talent-team-selfie-at-white-house.jpg" alt="the USDS talent team taking a selfie at the white house" />
     <img src="img/home/usds-meeting-in-progress-cardboard-sign.jpg" alt="a cardboard sign that says meeting in progress" />
-    <img src="img/home/engineer-coding-infront-of-fireplace.jpg" alt="a usds engineer working infront of a fireplace" />
+    <img src="img/home/engineer-coding-infront-of-fireplace.jpg" alt="a USDS engineer working infront of a fireplace" />
   </div>
   <div class="album-row">
-<<<<<<< HEAD
-    <img src="img/home/defense-digital-service-team-photo.jpg" alt="the-defense-digital-service-team-photo" />
-    <img src="img/home/usds-team-at-dhs-team-photo.jpg" alt="the-usds-team-at-dhs-team-photo" />
-    <img src="img/home/usa-jacket-hanging-on-coatrack.jpg" alt="a-usa-embroidered-jacket-hanging-on-a-coatrack" />
-    <img src="img/home/team-working-in-usds-hq.jpg" alt="the-usds-team-working-in-the-usds-hq" />
-    <img src="img/home/hand-holding-a-usds-sticker.jpg" alt="A hand holding a USDS sticker" />
-    <img src="img/home/usds-team-laughing-in-meeting.jpg" alt="the-usds-team-laughing-in-a-meeting" />
-=======
     <img src="img/home/defense-digital-service-team-photo.jpg" alt="the defense digital service posing for a team photo" />
-    <img src="img/home/usds-team-at-dhs-team-photo.jpg" alt="the usds team at dhs posing for a team photo" />
+    <img src="img/home/usds-team-at-dhs-team-photo.jpg" alt="the USDS team at dhs posing for a team photo" />
     <img src="img/home/usa-jacket-hanging-on-coatrack.jpg" alt="a usa embroidered jacket hanging on a coat rack" />
-    <img src="img/home/team-working-in-usds-hq.jpg" alt="the usds team working in the HQ office" />
-    <img src="img/home/a-hand-holding-a-usds-sticker.jpg" alt="a hand holding a usds sticker" />
-    <img src="img/home/usds-team-laughing-in-meeting.jpg" alt="members of the usds team laughing in a meeting" />
->>>>>>> f2e25f904048927655c7bdbcef45f0385f2b06d9
+    <img src="img/home/team-working-in-usds-hq.jpg" alt="the USDS team working in the HQ office" />
+    <img src="img/home/hand-holding-a-usds-sticker.jpg" alt="a hand holding a USDS sticker" />
+    <img src="img/home/usds-team-laughing-in-meeting.jpg" alt="members of the USDS team laughing in a meeting" />
   </div>
 </section>
 

_includes/header.html

@@ -2,6 +2,9 @@
   <div class="disclaimer-bar">
     <div class="usa-grid">
       <div class="usa-width-one-whole">
+        <div id="beta-notice" class="hidden-xs">
+          This site is in beta and a <a href="http://playbook.cio.gov" target="_blank">work in progress</a>
+        </div>
         <img class="eop-seal" alt="An image of the presidential seal" src="img/layout/seal.png" />
         <span class="hidden-xs">An official website of the </span>Executive Office of the President</span>
       </div>

_sass/_main.scss

@@ -46,6 +46,9 @@ body {
     padding-bottom: 13px;
     margin: auto;
 
+    #beta-notice {
+      float: right;
+    }
     .disclaimer-bar {
       height: 30px;
       padding-bottom: .5rem;
@@ -63,6 +66,10 @@ body {
         height: 20px;
         margin-right: 0.5rem;
       }
+      a, a:hover {
+        text-decoration: underline;
+        color: #777;
+      }
     }
 
     .site-navbar .desktop {

index.html

@@ -7,7 +7,7 @@
 <section class="jumbotron hidden-xs">
   <div class="jumbotron-text">
     <h1>
-      Building a more awesome<br />government through technology
+      Building a more <span id="everything-is-awesome">awesome</span><br />government through technology
     </h1>
     <h2>
       The United States Digital Service is a startup at The White House, using design<br />
@@ -21,8 +21,7 @@ <h2>
 </section>
 
 <section class="mobile-lede hidden-sm hidden-md hidden-lg">
-  <img src="img/experts.jpg" alt="A photo of team members
-  in the Indian Treaty Room (photo credit: Fast Company)">
+  <img src="img/experts.jpg" alt="A photo of team members in the Indian Treaty Room (photo credit: Fast Company)">
   <h2>
     Building a more awesome government through technology
   </h2>

js/script.js

@@ -65,6 +65,7 @@ $('#staff-member-carousel').slick({
 
 var header = $('#fixed-header');
 var headerCollapsed = false;
+var awesomeCounter = 0;
 $( document ).ready(function() {
     $( window ).scroll(function() {
       var scrollTopPos = $(window).scrollTop();
@@ -103,4 +104,14 @@ $( document ).ready(function() {
       $( ".join-page .faqs li" ).has( "a[href$='#" + hash + "']" ).addClass('active');
     });
 
+    $('#everything-is-awesome').on( "click", function() {
+      // Yes, there were more important things to get done, but everyone needs a mental break sometimes
+      if (awesomeCounter >= 10) {
+        window.open('https://www.youtube.com/watch?v=StTqXEQ2l-Y');
+      }
+      // Not yet awesome
+      awesomeCounter++;
+    });
+
+
 });