cafe-grader-web

Commit r551:d69093a5f3c2 public

parent | child
Description:
new branch for bootstrap
Commit status:
[Not Reviewed]
References:
bootstrap
Diff options:
Raw Diff | Patch Diff | Download Diff | Show whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r551:d69093a5f3c2 - - 5 files changed: 17 inserted, 23 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -28,36 +28,41
28 # gem 'jbuilder'
28 # gem 'jbuilder'
29
29
30 # Use unicorn as the app server
30 # Use unicorn as the app server
31 # gem 'unicorn'
31 # gem 'unicorn'
32
32
33 # Deploy with Capistrano
33 # Deploy with Capistrano
34 # gem 'capistrano'
34 # gem 'capistrano'
35
35
36 # To use debugger
36 # To use debugger
37 # gem 'debugger'
37 # gem 'debugger'
38 #
38 #
39
39
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
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -16,51 +16,56
16 activemodel (= 3.2.21)
16 activemodel (= 3.2.21)
17 activesupport (= 3.2.21)
17 activesupport (= 3.2.21)
18 builder (~> 3.0.0)
18 builder (~> 3.0.0)
19 erubis (~> 2.7.0)
19 erubis (~> 2.7.0)
20 journey (~> 1.0.4)
20 journey (~> 1.0.4)
21 rack (~> 1.4.5)
21 rack (~> 1.4.5)
22 rack-cache (~> 1.2)
22 rack-cache (~> 1.2)
23 rack-test (~> 0.6.1)
23 rack-test (~> 0.6.1)
24 sprockets (~> 2.2.1)
24 sprockets (~> 2.2.1)
25 activemodel (3.2.21)
25 activemodel (3.2.21)
26 activesupport (= 3.2.21)
26 activesupport (= 3.2.21)
27 builder (~> 3.0.0)
27 builder (~> 3.0.0)
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)
55 haml (4.0.6)
60 haml (4.0.6)
56 tilt
61 tilt
57 hike (1.2.3)
62 hike (1.2.3)
58 i18n (0.7.0)
63 i18n (0.7.0)
59 in_place_editing (1.2.0)
64 in_place_editing (1.2.0)
60 journey (1.0.4)
65 journey (1.0.4)
61 jquery-rails (3.1.2)
66 jquery-rails (3.1.2)
62 railties (>= 3.0, < 5.0)
67 railties (>= 3.0, < 5.0)
63 thor (>= 0.14, < 2.0)
68 thor (>= 0.14, < 2.0)
64 jquery-tablesorter (1.13.4)
69 jquery-tablesorter (1.13.4)
65 railties (>= 3.1, < 5)
70 railties (>= 3.1, < 5)
66 jquery-timepicker-addon-rails (1.4.1)
71 jquery-timepicker-addon-rails (1.4.1)
@@ -131,45 +136,47
131 sass (>= 3.1.10)
136 sass (>= 3.1.10)
132 tilt (~> 1.3)
137 tilt (~> 1.3)
133 sprockets (2.2.3)
138 sprockets (2.2.3)
134 hike (~> 1.2)
139 hike (~> 1.2)
135 multi_json (~> 1.0)
140 multi_json (~> 1.0)
136 rack (~> 1.0)
141 rack (~> 1.0)
137 tilt (~> 1.1, != 1.3.0)
142 tilt (~> 1.1, != 1.3.0)
138 test-unit (3.0.9)
143 test-unit (3.0.9)
139 power_assert
144 power_assert
140 thor (0.19.1)
145 thor (0.19.1)
141 tilt (1.4.1)
146 tilt (1.4.1)
142 treetop (1.4.15)
147 treetop (1.4.15)
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 mail
171 mail
165 mysql2
172 mysql2
166 prototype-rails
173 prototype-rails
167 rails (= 3.2.21)
174 rails (= 3.2.21)
168 rdiscount
175 rdiscount
169 rouge
176 rouge
170 rspec-rails (~> 2.99.0)
177 rspec-rails (~> 2.99.0)
171 sass-rails (~> 3.2.6)
178 sass-rails (~> 3.2.6)
172 test-unit
179 test-unit
173 uglifier
180 uglifier
174 verification!
181 verification!
175 will_paginate (~> 3.0.7)
182 will_paginate (~> 3.0.7)
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,17 +1,18
1 // This is a manifest file that'll be compiled into application.js, which will include all the files
1 // This is a manifest file that'll be compiled into application.js, which will include all the files
2 // listed below.
2 // listed below.
3 //
3 //
4 // Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
4 // Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
5 // or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
5 // or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
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
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,33 +1,37
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
22 h1
26 h1
23 font-size: 24px
27 font-size: 24px
24 color: #334488
28 color: #334488
25 line-height: 2em
29 line-height: 2em
26
30
27
31
28 h2
32 h2
29 font-size: 18px
33 font-size: 18px
30 color: #5566bb
34 color: #5566bb
31 line-height: 1.5em
35 line-height: 1.5em
32
36
33
37
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
deleted file
You need to be logged in to leave comments. Login now