Description:
new branch for bootstrap
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r551:d69093a5f3c2 - - 5 files changed: 17 inserted, 23 deleted
| @@ -49,6 +49,11 | |||||
|
|
49 | #syntax highlighter |
|
49 | #syntax highlighter |
|
|
50 | gem 'rouge' |
|
50 | gem 'rouge' |
|
|
51 |
|
51 | ||
|
|
|
52 | + #add bootstrap | ||
|
|
|
53 | + gem 'bootstrap-sass', '~> 3.2.0' | ||
|
|
|
54 | + gem 'autoprefixer-rails' | ||
|
|
|
55 | + | ||
|
|
|
56 | + | ||
|
|
52 | gem 'haml' |
|
57 | gem 'haml' |
|
|
53 | gem 'mail' |
|
58 | gem 'mail' |
|
|
54 | gem 'rdiscount' |
|
59 | gem 'rdiscount' |
| @@ -37,9 +37,14 | |||||
|
|
37 | i18n (~> 0.6, >= 0.6.4) |
|
37 | i18n (~> 0.6, >= 0.6.4) |
|
|
38 | multi_json (~> 1.0) |
|
38 | multi_json (~> 1.0) |
|
|
39 | arel (3.0.3) |
|
39 | arel (3.0.3) |
|
|
|
40 | + autoprefixer-rails (6.0.3) | ||
|
|
|
41 | + execjs | ||
|
|
|
42 | + json | ||
|
|
40 | best_in_place (3.0.3) |
|
43 | best_in_place (3.0.3) |
|
|
41 | actionpack (>= 3.2) |
|
44 | actionpack (>= 3.2) |
|
|
42 | railties (>= 3.2) |
|
45 | railties (>= 3.2) |
|
|
|
46 | + bootstrap-sass (3.2.0.2) | ||
|
|
|
47 | + sass (~> 3.2) | ||
|
|
43 | builder (3.0.4) |
|
48 | builder (3.0.4) |
|
|
44 | coffee-rails (3.2.2) |
|
49 | coffee-rails (3.2.2) |
|
|
45 | coffee-script (>= 2.2.0) |
|
50 | coffee-script (>= 2.2.0) |
| @@ -152,7 +157,9 | |||||
|
|
152 | ruby |
|
157 | ruby |
|
|
153 |
|
158 | ||
|
|
154 | DEPENDENCIES |
|
159 | DEPENDENCIES |
|
|
|
160 | + autoprefixer-rails | ||
|
|
155 | best_in_place (~> 3.0.1) |
|
161 | best_in_place (~> 3.0.1) |
|
|
|
162 | + bootstrap-sass (~> 3.2.0) | ||
|
|
156 | coffee-rails (~> 3.2.2) |
|
163 | coffee-rails (~> 3.2.2) |
|
|
157 | dynamic_form |
|
164 | dynamic_form |
|
|
158 | haml |
|
165 | haml |
| @@ -15,3 +15,4 | |||||
|
|
15 | //= require effects |
|
15 | //= require effects |
|
|
16 | //= require dragdrop |
|
16 | //= require dragdrop |
|
|
17 | //= require controls |
|
17 | //= require controls |
|
|
|
18 | + //= require bootstrap-sprockets | ||
| @@ -7,6 +7,10 | |||||
|
|
7 | @import jquery-tablesorter/theme.metro-dark |
|
7 | @import jquery-tablesorter/theme.metro-dark |
|
|
8 | @import tablesorter-theme.cafe |
|
8 | @import tablesorter-theme.cafe |
|
|
9 |
|
9 | ||
|
|
|
10 | + | ||
|
|
|
11 | + @import "bootstrap-sprockets" | ||
|
|
|
12 | + @import "bootstrap" | ||
|
|
|
13 | + | ||
|
|
10 | body |
|
14 | body |
|
|
11 | background: white image-url("topbg.jpg") repeat-x top center |
|
15 | background: white image-url("topbg.jpg") repeat-x top center |
|
|
12 | font-size: 13px |
|
16 | font-size: 13px |
| deleted file |
You need to be logged in to leave comments.
Login now