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
| @@ -28,36 +28,41 | |||
|
|
28 | 28 | # gem 'jbuilder' |
|
|
29 | 29 | |
|
|
30 | 30 | # Use unicorn as the app server |
|
|
31 | 31 | # gem 'unicorn' |
|
|
32 | 32 | |
|
|
33 | 33 | # Deploy with Capistrano |
|
|
34 | 34 | # gem 'capistrano' |
|
|
35 | 35 | |
|
|
36 | 36 | # To use debugger |
|
|
37 | 37 | # gem 'debugger' |
|
|
38 | 38 | # |
|
|
39 | 39 | |
|
|
40 | 40 | #in-place editor |
|
|
41 | 41 | gem 'best_in_place', '~> 3.0.1' |
|
|
42 | 42 | |
|
|
43 | 43 | # jquery addition |
|
|
44 | 44 | gem 'jquery-rails' |
|
|
45 | 45 | gem 'jquery-ui-sass-rails' |
|
|
46 | 46 | gem 'jquery-timepicker-addon-rails' |
|
|
47 | 47 | gem 'jquery-tablesorter' |
|
|
48 | 48 | |
|
|
49 | 49 | #syntax highlighter |
|
|
50 | 50 | gem 'rouge' |
|
|
51 | 51 | |
|
|
52 | + #add bootstrap | |
|
|
53 | + gem 'bootstrap-sass', '~> 3.2.0' | |
|
|
54 | + gem 'autoprefixer-rails' | |
|
|
55 | + | |
|
|
56 | + | |
|
|
52 | 57 | gem 'haml' |
|
|
53 | 58 | gem 'mail' |
|
|
54 | 59 | gem 'rdiscount' |
|
|
55 | 60 | gem 'test-unit' |
|
|
56 | 61 | gem 'will_paginate', '~> 3.0.7' |
|
|
57 | 62 | gem 'dynamic_form' |
|
|
58 | 63 | gem 'in_place_editing' |
|
|
59 | 64 | gem 'verification', :git => 'https://github.com/sikachu/verification.git' |
|
|
60 | 65 | |
|
|
61 | 66 | group :test, :development do |
|
|
62 | 67 | gem 'rspec-rails', '~> 2.99.0' |
|
|
63 | 68 | end |
| @@ -16,51 +16,56 | |||
|
|
16 | 16 | activemodel (= 3.2.21) |
|
|
17 | 17 | activesupport (= 3.2.21) |
|
|
18 | 18 | builder (~> 3.0.0) |
|
|
19 | 19 | erubis (~> 2.7.0) |
|
|
20 | 20 | journey (~> 1.0.4) |
|
|
21 | 21 | rack (~> 1.4.5) |
|
|
22 | 22 | rack-cache (~> 1.2) |
|
|
23 | 23 | rack-test (~> 0.6.1) |
|
|
24 | 24 | sprockets (~> 2.2.1) |
|
|
25 | 25 | activemodel (3.2.21) |
|
|
26 | 26 | activesupport (= 3.2.21) |
|
|
27 | 27 | builder (~> 3.0.0) |
|
|
28 | 28 | activerecord (3.2.21) |
|
|
29 | 29 | activemodel (= 3.2.21) |
|
|
30 | 30 | activesupport (= 3.2.21) |
|
|
31 | 31 | arel (~> 3.0.2) |
|
|
32 | 32 | tzinfo (~> 0.3.29) |
|
|
33 | 33 | activeresource (3.2.21) |
|
|
34 | 34 | activemodel (= 3.2.21) |
|
|
35 | 35 | activesupport (= 3.2.21) |
|
|
36 | 36 | activesupport (3.2.21) |
|
|
37 | 37 | i18n (~> 0.6, >= 0.6.4) |
|
|
38 | 38 | multi_json (~> 1.0) |
|
|
39 | 39 | arel (3.0.3) |
|
|
40 | + autoprefixer-rails (6.0.3) | |
|
|
41 | + execjs | |
|
|
42 | + json | |
|
|
40 | 43 | best_in_place (3.0.3) |
|
|
41 | 44 | actionpack (>= 3.2) |
|
|
42 | 45 | railties (>= 3.2) |
|
|
46 | + bootstrap-sass (3.2.0.2) | |
|
|
47 | + sass (~> 3.2) | |
|
|
43 | 48 | builder (3.0.4) |
|
|
44 | 49 | coffee-rails (3.2.2) |
|
|
45 | 50 | coffee-script (>= 2.2.0) |
|
|
46 | 51 | railties (~> 3.2.0) |
|
|
47 | 52 | coffee-script (2.3.0) |
|
|
48 | 53 | coffee-script-source |
|
|
49 | 54 | execjs |
|
|
50 | 55 | coffee-script-source (1.9.0) |
|
|
51 | 56 | diff-lcs (1.2.5) |
|
|
52 | 57 | dynamic_form (1.1.4) |
|
|
53 | 58 | erubis (2.7.0) |
|
|
54 | 59 | execjs (2.3.0) |
|
|
55 | 60 | haml (4.0.6) |
|
|
56 | 61 | tilt |
|
|
57 | 62 | hike (1.2.3) |
|
|
58 | 63 | i18n (0.7.0) |
|
|
59 | 64 | in_place_editing (1.2.0) |
|
|
60 | 65 | journey (1.0.4) |
|
|
61 | 66 | jquery-rails (3.1.2) |
|
|
62 | 67 | railties (>= 3.0, < 5.0) |
|
|
63 | 68 | thor (>= 0.14, < 2.0) |
|
|
64 | 69 | jquery-tablesorter (1.13.4) |
|
|
65 | 70 | railties (>= 3.1, < 5) |
|
|
66 | 71 | jquery-timepicker-addon-rails (1.4.1) |
| @@ -131,45 +136,47 | |||
|
|
131 | 136 | sass (>= 3.1.10) |
|
|
132 | 137 | tilt (~> 1.3) |
|
|
133 | 138 | sprockets (2.2.3) |
|
|
134 | 139 | hike (~> 1.2) |
|
|
135 | 140 | multi_json (~> 1.0) |
|
|
136 | 141 | rack (~> 1.0) |
|
|
137 | 142 | tilt (~> 1.1, != 1.3.0) |
|
|
138 | 143 | test-unit (3.0.9) |
|
|
139 | 144 | power_assert |
|
|
140 | 145 | thor (0.19.1) |
|
|
141 | 146 | tilt (1.4.1) |
|
|
142 | 147 | treetop (1.4.15) |
|
|
143 | 148 | polyglot |
|
|
144 | 149 | polyglot (>= 0.3.1) |
|
|
145 | 150 | tzinfo (0.3.43) |
|
|
146 | 151 | uglifier (2.7.0) |
|
|
147 | 152 | execjs (>= 0.3.0) |
|
|
148 | 153 | json (>= 1.8.0) |
|
|
149 | 154 | will_paginate (3.0.7) |
|
|
150 | 155 | |
|
|
151 | 156 | PLATFORMS |
|
|
152 | 157 | ruby |
|
|
153 | 158 | |
|
|
154 | 159 | DEPENDENCIES |
|
|
160 | + autoprefixer-rails | |
|
|
155 | 161 | best_in_place (~> 3.0.1) |
|
|
162 | + bootstrap-sass (~> 3.2.0) | |
|
|
156 | 163 | coffee-rails (~> 3.2.2) |
|
|
157 | 164 | dynamic_form |
|
|
158 | 165 | haml |
|
|
159 | 166 | in_place_editing |
|
|
160 | 167 | jquery-rails |
|
|
161 | 168 | jquery-tablesorter |
|
|
162 | 169 | jquery-timepicker-addon-rails |
|
|
163 | 170 | jquery-ui-sass-rails |
|
|
164 | 171 | |
|
|
165 | 172 | mysql2 |
|
|
166 | 173 | prototype-rails |
|
|
167 | 174 | rails (= 3.2.21) |
|
|
168 | 175 | rdiscount |
|
|
169 | 176 | rouge |
|
|
170 | 177 | rspec-rails (~> 2.99.0) |
|
|
171 | 178 | sass-rails (~> 3.2.6) |
|
|
172 | 179 | test-unit |
|
|
173 | 180 | uglifier |
|
|
174 | 181 | verification! |
|
|
175 | 182 | will_paginate (~> 3.0.7) |
| @@ -1,17 +1,18 | |||
|
|
1 | 1 | // This is a manifest file that'll be compiled into application.js, which will include all the files |
|
|
2 | 2 | // listed below. |
|
|
3 | 3 | // |
|
|
4 | 4 | // Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts, |
|
|
5 | 5 | // or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path. |
|
|
6 | 6 | // |
|
|
7 | 7 | // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the |
|
|
8 | 8 | // the compiled file. |
|
|
9 | 9 | // |
|
|
10 | 10 | // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD |
|
|
11 | 11 | // GO AFTER THE REQUIRES BELOW. |
|
|
12 | 12 | // |
|
|
13 | 13 | //= require prototype |
|
|
14 | 14 | //= require prototype_ujs |
|
|
15 | 15 | //= require effects |
|
|
16 | 16 | //= require dragdrop |
|
|
17 | 17 | //= require controls |
|
|
18 | + //= require bootstrap-sprockets | |
| @@ -1,33 +1,37 | |||
|
|
1 | 1 | |
|
|
2 | 2 | @import jquery.ui.core |
|
|
3 | 3 | @import jquery.ui.theme |
|
|
4 | 4 | @import jquery.ui.datepicker |
|
|
5 | 5 | @import jquery.ui.slider |
|
|
6 | 6 | @import jquery-ui-timepicker-addon |
|
|
7 | 7 | @import jquery-tablesorter/theme.metro-dark |
|
|
8 | 8 | @import tablesorter-theme.cafe |
|
|
9 | 9 | |
|
|
10 | + | |
|
|
11 | + @import "bootstrap-sprockets" | |
|
|
12 | + @import "bootstrap" | |
|
|
13 | + | |
|
|
10 | 14 | body |
|
|
11 | 15 | background: white image-url("topbg.jpg") repeat-x top center |
|
|
12 | 16 | font-size: 13px |
|
|
13 | 17 | font-family: Tahoma, "sans-serif" |
|
|
14 | 18 | margin: 10px |
|
|
15 | 19 | padding: 10px |
|
|
16 | 20 | |
|
|
17 | 21 | |
|
|
18 | 22 | input |
|
|
19 | 23 | font-family: Tahoma, "sans-serif" |
|
|
20 | 24 | |
|
|
21 | 25 | |
|
|
22 | 26 | h1 |
|
|
23 | 27 | font-size: 24px |
|
|
24 | 28 | color: #334488 |
|
|
25 | 29 | line-height: 2em |
|
|
26 | 30 | |
|
|
27 | 31 | |
|
|
28 | 32 | h2 |
|
|
29 | 33 | font-size: 18px |
|
|
30 | 34 | color: #5566bb |
|
|
31 | 35 | line-height: 1.5em |
|
|
32 | 36 | |
|
|
33 | 37 | |
| deleted file |
You need to be logged in to leave comments.
Login now