From 0bcdee759e44daf3f0fc46b346a5fcf428494e8c Mon Sep 17 00:00:00 2001
From: Waseem Daher <wdaher@humbughq.com>
Date: Tue, 7 May 2013 16:41:37 -0400
Subject: [PATCH] Use FontAwesome gear for settings icon.

(imported from commit fbcfd7fb94d7df34fec5dc49ab7deb366e6cf4d9)
---
 templates/zephyr/navbar.html    | 2 +-
 zephyr/static/styles/fonts.css  | 1 +
 zephyr/static/styles/zephyr.css | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/templates/zephyr/navbar.html b/templates/zephyr/navbar.html
index 7e9f6db161..303833a082 100644
--- a/templates/zephyr/navbar.html
+++ b/templates/zephyr/navbar.html
@@ -38,7 +38,7 @@
               {# /stuff that gets visible in skinny mode #}
               <li class="dropdown" id="gear-menu">
                 <a id="settings-dropdown" href="#" role="button" class="dropdown-toggle" data-toggle="dropdown">
-                  <span class="glyphicons cogwheel"><i></i></span><b class="caret"></b>
+                  <i class="icon-vector-cog"></i></span><b class="caret"></b>
                 </a>
                 <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="settings-dropdown">
                   <li title="Messages">
diff --git a/zephyr/static/styles/fonts.css b/zephyr/static/styles/fonts.css
index c0a8c1f66d..f7a2e86456 100644
--- a/zephyr/static/styles/fonts.css
+++ b/zephyr/static/styles/fonts.css
@@ -431,3 +431,4 @@ ul.icons li [class*=" icon-vector-"] {
 .icon-vector-edit:before                 { content: "\f044"; }
 .icon-vector-bullhorn:before             { content: "\f0a1"; }
 .icon-vector-list:before                 { content: "\f03a"; }
+.icon-vector-cog:before                  { content: "\f013"; }
diff --git a/zephyr/static/styles/zephyr.css b/zephyr/static/styles/zephyr.css
index fa928d2343..90f26fe7b2 100644
--- a/zephyr/static/styles/zephyr.css
+++ b/zephyr/static/styles/zephyr.css
@@ -1006,9 +1006,9 @@ table.floating_recipient {
     }
 }
 
-#settings-dropdown .glyphicons {
-    margin-right: -10px;
-    margin-bottom: 5px;
+#settings-dropdown {
+    padding: 5px;
+    font-size: 175%;
 }
 
 #notifications-area {