From: davegandy <dave@davegandy.com>
Date: Wed, 23 Oct 2013 14:32:25 +0000 (-0400)
Subject: swapping fa-reorder in the place of icon-bar
X-Git-Tag: v4.0.0~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b7cf32a852db5a6c9060ff8ecc11c758b199239;p=thirdparty%2FFont-Awesome.git

swapping fa-reorder in the place of icon-bar
---

diff --git a/src/_includes/navbar.html b/src/_includes/navbar.html
index 507a4de676..cc149f341f 100644
--- a/src/_includes/navbar.html
+++ b/src/_includes/navbar.html
@@ -3,9 +3,7 @@
     <div class="navbar-header">
       <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
         <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
+        <i class="fa fa-reorder fa-lg"></i>
       </button>
       <a class="navbar-brand" href="{{ page.relative_path }}"><i class="fa fa-flag"></i> Font Awesome</a>
     </div>
diff --git a/src/assets/less/site/bootstrap/navbar.less b/src/assets/less/site/bootstrap/navbar.less
index 40db1ddf0e..833f0028f8 100644
--- a/src/assets/less/site/bootstrap/navbar.less
+++ b/src/assets/less/site/bootstrap/navbar.less
@@ -17,3 +17,17 @@
 }
 
 .navbar-inverse .navbar-collapse, .navbar-inverse .navbar-form { border-color: @jumbotron-border; }
+
+.navbar-inverse .navbar-toggle {
+  color: @jumbotron-color;
+  text-shadow: 0 1px 0 rgba(0,0,0,0.15);
+  padding: 4px 10px;
+  margin-top: 5px;
+  margin-bottom: 5px;
+  &:hover {
+    background-color: mix(@jumbotron-color, @jumbotron-bg, 95%);
+    border-color: mix(@jumbotron-color, @jumbotron-bg, 95%);
+    color: @jumbotron-bg;
+    text-shadow: 0 -1px 0 @jumbotron-color;
+  }
+}
\ No newline at end of file
diff --git a/src/assets/less/site/bootstrap/variables.less b/src/assets/less/site/bootstrap/variables.less
index e260f0d445..da851b31ae 100644
--- a/src/assets/less/site/bootstrap/variables.less
+++ b/src/assets/less/site/bootstrap/variables.less
@@ -89,8 +89,7 @@
 @navbar-inverse-link-active-bg:             @navbar-inverse-border;
 
 // Inverted navbar toggle
-@navbar-inverse-toggle-hover-bg:            @fa-green-dark;
-@navbar-inverse-toggle-icon-bar-bg:         @jumbotron-color;
+@navbar-inverse-toggle-hover-bg:            @jumbotron-color;
 @navbar-inverse-toggle-border-color:        mix(@jumbotron-color, @fa-green, 75%);