locomotivecms_wagon 1.5.1 → 1.5.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (73) hide show
  1. checksums.yaml +4 -4
  2. data/generators/foundation5/public/stylesheets/foundation/_functions.scss +3 -2
  3. data/generators/foundation5/public/stylesheets/foundation/_settings.scss +419 -274
  4. data/generators/foundation5/public/stylesheets/foundation/components/_accordion.scss +110 -6
  5. data/generators/foundation5/public/stylesheets/foundation/components/_alert-boxes.scss +4 -2
  6. data/generators/foundation5/public/stylesheets/foundation/components/_block-grid.scss +2 -2
  7. data/generators/foundation5/public/stylesheets/foundation/components/_breadcrumbs.scss +8 -3
  8. data/generators/foundation5/public/stylesheets/foundation/components/_button-groups.scss +98 -9
  9. data/generators/foundation5/public/stylesheets/foundation/components/_buttons.scss +66 -29
  10. data/generators/foundation5/public/stylesheets/foundation/components/_clearing.scss +5 -5
  11. data/generators/foundation5/public/stylesheets/foundation/components/_dropdown-buttons.scss +11 -10
  12. data/generators/foundation5/public/stylesheets/foundation/components/_dropdown.scss +49 -35
  13. data/generators/foundation5/public/stylesheets/foundation/components/_forms.scss +125 -38
  14. data/generators/foundation5/public/stylesheets/foundation/components/_global.scss +64 -38
  15. data/generators/foundation5/public/stylesheets/foundation/components/_grid.scss +19 -4
  16. data/generators/foundation5/public/stylesheets/foundation/components/_icon-bar.scss +293 -0
  17. data/generators/foundation5/public/stylesheets/foundation/components/_joyride.scss +11 -9
  18. data/generators/foundation5/public/stylesheets/foundation/components/_keystrokes.scss +4 -4
  19. data/generators/foundation5/public/stylesheets/foundation/components/_labels.scss +5 -3
  20. data/generators/foundation5/public/stylesheets/foundation/components/_magellan.scss +1 -1
  21. data/generators/foundation5/public/stylesheets/foundation/components/_offcanvas.scss +190 -33
  22. data/generators/foundation5/public/stylesheets/foundation/components/_orbit.scss +92 -147
  23. data/generators/foundation5/public/stylesheets/foundation/components/_pagination.scss +22 -10
  24. data/generators/foundation5/public/stylesheets/foundation/components/_panels.scss +12 -7
  25. data/generators/foundation5/public/stylesheets/foundation/components/_pricing-tables.scss +11 -11
  26. data/generators/foundation5/public/stylesheets/foundation/components/_progress-bars.scss +2 -2
  27. data/generators/foundation5/public/stylesheets/foundation/components/_range-slider.scss +29 -9
  28. data/generators/foundation5/public/stylesheets/foundation/components/_reveal.scss +62 -56
  29. data/generators/foundation5/public/stylesheets/foundation/components/_side-nav.scss +3 -2
  30. data/generators/foundation5/public/stylesheets/foundation/components/_split-buttons.scss +2 -2
  31. data/generators/foundation5/public/stylesheets/foundation/components/_sub-nav.scss +4 -6
  32. data/generators/foundation5/public/stylesheets/foundation/components/_switches.scss +230 -0
  33. data/generators/foundation5/public/stylesheets/foundation/components/_tables.scss +13 -7
  34. data/generators/foundation5/public/stylesheets/foundation/components/_tabs.scss +22 -8
  35. data/generators/foundation5/public/stylesheets/foundation/components/_thumbs.scss +2 -4
  36. data/generators/foundation5/public/stylesheets/foundation/components/_toolbar.scss +70 -0
  37. data/generators/foundation5/public/stylesheets/foundation/components/_tooltips.scss +9 -7
  38. data/generators/foundation5/public/stylesheets/foundation/components/_top-bar.scss +82 -56
  39. data/generators/foundation5/public/stylesheets/foundation/components/_type.scss +23 -11
  40. data/generators/foundation5/public/stylesheets/foundation/components/_visibility.scss +7 -7
  41. data/generators/foundation5/public/stylesheets/foundation.css +4327 -3587
  42. data/generators/foundation5/public/stylesheets/foundation.css.scss +38 -38
  43. data/generators/foundation5/public/stylesheets/normalize.css +71 -139
  44. data/generators/foundation5/public/stylesheets/normalize.css.scss +5 -3
  45. data/lib/locomotive/wagon/cli.rb +24 -1
  46. data/lib/locomotive/wagon/generators/content_type.rb +4 -1
  47. data/lib/locomotive/wagon/generators/page.rb +10 -5
  48. data/lib/locomotive/wagon/generators/relationship.rb +100 -0
  49. data/lib/locomotive/wagon/generators/site/foundation5.rb +2 -2
  50. data/lib/locomotive/wagon/generators/snippet.rb +3 -3
  51. data/lib/locomotive/wagon/liquid/tags/locale_switcher.rb +2 -2
  52. data/lib/locomotive/wagon/version.rb +1 -1
  53. data/lib/locomotive/wagon.rb +1 -0
  54. data/locomotivecms_wagon.gemspec +1 -1
  55. data/spec/fixtures/blog/app/content_types/comments.yml +20 -0
  56. data/spec/fixtures/blog/app/content_types/posts.yml +19 -0
  57. data/spec/fixtures/blog/app/views/pages/404.liquid +11 -0
  58. data/spec/fixtures/blog/app/views/pages/about-us.liquid.haml +29 -0
  59. data/spec/fixtures/blog/app/views/pages/index.liquid +25 -0
  60. data/spec/fixtures/blog/app/views/pages/posts/content_type_template.fr.liquid +14 -0
  61. data/spec/fixtures/blog/app/views/pages/posts/content_type_template.liquid +15 -0
  62. data/spec/fixtures/blog/app/views/pages/posts.fr.liquid +13 -0
  63. data/spec/fixtures/blog/app/views/pages/posts.liquid +13 -0
  64. data/spec/fixtures/blog/config/deploy.yml +4 -0
  65. data/spec/fixtures/blog/config/site.yml +16 -0
  66. data/spec/fixtures/blog/data/comments.yml +16 -0
  67. data/spec/fixtures/blog/data/posts.yml +7 -0
  68. data/spec/integration/generators/page_spec.rb +87 -0
  69. data/spec/integration/generators/relationship_spec.rb +102 -0
  70. data/spec/support/helpers.rb +19 -1
  71. metadata +38 -6
  72. data/generators/foundation5/public/stylesheets/foundation/components/_reveal-new.scss +0 -0
  73. data/generators/foundation5/public/stylesheets/foundation/components/_switch.scss +0 -294
