From 0a1f1b8f38ca7082cfd999768ff5d08e4e52844f Mon Sep 17 00:00:00 2001
From: James Allen <james@sharelatex.com>
Date: Fri, 6 Jun 2014 16:37:59 +0100
Subject: [PATCH] Sort out responsive navbar

---
 services/web/app/views/layout.jade            |   2 +-
 .../{menubar.jade => layout/navbar.jade}      |   2 +-
 services/web/public/img/logo.png              | Bin 0 -> 8327 bytes
 .../public/stylesheets/components/navbar.less |  33 ++++++++++++------
 4 files changed, 24 insertions(+), 13 deletions(-)
 rename services/web/app/views/{menubar.jade => layout/navbar.jade} (96%)
 create mode 100644 services/web/public/img/logo.png

diff --git a/services/web/app/views/layout.jade b/services/web/app/views/layout.jade
index e52781d195..efc514f8ac 100644
--- a/services/web/app/views/layout.jade
+++ b/services/web/app/views/layout.jade
@@ -38,7 +38,7 @@ html(itemscope, itemtype='http://schema.org/Product')
 	- if (typeof(bodyClasses) == "undefined")
 		- var bodyClasses = []
 	body(class=bodyClasses)
-		include menubar
+		include layout/navbar
 		block content
 		- if (typeof(lookingForScribtex) != "undefined" && lookingForScribtex)
 			.modal.hide#scribtexModal
diff --git a/services/web/app/views/menubar.jade b/services/web/app/views/layout/navbar.jade
similarity index 96%
rename from services/web/app/views/menubar.jade
rename to services/web/app/views/layout/navbar.jade
index 4daa9aec0b..10ffe822d7 100644
--- a/services/web/app/views/menubar.jade
+++ b/services/web/app/views/layout/navbar.jade
@@ -3,7 +3,7 @@ nav.navbar.navbar-default
 		.navbar-header
 			button.navbar-toggle(data-toggle="collapse",data-target="#navbar-collapse")
 				i.fa.fa-bars
-			a(href='/').navbar-brand ShareLaTeX
+			a(href='/').navbar-brand
 
 		.navbar-collapse.collapse#navbar-collapse
 			ul.nav.navbar-nav.navbar-right
diff --git a/services/web/public/img/logo.png b/services/web/public/img/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ecceead1e46c685e0b1d9a5d9c8119da13d71eb
GIT binary patch
literal 8327
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

literal 0
HcmV?d00001

diff --git a/services/web/public/stylesheets/components/navbar.less b/services/web/public/stylesheets/components/navbar.less
index 06246494cc..ecd45b0302 100755
--- a/services/web/public/stylesheets/components/navbar.less
+++ b/services/web/public/stylesheets/components/navbar.less
@@ -52,7 +52,7 @@
   overflow-x: visible;
   padding-right: @navbar-padding-horizontal;
   padding-left:  @navbar-padding-horizontal;
-  border-top: 1px solid transparent;
+  //border-top: 1px solid transparent;
   box-shadow: inset 0 1px 0 rgba(255,255,255,.1);
   &:extend(.clearfix all);
   -webkit-overflow-scrolling: touch;
@@ -180,7 +180,7 @@
   position: relative;
   float: right;
   margin-right: @navbar-padding-horizontal;
-  .navbar-vertical-align(34px);
+  //.navbar-vertical-align(34px);
   background-color: transparent;
   background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
   border: 2px solid @navbar-default-link-color;
@@ -370,12 +370,12 @@
   padding: 1rem 2rem;
 
   .navbar-brand {
-    color: @navbar-default-brand-color;
-    &:hover,
-    &:focus {
-      color: @navbar-default-brand-hover-color;
-      background-color: @navbar-default-brand-hover-bg;
-    }
+    background-image: url('/img/logo.png');
+    background-repeat: no-repeat;
+    height: 16px;
+    margin-top: 10px;
+    padding: 0;
+    width: 128px;
   }
 
   .navbar-text {
@@ -385,12 +385,11 @@
   .navbar-nav {
     > li > a {
       color: @navbar-default-link-color;
-      border: 2px solid @navbar-default-link-color;
+      border: 2px solid transparent;
       border-radius: @border-radius-base;
       font-size: @font-size-base * .8;
       font-weight: 700;
       line-height: 1;
-      margin-left: 1rem;
       padding: 10px 10px 11px;
 
       &:hover,
@@ -416,6 +415,13 @@
         background-color: @navbar-default-link-disabled-bg;
       }
     }
+
+    @media (min-width: @grid-float-breakpoint) {
+      > li > a {
+        border-color: @navbar-default-link-color;
+        margin-left: 1rem;
+      }
+    }
   }
 
   .navbar-toggle {
@@ -450,10 +456,15 @@
       // Dropdowns get custom display when collapsed
       .open .dropdown-menu {
         > li > a {
+          border-radius: @border-radius-base;
+          font-size: @font-size-base * .8;
+          font-weight: 700;
+          line-height: 1;
+          padding: 12px 12px 13px 30px;
           color: @navbar-default-link-color;
           &:hover,
           &:focus {
-            color: @navbar-default-link-hover-color;
+            color: #fff;
             background-color: @navbar-default-link-hover-bg;
           }
         }