Parcourir la Source

Proper bootstrap version and hooking

Maarten van den Berg il y a 8 ans
Parent
commit
437977872b
4 fichiers modifiés avec 8 ajouts et 6 suppressions
  1. 1 1
      Gemfile
  2. 4 3
      Gemfile.lock
  3. 1 0
      app/assets/javascripts/application.js
  4. 2 2
      app/assets/stylesheets/application.css

+ 1 - 1
Gemfile

@@ -28,7 +28,7 @@ gem 'jbuilder', '~> 2.5'
28 28
 gem 'bcrypt', '~> 3.1.7'
29 29
 
30 30
 # Use Bootstrap for CSS
31
-gem 'bootstrap-sass', '~> 2.3.0'
31
+gem 'bootstrap-sass', '~> 3.3.6'
32 32
 gem 'autoprefixer-rails'
33 33
 
34 34
 # Use Capistrano for deployment

+ 4 - 3
Gemfile.lock

@@ -42,8 +42,9 @@ GEM
42 42
     autoprefixer-rails (6.5.3.1)
43 43
       execjs
44 44
     bcrypt (3.1.11)
45
-    bootstrap-sass (2.3.2.2)
46
-      sass (~> 3.2)
45
+    bootstrap-sass (3.3.7)
46
+      autoprefixer-rails (>= 5.2.1)
47
+      sass (>= 3.3.4)
47 48
     builder (3.2.2)
48 49
     byebug (9.0.6)
49 50
     coffee-rails (4.2.1)
@@ -161,7 +162,7 @@ PLATFORMS
161 162
 DEPENDENCIES
162 163
   autoprefixer-rails
163 164
   bcrypt (~> 3.1.7)
164
-  bootstrap-sass (~> 2.3.0)
165
+  bootstrap-sass (~> 3.3.6)
165 166
   byebug
166 167
   coffee-rails (~> 4.2)
167 168
   jbuilder (~> 2.5)

+ 1 - 0
app/assets/javascripts/application.js

@@ -13,4 +13,5 @@
13 13
 //= require jquery
14 14
 //= require jquery_ujs
15 15
 //= require turbolinks
16
+//= require bootstrap-sprockets
16 17
 //= require_tree .

+ 2 - 2
app/assets/stylesheets/application.css

@@ -10,6 +10,6 @@
10 10
  * files in this directory. Styles in this file should be added after the last require_* statement.
11 11
  * It is generally better to create a new file per style scope.
12 12
  *
13
- *= require_tree .
14
- *= require_self
15 13
  */
14
+@import "bootstrap-sprockets";
15
+@import "bootstrap";