@@ -11,7 +11,7 @@ $include-html-orbit-classes: $include-html-classes !default;
11
11
  // We use these to control the caption styles
12
12
  $orbit-container-bg: none !default;
13
13
  $orbit-caption-bg: rgba(51,51,51, 0.8) !default;
14
- $orbit-caption-font-color: #fff !default;
14
+ $orbit-caption-font-color: $white !default;
15
15
  $orbit-caption-font-size: rem-calc(14) !default;
16
16
  $orbit-caption-position: "bottom" !default; // Supported values: "bottom", "under"
17
17
  $orbit-caption-padding: rem-calc(10 14) !default;
@@ -20,27 +20,23 @@ $orbit-caption-height: auto !default;
20
20
  // We use these to control the left/right nav styles
21
21
  $orbit-nav-bg: transparent !default;
22
22
  $orbit-nav-bg-hover: rgba(0,0,0,0.3) !default;
23
- $orbit-nav-arrow-color: #fff !default;
24
- $orbit-nav-arrow-color-hover: #fff !default;
23
+ $orbit-nav-arrow-color: $white !default;
24
+ $orbit-nav-arrow-color-hover: $white !default;
25
25
 
26
26
  // We use these to control the timer styles
27
27
  $orbit-timer-bg: rgba(255,255,255,0.3) !default;
28
28
  $orbit-timer-show-progress-bar: true !default;
29
29
 
30
30
  // We use these to control the bullet nav styles
31
- $orbit-bullet-nav-color: #ccc !default;
32
- $orbit-bullet-nav-color-active: #999 !default;
31
+ $orbit-bullet-nav-color: $iron !default;
32
+ $orbit-bullet-nav-color-active: $aluminum !default;
33
33
  $orbit-bullet-radius: rem-calc(9) !default;
34
34
 
35
35
  // We use these to controls the style of slide numbers
36
36
  $orbit-slide-number-bg: rgba(0,0,0,0) !default;
37
- $orbit-slide-number-font-color: #fff !default;
37
+ $orbit-slide-number-font-color: $white !default;
38
38
  $orbit-slide-number-padding: rem-calc(5) !default;
39
39
 
