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
| @@ -40,24 +40,29 | |||||
|
|
40 | #in-place editor |
|
40 | #in-place editor |
|
|
41 | gem 'best_in_place', '~> 3.0.1' |
|
41 | gem 'best_in_place', '~> 3.0.1' |
|
|
42 |
|
42 | ||
|
|
43 | # jquery addition |
|
43 | # jquery addition |
|
|
44 | gem 'jquery-rails' |
|
44 | gem 'jquery-rails' |
|
|
45 | gem 'jquery-ui-sass-rails' |
|
45 | gem 'jquery-ui-sass-rails' |
|
|
46 | gem 'jquery-timepicker-addon-rails' |
|
46 | gem 'jquery-timepicker-addon-rails' |
|
|
47 | gem 'jquery-tablesorter' |
|
47 | gem 'jquery-tablesorter' |
|
|
48 |
|
48 | ||
|
|
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' |
|
|
55 | gem 'test-unit' |
|
60 | gem 'test-unit' |
|
|
56 | gem 'will_paginate', '~> 3.0.7' |
|
61 | gem 'will_paginate', '~> 3.0.7' |
|
|
57 | gem 'dynamic_form' |
|
62 | gem 'dynamic_form' |
|
|
58 | gem 'in_place_editing' |
|
63 | gem 'in_place_editing' |
|
|
59 | gem 'verification', :git => 'https://github.com/sikachu/verification.git' |
|
64 | gem 'verification', :git => 'https://github.com/sikachu/verification.git' |
|
|
60 |
|
65 | ||
|
|
61 | group :test, :development do |
|
66 | group :test, :development do |
|
|
62 | gem 'rspec-rails', '~> 2.99.0' |
|
67 | gem 'rspec-rails', '~> 2.99.0' |
|
|
63 | end |
|
68 | end |
| @@ -28,27 +28,32 | |||||
|
|
28 | activerecord (3.2.21) |
|
28 | activerecord (3.2.21) |
|
|
29 | activemodel (= 3.2.21) |
|
29 | activemodel (= 3.2.21) |
|
|
30 | activesupport (= 3.2.21) |
|
30 | activesupport (= 3.2.21) |
|
|
31 | arel (~> 3.0.2) |
|
31 | arel (~> 3.0.2) |
|
|
32 | tzinfo (~> 0.3.29) |
|
32 | tzinfo (~> 0.3.29) |
|
|
33 | activeresource (3.2.21) |
|
33 | activeresource (3.2.21) |
|
|
34 | activemodel (= 3.2.21) |
|
34 | activemodel (= 3.2.21) |
|
|
35 | activesupport (= 3.2.21) |
|
35 | activesupport (= 3.2.21) |
|
|
36 | activesupport (3.2.21) |
|
36 | activesupport (3.2.21) |
|
|
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) |
|
|
46 | railties (~> 3.2.0) |
|
51 | railties (~> 3.2.0) |
|
|
47 | coffee-script (2.3.0) |
|
52 | coffee-script (2.3.0) |
|
|
48 | coffee-script-source |
|
53 | coffee-script-source |
|
|
49 | execjs |
|
54 | execjs |
|
|
50 | coffee-script-source (1.9.0) |
|
55 | coffee-script-source (1.9.0) |
|
|
51 | diff-lcs (1.2.5) |
|
56 | diff-lcs (1.2.5) |
|
|
52 | dynamic_form (1.1.4) |
|
57 | dynamic_form (1.1.4) |
|
|
53 | erubis (2.7.0) |
|
58 | erubis (2.7.0) |
|
|
54 | execjs (2.3.0) |
|
59 | execjs (2.3.0) |
| @@ -143,25 +148,27 | |||||
|
|
143 | polyglot |
|
148 | polyglot |
|
|
144 | polyglot (>= 0.3.1) |
|
149 | polyglot (>= 0.3.1) |
|
|
145 | tzinfo (0.3.43) |
|
150 | tzinfo (0.3.43) |
|
|
146 | uglifier (2.7.0) |
|
151 | uglifier (2.7.0) |
|
|
147 | execjs (>= 0.3.0) |
|
152 | execjs (>= 0.3.0) |
|
|
148 | json (>= 1.8.0) |
|
153 | json (>= 1.8.0) |
|
|
149 | will_paginate (3.0.7) |
|
154 | will_paginate (3.0.7) |
|
|
150 |
|
155 | ||
|
|
151 | PLATFORMS |
|
156 | PLATFORMS |
|
|
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 |
|
|
159 | in_place_editing |
|
166 | in_place_editing |
|
|
160 | jquery-rails |
|
167 | jquery-rails |
|
|
161 | jquery-tablesorter |
|
168 | jquery-tablesorter |
|
|
162 | jquery-timepicker-addon-rails |
|
169 | jquery-timepicker-addon-rails |
|
|
163 | jquery-ui-sass-rails |
|
170 | jquery-ui-sass-rails |
|
|
164 |
|
171 | ||
|
|
165 | mysql2 |
|
172 | mysql2 |
|
|
166 | prototype-rails |
|
173 | prototype-rails |
|
|
167 | rails (= 3.2.21) |
|
174 | rails (= 3.2.21) |
| @@ -6,12 +6,13 | |||||
|
|
6 | // |
|
6 | // |
|
|
7 | // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the |
|
7 | // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the |
|
|
8 | // the compiled file. |
|
8 | // the compiled file. |
|
|
9 | // |
|
9 | // |
|
|
10 | // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD |
|
10 | // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD |
|
|
11 | // GO AFTER THE REQUIRES BELOW. |
|
11 | // GO AFTER THE REQUIRES BELOW. |
|
|
12 | // |
|
12 | // |
|
|
13 | //= require prototype |
|
13 | //= require prototype |
|
|
14 | //= require prototype_ujs |
|
14 | //= require prototype_ujs |
|
|
15 | //= require effects |
|
15 | //= require effects |
|
|
16 | //= require dragdrop |
|
16 | //= require dragdrop |
|
|
17 | //= require controls |
|
17 | //= require controls |
|
|
|
18 | + //= require bootstrap-sprockets | ||
| @@ -1,21 +1,25 | |||||
|
|
1 |
|
1 | ||
|
|
2 | @import jquery.ui.core |
|
2 | @import jquery.ui.core |
|
|
3 | @import jquery.ui.theme |
|
3 | @import jquery.ui.theme |
|
|
4 | @import jquery.ui.datepicker |
|
4 | @import jquery.ui.datepicker |
|
|
5 | @import jquery.ui.slider |
|
5 | @import jquery.ui.slider |
|
|
6 | @import jquery-ui-timepicker-addon |
|
6 | @import jquery-ui-timepicker-addon |
|
|
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 |
|
|
13 | font-family: Tahoma, "sans-serif" |
|
17 | font-family: Tahoma, "sans-serif" |
|
|
14 | margin: 10px |
|
18 | margin: 10px |
|
|
15 | padding: 10px |
|
19 | padding: 10px |
|
|
16 |
|
20 | ||
|
|
17 |
|
21 | ||
|
|
18 | input |
|
22 | input |
|
|
19 | font-family: Tahoma, "sans-serif" |
|
23 | font-family: Tahoma, "sans-serif" |
|
|
20 |
|
24 | ||
|
|
21 |
|
25 | ||
| deleted file |
You need to be logged in to leave comments.
Login now