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
@@ -1,63 +1,68
1 1 source 'https://rubygems.org'
2 2
3 3 gem 'rails', '3.2.21'
4 4
5 5 # Bundle edge Rails instead:
6 6 # gem 'rails', :git => 'git://github.com/rails/rails.git'
7 7
8 8 gem 'mysql2'
9 9
10 10 # Gems used only for assets and not required
11 11 # in production environments by default.
12 12 group :assets do
13 13 gem 'sass-rails', '~> 3.2.6'
14 14 gem 'coffee-rails', '~> 3.2.2'
15 15
16 16 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
17 17 # gem 'therubyracer', :platforms => :ruby
18 18
19 19 gem 'uglifier'
20 20 end
21 21
22 22 gem 'prototype-rails'
23 23
24 24 # To use ActiveModel has_secure_password
25 25 # gem 'bcrypt-ruby', '~> 3.0.0'
26 26
27 27 # To use Jbuilder templates for JSON
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
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,175 +1,182
1 1 GIT
2 2 remote: https://github.com/sikachu/verification.git
3 3 revision: 76eaf51b13276ecae54bd9cd115832595d2ff56d
4 4 specs:
5 5 verification (1.0.3)
6 6 actionpack (>= 3.0.0, < 5.0)
7 7 activesupport (>= 3.0.0, < 5.0)
8 8
9 9 GEM
10 10 remote: https://rubygems.org/
11 11 specs:
12 12 actionmailer (3.2.21)
13 13 actionpack (= 3.2.21)
14 14 mail (~> 2.5.4)
15 15 actionpack (3.2.21)
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)
67 72 railties (>= 3.1)
68 73 jquery-ui-rails (4.0.3)
69 74 jquery-rails
70 75 railties (>= 3.1.0)
71 76 jquery-ui-sass-rails (4.0.3.0)
72 77 jquery-rails
73 78 jquery-ui-rails (= 4.0.3)
74 79 railties (>= 3.1.0)
75 80 json (1.8.2)
76 81 mail (2.5.4)
77 82 mime-types (~> 1.16)
78 83 treetop (~> 1.4.8)
79 84 mime-types (1.25.1)
80 85 multi_json (1.10.1)
81 86 mysql2 (0.3.20)
82 87 polyglot (0.3.5)
83 88 power_assert (0.2.2)
84 89 prototype-rails (3.2.1)
85 90 rails (~> 3.2)
86 91 rack (1.4.5)
87 92 rack-cache (1.2)
88 93 rack (>= 0.4)
89 94 rack-ssl (1.3.4)
90 95 rack
91 96 rack-test (0.6.3)
92 97 rack (>= 1.0)
93 98 rails (3.2.21)
94 99 actionmailer (= 3.2.21)
95 100 actionpack (= 3.2.21)
96 101 activerecord (= 3.2.21)
97 102 activeresource (= 3.2.21)
98 103 activesupport (= 3.2.21)
99 104 bundler (~> 1.0)
100 105 railties (= 3.2.21)
101 106 railties (3.2.21)
102 107 actionpack (= 3.2.21)
103 108 activesupport (= 3.2.21)
104 109 rack-ssl (~> 1.3.2)
105 110 rake (>= 0.8.7)
106 111 rdoc (~> 3.4)
107 112 thor (>= 0.14.6, < 2.0)
108 113 rake (10.4.2)
109 114 rdiscount (2.1.8)
110 115 rdoc (3.12.2)
111 116 json (~> 1.4)
112 117 rouge (1.8.0)
113 118 rspec-collection_matchers (1.1.2)
114 119 rspec-expectations (>= 2.99.0.beta1)
115 120 rspec-core (2.99.2)
116 121 rspec-expectations (2.99.2)
117 122 diff-lcs (>= 1.1.3, < 2.0)
118 123 rspec-mocks (2.99.3)
119 124 rspec-rails (2.99.0)
120 125 actionpack (>= 3.0)
121 126 activemodel (>= 3.0)
122 127 activesupport (>= 3.0)
123 128 railties (>= 3.0)
124 129 rspec-collection_matchers
125 130 rspec-core (~> 2.99.0)
126 131 rspec-expectations (~> 2.99.0)
127 132 rspec-mocks (~> 2.99.0)
128 133 sass (3.4.11)
129 134 sass-rails (3.2.6)
130 135 railties (~> 3.2.0)
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 mail
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)
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -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
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,105 +1,109
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
34 38 hr
35 39 border-top: 1px solid #dddddd
36 40 border-bottom: 1px solid #eeeeee
37 41
38 42
39 43 a
40 44 color: #6666cc
41 45 text-decoration: none
42 46
43 47 &:link, &:visited
44 48 color: #6666cc
45 49 text-decoration: none
46 50
47 51 &:hover, &:focus
48 52 color: #111166
49 53 text-decoration: none
50 54
51 55
52 56 div
53 57 &.userbar
54 58 line-height: 1.5em
55 59 text-align: right
56 60 font-size: 12px
57 61
58 62 &.title
59 63 padding: 10px 0px
60 64 line-height: 1.5em
61 65 font-size: 13px
62 66
63 67 span.contest-over-msg
64 68 font-size: 15px
65 69 color: red
66 70
67 71 table
68 72 width: 100%
69 73 font-weight: bold
70 74
71 75 td
72 76 &.left-col
73 77 text-align: left
74 78 vertical-align: top
75 79 color: #444444
76 80
77 81 &.right-col
78 82 text-align: right
79 83 vertical-align: top
80 84 font-size: 18px
81 85 color: #116699
82 86
83 87
84 88 table.info
85 89 margin: 10px 0
86 90 border: 1px solid #666666
87 91 border-collapse: collapse
88 92 font-size: 12px
89 93
90 94 th
91 95 border: 1px solid #666666
92 96 line-height: 1.5em
93 97 padding: 0 0.5em
94 98
95 99 td
96 100 border-left: 1px solid #666666
97 101 border-right: 1px solid #666666
98 102 line-height: 1.5em
99 103 padding: 0 0.5em
100 104
101 105
102 106 tr
103 107 &.info-head
104 108 background: #777777
105 109 color: white
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