40
- // We use these to controls the css animation
41
- $orbit-animation-speed: 500ms !default;
42
- $orbit-animation-ease: ease-in-out !default;
43
-
44
40
  // Graceful Loading Wrapper and preloader
45
41
  $wrapper-class: "slideshow-wrapper" !default;
46
42
  $preloader-class: "preloader" !default;
@@ -50,33 +46,25 @@ $orbit-nav-hide-for-small: true !default;
50
46
  $orbit-bullet-hide-for-small: true !default;
51
47
  $orbit-timer-hide-for-small: true !default;
52
48
 
53
- // CSS Transform
54
- // This function is needed in order to put in all of the browser prefixes.
55
- // The normal tranform attribute still does not work properly across all browsers.
56
- // In order to receive the transitionEnd events then you will still need to use the vendor prefixes
57
- @mixin translate3d($x,$y,$z) {
58
- -ms-transform:translate($x,$y);
59
-
60
- -webkit-transform: translate3d($x,$y,$z);
61
- -moz-transform: translate3d($x,$y,$z);
62
- -o-transform: translate3d($x,$y,$z);
63
- transform: translate3d($x,$y,$z);
64
- }
65
-
66
- @mixin rotate($d) {
67
- -webkit-transform: rotate($d);
68
- -moz-transform: rotate($d);
69
- -ms-transform: rotate($d);
70
- -o-transform: rotate($d);
71
- transform: rotate($d);
72
- }
73
49
 
74
50
  @include exports("orbit") {
75
51
  @if $include-html-orbit-classes {
76
52
 
53
+ @-webkit-keyframes rotate {
54
+ from { -webkit-transform: rotate(0deg); }
55
+ to { -webkit-transform: rotate(360deg); }
56
+ }
57
+ @-moz-keyframes rotate {
58
+ from { -moz-transform: rotate(0deg); }
59
+ to { -moz-transform: rotate(360deg); }
60
+ }
61
+ @-o-keyframes rotate {
62
+ from { -o-transform: rotate(0deg); }
63
+ to { -o-transform: rotate(360deg); }
64
+ }
77
65
  @keyframes rotate {
78
- from { @include rotate(0deg); }
79
- to { @include rotate(360deg); }
66
+ from { transform: rotate(0deg); }
67
+ to { transform: rotate(360deg); }
80
68
  }
81
69
 
82
70
  /* Orbit Graceful Loading */
@@ -103,6 +91,9 @@ $orbit-timer-hide-for-small: true !default;
103
91
 
104
92
  .orbit-caption { display: block; }
105
93
  }
94
+ .orbit-bullets li {
95
+ display: inline-block;
96
+ }
106
97
  }
107
98
 
108
99
  // Orbit preloader
@@ -116,7 +107,7 @@ $orbit-timer-hide-for-small: true !default;
116
107
  margin-top: -20px;
117
108
  margin-left: -20px;
118
109
  border: solid 3px;
119
- border-color: #555 #fff;
110
+ border-color: $charcoal $white;
120
111
  @include radius(1000px);
121
112
  animation-name: rotate;
122
113
  animation-duration: 1.5s;
@@ -125,6 +116,7 @@ $orbit-timer-hide-for-small: true !default;
125
116
  }
126
117
  }
127
118
 
