Was still using gem verison of bootstrap, fixed

dancunningham · Nov 17, 2013 · a79d1e0 · a79d1e0
1 parent 2a9655c
commit a79d1e0
Show file tree

Hide file tree

Showing 8 changed files with 838 additions and 10 deletions.
diff --git a/Gemfile b/Gemfile
@@ -8,7 +8,6 @@ gem 'coffee-rails', '~> 4.0.0'
 gem 'jquery-rails'
 gem 'turbolinks'
 gem 'jbuilder', '~> 1.2'
-gem 'bootstrap-sass', '>= 3.0.0.0'
 gem 'cancan'
 gem 'devise'
 gem 'devise_invitable'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -34,8 +34,6 @@ GEM
       erubis (>= 2.6.6)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    bootstrap-sass (3.0.2.1)
-      sass (~> 3.2)
     builder (3.1.4)
     cancan (1.6.10)
     celluloid (0.15.2)
@@ -227,7 +225,6 @@ PLATFORMS
 DEPENDENCIES
   better_errors
   binding_of_caller
-  bootstrap-sass (>= 3.0.0.0)
   cancan
   coffee-rails (~> 4.0.0)
   database_cleaner (= 1.0.1)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -13,5 +13,4 @@
 //= require jquery
 //= require jquery_ujs
 //= require turbolinks
-//= require bootstrap
 //= require_tree .
diff --git a/app/assets/stylesheets/bootstrap.min.css b/app/assets/stylesheets/bootstrap.min.css
diff --git a/app/assets/stylesheets/framework_and_overrides.css.scss b/app/assets/stylesheets/framework_and_overrides.css.scss
@@ -1,5 +1,5 @@
 // import the CSS framework
-@import "bootstrap";
+// @import "bootstrap";
 
 // override for the 'Home' navigation link
 .navbar-brand {

diff --git a/app/views/layouts/_navigation.html.erb b/app/views/layouts/_navigation.html.erb
@@ -1,4 +1,4 @@
-<nav class="navbar navbar-default navbar-static-top" role="navigation">
+<nav class="navbar navbar-default navbar-inverse navbar-static-top" role="navigation">
   <div class="container">
     <div class="navbar-header">
       <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -6,7 +6,6 @@
     <meta name="description" content="<%= content_for?(:description) ? yield(:description) : "Riseup" %>">
     <!-- Latest compiled and minified CSS -->
     <%= stylesheet_link_tag "application", :media => "all" %>
-    <%= stylesheet_link_tag "bootstrap.min", :media => "all" %>
     <%= csrf_meta_tags %>
   </head>
   <body>

diff --git a/config/environments/development.rb b/config/environments/development.rb
@@ -31,8 +31,6 @@
 
   config.action_mailer.default_url_options = { :host => 'riseupstories.herokuapp.com' }
 
-  config.action_mailer.default_url_options = { :host => 'riseupstories.herokuapp.com' }
-
   config.action_mailer.smtp_settings = {
     address: "smtp.sendgrid.net",
     port: 25,