Fixes CSS issues that came after the switch to assets pipelining.

We need to bring our own bootstraps because we're using cutoms version of the lib (reason why we have the less files in /doc/), so we can't rely on saas-botstrap.
McWild · Nov 8, 2013 · fe23e29 · fe23e29
1 parent a4dc69f
commit fe23e29
Show file tree

Hide file tree

Showing 7 changed files with 6,321 additions and 5 deletions.
diff --git a/Gemfile b/Gemfile
@@ -51,8 +51,6 @@ gem 'twitter'
 gem "jquery-rails", "~> 3.0.4"
 gem "jquery-ui-rails", "~> 4.0.4"
 
-gem 'bootstrap-sass', '~> 2.3.2.1'
-
 # Growler replacement
 gem "gritter", "~> 1.0.3"
 

diff --git a/app/assets/stylesheets/accounts.css b/app/assets/stylesheets/accounts.css
@@ -1,3 +1,5 @@
+@import "bootstrap-accounts";
+
 body {
   padding-top: 120px;
 }

diff --git a/app/assets/stylesheets/administration_structure.css.scss b/app/assets/stylesheets/administration_structure.css.scss
@@ -184,7 +184,7 @@ a.delete:focus {
 }
 
 .icon-large {
-    background-image: image-url("../images/admin/glyphicons-large.png");
+    background-image: image-url("admin/glyphicons-large.png");
     background-position: 24px 24px;
     background-repeat: no-repeat;
     display: inline-block;

diff --git a/app/assets/stylesheets/bootstrap-accounts.css b/app/assets/stylesheets/bootstrap-accounts.css