From d7cba7c44906a31ee1d9d97ef9a4f433a75ebecf Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Fri, 15 Jan 2016 05:04:44 -0800
Subject: [PATCH] Fix rebase bugs

---
 client/less/main.less                         |  9 ++++-----
 .../challenges/showZiplineOrBasejump.jade     | 19 +++++++++----------
 server/views/stories/news-nav.jade            |  6 +++---
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/client/less/main.less b/client/less/main.less
index ecf34c742a..5461b43c63 100644
--- a/client/less/main.less
+++ b/client/less/main.less
@@ -390,6 +390,10 @@ p {
   border-radius: 6px;
 }
 
+.btn-bigger {
+  font-size: 30px;
+}
+
 .big-text-field {
   font-size: 30px;
   height: 57px;
@@ -448,11 +452,6 @@ thead {
   color: @body-bg;
 }
 
-.navbar-right {
-  background-color: #215f1e;
-  text-align: center;
-}
-
 .signup-btn-nav {
   margin-top: -2px !important;
   padding-top: 10px !important;
diff --git a/server/views/challenges/showZiplineOrBasejump.jade b/server/views/challenges/showZiplineOrBasejump.jade
index f370ff1fa4..e2a0db3783 100644
--- a/server/views/challenges/showZiplineOrBasejump.jade
+++ b/server/views/challenges/showZiplineOrBasejump.jade
@@ -2,17 +2,16 @@ extends ../layout-wide
 block content
     .row
         .col-md-4.bonfire-top
-            h1.text-center= name
+            h4.text-center= name
             hr
-            h4
-                ol
-                    for step, index in description
-                        .row.checklist-element(id="#{dashedName + index}")
-                            .col-xs-3.col-sm-1.col-md-2.padded-ionic-icon.text-center
-                                input(type='checkbox' class='challenge-list-checkbox')
-                            .col-xs-9.col-sm-11.col-md-10
-                                li.step-text.wrappable!= step
-        .col-md-8
+            ol
+                for step, index in description
+                    .row.checklist-element(id="#{dashedName + index}")
+                        .col-xs-3.col-sm-1.col-md-2.padded-ionic-icon.text-center
+                            input(type='checkbox' class='challenge-list-checkbox')
+                        .col-xs-9.col-sm-11.col-md-10
+                            li.step-text.wrappable!= step
+        .col-xs-12.col-sm-12.col-md-8
             .embed-responsive.embed-responsive-16by9
                 iframe.embed-responsive-item(src='//player.vimeo.com/video/#{video}')
             br
diff --git a/server/views/stories/news-nav.jade b/server/views/stories/news-nav.jade
index 5c93e82c11..bed42d5528 100644
--- a/server/views/stories/news-nav.jade
+++ b/server/views/stories/news-nav.jade
@@ -1,16 +1,16 @@
 .row
     .col-xs-12.col-sm-3
         span
-            a.btn.btn-primary.btn-big.btn-block.btn-responsive(href='/stories/submit' class="#{ page === 'hot' ? '' : 'hidden' }") Submit a link
+            a.btn.btn-primary.btn-bigger.btn-block.btn-responsive(href='/stories/submit' class="#{ page === 'hot' ? '' : 'hidden' }") Submit a link
         span
-            a.btn.btn-success.btn-big.btn-block.btn-responsive(href='/news/' class="#{ (page !== 'hot') ? '' : 'hidden' }") All
+            a.btn.btn-success.btn-bigger.btn-block.btn-responsive(href='/news/' class="#{ (page !== 'hot') ? '' : 'hidden' }") All
         .visible-xs
             .button-spacer
     .col-xs-12.col-sm-9
         .input-group
             input#searchArea.big-text-field.field-responsive.form-control(type='text', placeholder='Search our links')
             span.input-group-btn
-                button#searchbutton.btn.btn-big.btn-primary.btn-responsive(type='button') Search
+                button#searchbutton.btn.btn-bigger.btn-primary.btn-responsive(type='button') Search
         .spacer
 
 #search-results