119
+
128
120
  .orbit-container {
129
121
  overflow: hidden;
130
122
  width: 100%;
@@ -142,61 +134,24 @@ $orbit-timer-hide-for-small: true !default;
142
134
 
143
135
  img { display: block; max-width: 100%; }
144
136
 
145
- &.fade > li {
146
- opacity: 0;
147
- transition: opacity $orbit-animation-speed $orbit-animation-ease;
148
- @include translate3d(0,0,0);
149
- &.animate-in {
150
- opacity: 1;
151
- z-index: 20;
152
- transition: opacity $orbit-animation-speed $orbit-animation-ease;
153
- }
154
- &.animate-out {
155
- z-index: 10;
156
- transition: opacity $orbit-animation-speed $orbit-animation-ease;
157
- }
158
- }
159
-
160
- &.swipe-next > li {
161
- @include translate3d(100%,0,0);
162
- &.animate-in {
163
- @include translate3d(0,0,0);
164
- transition-duration:$orbit-animation-speed;
165
- }
166
- &.animate-out {
167
- @include translate3d(-100%,0,0);
168
- transition-duration:$orbit-animation-speed;
169
- }
170
- }
171
-
172
- &.swipe-prev > li {
173
- @include translate3d(-100%,0,0);
174
- &.animate-in {
175
- @include translate3d(0,0,0);
176
- transition-duration:$orbit-animation-speed;
177
- }
178
- &.animate-out {
179
- @include translate3d(100%,0,0);
180
- transition-duration:$orbit-animation-speed;
181
- }
182
- }
183
-
184
- > li {
137
+ &>* {
185
138
  position: absolute;
186
139
  top: 0;
187
- left: 0;
188
140
  width: 100%;
189
- @include translate3d(100%,0,0);
190
-
191
- > a { display: block; }
141
+ @if $text-direction == rtl {
142
+ margin-right: 100%;
143
+ }
144
+ @else {
145
+ margin-left: 100%;
146
+ }
192
147
 
193
- &.active {
194
- opacity: 1;
195
- // "relative" positioning is required for variable height of children.
196
- position:relative;
197
- top: 0;
198
- left: 0;
199
- @include translate3d(0,0,0);
148
+ &:first-child {
149
+ @if $text-direction == rtl {
150
+ margin-right: 0%;
151
+ }
152
+ @else {
153
+ margin-left: 0%;
154
+ }
200
155
  }
201
156
 
202
157
  .orbit-caption {
@@ -221,7 +176,7 @@ $orbit-timer-hide-for-small: true !default;
221
176
  top: 10px;
222
177
  #{$default-float}: 10px;
223
178
  font-size: 12px;
224
- span { font-weight: $font-weight-bold; padding: $orbit-slide-number-padding;}
179
+ span { font-weight: 700; padding: $orbit-slide-number-padding;}
225
180
  color: $orbit-slide-number-font-color;
226
181
  background: $orbit-slide-number-bg;
227
182
  z-index: 10;
@@ -243,8 +198,6 @@ $orbit-timer-hide-for-small: true !default;
243
198
  position: relative;
244
199
  right: 20px;
245
200
  top: 5px;
246
- } @else {
247
- display:none; // This is used by the Javascript to not create a handler.
248
201
  }
249
202
  }
250
203
 
@@ -256,11 +209,11 @@ $orbit-timer-hide-for-small: true !default;
256
209
  #{$opposite-direction}: 0;
257
210
  width: 11px;
258
211
  height: 14px;
259
- border: solid 4px #fff;
212
+ border: solid 4px $white;
260
213
  border-top: none;
261
214
  border-bottom: none;
262
215
  }
263
-
216
+
264
217
  // Pause button
265
218
  &.paused {
266
219
  & > span {
@@ -270,16 +223,16 @@ $orbit-timer-hide-for-small: true !default;
270
223
  height: 14px;
271
224
  border: inset 8px;
272
225
  border-left-style: solid;
273
- @include rotate(180deg);
274
- border-color: transparent #fff transparent transparent;
275
- &.dark {
276
- border-color: transparent #333 transparent transparent;
226
+ border-color: transparent;
227
+ border-left-color: $white;
228
+ &.dark {
229
+ border-left-color: $oil;
277
230
  }
278
231
  }
279
232
  }
280
233
  }
281
-
282
-
234
+
235
+
283
236
 
284
237
  &:hover .orbit-timer > span { display: block; }
285
238
 
@@ -333,37 +286,37 @@ $orbit-timer-hide-for-small: true !default;
333
286
  border-#{$default-float}-color: $orbit-nav-arrow-color-hover;
334
287
  }
335
288
  }
289
+ }
336
290
 
