From 94f030875ca6bf203ab739df6f8f76dc0f8e45f8 Mon Sep 17 00:00:00 2001
From: Nicolae Claudius <claudius.nicolae@gmail.com>
Date: Sun, 25 Aug 2013 20:38:11 +0300
Subject: [PATCH] use b3 glyphicons font

---
 Gemfile                                      |  1 -
 Gemfile.lock                                 |  6 +-----
 app/views/shared/navigation/_public.html.erb | 16 ++++++++--------
 app/views/shared/navigation/_users.html.erb  | 12 ++++++------
 4 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/Gemfile b/Gemfile
index 6cc3bb0..0ea70a8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -41,7 +41,6 @@ gem 'compass-rails',
 gem 'bootstrap-sass',
   git: 'git://github.com/thomas-mcdonald/bootstrap-sass.git',
   branch: '3'
-gem 'font-awesome-sass-rails', '~> 3.0.0'
 gem 'webshims-rails', '~> 1.10.10'
 gem 'detect_timezone_rails', '~> 0.0.3'
 # gem 'jquery-cookie-rails', '~> 1.3.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index ff8c49e..00a6765 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -14,7 +14,7 @@ GIT
 
 GIT
   remote: git://github.com/thomas-mcdonald/bootstrap-sass.git
-  revision: 4a8d1a9add83896cbc5f5441e209b00626f74338
+  revision: 571ba865e1cd01f583c5949446803b9f2cd21926
   branch: 3
   specs:
     bootstrap-sass (3.0.0.0)
@@ -161,9 +161,6 @@ GEM
     ffi (1.9.0)
     file-tail (1.0.12)
       tins (~> 0.5)
-    font-awesome-sass-rails (3.0.2.2)
-      railties (>= 3.1.1)
-      sass-rails (>= 3.1.1)
     formatador (0.2.4)
     fssm (0.2.10)
     gem_plugin (0.2.3)
@@ -375,7 +372,6 @@ DEPENDENCIES
   devise (~> 3.0.3)
   factory_girl_rails (~> 4.2.1)
   faker (~> 1.2.0)
-  font-awesome-sass-rails (~> 3.0.0)
   guard (= 1.8.2)
   guard-rspec (= 3.0.2)
   jquery-rails (~> 3.0.4)
diff --git a/app/views/shared/navigation/_public.html.erb b/app/views/shared/navigation/_public.html.erb
index 217a700..95a58b2 100644
--- a/app/views/shared/navigation/_public.html.erb
+++ b/app/views/shared/navigation/_public.html.erb
@@ -1,31 +1,31 @@
 <% semantic_navigation :public_nav, html: { class: 'nav navbar-nav' } do |n| %>
   <%= n.item '', link: page_path('about') do %>
-    <i class="icon-white icon-info-sign"></i> About
+    <i class="glyphicon glyphicon-info-sign"></i> About
   <% end %>
   <%= n.item '', link: page_path('team') do %>
-    <i class="icon-white icon-user"></i> Team
+    <i class="glyphicon glyphicon-user"></i> Team
   <% end %>
   <%= n.item '', link: page_path('contact') do %>
-    <i class="icon-white icon-envelope"></i> Contact
+    <i class="glyphicon glyphicon-envelope"></i> Contact
   <% end %>
   <%= n.item '', link: page_path('help') do %>
-    <i class="icon-white icon-question-sign"></i> Help & Support
+    <i class="glyphicon glyphicon-question-sign"></i> Help & Support
   <% end %>
 <% end %>
 
 <% semantic_navigation :session_nav, html: { class: 'nav navbar-nav pull-right' } do |n| %>
   <%= n.item '', link: Settings.news_link, 
     html: { rel: 'tooltip', data: { placement: 'bottom' }, title: Settings.news_link } do %>
-    <i class="icon-white icon-share-alt"></i> News
+    <i class="glyphicon glyphicon-share-alt"></i> News
   <% end %>
   <%= n.item '', link: page_path('donate'),
     html: { rel: 'tooltip', title: 'PayPal', data: { placement: 'bottom' }, class: 'highlight' } do %>
-    <i class="icon-white icon-heart"></i> Donate
+    <i class="glyphicon glyphicon-heart"></i> Donate
   <% end %>
   <%= n.item '', link: new_user_registration_path do %>
-    <i class="icon-white icon-arrow-up"></i> Sign up
+    <i class="glyphicon glyphicon-arrow-up"></i> Sign up
   <% end %>
   <%= n.item '', link: new_user_session_path do %>
-    <i class="icon-white icon-arrow-right"></i> Sign in
+    <i class="glyphicon glyphicon-arrow-right"></i> Sign in
   <% end %>
 <% end %>
diff --git a/app/views/shared/navigation/_users.html.erb b/app/views/shared/navigation/_users.html.erb
index ebc12ee..a4b4555 100644
--- a/app/views/shared/navigation/_users.html.erb
+++ b/app/views/shared/navigation/_users.html.erb
@@ -1,27 +1,27 @@
 <% semantic_navigation :application_nav, html: { class: 'nav navbar-nav' } do |n| %>
   <%= n.item '', link: domains_path do %>
-    <i class="icon-white icon-th-list"></i> My Domains
+    <i class="glyphicon glyphicon-th-list"></i> My Domains
   <% end %>
   <%= n.item '', link: hosts_path do %>
-    <i class="icon-white icon-th"></i> Dynamic Hosts
+    <i class="glyphicon glyphicon-th"></i> Dynamic Hosts
   <% end %>
   <%= n.item '', link: page_path('help') do %>
-    <i class="icon-white icon-question-sign"></i> Help & Support
+    <i class="glyphicon glyphicon-question-sign"></i> Help & Support
   <% end %>
 <% end %>
 
 <% semantic_navigation :user_nav, html: { class: 'nav navbar-nav navbar-right' } do |n| %>
   <%= n.item '', link: Settings.news_link, 
     html: { rel: 'tooltip', data: { placement: 'bottom' }, title: Settings.news_link } do %>
-    <i class="icon-white icon-share-alt"></i> News
+    <i class="glyphicon glyphicon-share-alt"></i> News
   <% end %>
   <%= n.item '', link: page_path('donate'),
     html: { rel: 'tooltip', title: 'PayPal', data: { placement: 'bottom' }, class: 'highlight' } do %>
-    <i class="icon-white icon-heart"></i> Donate
+    <i class="glyphicon glyphicon-heart"></i> Donate
   <% end %>
     <li class="dropdown">
       <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-        <i class="icon-white icon-user"></i> <%= current_user.email %> <b class="caret"></b>
+        <i class="glyphicon glyphicon-user"></i> <%= current_user.email %> <b class="caret"></b>
       </a>
       <%= n.group do %>
         <%= n.item '', link: edit_user_registration_path, html: { rel: 'tooltip', title: "IP: #{client_remote_ip}" } do %>