spree_core 1.0.0 → 1.0.1
Sign up to get free protection for your applications and to get access to all the features.
- data/app/assets/javascripts/admin/calculator.js +3 -3
- data/app/assets/javascripts/store/cart.js +1 -1
- data/app/assets/stylesheets/store/screen.css.scss +232 -121
- data/app/controllers/spree/admin/users_controller.rb +0 -1
- data/app/helpers/spree/admin/navigation_helper.rb +1 -1
- data/app/models/spree/address.rb +2 -1
- data/app/models/spree/app_configuration.rb +1 -1
- data/app/models/spree/calculator/default_tax.rb +5 -1
- data/app/models/spree/preference.rb +1 -2
- data/app/models/spree/preferences/preferable.rb +1 -1
- data/app/models/spree/product/scopes.rb +2 -1
- data/app/models/spree/shipment.rb +1 -0
- data/app/models/spree/variant.rb +8 -0
- data/app/views/spree/admin/banners/_gateway.html.erb +1 -1
- data/app/views/spree/admin/orders/_form.html.erb +1 -1
- data/app/views/spree/admin/shared/_calculator_fields.html.erb +1 -1
- data/app/views/spree/checkout/_address.html.erb +2 -2
- data/app/views/spree/checkout/edit.html.erb +11 -13
- data/app/views/spree/orders/_line_item.html.erb +1 -1
- data/app/views/spree/products/show.html.erb +6 -8
- data/app/views/spree/shared/_order_details.html.erb +7 -2
- data/app/views/spree/shared/_products.html.erb +2 -4
- data/lib/spree/core/controller_helpers.rb +1 -30
- data/lib/spree/core/engine.rb +1 -1
- data/lib/spree/core/testing_support/factories/country_factory.rb +1 -1
- data/lib/spree/core/version.rb +1 -1
- metadata +30 -30
@@ -1,14 +1,14 @@
|
|
1
1
|
$(function() {
|
2
2
|
var original_calc_type = $('#calc-type').attr('value');
|
3
|
-
$('div
|
3
|
+
$('div.calculator-settings-warning').hide();
|
4
4
|
$('#calc-type').change(function() {
|
5
5
|
if ($('#calc-type').attr('value') == original_calc_type) {
|
6
6
|
$('div.calculator-settings').show();
|
7
|
-
$('div
|
7
|
+
$('div.calculator-settings-warning').hide();
|
8
8
|
$('.calculator-settings input').prop("disabled", false);
|
9
9
|
} else {
|
10
10
|
$('div.calculator-settings').hide();
|
11
|
-
$('div
|
11
|
+
$('div.calculator-settings-warning').show();
|
12
12
|
$('.calculator-settings input').prop("disabled", true);
|
13
13
|
}
|
14
14
|
});
|
@@ -2,7 +2,7 @@
|
|
2
2
|
$(document).ready(function(){
|
3
3
|
if($('form#update-cart').is('*')){
|
4
4
|
$('form#update-cart a.delete').show().live('click', function(e){
|
5
|
-
$(this).parents('
|
5
|
+
$(this).parents('.line-item').first().find('input.line_item_quantity').val(0);
|
6
6
|
$(this).parents('form').first().submit();
|
7
7
|
e.preventDefault();
|
8
8
|
});
|
@@ -1,53 +1,96 @@
|
|
1
1
|
/*--------------------------------------*/
|
2
2
|
/* Colors
|
3
3
|
/*--------------------------------------*/
|
4
|
-
$c_base: #404042; /* Dark gray */
|
5
|
-
$c_gray: #bbbbbb; /* Mid light gray */
|
6
|
-
$c_colored: #00ADEE; /* Light blue */
|
7
|
-
$c_colored_alt: #f0f8ff; /* Lighter blue */
|
8
|
-
$c_border: #dedede; /* Light gray */
|
9
4
|
$c_green: #8dba53; /* Spree green */
|
10
5
|
$c_red: #e45353; /* Error red */
|
11
6
|
|
7
|
+
$layout_background_color: #FFFFFF;
|
8
|
+
$title_text_color: #404042;
|
9
|
+
$body_text_color: #404042;
|
10
|
+
$link_text_color: #00ADEE;
|
11
|
+
|
12
|
+
$product_background_color: #FFFFFF;
|
13
|
+
$product_title_text_color: #404042;
|
14
|
+
$product_body_text_color: #404042;
|
15
|
+
$product_link_text_color: #BBBBBB;
|
16
|
+
|
12
17
|
/*--------------------------------------*/
|
13
|
-
/* Fonts
|
18
|
+
/* Fonts import from remote
|
14
19
|
/*--------------------------------------*/
|
15
|
-
@import url(
|
20
|
+
@import url(//fonts.googleapis.com/css?family=Ubuntu:400,700,400italic,700italic|&subset=latin,cyrillic,greek,greek-ext,latin-ext,cyrillic-ext);
|
21
|
+
|
22
|
+
/*--------------------------------------*/
|
23
|
+
/* Font families
|
24
|
+
/*--------------------------------------*/
|
25
|
+
$ff_base: 'Ubuntu', sans-serif;
|
26
|
+
|
27
|
+
/*--------------------------------------
|
28
|
+
| Font sizes
|
29
|
+
|--------------------------------------
|
30
|
+
|- Navigation
|
31
|
+
| */
|
32
|
+
$header_navigation_font_size: 14px;
|
33
|
+
$horizontal_navigation_font_size: 16px;
|
34
|
+
$main_navigation_header_font_size: 14px;
|
35
|
+
$main_navigation_font_size: 12px;
|
36
|
+
/*|------------------------------------
|
37
|
+
|- Product Listing
|
38
|
+
| */
|
39
|
+
$product_list_name_font_size: 12px;
|
40
|
+
$product_list_price_font_size: 16px;
|
41
|
+
$product_list_header_font_size: 20px;
|
42
|
+
$product_list_search_font_size: 14px;
|
43
|
+
/*|------------------------------------
|
44
|
+
|- Product Details
|
45
|
+
| */
|
46
|
+
$product_detail_name_font_size: 24px;
|
47
|
+
$product_detail_description_font_size: 12px;
|
48
|
+
$product_detail_price_font_size: 20px;
|
49
|
+
$product_detail_title_font_size: 14px;
|
50
|
+
/*|------------------------------------
|
51
|
+
|- Basic
|
52
|
+
| */
|
53
|
+
$heading_font_size: 24px;
|
54
|
+
$sub_heading_font_size: 14px;
|
55
|
+
$button_font_size: 12px;
|
56
|
+
$input_box_font_size: 13px;
|
57
|
+
$base_font_size: 12px;
|
16
58
|
|
17
59
|
/*--------------------------------------*/
|
18
60
|
/* Basic styles
|
19
61
|
/*--------------------------------------*/
|
20
62
|
body {
|
21
|
-
font-family:
|
22
|
-
color: $
|
63
|
+
font-family: $ff_base;
|
64
|
+
color: $body_text_color;
|
23
65
|
line-height: 18px;
|
24
|
-
font-size:
|
66
|
+
font-size: $base_font_size;
|
67
|
+
background-color: $layout_background_color;
|
25
68
|
}
|
26
69
|
|
27
70
|
/* Line style */
|
28
71
|
hr {
|
29
|
-
border-color: $
|
72
|
+
border-color: lighten($body_text_color, 60);
|
30
73
|
}
|
31
74
|
|
32
75
|
/* Custom text-selection colors (remove any text shadows: twitter.com/miketaylr/status/12228805301) */
|
33
|
-
::-moz-selection{background: $
|
34
|
-
::selection {background: $
|
76
|
+
::-moz-selection{background: $link_text_color; color: $layout_background_color; text-shadow: none;}
|
77
|
+
::selection {background: $link_text_color; color: $layout_background_color; text-shadow: none;}
|
35
78
|
|
36
79
|
/* j.mp/webkit-tap-highlight-color */
|
37
|
-
a:link {-webkit-tap-highlight-color: $
|
80
|
+
a:link {-webkit-tap-highlight-color: $link_text_color;}
|
38
81
|
|
39
|
-
ins {background-color: $
|
40
|
-
mark {background-color: $
|
82
|
+
ins {background-color: $link_text_color; color: $layout_background_color; text-decoration: none;}
|
83
|
+
mark {background-color: $link_text_color; color: $layout_background_color; font-style: italic; font-weight: bold;}
|
41
84
|
|
42
85
|
/*--------------------------------------*/
|
43
86
|
/* Links
|
44
87
|
/*--------------------------------------*/
|
45
88
|
a {
|
46
89
|
text-decoration: none;
|
47
|
-
color: $
|
90
|
+
color: $link_text_color;
|
48
91
|
|
49
92
|
&:hover {
|
50
|
-
color: $
|
93
|
+
color: darken($link_text_color, 10) !important;
|
51
94
|
}
|
52
95
|
}
|
53
96
|
|
@@ -73,7 +116,7 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
|
|
73
116
|
padding: 5px;
|
74
117
|
|
75
118
|
&.odd {
|
76
|
-
background-color: $
|
119
|
+
background-color: lighten($body_text_color, 60);
|
77
120
|
}
|
78
121
|
}
|
79
122
|
dt {
|
@@ -88,15 +131,17 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
|
|
88
131
|
/*--------------------------------------*/
|
89
132
|
/* Headers
|
90
133
|
/*--------------------------------------*/
|
134
|
+
h1 { font-size: $heading_font_size; line-height: $heading_font_size + 10; }
|
135
|
+
h2 { font-size: $heading_font_size - 2; line-height: $heading_font_size - 2 + 10; }
|
136
|
+
h3 { font-size: $heading_font_size - 4; line-height: $heading_font_size - 4 + 10; }
|
137
|
+
h4 { font-size: $heading_font_size - 6; line-height: $heading_font_size - 6 + 10; }
|
138
|
+
h5 { font-size: $sub_heading_font_size; line-height: $sub_heading_font_size + 10; }
|
139
|
+
h6 { font-size: $sub_heading_font_size - 2; line-height: $sub_heading_font_size - 2 + 10; }
|
140
|
+
|
91
141
|
h1, h2, h3, h4, h5, h6 {
|
92
142
|
font-weight: bold;
|
143
|
+
color: $title_text_color;
|
93
144
|
}
|
94
|
-
h1 { font-size: 24px; line-height: 34px; }
|
95
|
-
h2 { font-size: 23px; line-height: 32px; }
|
96
|
-
h3 { font-size: 20px; line-height: 30px; }
|
97
|
-
h4 { font-size: 18px; line-height: 28px; }
|
98
|
-
h5 { font-size: 16px; line-height: 26px; }
|
99
|
-
h6 { font-size: 14px; line-height: 24px; }
|
100
145
|
|
101
146
|
/*--------------------------------------*/
|
102
147
|
/* Forms
|
@@ -107,12 +152,13 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
|
|
107
152
|
input[type="password"], input[type="search"], input[type="tel"],
|
108
153
|
input[type="text"], input[type="time"], input[type="url"],
|
109
154
|
input[type="week"] {
|
110
|
-
border: 1px solid $
|
155
|
+
border: 1px solid lighten($body_text_color, 60);
|
111
156
|
padding: 2px 5px;
|
112
|
-
font-family:
|
157
|
+
font-family: $ff_base;
|
158
|
+
font-size: $input_box_font_size;
|
113
159
|
|
114
160
|
&:active, &:focus {
|
115
|
-
border-color: $
|
161
|
+
border-color: $link_text_color;;
|
116
162
|
outline: none;
|
117
163
|
-webkit-box-shadow: none;
|
118
164
|
-moz-box-shadow: none;
|
@@ -126,8 +172,8 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
|
|
126
172
|
}
|
127
173
|
|
128
174
|
select {
|
129
|
-
border: 1px solid $
|
130
|
-
font-family:
|
175
|
+
border: 1px solid lighten($body_text_color, 60);
|
176
|
+
font-family: $ff_base;
|
131
177
|
background-image: url('select_arrow.gif');
|
132
178
|
background-repeat: no-repeat;
|
133
179
|
background-position: right center;
|
@@ -139,19 +185,20 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
|
|
139
185
|
|
140
186
|
label.error {
|
141
187
|
display: block;
|
142
|
-
font-size:
|
188
|
+
font-size: $base_font_size - 1;
|
143
189
|
color: $c_red;
|
144
190
|
margin-top: 3px;
|
145
191
|
}
|
146
192
|
|
147
193
|
input[type="submit"], input[type="button"],
|
148
194
|
input[type= "reset"], button, a.button {
|
149
|
-
background-color: $
|
195
|
+
background-color: $link_text_color;;
|
150
196
|
background-image: none;
|
151
197
|
text-shadow: none;
|
152
|
-
color:
|
198
|
+
color: $layout_background_color;
|
153
199
|
font-weight: bold;
|
154
|
-
font-
|
200
|
+
font-size: $button_font_size;
|
201
|
+
font-family: $ff_base;
|
155
202
|
border: 1px solid rgba(0, 138, 189, .75);
|
156
203
|
-webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,0.4);
|
157
204
|
-khtml-box-shadow: inset 0 1px 0 rgba(255,255,255,0.4);
|
@@ -164,20 +211,18 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
|
|
164
211
|
-ms-border-radius: 0px;
|
165
212
|
-o-border-radius: 0px;
|
166
213
|
border-radius: 0px;
|
167
|
-
|
168
|
-
// font-size: 13px;
|
169
214
|
vertical-align: text-top;
|
170
215
|
|
171
216
|
&.large {
|
172
217
|
padding: 7px 10px;
|
173
|
-
font-size:
|
218
|
+
font-size: $button_font_size + 2;
|
174
219
|
}
|
175
220
|
|
176
221
|
&:hover {
|
177
222
|
background-image: none;
|
178
|
-
background-color: $
|
179
|
-
border-color: $
|
180
|
-
color:
|
223
|
+
background-color: $body_text_color;
|
224
|
+
border-color: $body_text_color;
|
225
|
+
color: $layout_background_color !important;
|
181
226
|
}
|
182
227
|
}
|
183
228
|
|
@@ -205,7 +250,7 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
|
|
205
250
|
/*--------------------------------------*/
|
206
251
|
footer#footer {
|
207
252
|
padding: 10px 0;
|
208
|
-
border-top: 1px solid $
|
253
|
+
border-top: 1px solid lighten($body_text_color, 60);
|
209
254
|
}
|
210
255
|
|
211
256
|
/*--------------------------------------*/
|
@@ -220,7 +265,7 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
|
|
220
265
|
/*--------------------------------------*/
|
221
266
|
table {
|
222
267
|
thead {
|
223
|
-
background-color: $
|
268
|
+
background-color: lighten($body_text_color, 60);
|
224
269
|
text-transform: uppercase;
|
225
270
|
|
226
271
|
tr {
|
@@ -232,7 +277,7 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
|
|
232
277
|
|
233
278
|
tbody, tfoot {
|
234
279
|
tr {
|
235
|
-
border-bottom: 1px solid $
|
280
|
+
border-bottom: 1px solid lighten($body_text_color, 60);
|
236
281
|
|
237
282
|
td {
|
238
283
|
vertical-align: middle;
|
@@ -240,7 +285,7 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
|
|
240
285
|
}
|
241
286
|
|
242
287
|
&.alt, &.odd {
|
243
|
-
background-color: $
|
288
|
+
background-color: lighten($link_text_color, 50);
|
244
289
|
}
|
245
290
|
}
|
246
291
|
}
|
@@ -260,7 +305,7 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
|
|
260
305
|
|
261
306
|
a{
|
262
307
|
font-weight: bold;
|
263
|
-
font-size:
|
308
|
+
font-size: $header_navigation_font_size;
|
264
309
|
text-transform: uppercase;
|
265
310
|
}
|
266
311
|
}
|
@@ -271,37 +316,44 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
|
|
271
316
|
text-transform: uppercase;
|
272
317
|
font-weight: bold;
|
273
318
|
margin-top: 20px;
|
274
|
-
border-bottom: 1px solid $
|
319
|
+
border-bottom: 1px solid lighten($body_text_color, 60);
|
275
320
|
padding-bottom: 6px;
|
276
321
|
|
277
322
|
li {
|
323
|
+
|
278
324
|
a {
|
279
|
-
font-size:
|
325
|
+
font-size: $horizontal_navigation_font_size;
|
280
326
|
padding: 5px;
|
281
327
|
}
|
282
328
|
|
329
|
+
&:first-child {
|
330
|
+
a {
|
331
|
+
padding-left: 0
|
332
|
+
}
|
333
|
+
}
|
334
|
+
|
283
335
|
&#link-to-cart {
|
284
336
|
float: right;
|
285
337
|
padding-left: 24px;
|
286
338
|
background: url("cart.png") no-repeat left center;
|
287
339
|
|
288
340
|
&:hover {
|
289
|
-
border-color: $
|
341
|
+
border-color: $link_text_color;
|
290
342
|
|
291
343
|
.amount {
|
292
|
-
border-color: $
|
344
|
+
border-color: $link_text_color;
|
293
345
|
}
|
294
346
|
}
|
295
347
|
|
296
348
|
a {
|
297
349
|
font-weight: normal;
|
298
|
-
font-size:
|
299
|
-
color: $
|
350
|
+
font-size: $horizontal_navigation_font_size;
|
351
|
+
color: $link_text_color;
|
300
352
|
|
301
353
|
.amount {
|
302
|
-
font-size:
|
354
|
+
font-size: $horizontal_navigation_font_size + 2;
|
303
355
|
font-weight: bold;
|
304
|
-
border-left: 1px solid $
|
356
|
+
border-left: 1px solid lighten($body_text_color, 60);
|
305
357
|
padding-left: 5px;
|
306
358
|
padding-bottom: 5px;
|
307
359
|
}
|
@@ -313,26 +365,32 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
|
|
313
365
|
nav#taxonomies {
|
314
366
|
.taxonomy-root {
|
315
367
|
text-transform: uppercase;
|
316
|
-
border-bottom: 1px solid $
|
368
|
+
border-bottom: 1px solid lighten($body_text_color, 60);
|
317
369
|
margin-bottom: 5px;
|
318
|
-
|
370
|
+
font-size: $main_navigation_header_font_size;
|
319
371
|
}
|
320
372
|
|
321
373
|
.taxons-list {
|
322
374
|
padding-left: 20px;
|
323
375
|
margin-bottom: 20px;
|
324
376
|
list-style: disc outside;
|
377
|
+
|
378
|
+
li {
|
379
|
+
a {
|
380
|
+
font-size: $main_navigation_font_size
|
381
|
+
}
|
382
|
+
}
|
325
383
|
}
|
326
384
|
}
|
327
385
|
|
328
386
|
#breadcrumbs {
|
329
|
-
border-bottom: 1px solid $
|
387
|
+
border-bottom: 1px solid lighten($body_text_color, 60);
|
330
388
|
padding: 3px 0;
|
331
389
|
margin-bottom: 15px;
|
332
390
|
|
333
391
|
li {
|
334
392
|
a {
|
335
|
-
color: $
|
393
|
+
color: $link_text_color;
|
336
394
|
}
|
337
395
|
span {
|
338
396
|
text-transform: uppercase;
|
@@ -346,12 +404,12 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
|
|
346
404
|
/*--------------------------------------*/
|
347
405
|
.flash {
|
348
406
|
padding: 10px;
|
349
|
-
color:
|
407
|
+
color: $layout_background_color;
|
350
408
|
font-weight: bold;
|
351
409
|
margin-bottom: 10px;
|
352
410
|
|
353
411
|
&.notice {
|
354
|
-
background-color: $
|
412
|
+
background-color: $link_text_color;
|
355
413
|
}
|
356
414
|
&.success {
|
357
415
|
background-color: $c_green;
|
@@ -389,9 +447,14 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
|
|
389
447
|
/*--------------------------------------*/
|
390
448
|
/* Products
|
391
449
|
/*--------------------------------------*/
|
450
|
+
[data-hook="product_show"] {
|
451
|
+
h6 {
|
452
|
+
font-size: $product_detail_title_font_size;
|
453
|
+
}
|
454
|
+
}
|
455
|
+
|
392
456
|
.product-section-title {
|
393
457
|
text-transform: uppercase;
|
394
|
-
color: $c_colored;
|
395
458
|
margin-top: 15px;
|
396
459
|
}
|
397
460
|
|
@@ -408,19 +471,33 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
|
|
408
471
|
|
409
472
|
span.price {
|
410
473
|
font-weight: bold;
|
411
|
-
color: $
|
474
|
+
color: $link_text_color;
|
412
475
|
|
413
476
|
&.selling {
|
414
|
-
font-size:
|
477
|
+
font-size: $product_detail_price_font_size;
|
415
478
|
}
|
416
479
|
&.diff {
|
417
|
-
font-weight: bold
|
480
|
+
font-weight: bold;
|
418
481
|
}
|
419
482
|
}
|
420
483
|
|
484
|
+
.taxon-title {
|
485
|
+
font-size: $product_list_header_font_size;
|
486
|
+
}
|
487
|
+
|
488
|
+
.search-results-title {
|
489
|
+
font-size: $product_list_search_font_size;
|
490
|
+
}
|
491
|
+
|
421
492
|
ul#products {
|
422
|
-
|
423
|
-
|
493
|
+
&:after {
|
494
|
+
content: " ";
|
495
|
+
display: block;
|
496
|
+
clear: both;
|
497
|
+
visibility: hidden;
|
498
|
+
line-height: 0;
|
499
|
+
height: 0;
|
500
|
+
}
|
424
501
|
|
425
502
|
li {
|
426
503
|
text-align: center;
|
@@ -433,25 +510,27 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
|
|
433
510
|
&.info {
|
434
511
|
height: 35px;
|
435
512
|
margin-top: 5px;
|
436
|
-
|
437
|
-
|
513
|
+
font-size: $product_list_name_font_size;
|
514
|
+
color: $product_link_text_color;
|
515
|
+
border-bottom: 1px solid lighten($body_text_color, 60);
|
438
516
|
}
|
439
517
|
}
|
440
518
|
|
441
519
|
.product-image {
|
442
|
-
border: 1px solid $
|
520
|
+
border: 1px solid lighten($body_text_color, 60);
|
443
521
|
padding: 5px;
|
444
522
|
min-height: 110px;
|
523
|
+
background-color: $product_background_color;
|
445
524
|
|
446
525
|
&:hover {
|
447
|
-
border-color: $
|
526
|
+
border-color: $link_text_color;
|
448
527
|
}
|
449
528
|
|
450
529
|
}
|
451
530
|
|
452
531
|
.price {
|
453
|
-
color: $
|
454
|
-
font-size:
|
532
|
+
color: $link_text_color;
|
533
|
+
font-size: $product_list_price_font_size;
|
455
534
|
padding-top: 5px;
|
456
535
|
display: block;
|
457
536
|
}
|
@@ -462,13 +541,13 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
|
|
462
541
|
text-transform: uppercase;
|
463
542
|
|
464
543
|
a {
|
465
|
-
color: $
|
544
|
+
color: $link_text_color;
|
466
545
|
}
|
467
546
|
}
|
468
547
|
|
469
548
|
.search-results-title {
|
470
549
|
text-transform: uppercase;
|
471
|
-
border-bottom: 1px solid $
|
550
|
+
border-bottom: 1px solid lighten($body_text_color, 60);
|
472
551
|
margin-bottom: 10px;
|
473
552
|
}
|
474
553
|
|
@@ -483,8 +562,8 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
|
|
483
562
|
text-transform: uppercase;
|
484
563
|
border-bottom: 1px solid #ededed;
|
485
564
|
margin-bottom: 5px;
|
486
|
-
color:
|
487
|
-
font-size:
|
565
|
+
color: $link_text_color;
|
566
|
+
font-size: $base_font_size + 2;
|
488
567
|
line-height: 24px;
|
489
568
|
}
|
490
569
|
}
|
@@ -496,15 +575,28 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
|
|
496
575
|
#product-images {
|
497
576
|
#main-image {
|
498
577
|
text-align: center;
|
499
|
-
border: 1px solid $
|
578
|
+
border: 1px solid lighten($body_text_color, 60);
|
579
|
+
background-color: $product_background_color;
|
580
|
+
}
|
581
|
+
#product-thumbnails {
|
582
|
+
li {
|
583
|
+
background-color: $product_background_color;
|
584
|
+
}
|
500
585
|
}
|
501
586
|
}
|
502
587
|
|
503
588
|
#product-description {
|
504
589
|
.product-title {
|
505
|
-
border-bottom: 1px solid $
|
590
|
+
border-bottom: 1px solid lighten($body_text_color, 60);
|
506
591
|
margin-bottom: 15px;
|
507
|
-
|
592
|
+
color: $product_title_text_color;
|
593
|
+
font-size: $product_detail_name_font_size;
|
594
|
+
}
|
595
|
+
|
596
|
+
[data-hook="product-description"] {
|
597
|
+
font-size: $product_detail_description_font_size;
|
598
|
+
color: $product_body_text_color;
|
599
|
+
}
|
508
600
|
}
|
509
601
|
|
510
602
|
#product-thumbnails {
|
@@ -512,20 +604,20 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
|
|
512
604
|
|
513
605
|
li {
|
514
606
|
margin-right: 6px;
|
515
|
-
border: 1px solid $
|
607
|
+
border: 1px solid lighten($body_text_color, 60);
|
516
608
|
|
517
609
|
img {
|
518
610
|
padding: 5px;
|
519
611
|
}
|
520
612
|
|
521
613
|
&:hover, &.selected {
|
522
|
-
border-color: $
|
614
|
+
border-color: $link_text_color;
|
523
615
|
}
|
524
616
|
}
|
525
617
|
}
|
526
618
|
|
527
619
|
#product-properties {
|
528
|
-
border: 1px solid $
|
620
|
+
border: 1px solid lighten($body_text_color, 60);
|
529
621
|
padding: 10px;
|
530
622
|
}
|
531
623
|
|
@@ -550,30 +642,30 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
|
|
550
642
|
font-weight: bold;
|
551
643
|
text-transform: uppercase;
|
552
644
|
padding: 5px 20px;
|
553
|
-
color: $
|
645
|
+
color: lighten($body_text_color, 20);
|
554
646
|
|
555
647
|
&.current-first, &.current {
|
556
|
-
background-color: $
|
557
|
-
color:
|
648
|
+
background-color: $link_text_color;
|
649
|
+
color: $layout_background_color;
|
558
650
|
}
|
559
651
|
|
560
652
|
&.completed-first, &.completed {
|
561
|
-
background-color: $
|
562
|
-
color:
|
653
|
+
background-color: lighten($body_text_color, 60);
|
654
|
+
color: $layout_background_color;
|
563
655
|
|
564
656
|
a {
|
565
|
-
color:
|
657
|
+
color: $layout_background_color;
|
566
658
|
}
|
567
659
|
|
568
660
|
&:hover {
|
569
|
-
background-color: $
|
570
|
-
color:
|
661
|
+
background-color: $link_text_color;
|
662
|
+
color: $layout_background_color;
|
571
663
|
|
572
664
|
a {
|
573
|
-
color:
|
665
|
+
color: $layout_background_color;
|
574
666
|
|
575
667
|
&:hover {
|
576
|
-
color:
|
668
|
+
color: $layout_background_color !important;
|
577
669
|
}
|
578
670
|
}
|
579
671
|
}
|
@@ -583,15 +675,14 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
|
|
583
675
|
|
584
676
|
#checkout-summary {
|
585
677
|
text-align: center;
|
586
|
-
border: 1px solid $
|
678
|
+
border: 1px solid lighten($body_text_color, 60);
|
587
679
|
margin-top: 23px;
|
588
680
|
margin-left: 0;
|
589
681
|
|
590
682
|
h3 {
|
591
683
|
text-transform: uppercase;
|
592
|
-
font-size:
|
593
|
-
|
594
|
-
border-bottom: 1px solid $c_border;
|
684
|
+
font-size: $base_font_size + 2;
|
685
|
+
border-bottom: 1px solid lighten($body_text_color, 60);
|
595
686
|
}
|
596
687
|
|
597
688
|
table {
|
@@ -611,7 +702,7 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
|
|
611
702
|
|
612
703
|
#summary-order-total {
|
613
704
|
@extend span.price;
|
614
|
-
font-size:
|
705
|
+
font-size: $base_font_size + 2;
|
615
706
|
}
|
616
707
|
}
|
617
708
|
}
|
@@ -619,14 +710,14 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
|
|
619
710
|
#billing, #shipping, #shipping_method,
|
620
711
|
#payment, #order_details, #order_summary {
|
621
712
|
margin-top: 10px;
|
622
|
-
border: 1px solid $
|
713
|
+
border: 1px solid lighten($body_text_color, 60);
|
623
714
|
padding: 10px;
|
624
715
|
|
625
716
|
legend {
|
626
717
|
text-transform: uppercase;
|
627
718
|
font-weight: bold;
|
628
|
-
font-size:
|
629
|
-
color: $
|
719
|
+
font-size: $base_font_size + 2;
|
720
|
+
color: $link_text_color;
|
630
721
|
padding: 5px;
|
631
722
|
margin-left: 15px;
|
632
723
|
}
|
@@ -655,7 +746,7 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
|
|
655
746
|
|
656
747
|
table tfoot {
|
657
748
|
text-align: right;
|
658
|
-
color: $
|
749
|
+
color: lighten($body_text_color, 20);
|
659
750
|
|
660
751
|
tr {
|
661
752
|
border: none;
|
@@ -663,11 +754,11 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
|
|
663
754
|
|
664
755
|
&#order-total {
|
665
756
|
text-transform: uppercase;
|
666
|
-
font-size:
|
667
|
-
color: $
|
757
|
+
font-size: $base_font_size + 4;
|
758
|
+
color: $body_text_color;
|
668
759
|
|
669
760
|
tr {
|
670
|
-
border-top: 1px solid $
|
761
|
+
border-top: 1px solid lighten($body_text_color, 60);
|
671
762
|
|
672
763
|
td {
|
673
764
|
padding: 10px;
|
@@ -677,10 +768,17 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
|
|
677
768
|
}
|
678
769
|
|
679
770
|
.steps-data {
|
680
|
-
|
771
|
+
div.columns {
|
772
|
+
padding: 5px;
|
773
|
+
margin: 0;
|
774
|
+
|
775
|
+
&:first-child {
|
776
|
+
margin-left: 10px;
|
777
|
+
}
|
778
|
+
}
|
681
779
|
|
682
780
|
h6 {
|
683
|
-
border-bottom: 1px solid $
|
781
|
+
border-bottom: 1px solid lighten($body_text_color, 60);
|
684
782
|
margin-bottom: 5px;
|
685
783
|
}
|
686
784
|
}
|
@@ -691,7 +789,7 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
|
|
691
789
|
label {
|
692
790
|
float: left;
|
693
791
|
font-weight: bold;
|
694
|
-
font-size:
|
792
|
+
font-size: $base_font_size + 2;
|
695
793
|
margin-right: 40px;
|
696
794
|
padding: 5px;
|
697
795
|
}
|
@@ -700,8 +798,8 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
|
|
700
798
|
|
701
799
|
p[data-hook="use_billing"] {
|
702
800
|
float: right;
|
703
|
-
margin-top: -
|
704
|
-
background-color:
|
801
|
+
margin-top: -18px;
|
802
|
+
background-color: $layout_background_color;
|
705
803
|
padding: 5px;
|
706
804
|
}
|
707
805
|
|
@@ -759,14 +857,12 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
|
|
759
857
|
#existing-customer, #new-customer, #forgot-password {
|
760
858
|
h6 {
|
761
859
|
text-transform: uppercase;
|
762
|
-
color: $c_colored;
|
763
860
|
}
|
764
861
|
}
|
765
862
|
|
766
863
|
#registration {
|
767
864
|
h6 {
|
768
|
-
text-transform: uppercase;
|
769
|
-
color: $c_colored;
|
865
|
+
text-transform: uppercase;
|
770
866
|
}
|
771
867
|
|
772
868
|
#existing-customer {
|
@@ -777,7 +873,7 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
|
|
777
873
|
|
778
874
|
#user-info {
|
779
875
|
margin-bottom: 15px;
|
780
|
-
border: 1px solid $
|
876
|
+
border: 1px solid lighten($body_text_color, 60);
|
781
877
|
padding: 10px;
|
782
878
|
}
|
783
879
|
|
@@ -805,7 +901,7 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
|
|
805
901
|
a {
|
806
902
|
text-transform: uppercase;
|
807
903
|
font-weight: bold;
|
808
|
-
color: $
|
904
|
+
color: $link_text_color;
|
809
905
|
}
|
810
906
|
}
|
811
907
|
}
|
@@ -832,7 +928,7 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
|
|
832
928
|
}
|
833
929
|
p[data-hook="use_billing"] {
|
834
930
|
margin-top: -15px;
|
835
|
-
}
|
931
|
+
}
|
836
932
|
}
|
837
933
|
|
838
934
|
/* All Mobile Sizes (devices and browser) */
|
@@ -842,6 +938,16 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
|
|
842
938
|
-webkit-text-size-adjust: none;
|
843
939
|
}
|
844
940
|
|
941
|
+
#order_details .steps-data div.columns,
|
942
|
+
#order_summary .steps-data div.columns {
|
943
|
+
padding: 0;
|
944
|
+
margin: 0;
|
945
|
+
|
946
|
+
&:first-child {
|
947
|
+
margin: 0
|
948
|
+
}
|
949
|
+
}
|
950
|
+
|
845
951
|
nav#taxonomies {
|
846
952
|
text-align: center;
|
847
953
|
|
@@ -921,19 +1027,19 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
|
|
921
1027
|
tbody {
|
922
1028
|
tr {
|
923
1029
|
td[data-hook="cart_item_description"], td[data-hook="order_item_description"] {
|
924
|
-
font-size:
|
1030
|
+
font-size: $base_font_size - 1;
|
925
1031
|
line-height: 15px;
|
926
1032
|
width: 100px;
|
927
1033
|
|
928
1034
|
h4 {
|
929
|
-
font-size:
|
1035
|
+
font-size: $base_font_size + 2;
|
930
1036
|
line-height: 17px;
|
931
1037
|
margin-bottom: 10px;
|
932
1038
|
}
|
933
1039
|
}
|
934
1040
|
td[data-hook="cart_item_price"], td[data-hook="cart_item_total"],
|
935
1041
|
td[data-hook="order_item_price"], td[data-hook="order_item_total"] {
|
936
|
-
font-size:
|
1042
|
+
font-size: $base_font_size !important;
|
937
1043
|
}
|
938
1044
|
td[data-hook="cart_item_image"], td[data-hook="order_item_image"] {
|
939
1045
|
img {
|
@@ -990,7 +1096,7 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
|
|
990
1096
|
}
|
991
1097
|
}
|
992
1098
|
td[data-hook="cart_item_price"], td[data-hook="cart_item_total"] {
|
993
|
-
font-size:
|
1099
|
+
font-size: $base_font_size + 2 !important;
|
994
1100
|
}
|
995
1101
|
}
|
996
1102
|
}
|
@@ -1039,16 +1145,21 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
|
|
1039
1145
|
}
|
1040
1146
|
|
1041
1147
|
ul#products {
|
1042
|
-
margin-left: 0;
|
1043
1148
|
|
1044
1149
|
li {
|
1045
|
-
width:
|
1150
|
+
width: 142px;
|
1046
1151
|
margin-right: 15px;
|
1152
|
+
|
1153
|
+
&.secondary, &.omega {
|
1154
|
+
margin-right: 0;
|
1155
|
+
}
|
1047
1156
|
}
|
1157
|
+
|
1158
|
+
|
1048
1159
|
}
|
1049
1160
|
|
1050
1161
|
#content {
|
1051
1162
|
text-align: center;
|
1052
1163
|
}
|
1053
1164
|
|
1054
|
-
}
|
1165
|
+
}
|