Commit 348c0ab9a14d96daa43dadc8961ef27a3c9d48c7
1 parent
3f864de1
Exists in
master
and in
2 other branches
Downgrade bootstrap
Showing
9 changed files
with
881 additions
and
24 deletions
Show diff stats
Gemfile
@@ -7,7 +7,11 @@ gem 'activeadmin', github: 'gregbell/active_admin' | @@ -7,7 +7,11 @@ gem 'activeadmin', github: 'gregbell/active_admin' | ||
7 | 7 | ||
8 | gem 'haml-rails' | 8 | gem 'haml-rails' |
9 | gem 'sass-rails', '~> 4.0.3' | 9 | gem 'sass-rails', '~> 4.0.3' |
10 | -gem 'bootstrap-sass' | 10 | + |
11 | +# gem 'bootstrap-sass' | ||
12 | +gem 'twitter-bootstrap-rails' | ||
13 | +gem 'less-rails' | ||
14 | + | ||
11 | gem 'uglifier', '>= 1.3.0' | 15 | gem 'uglifier', '>= 1.3.0' |
12 | gem 'coffee-rails', '~> 4.0.0' | 16 | gem 'coffee-rails', '~> 4.0.0' |
13 | gem 'jquery-rails' | 17 | gem 'jquery-rails' |
Gemfile.lock
@@ -55,8 +55,6 @@ GEM | @@ -55,8 +55,6 @@ GEM | ||
55 | erubis (>= 2.6.6) | 55 | erubis (>= 2.6.6) |
56 | binding_of_caller (0.7.2) | 56 | binding_of_caller (0.7.2) |
57 | debug_inspector (>= 0.0.1) | 57 | debug_inspector (>= 0.0.1) |
58 | - bootstrap-sass (3.1.1.1) | ||
59 | - sass (~> 3.2) | ||
60 | bourbon (3.2.1) | 58 | bourbon (3.2.1) |
61 | sass (~> 3.2) | 59 | sass (~> 3.2) |
62 | thor | 60 | thor |
@@ -84,6 +82,7 @@ GEM | @@ -84,6 +82,7 @@ GEM | ||
84 | execjs | 82 | execjs |
85 | coffee-script-source (1.7.0) | 83 | coffee-script-source (1.7.0) |
86 | columnize (0.8.9) | 84 | columnize (0.8.9) |
85 | + commonjs (0.2.7) | ||
87 | daemons (1.1.9) | 86 | daemons (1.1.9) |
88 | database_cleaner (1.2.0) | 87 | database_cleaner (1.2.0) |
89 | debug_inspector (0.0.2) | 88 | debug_inspector (0.0.2) |
@@ -169,6 +168,11 @@ GEM | @@ -169,6 +168,11 @@ GEM | ||
169 | activesupport (>= 3.0.0) | 168 | activesupport (>= 3.0.0) |
170 | launchy (2.4.2) | 169 | launchy (2.4.2) |
171 | addressable (~> 2.3) | 170 | addressable (~> 2.3) |
171 | + less (2.5.0) | ||
172 | + commonjs (~> 0.2.7) | ||
173 | + less-rails (2.5.0) | ||
174 | + actionpack (>= 3.1) | ||
175 | + less (~> 2.5.0) | ||
172 | libv8 (3.16.14.3) | 176 | libv8 (3.16.14.3) |
173 | listen (2.7.4) | 177 | listen (2.7.4) |
174 | celluloid (>= 0.15.2) | 178 | celluloid (>= 0.15.2) |
@@ -313,6 +317,11 @@ GEM | @@ -313,6 +317,11 @@ GEM | ||
313 | polyglot (>= 0.3.1) | 317 | polyglot (>= 0.3.1) |
314 | turbolinks (2.2.2) | 318 | turbolinks (2.2.2) |
315 | coffee-rails | 319 | coffee-rails |
320 | + twitter-bootstrap-rails (2.2.8) | ||
321 | + actionpack (>= 3.1) | ||
322 | + execjs | ||
323 | + rails (>= 3.1) | ||
324 | + railties (>= 3.1) | ||
316 | tzinfo (1.1.0) | 325 | tzinfo (1.1.0) |
317 | thread_safe (~> 0.1) | 326 | thread_safe (~> 0.1) |
318 | uglifier (2.5.0) | 327 | uglifier (2.5.0) |
@@ -332,7 +341,6 @@ DEPENDENCIES | @@ -332,7 +341,6 @@ DEPENDENCIES | ||
332 | awesome_print | 341 | awesome_print |
333 | better_errors | 342 | better_errors |
334 | binding_of_caller | 343 | binding_of_caller |
335 | - bootstrap-sass | ||
336 | cancan | 344 | cancan |
337 | capybara | 345 | capybara |
338 | coffee-rails (~> 4.0.0) | 346 | coffee-rails (~> 4.0.0) |
@@ -349,6 +357,7 @@ DEPENDENCIES | @@ -349,6 +357,7 @@ DEPENDENCIES | ||
349 | inherited_resources | 357 | inherited_resources |
350 | jquery-rails | 358 | jquery-rails |
351 | launchy | 359 | launchy |
360 | + less-rails | ||
352 | mysql2 | 361 | mysql2 |
353 | pry-debugger | 362 | pry-debugger |
354 | pry-rails | 363 | pry-rails |
@@ -370,4 +379,5 @@ DEPENDENCIES | @@ -370,4 +379,5 @@ DEPENDENCIES | ||
370 | therubyracer | 379 | therubyracer |
371 | thin | 380 | thin |
372 | turbolinks | 381 | turbolinks |
382 | + twitter-bootstrap-rails | ||
373 | uglifier (>= 1.3.0) | 383 | uglifier (>= 1.3.0) |
@@ -0,0 +1,45 @@ | @@ -0,0 +1,45 @@ | ||
1 | +# A sample Guardfile | ||
2 | +# More info at https://github.com/guard/guard#readme | ||
3 | + | ||
4 | +guard :bundler do | ||
5 | + watch('Gemfile') | ||
6 | + # Uncomment next line if your Gemfile contains the `gemspec' command. | ||
7 | + # watch(/^.+\.gemspec/) | ||
8 | +end | ||
9 | + | ||
10 | +guard 'livereload' do | ||
11 | + watch(%r{app/views/.+\.(erb|haml|slim)$}) | ||
12 | + watch(%r{app/helpers/.+\.rb}) | ||
13 | + watch(%r{public/.+\.(css|js|html)}) | ||
14 | + watch(%r{config/locales/.+\.yml}) | ||
15 | + # Rails Assets Pipeline | ||
16 | + watch(%r{(app|vendor)(/assets/\w+/(.+\.(css|js|html|png|jpg))).*}) { |m| "/assets/#{m[3]}" } | ||
17 | +end | ||
18 | + | ||
19 | +guard 'rails' do | ||
20 | + watch('Gemfile.lock') | ||
21 | + watch(%r{^(config|lib)/.*\.([^.]+)$}) { |m| m[0] if m[2] != 'yml' && !m[0]['locales'] } | ||
22 | +end | ||
23 | + | ||
24 | + | ||
25 | +guard :rspec do | ||
26 | + watch(%r{^spec/.+_spec\.rb$}) | ||
27 | + watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" } | ||
28 | + watch('spec/spec_helper.rb') { "spec" } | ||
29 | + | ||
30 | + # Rails example | ||
31 | + watch(%r{^app/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" } | ||
32 | + watch(%r{^app/(.*)(\.erb|\.haml|\.slim)$}) { |m| "spec/#{m[1]}#{m[2]}_spec.rb" } | ||
33 | + watch(%r{^app/controllers/(.+)_(controller)\.rb$}) { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] } | ||
34 | + watch(%r{^spec/support/(.+)\.rb$}) { "spec" } | ||
35 | + watch('config/routes.rb') { "spec/routing" } | ||
36 | + watch('app/controllers/application_controller.rb') { "spec/controllers" } | ||
37 | + | ||
38 | + # Capybara features specs | ||
39 | + watch(%r{^app/views/(.+)/.*\.(erb|haml|slim)$}) { |m| "spec/features/#{m[1]}_spec.rb" } | ||
40 | + | ||
41 | + # Turnip features and steps | ||
42 | + watch(%r{^spec/acceptance/(.+)\.feature$}) | ||
43 | + watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' } | ||
44 | +end | ||
45 | + |
app/assets/stylesheets/application.css
@@ -1,15 +0,0 @@ | @@ -1,15 +0,0 @@ | ||
1 | -/* | ||
2 | - * This is a manifest file that'll be compiled into application.css, which will include all the files | ||
3 | - * listed below. | ||
4 | - * | ||
5 | - * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, | ||
6 | - * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path. | ||
7 | - * | ||
8 | - * You're free to add application-wide styles to this file and they'll appear at the bottom of the | ||
9 | - * compiled file so the styles you add here take precedence over styles defined in any styles | ||
10 | - * defined in the other CSS/SCSS files in this directory. It is generally better to create a new | ||
11 | - * file per style scope. | ||
12 | - * | ||
13 | - *= require_tree . | ||
14 | - *= require_self | ||
15 | - */ |
@@ -0,0 +1,15 @@ | @@ -0,0 +1,15 @@ | ||
1 | +/* | ||
2 | + * This is a manifest file that'll be compiled into application.css, which will include all the files | ||
3 | + * listed below. | ||
4 | + * | ||
5 | + * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, | ||
6 | + * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path. | ||
7 | + * | ||
8 | + * You're free to add application-wide styles to this file and they'll appear at the bottom of the | ||
9 | + * compiled file so the styles you add here take precedence over styles defined in any styles | ||
10 | + * defined in the other CSS/SCSS files in this directory. It is generally better to create a new | ||
11 | + * file per style scope. | ||
12 | + * | ||
13 | + *= require_tree . | ||
14 | + *= require_self | ||
15 | + */ |
@@ -0,0 +1,420 @@ | @@ -0,0 +1,420 @@ | ||
1 | +@import "twitter/bootstrap/bootstrap"; | ||
2 | +@import "twitter/bootstrap/responsive"; | ||
3 | + | ||
4 | +@iconSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings.png'); | ||
5 | +@iconWhiteSpritePath: asset-path('twitter/bootstrap/glyphicons-halflings-white.png'); | ||
6 | + | ||
7 | +@navbarBackground: #DDD; | ||
8 | +@navbarBackgroundHighlight: #DDD; | ||
9 | +@navbarLinkColor: #000; | ||
10 | +@navbarLinkColorHover: #AAA; | ||
11 | + | ||
12 | +@linkColor: #888; | ||
13 | +@linkColorHover: darken(@linkColor, 15%); | ||
14 | + | ||
15 | + | ||
16 | +body{ | ||
17 | + margin-top:80px; | ||
18 | +} | ||
19 | + | ||
20 | +footer { | ||
21 | + background-color: #d6d6d6; | ||
22 | + text-align:center; | ||
23 | + padding:2%; | ||
24 | + -moz-box-shadow: 10px 10px 5px #888; | ||
25 | + -webkit-box-shadow: 10px 10px 5px #888; | ||
26 | + box-shadow: 10px 10px 5px #888; | ||
27 | +} | ||
28 | + | ||
29 | +#order_chart_user{ | ||
30 | + height:300px; | ||
31 | + width:700px; | ||
32 | + margin-left:150px; | ||
33 | +} | ||
34 | +.center_box{ | ||
35 | + margin-left:10%; | ||
36 | + width:100%; | ||
37 | +} | ||
38 | + | ||
39 | +.inputs{ width:300px; } | ||
40 | +.navbar .brand { | ||
41 | + color:#000; | ||
42 | +} | ||
43 | +.video{ | ||
44 | + width:auto; | ||
45 | + padding-left:220px; | ||
46 | +} | ||
47 | + | ||
48 | +.left{ | ||
49 | + padding:0px; | ||
50 | + float:left; | ||
51 | + width:480px; | ||
52 | + height:400px; | ||
53 | + | ||
54 | +} | ||
55 | + | ||
56 | +.login{ | ||
57 | + min-width:250px; | ||
58 | + padding:5%; | ||
59 | + margin-left:35%; | ||
60 | + margin-right:35%; | ||
61 | + -moz-box-shadow: 0 0 5px 5px #888; | ||
62 | + -webkit-box-shadow: 0 0 5px 5px#888; | ||
63 | + box-shadow: 0 0 5px 5px #888; | ||
64 | +} | ||
65 | + | ||
66 | +.login h2{ | ||
67 | + background-color:#FFF; | ||
68 | + color:#000; | ||
69 | + text-align:center; | ||
70 | + margin-bottom:10px; | ||
71 | + -moz-box-shadow: 0 0 5px 5px #CCC; | ||
72 | + -webkit-box-shadow: 0 0 5px 5px#CCC; | ||
73 | + box-shadow: 0 0 5px 5px #CCC; | ||
74 | +} | ||
75 | + | ||
76 | +.login h3{ | ||
77 | + text-align:center; | ||
78 | + color:#BBB; | ||
79 | + text-shadow: 1px 1px #AAA; | ||
80 | +} | ||
81 | + | ||
82 | +.upload{ | ||
83 | + width: 100%; | ||
84 | + height: 480px; | ||
85 | + text-align:center; | ||
86 | +} | ||
87 | + | ||
88 | +.upload a{ | ||
89 | + text-align:center; | ||
90 | +} | ||
91 | + | ||
92 | +.center{ | ||
93 | + text-align:center; | ||
94 | +} | ||
95 | + | ||
96 | +.attention{ | ||
97 | + background:#FFF; | ||
98 | + color:#0000FF; | ||
99 | + padding:0.4%; | ||
100 | +} | ||
101 | + | ||
102 | +.attention:hover{ | ||
103 | + background:#000; | ||
104 | + color:#FFF; | ||
105 | +} | ||
106 | + | ||
107 | +.error{ | ||
108 | + background:#A60707; | ||
109 | + width:100%; | ||
110 | + padding:0.4%; | ||
111 | + color:#FFF; | ||
112 | + text-decoration:none; | ||
113 | + -moz-box-shadow: 0 0 5px 5px #CCC; | ||
114 | + -webkit-box-shadow: 0 0 5px 5px #CCC; | ||
115 | + box-shadow: 0 0 5px 5px #CCC; | ||
116 | + text-align:center; | ||
117 | +} | ||
118 | + | ||
119 | +.bold{ | ||
120 | + font-weight:bold; | ||
121 | + font-size:15px; | ||
122 | +} | ||
123 | + | ||
124 | +.field{ | ||
125 | + margin-bottom:20px; | ||
126 | +} | ||
127 | + | ||
128 | +.horizontal-form{ | ||
129 | + padding-top:20px; | ||
130 | +} | ||
131 | + | ||
132 | +.actions{ | ||
133 | + margin-top:10px; | ||
134 | +} | ||
135 | + | ||
136 | +.radio{ | ||
137 | + font-size:15px; | ||
138 | +} | ||
139 | + | ||
140 | +label{ | ||
141 | + font-size:18px; | ||
142 | +} | ||
143 | + | ||
144 | +#upload{ | ||
145 | + margin-top:10px; | ||
146 | + background-color:#DDD; | ||
147 | + height:100px; | ||
148 | + text-transform:uppercase; | ||
149 | + color:#000; | ||
150 | + text-align:center; | ||
151 | + | ||
152 | + -moz-box-shadow: 0 0 1px 1px #888; | ||
153 | + -webkit-box-shadow: 0 0 1px 1px#888; | ||
154 | + box-shadow: 0 0 1px 1px #888; | ||
155 | +} | ||
156 | + | ||
157 | +#player{ | ||
158 | + display:block; | ||
159 | + width:600px; | ||
160 | + height:300px; | ||
161 | + float:right; | ||
162 | + | ||
163 | + | ||
164 | + -moz-box-shadow: 0 0 5px 5px #888; | ||
165 | + -webkit-box-shadow: 0 0 5px 5px#888; | ||
166 | + box-shadow: 0 0 5px 5px #888; | ||
167 | +} | ||
168 | + | ||
169 | +#player2{ | ||
170 | + display:block; | ||
171 | + width:200px; | ||
172 | + height:150px; | ||
173 | + | ||
174 | + -moz-box-shadow: 0 0 5px 5px #888; | ||
175 | + -webkit-box-shadow: 0 0 5px 5px#888; | ||
176 | + box-shadow: 0 0 5px 5px #888; | ||
177 | +} | ||
178 | + | ||
179 | +#player3{ | ||
180 | + display:block; | ||
181 | + width:200px; | ||
182 | + height:150px; | ||
183 | + | ||
184 | + -moz-box-shadow: 0 0 5px 5px #888; | ||
185 | + -webkit-box-shadow: 0 0 5px 5px#888; | ||
186 | + box-shadow: 0 0 5px 5px #888; | ||
187 | +} | ||
188 | + | ||
189 | +#player4{ | ||
190 | + display:block; | ||
191 | + width:200px; | ||
192 | + height:150px; | ||
193 | + | ||
194 | + -moz-box-shadow: 0 0 5px 5px #888; | ||
195 | + -webkit-box-shadow: 0 0 5px 5px#888; | ||
196 | + box-shadow: 0 0 5px 5px #888; | ||
197 | +} | ||
198 | + | ||
199 | +#player5{ | ||
200 | + display:block; | ||
201 | + width:500px; | ||
202 | + height:380px; | ||
203 | + | ||
204 | + -moz-box-shadow: 0 0 5px 5px #888; | ||
205 | + -webkit-box-shadow: 0 0 5px 5px#888; | ||
206 | + box-shadow: 0 0 5px 5px #888; | ||
207 | +} | ||
208 | + | ||
209 | +input{ | ||
210 | + display: inline-block; | ||
211 | + *display: inline; | ||
212 | + padding: 4px 12px; | ||
213 | + margin-bottom: 0; | ||
214 | + *margin-left: .3em; | ||
215 | + font-size: 14px; | ||
216 | + line-height: 20px; | ||
217 | + *line-height: 20px; | ||
218 | + color: #333333; | ||
219 | + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); | ||
220 | + vertical-align: middle; | ||
221 | + cursor: pointer; | ||
222 | + background-color: #DDD; | ||
223 | + *background-color: #e6e6e6; | ||
224 | + background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); | ||
225 | + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6)); | ||
226 | + background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); | ||
227 | + background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); | ||
228 | + background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); | ||
229 | + background-repeat: repeat-x; | ||
230 | + border: 1px solid #bbbbbb; | ||
231 | + border: 0; | ||
232 | + border-color: #e6e6e6 #e6e6e6 #bfbfbf; | ||
233 | + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); | ||
234 | + border-bottom-color: #DDDDDD; | ||
235 | + -webkit-border-radius: 4px; | ||
236 | + -moz-border-radius: 4px; | ||
237 | + border-radius: 4px; | ||
238 | + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0); | ||
239 | + filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); | ||
240 | + zoom: 1; | ||
241 | + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); | ||
242 | + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); | ||
243 | + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); | ||
244 | + | ||
245 | + | ||
246 | +} | ||
247 | + | ||
248 | +button, | ||
249 | +input, | ||
250 | +select, | ||
251 | +textarea { | ||
252 | + margin: 0; | ||
253 | + font-size: 100%; | ||
254 | + vertical-align: middle; | ||
255 | +} | ||
256 | + | ||
257 | +button, | ||
258 | +input { | ||
259 | + *overflow: visible; | ||
260 | + line-height: normal; | ||
261 | +} | ||
262 | + | ||
263 | +button::-moz-focus-inner, | ||
264 | +input::-moz-focus-inner { | ||
265 | + padding: 0; | ||
266 | + border: 0; | ||
267 | +} | ||
268 | + | ||
269 | +button, | ||
270 | +html input[type="button"], | ||
271 | +input[type="reset"], | ||
272 | +input[type="submit"] { | ||
273 | + cursor: pointer; | ||
274 | + -webkit-appearance: button; | ||
275 | +} | ||
276 | + | ||
277 | +label, | ||
278 | +input, | ||
279 | +button, | ||
280 | +select, | ||
281 | +textarea { | ||
282 | + font-size: 14px; | ||
283 | + font-weight: normal; | ||
284 | + line-height: 20px; | ||
285 | +} | ||
286 | + | ||
287 | +input, | ||
288 | +button, | ||
289 | +select, | ||
290 | +textarea { | ||
291 | + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; | ||
292 | +} | ||
293 | + | ||
294 | +label { | ||
295 | + display: block; | ||
296 | + margin-bottom: 5px; | ||
297 | +} | ||
298 | + | ||
299 | +select, | ||
300 | +textarea, | ||
301 | +input[type="text"], | ||
302 | +input[type="password"], | ||
303 | +input[type="datetime"], | ||
304 | +input[type="datetime-local"], | ||
305 | +input[type="date"], | ||
306 | +input[type="month"], | ||
307 | +input[type="time"], | ||
308 | +input[type="week"], | ||
309 | +input[type="number"], | ||
310 | +input[type="email"], | ||
311 | +input[type="url"], | ||
312 | +input[type="search"], | ||
313 | +input[type="tel"], | ||
314 | +input[type="color"], | ||
315 | +.uneditable-input { | ||
316 | + display: inline-block; | ||
317 | + height: 20px; | ||
318 | + padding: 4px 6px; | ||
319 | + margin-bottom: 10px; | ||
320 | + font-size: 14px; | ||
321 | + line-height: 20px; | ||
322 | + color: #555555; | ||
323 | + vertical-align: middle; | ||
324 | + -webkit-border-radius: 4px; | ||
325 | + -moz-border-radius: 4px; | ||
326 | + border-radius: 4px; | ||
327 | +} | ||
328 | + | ||
329 | +input, | ||
330 | +textarea, | ||
331 | +.uneditable-input { | ||
332 | + width: 206px; | ||
333 | +} | ||
334 | + | ||
335 | +textarea { | ||
336 | + height: auto; | ||
337 | +} | ||
338 | + | ||
339 | +textarea, | ||
340 | +input[type="text"], | ||
341 | +input[type="password"], | ||
342 | +input[type="datetime"], | ||
343 | +input[type="datetime-local"], | ||
344 | +input[type="date"], | ||
345 | +input[type="month"], | ||
346 | +input[type="time"], | ||
347 | +input[type="week"], | ||
348 | +input[type="number"], | ||
349 | +input[type="email"], | ||
350 | +input[type="url"], | ||
351 | +input[type="search"], | ||
352 | +input[type="tel"], | ||
353 | +input[type="color"], | ||
354 | +.uneditable-input { | ||
355 | + background-color: #ffffff; | ||
356 | + border: 1px solid #cccccc; | ||
357 | + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); | ||
358 | + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); | ||
359 | + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); | ||
360 | + -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; | ||
361 | + -moz-transition: border linear 0.2s, box-shadow linear 0.2s; | ||
362 | + -o-transition: border linear 0.2s, box-shadow linear 0.2s; | ||
363 | + transition: border linear 0.2s, box-shadow linear 0.2s; | ||
364 | +} | ||
365 | + | ||
366 | +textarea:focus, | ||
367 | +input[type="text"]:focus, | ||
368 | +input[type="password"]:focus, | ||
369 | +input[type="datetime"]:focus, | ||
370 | +input[type="datetime-local"]:focus, | ||
371 | +input[type="date"]:focus, | ||
372 | +input[type="month"]:focus, | ||
373 | +input[type="time"]:focus, | ||
374 | +input[type="week"]:focus, | ||
375 | +input[type="number"]:focus, | ||
376 | +input[type="email"]:focus, | ||
377 | +input[type="url"]:focus, | ||
378 | +input[type="search"]:focus, | ||
379 | +input[type="tel"]:focus, | ||
380 | +input[type="color"]:focus, | ||
381 | +.uneditable-input:focus { | ||
382 | + border-color: #f56a30; | ||
383 | + outline: 0; | ||
384 | + outline: thin dotted 9; | ||
385 | + /* IE6-9 */ | ||
386 | + | ||
387 | + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px #DDDDDD; | ||
388 | + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px #DDDDDD; | ||
389 | + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px #DDDDDD; | ||
390 | +} | ||
391 | + | ||
392 | +input[type="radio"], | ||
393 | +input[type="checkbox"] { | ||
394 | + margin: 4px 0 0; | ||
395 | + margin-top: 1px 9; | ||
396 | + *margin-top: 0; | ||
397 | + line-height: normal; | ||
398 | + cursor: pointer; | ||
399 | +} | ||
400 | + | ||
401 | +input[type="file"], | ||
402 | +input[type="image"], | ||
403 | +input[type="submit"], | ||
404 | +input[type="reset"], | ||
405 | +input[type="button"], | ||
406 | +input[type="radio"], | ||
407 | +input[type="checkbox"] { | ||
408 | + width: auto; | ||
409 | +} | ||
410 | + | ||
411 | +select, | ||
412 | +input[type="file"] { | ||
413 | + height: 30px; | ||
414 | + /* In IE7, the height of the select element cannot be changed by height, only font-size */ | ||
415 | + | ||
416 | + *margin-top: 4px; | ||
417 | + /* For IE7, add top margin to align select with labels */ | ||
418 | + | ||
419 | + line-height: 30px; | ||
420 | +} |
app/views/layouts/application.html.erb
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <html> | 2 | <html> |
3 | <head> | 3 | <head> |
4 | - <title>Vlibras</title> | ||
5 | - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> | ||
6 | - <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> | 4 | + <title>GTAaaS</title> |
5 | + <%= stylesheet_link_tag "application", :media => "all" %> | ||
6 | + <%= javascript_include_tag "application" %> | ||
7 | <%= csrf_meta_tags %> | 7 | <%= csrf_meta_tags %> |
8 | </head> | 8 | </head> |
9 | <body> | 9 | <body> |
10 | +<div class="navbar navbar-fixed-top"> | ||
11 | + <div class="navbar-inner"> | ||
12 | + <div class="container"> | ||
13 | + <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> | ||
10 | 14 | ||
11 | -<%= yield %> | 15 | + <span class="icon-bar"></span> |
16 | + <span class="icon-bar"></span> | ||
17 | + <span class="icon-bar"></span> | ||
18 | + </a> | ||
19 | + <%= link_to "GTAaaS", home_path, :target => "blank", :class => "brand" %> | ||
12 | 20 | ||
21 | + <%- if current_user.present? %> | ||
22 | + <div class="nav-collapse"> | ||
23 | + <ul class="nav"> | ||
24 | + <li><%= link_to t('shared.main'), home_path %></li> | ||
25 | + | ||
26 | + <li class="dropdown"> | ||
27 | + <a class="dropdown-toggle" href="#" data-toggle="dropdown"><%= t('shared.vlibras') %><strong class="caret"></strong></a> | ||
28 | + | ||
29 | + <ul class="dropdown-menu"> | ||
30 | + <li><%= link_to t('wikivideos.my_videos') %></li> | ||
31 | + <li><%= link_to t('videos.new') %></li> | ||
32 | + <li class="divider"></li> | ||
33 | + <li><%= link_to t('shared.form_alternative') %></li> | ||
34 | + </ul> | ||
35 | + </li> | ||
36 | + | ||
37 | + <li class="dropdown"> | ||
38 | + <a class="dropdown-toggle" href="#" data-toggle="dropdown"><%= t('shared.wikilibras') %><strong class="caret"></strong></a> | ||
39 | + | ||
40 | + <ul class="dropdown-menu"> | ||
41 | + <li><%= link_to t('wikivideos.my_signals') %></li> | ||
42 | + <li><%= link_to t('wikivideos.cadastro_sinal') %></li> | ||
43 | + <li class="divider"></li> | ||
44 | + <li><%= link_to t('wikivideos.dicionario_de_dados') %></li> | ||
45 | + </ul> | ||
46 | + </li> | ||
47 | + <li><%= link_to t('shared.slibras') %></li> | ||
48 | + <li><%= link_to t('shared.about'), "http://gtaaas.lavid.ufpb.br/projeto", :target => "blank" %></li> | ||
49 | + </ul> | ||
50 | + | ||
51 | + | ||
52 | + <ul class="nav pull-right"> | ||
53 | + <li class="dropdown"> | ||
54 | + <%= link_to t('shared.logout'), destroy_user_session_path, :method => 'delete' %> | ||
55 | + <!-- <a class="dropdown-toggle" href="#" data-toggle="dropdown"><%#= current_user.email %><strong class="caret"></strong></a> | ||
56 | + | ||
57 | + <ul class="dropdown-menu"> | ||
58 | + <li><%#= link_to t('shared.edit'), edit_user_registration_path %></li> | ||
59 | + <li class="divider"></li> | ||
60 | + <li><%#= link_to t('shared.logout'), destroy_user_session_path, :method => 'delete' %></li> | ||
61 | + </ul> --> | ||
62 | + </li> | ||
63 | + </ul> | ||
64 | + <% end %> | ||
65 | + | ||
66 | + <ul class="nav secondary-nav"> | ||
67 | + <!-- <li><%= link_to image_tag('pt.png'), url_for( :locale => 'pt' ), :title => "Português" %></li> | ||
68 | + <li><%= link_to image_tag('en.png'), url_for( :locale => 'en' ), :title => 'English' %></li> --> | ||
69 | + </ul> | ||
70 | + </div><!--/.nav-collapse --> | ||
71 | + </div> | ||
72 | + </div> | ||
73 | +</div> | ||
74 | + | ||
75 | +<div class="container"> | ||
76 | + <div class="body"></div> | ||
77 | + <div class="breadcrumb"> | ||
78 | + <%= yield :menu %> | ||
79 | + </div> | ||
80 | + | ||
81 | + <div class="container-fluid"> | ||
82 | + <%#= render_breadcrumbs %> | ||
83 | + <%= yield %> | ||
84 | + </div> | ||
85 | + <footer> | ||
86 | + <p>GTAaaS - <%= t('shared.project') %> <a href="http://gtaaas.lavid.ufpb.br" target="_blank">LAVID</a> | © <%= Time.now.year %>. <%= t('shared.copyright') %>.</p> | ||
87 | + </footer> | ||
88 | +</div> | ||
13 | </body> | 89 | </body> |
14 | </html> | 90 | </html> |
config/application.rb
@@ -18,6 +18,6 @@ module Vlibras | @@ -18,6 +18,6 @@ module Vlibras | ||
18 | 18 | ||
19 | # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. | 19 | # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. |
20 | # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] | 20 | # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] |
21 | - # config.i18n.default_locale = :de | 21 | + config.i18n.default_locale = 'pt-BR' |
22 | end | 22 | end |
23 | end | 23 | end |
@@ -0,0 +1,302 @@ | @@ -0,0 +1,302 @@ | ||
1 | +# encoding: UTF-8 | ||
2 | +# | ||
3 | +# Author Igor Amorim - www.igoramorim.com | ||
4 | +# | ||
5 | +pt-BR: | ||
6 | + shared: | ||
7 | + main: "MENU" | ||
8 | + about: "SOBRE O PROJETO" | ||
9 | + project: "Este projeto pertence ao Laboratório de Aplicações de Vídeo Digital" | ||
10 | + copyright: "Todos os direitos reservados" | ||
11 | + edit_account: "Editar conta" | ||
12 | + edit: "Editar" | ||
13 | + back: "Voltar" | ||
14 | + confirm: "Confirmar" | ||
15 | + signup: "Faça seu cadastro" | ||
16 | + signin: "Entrar" | ||
17 | + login: "Entrar" | ||
18 | + logout: "Sair" | ||
19 | + sidebar: "Escolha uma opção abaixo" | ||
20 | + help: "Como funciona?" | ||
21 | + form_alternative: "RÁPIDO V-LIBRAS" | ||
22 | + wikilibras: "WIKILIBRAS" | ||
23 | + vlibras: "V-LIBRAS" | ||
24 | + slibras: "S-LIBRAS" | ||
25 | + admin: "ADMIN" | ||
26 | + videos: "Videos" | ||
27 | + user: "Usuário" | ||
28 | + confirm_delete: "Tem cereteza que deseja excluir?" | ||
29 | + table: "Tabela" | ||
30 | + created_at: "Criado em" | ||
31 | + updated_at: "Atualizado em" | ||
32 | + | ||
33 | + videos: | ||
34 | + new: "Novo Vídeo" | ||
35 | + edit: "Editando Vídeo" | ||
36 | + list: "Lista de Vídeos do V-LIBRAS" | ||
37 | + show: "Mostrar Vídeo" | ||
38 | + delete: "Excluir Vídeo" | ||
39 | + download: "Baixar Vídeo" | ||
40 | + url: "Vídeo" | ||
41 | + subtitle: "Legenda" | ||
42 | + window_size: "Tamanho da janela de Libras" | ||
43 | + window_position: "Posição da janela de Libras" | ||
44 | + top_left: "Superior Esquerdo" | ||
45 | + top_right: "Superior Direito" | ||
46 | + bottom_right: "Inferior Direito" | ||
47 | + bottom_left: "Inferior Esquerdo" | ||
48 | + transparency: "Tipo de Background" | ||
49 | + video_type: "Entrada" | ||
50 | + | ||
51 | + wikivideos: | ||
52 | + user: "Usuário" | ||
53 | + new: "Novo Sinal" | ||
54 | + edit: "Editando Sinal" | ||
55 | + list: "Lista de Sinais do WIKILIBRAS" | ||
56 | + show: "Mostrar Sinal" | ||
57 | + delete: "Excluir Sinal" | ||
58 | + my_videos: "Meus vídeos" | ||
59 | + my_signals: "Meus Sinais" | ||
60 | + cadastro_sinal: "Cadastrar Sinal" | ||
61 | + dicionario_de_dados: "Dicionário de dados" | ||
62 | + signal_name: "Nome do Sinal" | ||
63 | + movement_type: "Tipo de movimento" | ||
64 | + amount_of_hands: "Quantidade de mãos" | ||
65 | + facial_expression: "Expressão facial" | ||
66 | + repeat_flag_primary: "Flag repetição primária" | ||
67 | + primary_configuration_fingers: "Config primária dos dedos" | ||
68 | + primary_orientation_of_hands: "Orientação primária da mão" | ||
69 | + subdivision_of_articulation_primary: "Subdivisão da articulação primária" | ||
70 | + localization_of_articulation_primary: "localização de articulação primária" | ||
71 | + time_spent: "Tempo gasto" | ||
72 | + | ||
73 | + slibras: | ||
74 | + list: "Lista de Vídeos do S-LIBRAS" | ||
75 | + | ||
76 | + users: | ||
77 | + signals: "Sinais" | ||
78 | + name: "Nome" | ||
79 | + email: "Email" | ||
80 | + address: "Endereço" | ||
81 | + zipcode: "CEP" | ||
82 | + phone: "Telefone" | ||
83 | + new: "Novo Usuário" | ||
84 | + edit: "Editando Usuário" | ||
85 | + list: "Lista de Usuários" | ||
86 | + show: "Mostrando Usuário" | ||
87 | + | ||
88 | + pages: | ||
89 | + title: "Título" | ||
90 | + text: "Texto" | ||
91 | + new: "Nova Página" | ||
92 | + edit: "Editando Página" | ||
93 | + list: "Lista de Página" | ||
94 | + show: "Mostrando Página" | ||
95 | + | ||
96 | + flash: | ||
97 | + actions: | ||
98 | + create: | ||
99 | + notice: "Salvo com sucesso!" | ||
100 | + | ||
101 | + # formatos de data e hora | ||
102 | + date: | ||
103 | + formats: | ||
104 | + default: "%d/%m/%Y" | ||
105 | + short: "%d de %B" | ||
106 | + long: "%d de %B de %Y" | ||
107 | + | ||
108 | + day_names: [Domingo, Segunda, Terça, Quarta, Quinta, Sexta, Sábado] | ||
109 | + abbr_day_names: [Dom, Seg, Ter, Qua, Qui, Sex, Sáb] | ||
110 | + | ||
111 | + month_names: [~, Janeiro, Fevereiro, Março, Abril, Maio, Junho, Julho, Agosto, Setembro, Outubro, Novembro, Dezembro] | ||
112 | + abbr_month_names: [~, Jan, Fev, Mar, Abr, Mai, Jun, Jul, Ago, Set, Out, Nov, Dez] | ||
113 | + order: | ||
114 | + - :day | ||
115 | + - :month | ||
116 | + - :year | ||
117 | + | ||
118 | + time: | ||
119 | + formats: | ||
120 | + sample: '%d.%m.%Y' | ||
121 | + default: "%A, %d de %B de %Y, %H:%M h" | ||
122 | + short: "%d/%m, %H:%M h" | ||
123 | + long: "%A, %d de %B de %Y, %H:%M h" | ||
124 | + am: '' | ||
125 | + pm: '' | ||
126 | + | ||
127 | + # Usado no Array.to_sentence | ||
128 | + support: | ||
129 | + array: | ||
130 | + words_connector: ", " | ||
131 | + two_words_connector: " e " | ||
132 | + last_word_connector: " e " | ||
133 | + | ||
134 | + select: | ||
135 | + prompt: "Por favor selecione" | ||
136 | + | ||
137 | + number: | ||
138 | + format: | ||
139 | + separator: ',' | ||
140 | + delimiter: '.' | ||
141 | + precision: 3 | ||
142 | + significant: false | ||
143 | + strip_insignificant_zeros: false | ||
144 | + | ||
145 | + currency: | ||
146 | + format: | ||
147 | + format: '%u %n' | ||
148 | + unit: 'R$' | ||
149 | + separator: ',' | ||
150 | + delimiter: '.' | ||
151 | + precision: 2 | ||
152 | + significant: false | ||
153 | + strip_insignificant_zeros: false | ||
154 | + | ||
155 | + percentage: | ||
156 | + format: | ||
157 | + delimiter: '.' | ||
158 | + | ||
159 | + precision: | ||
160 | + format: | ||
161 | + delimiter: '.' | ||
162 | + | ||
163 | + human: | ||
164 | + format: | ||
165 | + delimiter: '.' | ||
166 | + precision: 2 | ||
167 | + significant: true | ||
168 | + strip_insignificant_zeros: true | ||
169 | + storage_units: | ||
170 | + format: "%n %u" | ||
171 | + units: | ||
172 | + byte: | ||
173 | + one: "Byte" | ||
174 | + other: "Bytes" | ||
175 | + kb: "KB" | ||
176 | + mb: "MB" | ||
177 | + gb: "GB" | ||
178 | + tb: "TB" | ||
179 | + # number_to_human() | ||
180 | + # new in rails 3: please add to other locales | ||
181 | + decimal_units: | ||
182 | + format: "%n %u" | ||
183 | + units: | ||
184 | + unit: "" | ||
185 | + thousand: "mil" | ||
186 | + million: | ||
187 | + one: milhão | ||
188 | + other: milhões | ||
189 | + billion: | ||
190 | + one: bilhão | ||
191 | + other: bilhões | ||
192 | + trillion: | ||
193 | + one: trilhão | ||
194 | + other: trilhões | ||
195 | + quadrillion: | ||
196 | + one: quatrilhão | ||
197 | + other: quatrilhões | ||
198 | + | ||
199 | + # distancia do tempo em palavras | ||
200 | + datetime: | ||
201 | + distance_in_words: | ||
202 | + half_a_minute: 'meio minuto' | ||
203 | + less_than_x_seconds: | ||
204 | + one: 'menos de 1 segundo' | ||
205 | + other: 'menos de %{count} segundos' | ||
206 | + x_seconds: | ||
207 | + one: '1 segundo' | ||
208 | + other: '%{count} segundos' | ||
209 | + less_than_x_minutes: | ||
210 | + one: 'menos de um minuto' | ||
211 | + other: 'menos de %{count} minutos' | ||
212 | + x_minutes: | ||
213 | + one: '1 minuto' | ||
214 | + other: '%{count} minutos' | ||
215 | + about_x_hours: | ||
216 | + one: 'aproximadamente 1 hora' | ||
217 | + other: 'aproximadamente %{count} horas' | ||
218 | + x_days: | ||
219 | + one: '1 dia' | ||
220 | + other: '%{count} dias' | ||
221 | + about_x_months: | ||
222 | + one: 'aproximadamente 1 mês' | ||
223 | + other: 'aproximadamente %{count} meses' | ||
224 | + x_months: | ||
225 | + one: '1 mês' | ||
226 | + other: '%{count} meses' | ||
227 | + about_x_years: | ||
228 | + one: 'aproximadamente 1 ano' | ||
229 | + other: 'aproximadamente %{count} anos' | ||
230 | + over_x_years: | ||
231 | + one: 'mais de 1 ano' | ||
232 | + other: 'mais de %{count} anos' | ||
233 | + almost_x_years: | ||
234 | + one: 'quase 1 ano' | ||
235 | + other: 'quase %{count} anos' | ||
236 | + prompts: | ||
237 | + year: "Ano" | ||
238 | + month: "Mês" | ||
239 | + day: "Dia" | ||
240 | + hour: "Hora" | ||
241 | + minute: "Minuto" | ||
242 | + second: "Segundo" | ||
243 | + | ||
244 | + helpers: | ||
245 | + select: | ||
246 | + prompt: "Por favor selecione" | ||
247 | + | ||
248 | + submit: | ||
249 | + create: 'Criar' | ||
250 | + update: 'Atualizar' | ||
251 | + submit: 'Salvar' | ||
252 | + | ||
253 | + errors: | ||
254 | + format: "%{attribute} %{message}" | ||
255 | + | ||
256 | + template: | ||
257 | + header: | ||
258 | + one: "Não foi possível gravar %{model}: 1 erro" | ||
259 | + other: "Não foi possível gravar %{model}: %{count} erros." | ||
260 | + body: "Por favor, verifique o(s) seguinte(s) campo(s):" | ||
261 | + | ||
262 | + messages: &errors_messages | ||
263 | + inclusion: "não está incluído na lista" | ||
264 | + exclusion: "não está disponível" | ||
265 | + invalid: "não é válido" | ||
266 | + confirmation: "não está de acordo com a confirmação" | ||
267 | + accepted: "deve ser aceito" | ||
268 | + empty: "não pode ficar vazio" | ||
269 | + blank: "não pode ficar em branco" | ||
270 | + too_long: "é muito longo (máximo: %{count} caracteres)" | ||
271 | + too_short: "é muito curto (mínimo: %{count} caracteres)" | ||
272 | + wrong_length: "não possui o tamanho esperado (%{count} caracteres)" | ||
273 | + not_a_number: "não é um número" | ||
274 | + not_an_integer: "não é um número inteiro" | ||
275 | + greater_than: "deve ser maior que %{count}" | ||
276 | + greater_than_or_equal_to: "deve ser maior ou igual a %{count}" | ||
277 | + equal_to: "deve ser igual a %{count}" | ||
278 | + less_than: "deve ser menor que %{count}" | ||
279 | + less_than_or_equal_to: "deve ser menor ou igual a %{count}" | ||
280 | + odd: "deve ser ímpar" | ||
281 | + even: "deve ser par" | ||
282 | + | ||
283 | + activerecord: | ||
284 | + models: | ||
285 | + user: | ||
286 | + one: 'Usuário' | ||
287 | + other: 'Usuários' | ||
288 | + | ||
289 | + errors: | ||
290 | + template: | ||
291 | + header: | ||
292 | + one: "Não foi possível gravar %{model}: 1 erro" | ||
293 | + other: "Não foi possível gravar %{model}: %{count} erros." | ||
294 | + body: "Por favor, verifique o(s) seguinte(s) campo(s):" | ||
295 | + | ||
296 | + messages: | ||
297 | + taken: "já está em uso" | ||
298 | + record_invalid: "A validação falhou: %{errors}" | ||
299 | + <<: *errors_messages | ||
300 | + | ||
301 | + full_messages: | ||
302 | + format: "%{attribute} %{message}" |