瀏覽代碼

Proper bootstrap version and hooking

Maarten van den Berg 8 年之前
父節點
當前提交
437977872b
共有 4 個文件被更改,包括 8 次插入6 次删除
  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
 gem 'bcrypt', '~> 3.1.7'
28
 gem 'bcrypt', '~> 3.1.7'
29
 
29
 
30
 # Use Bootstrap for CSS
30
 # Use Bootstrap for CSS
31
-gem 'bootstrap-sass', '~> 2.3.0'
31
+gem 'bootstrap-sass', '~> 3.3.6'
32
 gem 'autoprefixer-rails'
32
 gem 'autoprefixer-rails'
33
 
33
 
34
 # Use Capistrano for deployment
34
 # Use Capistrano for deployment

+ 4 - 3
Gemfile.lock

42
     autoprefixer-rails (6.5.3.1)
42
     autoprefixer-rails (6.5.3.1)
43
       execjs
43
       execjs
44
     bcrypt (3.1.11)
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
     builder (3.2.2)
48
     builder (3.2.2)
48
     byebug (9.0.6)
49
     byebug (9.0.6)
49
     coffee-rails (4.2.1)
50
     coffee-rails (4.2.1)
161
 DEPENDENCIES
162
 DEPENDENCIES
162
   autoprefixer-rails
163
   autoprefixer-rails
163
   bcrypt (~> 3.1.7)
164
   bcrypt (~> 3.1.7)
164
-  bootstrap-sass (~> 2.3.0)
165
+  bootstrap-sass (~> 3.3.6)
165
   byebug
166
   byebug
166
   coffee-rails (~> 4.2)
167
   coffee-rails (~> 4.2)
167
   jbuilder (~> 2.5)
168
   jbuilder (~> 2.5)

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

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

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

10
  * files in this directory. Styles in this file should be added after the last require_* statement.
10
  * files in this directory. Styles in this file should be added after the last require_* statement.
11
  * It is generally better to create a new file per style scope.
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";