Commit a55c4a6c

@@ -14,3 +14,6 @@
  *= require bootstrap-multiselect
  *= require_tree .
 */
+
+@import "font-awesome";
+@import "bootstrap";

@@ -12,8 +12,6 @@
 <meta name="apple-mobile-web-app-title" content="Cakeside">
 <meta name="apple-mobile-web-app-status-bar-style" content="black">
 <%= stylesheet_link_tag "application", media: "all", 'data-turbolinks-track' => true %>
-<link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.no-icons.min.css" rel="stylesheet">
-<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
 <%= favicon_link_tag 'favicon.ico' %>
 <%= favicon_link_tag 'apple-touch-icon-57x57.png', rel: 'apple-touch-startup-image', type: 'image/png' %>
 <%= favicon_link_tag 'apple-touch-icon-57x57.png', rel: 'apple-touch-icon', type: 'image/png', sizes: "57x57" %>
@@ -21,7 +19,7 @@
 <%= favicon_link_tag 'apple-touch-icon-114x114.png', rel: 'apple-touch-icon', type: 'image/png', sizes: "114x114" %>
 <%= yield :head %>
 <%= javascript_include_tag "application", 'data-turbolinks-track' => true %>
-<%= javascript_include_tag "//www.google.com/jsapi", "chartkick" %>
+<%# javascript_include_tag "//www.google.com/jsapi", "chartkick" %>
 <!--[if lt IE 9]>
   <script src="https://html5shim.googlecode.com/svn/trunk/html5.js"></script>
 <![endif]-->
@@ -36,8 +34,8 @@
   <%= yield %>
 </div> <!-- /container -->
 <%= render "layouts/footer" %>
-<%= render "layouts/uservoice_feedback"%>
-<%= render "layouts/disqus_comments_count" %>
+<%# render "layouts/uservoice_feedback"%>
+<%# render "layouts/disqus_comments_count" %>
 <%= render "layouts/google_analytics" %>
 </body>
 </html>

@@ -17,7 +17,6 @@ gem 'jquery-ui-rails', '~> 4.0.0'
 gem 'jquery-turbolinks'
 gem 'mini_magick'
 gem "kaminari"
-gem 'bootstrap-sass', '~> 2.3.0'
 gem 'delayed_job'
 gem 'delayed_job_active_record'
 gem 'daemons'
@@ -44,6 +43,8 @@ gem 'chartkick'
 gem 'groupdate'
 gem 'rack-cors', require: 'rack/cors'
 gem 'email_validator'
+gem 'font-awesome-rails'
+gem 'bootstrap-sass', '~> 2.3.0'
 
 group :development do
   gem 'capistrano', '3.3.5'

@@ -291,6 +291,8 @@ GEM
     fog-xml (0.1.3)
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
+    font-awesome-rails (4.7.0.1)
+      railties (>= 3.2, < 5.1)
     foreman (0.84.0)
       thor (~> 0.19.1)
     formatador (0.2.5)
@@ -576,6 +578,7 @@ DEPENDENCIES
   exifr
   factory_girl_rails
   ffaker
+  font-awesome-rails
   foreman
   geoip
   gibbon