Fixed merge conflicts.

dist/ratchet.css

@@ -1214,7 +1214,6 @@ select {
   font-size: inherit;
   text-decoration: none;
   line-height: 1;
-  cursor: default;
   -webkit-font-smoothing: antialiased;
   -webkit-transform: translateY(-50%);
   -ms-transform: translateY(-50%);
@@ -1245,7 +1244,6 @@ select {
   font-size: 24px;
   text-decoration: none;
   line-height: 1;
-  cursor: default;
   -webkit-font-smoothing: antialiased;
 }
 

docs/_includes/download-module.html

@@ -2,5 +2,5 @@
   <h4 class="docs-module-title">Download Ratchet</h4>
   <p>If you haven't already, download the source code for Ratchet.</p>
   <a href="https://github.com/twbs/ratchet/archive/v2.0.0.zip" class="btn btn-block btn-primary" data-ignore="push" onClick="_gaq.push(['_trackEvent', 'Downloads', 'V2.0']);">Download Ratchet</a>
-  <p>Currently v2.0.0</p>
+  <p class="version">Currently v2.0.0</p>
 </div>

docs/assets/css/docs.css

@@ -56,6 +56,11 @@ body {
   -moz-animation-duration: 2s;
   animation-duration: 2s;
 }
+.docs-header .version {
+  margin-top: 15px;
+  color: rgba(255, 255, 255, 0.5);
+  text-align: center;
+}
 
 .docs-masthead {
   position: relative;
@@ -78,7 +83,6 @@ body {
 
 .docs-nav .docs-nav-trigger {
   color: #fff;
-  cursor: pointer;
   opacity: .7;
 }
 .docs-nav .docs-nav-trigger.active {
@@ -300,6 +304,13 @@ body {
   font-weight: 300;
 }
 
+.version {
+  margin-top: 10px;
+  margin-bottom: 0;
+  color: #777;
+  font-size: 90%;
+}
+
 .docs-footer {
   border-top: 1px solid #ddd;
   margin-top: 50px;

docs/dist/ratchet.css

@@ -1214,7 +1214,6 @@ select {
   font-size: inherit;
   text-decoration: none;
   line-height: 1;
-  cursor: default;
   -webkit-font-smoothing: antialiased;
   -webkit-transform: translateY(-50%);
   -ms-transform: translateY(-50%);
@@ -1245,7 +1244,6 @@ select {
   font-size: 24px;
   text-decoration: none;
   line-height: 1;
-  cursor: default;
   -webkit-font-smoothing: antialiased;
 }
 

docs/dist/template.html

@@ -52,7 +52,7 @@
             </a>
           </li>
           <li class="table-view-cell">
-            <a class="push-right" href="https://goratchet.com">
+            <a class="push-right" href="https://github.com/twbs/ratchet/">
               <strong>Ratchet on Github</strong>
             </a>
           </li>
@@ -62,7 +62,7 @@
             </a>
           </li>
           <li class="table-view-cell">
-            <a class="push-right" href="http://www.twitter.com/GoRatchet">
+            <a class="push-right" href="https://www.twitter.com/GoRatchet">
               <strong>Ratchet on Twitter</strong>
             </a>
           </li>
@@ -71,4 +71,4 @@
     </div>
 
   </body>
-</html>
+</html>

docs/index.html

@@ -8,7 +8,7 @@ title: Ratchet
   <div class="docs-header-content">
     <p class="docs-subtitle">Build mobile apps with simple HTML&#8218; CSS&#8218; and JS components.</p>
     <a data-ignore="push" href="https://github.com/twbs/ratchet/archive/v2.0.0.zip" class="btn btn-primary" onClick="_gaq.push(['_trackEvent', 'Downloads', 'V2.0']);">Download Ratchet</a>
-    <p>Currently v2.0.0</p>
+    <p class="version">Currently v2.0.0</p>
   </div>
 
   {% include ad.html %}

sass/docs.scss

@@ -54,6 +54,11 @@ body {
     @include animation-name(fadeintext);
     @include animation-duration(2s);
   }
+  .version {
+    margin-top: 15px;
+    color: rgba(255,255,255,.5);
+    text-align: center;
+  }
 }
 
 // Masthead
@@ -75,7 +80,6 @@ body {
 .docs-nav {
   .docs-nav-trigger {
     color: #fff;
-    cursor: pointer;
     opacity: .7;
 
     &.active {
@@ -286,6 +290,12 @@ body {
 .docs-module-title {
   font-weight: 300;
 }
+.version {
+  margin-top: 10px;
+  margin-bottom: 0;
+  color: #777;
+  font-size: 90%;
+}
 
 
 // Footer

sass/push.scss

@@ -45,7 +45,6 @@
     font-size: inherit;
     text-decoration: none;
     line-height: 1;
-    cursor: default;
     -webkit-font-smoothing: antialiased;
     @include transform(translateY(-50%));
   }

sass/ratchicons.scss

@@ -18,7 +18,6 @@
   font-size: 24px;
   text-decoration: none;
   line-height: 1;
-  cursor: default;
   -webkit-font-smoothing: antialiased;
 }
 .icon-and-up:before { content: '\e809'; }