337
- .orbit-bullets-container { text-align: center; }
338
- .orbit-bullets {
339
- margin: 0 auto 30px auto;
340
- overflow: hidden;
341
- position: relative;
342
- top: 10px;
291
+ .orbit-bullets-container { text-align: center; }
292
+ .orbit-bullets {
293
+ margin: 0 auto 30px auto;
294
+ overflow: hidden;
295
+ position: relative;
296
+ top: 10px;
297
+ float: none;
298
+ text-align: center;
299
+ display: block;
300
+
301
+ li {
302
+ cursor:pointer;
303
+ display: inline-block;
304
+ width: $orbit-bullet-radius;
305
+ height: $orbit-bullet-radius;
306
+ background: $orbit-bullet-nav-color;
307
+ // float: $default-float;
343
308
  float: none;
344
- text-align: center;
345
- display: block;
346
-
347
- li {
348
- display: inline-block;
349
- width: $orbit-bullet-radius;
350
- height: $orbit-bullet-radius;
351
- background: $orbit-bullet-nav-color;
352
- // float: $default-float;
353
- float: none;
354
- margin-#{$opposite-direction}: 6px;
355
- @include radius(1000px);
356
-
357
- &.active {
358
- background: $orbit-bullet-nav-color-active;
359
- }
309
+ margin-#{$opposite-direction}: 6px;
310
+ @include radius(1000px);
360
311
 
361
- &:last-child { margin-#{$opposite-direction}: 0; }
312
+ &.active {
313
+ background: $orbit-bullet-nav-color-active;
362
314
  }
315
+
316
+ &:last-child { margin-#{$opposite-direction}: 0; }
363
317
  }
364
318
  }
365
319
 
366
-
367
320
  .touch {
368
321
  .orbit-container {
369
322
  .orbit-prev,
@@ -388,36 +341,28 @@ $orbit-timer-hide-for-small: true !default;
388
341
  }
389
342
 
390
343
  @media #{$small-only} {
391
- .orbit-stack-on-small {
392
-
393
- .orbit-slides-container {height: auto !important;}
394
- .orbit-slides-container > * {
395
- position: relative !important;
396
- margin-left: 0% !important;
397
- opacity: 1 !important;
398
- -webkit-transform: none !important;
399
- -moz-transform: none !important;
400
- -ms-transform: none !important;
401
- -o-transform: none !important;
402
- transform: none !important;
403
- transition: none !important;
404
- }
405
-
406
- @if $orbit-timer-hide-for-small {
407
- .orbit-timer{display: none;}
408
- }
409
- @if $orbit-nav-hide-for-small {
410
- .orbit-next,.orbit-prev{display: none;}
411
- }
412
- @if $orbit-bullet-hide-for-small {
413
- .orbit-bullets{display: none;}
414
- }
344
+ .orbit-stack-on-small {
345
+ .orbit-slides-container {height: auto !important;}
346
+ .orbit-slides-container > * {
347
+ position: relative;
348
+ margin:0% !important;
349
+ opacity:1 !important;
350
+ }
415
351
 
416
- .orbit-slide-number {
417
- display: none;
418
- }
352
+ .orbit-slide-number {
353
+ display: none;
419
354
  }
420
- }
355
+ }
421
356
 
357
+ @if $orbit-timer-hide-for-small {
358
+ .orbit-timer{display: none;}
359
+ }
360
+ @if $orbit-nav-hide-for-small {
361
+ .orbit-next,.orbit-prev{display: none;}
362
+ }
363
+ @if $orbit-bullet-hide-for-small {
364
+ .orbit-bullets{display: none;}
365
+ }
366
+ }
422
367
  }
423
368
  }
@@ -16,23 +16,23 @@ $pagination-margin: rem-calc(-5) !default;
16
16
  // We use these to set the list-item properties
17
17
  $pagination-li-float: $default-float !default;
18
18
  $pagination-li-height: rem-calc(24) !default;
19
- $pagination-li-font-color: #222 !default;
19
+ $pagination-li-font-color: $jet !default;
20
20
  $pagination-li-font-size: rem-calc(14) !default;
21
21
  $pagination-li-margin: rem-calc(5) !default;
22
22
 
23
23
  // We use these for the pagination anchor links
24
24
  $pagination-link-pad: rem-calc(1 10 1) !default;
25
- $pagination-link-font-color: #999 !default;
26
- $pagination-link-active-bg: scale-color(#fff, $lightness: -10%) !default;
25
+ $pagination-link-font-color: $aluminum !default;
26
+ $pagination-link-active-bg: scale-color($white, $lightness: -10%) !default;
27
27
 
28
28
  // We use these for disabled anchor links
29
29
  $pagination-link-unavailable-cursor: default !default;
30
- $pagination-link-unavailable-font-color: #999 !default;
30
+ $pagination-link-unavailable-font-color: $aluminum !default;
31
31
  $pagination-link-unavailable-bg-active: transparent !default;
32
32
 
33
33
  // We use these for currently selected anchor links
34
34
  $pagination-link-current-background: $primary-color !default;
35
- $pagination-link-current-font-color: #fff !default;
35
+ $pagination-link-current-font-color: $white !default;
36
36
  $pagination-link-current-font-weight: $font-weight-bold !default;
37
37
  $pagination-link-current-cursor: default !default;
38
38
  $pagination-link-current-active-bg: $primary-color !default;
@@ -48,12 +48,16 @@ $pagination-link-current-active-bg: $primary-color !default;
48
48
  // @mixins
49
49
  // Style unavailable list items
50
50
  @mixin pagination-unavailable-item {
51
- a {
51
+ a, button {
52
52
  cursor: $pagination-link-unavailable-cursor;
53
53
  color: $pagination-link-unavailable-font-color;
54
54
  }
55
55
  &:hover a,
56
- & a:focus { background: $pagination-link-unavailable-bg-active; }
56
+ & a:focus,
57
+
58
+ &:hover button,
59
+ & button:focus
60
+ { background: $pagination-link-unavailable-bg-active; }
57
61
  }
58
62
  // @mixins
59
63
  // Style the current list item. Do not assume that the current item has
@@ -61,7 +65,7 @@ $pagination-link-current-active-bg: $primary-color !default;
61
65
  // $has-anchor - Default: true, Options: false
62
66
  @mixin pagination-current-item($has-anchor: true) {
63
67
  @if $has-anchor {
64
- a {
68
+ a, button {
65
69
  background: $pagination-link-current-background;
66
70
  color: $pagination-link-current-font-color;
67
71
  font-weight: $pagination-link-current-font-weight;
@@ -103,15 +107,23 @@ $pagination-link-current-active-bg: $primary-color !default;
103
107
  font-size: $pagination-li-font-size;
104
108
  margin-#{$default-float}: $pagination-li-margin;
105
109
 
106
- a {
110
+ a, button {
107
111
  display: block;
108
112
  padding: $pagination-link-pad;
109
113
  color: $pagination-link-font-color;
114
+ background: none;
110
115
  @include radius;
116
+ font-weight: normal;
117
+ font-size: 1em;
118
+ line-height: inherit;
119
+ @include single-transition(background-color);
111
120
  }
112
121
 
113
122
  &:hover a,
114
- a:focus { background: $pagination-link-active-bg; }
123
+ a:focus,
124
+ &:hover button,
125
+ button:focus
126
+ { background: $pagination-link-active-bg; }
115
127
 
116
128
  @if $use-default-classes {
117
129
  &.unavailable { @include pagination-unavailable-item(); }
@@ -10,7 +10,7 @@
10
10
  $include-html-panel-classes: $include-html-classes !default;
11
11
 
12
12
  // We use these to control the background and border styles
13
- $panel-bg: scale-color(#fff, $lightness: -5%) !default;
13
+ $panel-bg: scale-color($white, $lightness: -5%) !default;
14
14
  $panel-border-style: solid !default;
15
15
  $panel-border-size: 1px !default;
16
16
 
@@ -23,8 +23,8 @@ $panel-margin-bottom: rem-calc(20) !default;
23
23
  $panel-padding: rem-calc(20) !default;
24
24
 
25
25
  // We use these to set default font colors
26
- $panel-font-color: #333 !default;
27
- $panel-font-color-alt: #fff !default;
26
+ $panel-font-color: $oil !default;
27
+ $panel-font-color-alt: $white !default;
28
28
 
29
29
  $panel-header-adjust: true !default;
30
30
  $callout-panel-link-color: $primary-color !default;
@@ -32,7 +32,7 @@ $callout-panel-link-color: $primary-color !default;
32
32
  // @mixins
33
33
  //
34
34
  // We use this mixin to create panels.
35
- // $bg - Sets the panel background color. Default: $panel-pg || scale-color(#fff, $lightness: -5%) !default
35
+ // $bg - Sets the panel background color. Default: $panel-pg || scale-color($white, $lightness: -5%) !default
36
36
  // $padding - Sets the panel padding amount. Default: $panel-padding || rem-calc(20)
37
37
  // $adjust - Sets the font color based on the darkness of the bg & resets header line-heights for panels. Default: $panel-header-adjust || true
38
38
  @mixin panel($bg:$panel-bg, $padding:$panel-padding, $adjust:$panel-header-adjust) {
@@ -47,6 +47,8 @@ $callout-panel-link-color: $primary-color !default;
47
47
  padding: $padding;
48
48
 
49
49
  background: $bg;
50
+ @if $bg-lightness >= 50% { color: $panel-font-color; }
51
+ @else { color: $panel-font-color-alt; }
50
52
 
51
53
  // Respect the padding, fool.
52
54
  &>:first-child { margin-top: 0; }
@@ -54,9 +56,12 @@ $callout-panel-link-color: $primary-color !default;
54
56
 
55
57
  @if $adjust {
56
58
  // We set the font color based on the darkness of the bg.
57
- @if $bg-lightness >= 50% and $bg == blue { h1,h2,h3,h4,h5,h6,p,li { color: $panel-font-color-alt; } }
58
- @else if $bg-lightness >= 50% { h1,h2,h3,h4,h5,h6,p,li { color: $panel-font-color; } }
59
- @else { h1,h2,h3,h4,h5,h6,p,li { color: $panel-font-color-alt; } }
59
+ @if $bg-lightness >= 50% {
60
+ h1,h2,h3,h4,h5,h6,p,li,dl { color: $panel-font-color; }
61
+ }
62
+ @else {
63
+ h1,h2,h3,h4,h5,h6,p,li,dl { color: $panel-font-color-alt; }
64
+ }
60
65
 
61
66
  // reset header line-heights for panels
62
67
  h1,h2,h3,h4,h5,h6 {
@@ -10,50 +10,50 @@
10
10
  $include-html-pricing-classes: $include-html-classes !default;
11
11
 
12
12
  // We use this to control the border color
13
- $price-table-border: solid 1px #ddd !default;
13
+ $price-table-border: solid 1px $gainsboro !default;
14
14
 
15
15
  // We use this to control the bottom margin of the pricing table
16
16
  $price-table-margin-bottom: rem-calc(20) !default;
17
17
 
18
18
  // We use these to control the title styles
19
- $price-title-bg: #333 !default;
19
+ $price-title-bg: $oil !default;
20
20
  $price-title-padding: rem-calc(15 20) !default;
21
21
  $price-title-align: center !default;
22
- $price-title-color: #eee !default;
22
+ $price-title-color: $smoke !default;
23
23
  $price-title-weight: $font-weight-normal !default;
24
24
  $price-title-size: rem-calc(16) !default;
25
25
  $price-title-font-family: $body-font-family !default;
26
26
 
27
27
  // We use these to control the price styles
28
- $price-money-bg: #f6f6f6 !default;
28
+ $price-money-bg: $vapor !default;
29
29
  $price-money-padding: rem-calc(15 20) !default;
30
30
  $price-money-align: center !default;
31
- $price-money-color: #333 !default;
31
+ $price-money-color: $oil !default;
32
32
  $price-money-weight: $font-weight-normal !default;
33
33
  $price-money-size: rem-calc(32) !default;
34
34
  $price-money-font-family: $body-font-family !default;
35
35
 
36
36
 
37
37
  // We use these to control the description styles
38
- $price-bg: #fff !default;
39
- $price-desc-color: #777 !default;
38
+ $price-bg: $white !default;
39
+ $price-desc-color: $monsoon !default;
40
40
  $price-desc-padding: rem-calc(15) !default;
41
41
  $price-desc-align: center !default;
42
42
  $price-desc-font-size: rem-calc(12) !default;
43
43
  $price-desc-weight: $font-weight-normal !default;
44
44
  $price-desc-line-height: 1.4 !default;
45
- $price-desc-bottom-border: dotted 1px #ddd !default;
45
+ $price-desc-bottom-border: dotted 1px $gainsboro !default;
46
46
 
47
47
  // We use these to control the list item styles
48
- $price-item-color: #333 !default;
48
+ $price-item-color: $oil !default;
49
49
  $price-item-padding: rem-calc(15) !default;
50
50
  $price-item-align: center !default;
51
51
  $price-item-font-size: rem-calc(14) !default;
52
52
  $price-item-weight: $font-weight-normal !default;
53
- $price-item-bottom-border: dotted 1px #ddd !default;
53
+ $price-item-bottom-border: dotted 1px $gainsboro !default;
54
54
 
55
55
  // We use these to control the CTA area styles
56
- $price-cta-bg: #fff !default;
56
+ $price-cta-bg: $white !default;
57
57
  $price-cta-align: center !default;
58
58
  $price-cta-padding: rem-calc(20 20 0) !default;
59
59
 
@@ -11,10 +11,10 @@ $include-html-media-classes: $include-html-classes !default;
11
11
 
12
12
  // We use this to set the progress bar height
13
13
  $progress-bar-height: rem-calc(25) !default;
14
- $progress-bar-color: #f6f6f6 !default;
14
+ $progress-bar-color: $vapor !default;
15
15
 
16
16
  // We use these to control the border styles
17
- $progress-bar-border-color: scale-color(#fff, $lightness: 20%) !default;
17
+ $progress-bar-border-color: scale-color($white, $lightness: 20%) !default;
18
18
  $progress-bar-border-size: 1px !default;
19
19
  $progress-bar-border-style: solid !default;
20
20
  $progress-bar-border-radius: $global-radius !default;
@@ -21,10 +21,11 @@ $range-slider-bar-height: rem-calc(16) !default;
21
21
 
22
22
  $range-slider-bar-border-width: 1px !default;
23
23
  $range-slider-bar-border-style: solid !default;
24
- $range-slider-bar-border-color: #ddd !default;
24
+ $range-slider-bar-border-color: $gainsboro !default;
25
25
  $range-slider-radius: $global-radius !default;
26
26
  $range-slider-round: $global-rounded !default;
27
- $range-slider-bar-bg-color: #fafafa !default;
27
+ $range-slider-bar-bg-color: $ghost !default;
28
+ $range-slider-active-segment-bg-color: scale-color($secondary-color, $lightness: -1%) !default;
28
29
 
29
30
  // Vertical bar styles
30
31
  $range-slider-vertical-bar-width: rem-calc(16) !default;
@@ -43,6 +44,7 @@ $range-slider-handle-round: $global-rounded !default;
43
44
  $range-slider-handle-bg-hover-color: scale-color($primary-color, $lightness: -12%) !default;
44
45
  $range-slider-handle-cursor: pointer !default;
45
46
 
47
+ $range-slider-disabled-opacity: 0.7 !default;
46
48
 
47
49
  //
48
50
  // @mixins
@@ -66,14 +68,19 @@ $range-slider-handle-cursor: pointer !default;
66
68
  @mixin range-slider-bar-style(
67
69
  $bg: true,
68
70
  $radius: false,
69
- $round: false) {
70
- @if $bg == true { background: $range-slider-bar-bg-color; }
71
- @if $radius == true { @include radius($range-slider-radius); }
72
- @if $round == true { @include radius($range-slider-round); }
71
+ $round: false,
72
+ $disabled: false) {
73
+ @if $bg == true { background: $range-slider-bar-bg-color; }
74
+ @if $radius == true { @include radius($range-slider-radius); }
75
+ @if $round == true { @include radius($range-slider-round); }
76
+ @if $disabled == true {
77
+ cursor: $cursor-default-value;
78
+ opacity: $range-slider-disabled-opacity;
73
79
  }
80
+ }
74
81
 
75
82
  @mixin range-slider-bar(
76
- $bg: $range-slider-bar-bg-color,
83
+ $bg: $range-slider-bar-bg-color,
77
84
  $radius:false) {
78
85
  @include range-slider-bar-base;
79
86
  @include range-slider-bar-style;
@@ -88,14 +95,23 @@ $range-slider-handle-cursor: pointer !default;
88
95
  height: $range-slider-handle-height;
89
96
  border: $range-slider-handle-border-width $range-slider-handle-border-style $range-slider-handle-border-color;
90
97
  cursor: $range-slider-handle-cursor;
98
+
99
+ // This removes the 300ms touch delay on Windows 8
100
+ -ms-touch-action: manipulation;
101
+ touch-action: manipulation;
91
102
  }
92
103
  @mixin range-slider-handle-style(
93
104
  $bg: true,
94
105
  $radius: false,
95
- $round: false) {
106
+ $round: false,
107
+ $disabled: false) {
96
108
  @if $bg == true { background: $range-slider-handle-bg-color; }
97
109
  @if $radius == true { @include radius($range-slider-radius); }
98
110
  @if $round == true { @include radius($range-slider-round); }
111
+ @if $disabled == true {
112
+ cursor: $cursor-default-value;
113
+ opacity: $range-slider-disabled-opacity;
114
+ }
99
115
  &:hover {
100
116
  background: $range-slider-handle-bg-hover-color;
101
117
  }
@@ -133,12 +149,16 @@ $range-slider-handle-cursor: pointer !default;
133
149
  @include range-slider-bar-style($round:true);
134
150
  .range-slider-handle { @include range-slider-handle-style($round: true); }
135
151
  }
152
+ &.disabled, &[disabled] {
153
+ @include range-slider-bar-style($disabled:true);
154
+ .range-slider-handle { @include range-slider-handle-style($disabled: true); }
155
+ }
136
156
  }
137
157
  .range-slider-active-segment {
138
158
  display: inline-block;
139
159
  position: absolute;
140
160
  height: $range-slider-bar-height - rem-calc((strip-unit($range-slider-bar-border-width) * 2));
141
- background: scale-color($secondary-color, $lightness: -1%);
161
+ background: $range-slider-active-segment-bg-color;
142
162
  }
143
163
  .range-slider-handle {
144
164
  @include range-slider-handle-base;