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
@@ -8,10 +8,11 @@
8
8
  // Off Canvas Tab Bar Variables
9
9
  $include-html-off-canvas-classes: $include-html-classes !default;
10
10
 
11
- $tabbar-bg: #333 !default;
11
+ $tabbar-bg: $oil !default;
12
12
  $tabbar-height: rem-calc(45) !default;
13
+ $tabbar-icon-width: $tabbar-height !default;
13
14
  $tabbar-line-height: $tabbar-height !default;
14
- $tabbar-color: #fff !default;
15
+ $tabbar-color: $white !default;
15
16
  $tabbar-middle-padding: 0 rem-calc(10) !default;
16
17
 
17
18
  // Off Canvas Divider Styles
@@ -20,50 +21,57 @@ $tabbar-right-section-border: $tabbar-left-section-border;
20
21
 
21
22
 
22
23
  // Off Canvas Tab Bar Headers
23
- $tabbar-header-color: #fff !default;
24
+ $tabbar-header-color: $white !default;
24
25
  $tabbar-header-weight: $font-weight-bold !default;
25
26
  $tabbar-header-line-height: $tabbar-height !default;
26
27
  $tabbar-header-margin: 0 !default;
27
28
 
28
29
  // Off Canvas Menu Variables
29
30
  $off-canvas-width: rem-calc(250) !default;
30
- $off-canvas-bg: #333 !default;
31
+ $off-canvas-bg: $oil !default;
32
+ $off-canvas-bg-hover: scale-color($tabbar-bg, $lightness: -30%) !default;
31
33
 
32
34
  // Off Canvas Menu List Variables
33
35
  $off-canvas-label-padding: 0.3rem rem-calc(15) !default;
34
- $off-canvas-label-color: #999 !default;
36
+ $off-canvas-label-color: $aluminum !default;
35
37
  $off-canvas-label-text-transform: uppercase !default;
36
38
  $off-canvas-label-font-size: rem-calc(12) !default;
37
39
  $off-canvas-label-font-weight: $font-weight-bold !default;
38
- $off-canvas-label-bg: #444 !default;
40
+ $off-canvas-label-bg: $tuatara !default;
39
41
  $off-canvas-label-border-top: 1px solid scale-color($off-canvas-label-bg, $lightness: 14%) !default;
40
42
  $off-canvas-label-border-bottom: none !default;
41
43
  $off-canvas-label-margin:0 !default;
42
44
  $off-canvas-link-padding: rem-calc(10, 15) !default;
43
- $off-canvas-link-color: rgba(#FFF, 0.7) !default;
45
+ $off-canvas-link-color: rgba($white, 0.7) !default;
44
46
  $off-canvas-link-border-bottom: 1px solid scale-color($off-canvas-bg, $lightness: -25%) !default;
47
+ $off-canvas-back-bg: #444 !default;
48
+ $off-canvas-back-border-top: $off-canvas-label-border-top !default;
49
+ $off-canvas-back-border-bottom: $off-canvas-label-border-bottom !default;
50
+ $off-canvas-back-hover-bg: scale-color($off-canvas-back-bg, $lightness: -30%) !default;
51
+ $off-canvas-back-hover-border-top: 1px solid scale-color($off-canvas-label-bg, $lightness: 14%) !default;
52
+ $off-canvas-back-hover-border-bottom: none !default;
45
53
 
46
54
  // Off Canvas Menu Icon Variables
47
- $tabbar-menu-icon-color: #FFF !default;
55
+ $tabbar-menu-icon-color: $white !default;
48
56
  $tabbar-menu-icon-hover: scale-color($tabbar-menu-icon-color, $lightness: -30%) !default;
49
57
 
50
58
  $tabbar-menu-icon-text-indent: rem-calc(35) !default;
51
- $tabbar-menu-icon-width: $tabbar-height !default;
59
+ $tabbar-menu-icon-width: $tabbar-icon-width !default;
52
60
  $tabbar-menu-icon-height: $tabbar-height !default;
53
61
  $tabbar-menu-icon-padding: 0 !default;
54
62
 
55
63
  $tabbar-hamburger-icon-width: rem-calc(16) !default;
56
64
  $tabbar-hamburger-icon-left: false !default;
57
65
  $tabbar-hamburger-icon-top: false !default;
58
- $tapbar-hamburger-icon-thickness: 1px !default;
59
- $tapbar-hamburger-icon-gap: 6px !default;
66
+ $tabbar-hamburger-icon-thickness: 1px !default;
67
+ $tabbar-hamburger-icon-gap: 6px !default;
60
68
 
61
69
  // Off Canvas Back-Link Overlay
62
70
  $off-canvas-overlay-transition: background 300ms ease !default;
63
71
  $off-canvas-overlay-cursor: pointer !default;
64
- $off-canvas-overlay-box-shadow: -4px 0 4px rgba(#000, 0.5), 4px 0 4px rgba(#000, 0.5) !default;
65
- $off-canvas-overlay-background: rgba(#FFF, 0.2) !default;
66
- $off-canvas-overlay-background-hover: rgba(#FFF, 0.05) !default;
72
+ $off-canvas-overlay-box-shadow: -4px 0 4px rgba($black, 0.5), 4px 0 4px rgba($black, 0.5) !default;
73
+ $off-canvas-overlay-background: rgba($white, 0.2) !default;
74
+ $off-canvas-overlay-background-hover: rgba($white, 0.05) !default;
67
75
 
68
76
  // Transition Variables
69
77
  $menu-slide: "transform 500ms ease" !default;
@@ -99,18 +107,21 @@ $menu-slide: "transform 500ms ease" !default;
99
107
  top: 0;
100
108
  bottom: 0;
101
109
  position: absolute;
110
+ overflow-x: hidden;
102
111
  overflow-y: auto;
103
112
  background: $off-canvas-bg;
104
113
  z-index: 1001;
105
114
  box-sizing: content-box;
106
115
  transition: transform 500ms ease 0s;
107
116
  -webkit-overflow-scrolling: touch;
117
+ -ms-overflow-style: -ms-autohiding-scrollbar;
118
+
108
119
  @if $position == left {
109
- @include translate3d(-100%,0,0);
120
+ @include translate3d(-100.5%,0,0);
110
121
  left: 0;
111
122
  }
112
123
  @if $position == right {
113
- @include translate3d(100%,0,0);
124
+ @include translate3d(100.5%,0,0);
114
125
  right: 0;
115
126
  }
116
127
  }
@@ -147,9 +158,9 @@ $menu-slide: "transform 500ms ease" !default;
147
158
  background: $tabbar-bg;
148
159
  color: $tabbar-color;
149
160
  height: $tabbar-height;
150
- line-height: $tabbar-height;
161
+ line-height: $tabbar-line-height;
151
162
 
152
- // make sure it's below the .exit-offcanvas link
163
+ // make sure it's below the .exit-off-canvas link
153
164
  position: relative;
154
165
  // z-index: 999;
155
166
 
@@ -166,7 +177,7 @@ $menu-slide: "transform 500ms ease" !default;
166
177
  // SMALL SECTIONS
167
178
  // These are small sections on the left and right that contain the off-canvas toggle buttons;
168
179
  @mixin tabbar-small-section($position) {
169
- width: $tabbar-height;
180
+ width: $tabbar-icon-width;
170
181
  height: $tabbar-height;
171
182
  position: absolute;
172
183
  top: 0;
@@ -188,20 +199,22 @@ $menu-slide: "transform 500ms ease" !default;
188
199
  text-align: center;
189
200
  height: $tabbar-height;
190
201
  top: 0;
191
- @media #{$medium-up} { text-align: left; }
202
+ @media #{$medium-up} {
203
+ &.left, &.right { text-align: left; }
204
+ }
192
205
 
193
206
  // still need to make these non-presentational
194
207
  &.left {
195
208
  left: 0;
196
- right: $tabbar-height;
209
+ right: $tabbar-icon-width;
197
210
  }
198
211
  &.right {
199
- left: $tabbar-height;
212
+ left: $tabbar-icon-width;
200
213
  right: 0;
201
214
  }
202
215
  &.middle {
203
- left: $tabbar-height;
204
- right: $tabbar-height;
216
+ left: $tabbar-icon-width;
217
+ right: $tabbar-icon-width;
205
218
  }
206
219
  }
207
220
 
@@ -230,8 +243,10 @@ $menu-slide: "transform 500ms ease" !default;
230
243
  padding: $off-canvas-link-padding;
231
244
  color: $off-canvas-link-color;
232
245
  border-bottom: $off-canvas-link-border-bottom;
233
- &:hover { background: scale-color($tabbar-bg, $lightness: -30%); }
234
246
  transition: background 300ms ease;
247
+ &:hover {
248
+ background: $off-canvas-bg-hover;
249
+ }
235
250
  }
236
251
  }
237
252
 
@@ -284,8 +299,8 @@ $menu-slide: "transform 500ms ease" !default;
284
299
  // This is a little bonus. You don't need it for off canvas to work. Mixins to be written in the future.
285
300
  .tab-bar .menu-icon {
286
301
  text-indent: $tabbar-menu-icon-text-indent;
287
- width: $tabbar-height;
288
- height: $tabbar-height;
302
+ width: $tabbar-menu-icon-width;
303
+ height: $tabbar-menu-icon-height;
289
304
  display: block;
290
305
  padding: $tabbar-menu-icon-padding;
291
306
  color: $tabbar-menu-icon-color;
@@ -298,12 +313,12 @@ $menu-slide: "transform 500ms ease" !default;
298
313
  // $width - Width of hamburger icon in rem Default: $tabbar-hamburger-icon-width.
299
314
  // $left - If false, icon will be centered horizontally || explicitly set value in rem Default: $tabbar-hamburger-icon-left= False
300
315
  // $top - If false, icon will be centered vertically || explicitly set value in rem Default: = False
301
- // $thickness - thickness of lines in hamburger icon, set value in px Default: $tapbar-hamburger-icon-thickness = 1px
302
- // $gap - spacing between the lines in hamburger icon, set value in px Default: $tapbar-hamburger-icon-gap = 6px
316
+ // $thickness - thickness of lines in hamburger icon, set value in px Default: $tabbar-hamburger-icon-thickness = 1px
317
+ // $gap - spacing between the lines in hamburger icon, set value in px Default: $tabbar-hamburger-icon-gap = 6px
303
318
  // $color - icon color Default: $tabbar-menu-icon-color
304
319
  // $hover-color - icon color when hovered Default: $tabbar-menu-icon-hover
305
320
  // $offcanvas - Set to true
306
- @include hamburger($tabbar-hamburger-icon-width, $tabbar-hamburger-icon-left, $tabbar-hamburger-icon-top, $tapbar-hamburger-icon-thickness, $tapbar-hamburger-icon-gap, $tabbar-menu-icon-color, $tabbar-menu-icon-hover, true)
321
+ @include hamburger($tabbar-hamburger-icon-width, $tabbar-hamburger-icon-left, $tabbar-hamburger-icon-top, $tabbar-hamburger-icon-thickness, $tabbar-hamburger-icon-gap, $tabbar-menu-icon-color, $tabbar-menu-icon-hover, true)
307
322
  }
308
323
 
309
324
  .left-off-canvas-menu { @include off-canvas-menu($position: left); }
@@ -337,10 +352,29 @@ $menu-slide: "transform 500ms ease" !default;
337
352
  transform: none;
338
353
  z-index: 1003;
339
354
  }
340
- .exit-offcanvas-menu {
341
- @include back-link;
342
- z-index: 1002;
355
+ .exit-off-canvas { @include back-link; }
356
+ }
357
+ .offcanvas-overlap-left {
358
+ .right-off-canvas-menu {
359
+ -ms-transform: none;
360
+ -webkit-transform: none;
361
+ -moz-transform: none;
362
+ -o-transform: none;
363
+ transform: none;
364
+ z-index: 1003;
343
365
  }
366
+ .exit-off-canvas { @include back-link; }
367
+ }
368
+ .offcanvas-overlap-right {
369
+ .left-off-canvas-menu {
370
+ -ms-transform: none;
371
+ -webkit-transform: none;
372
+ -moz-transform: none;
373
+ -o-transform: none;
374
+ transform: none;
375
+ z-index: 1003;
376
+ }
377
+ .exit-off-canvas { @include back-link; }
344
378
  }
345
379
 
346
380
  // Older browsers
@@ -354,3 +388,126 @@ $menu-slide: "transform 500ms ease" !default;
354
388
 
355
389
  }
356
390
  }
391
+
392
+ //
393
+ // Off-Canvas Submenu Classes
394
+ //
395
+ @mixin off-canvas-submenu($position) {
396
+ @include kill-flicker;
397
+ * { @include kill-flicker; }
398
+ width: $off-canvas-width;
399
+ top: 0;
400
+ bottom: 0;
401
+ position: absolute;
402
+ margin: 0;
403
+ overflow-x: hidden;
404
+ overflow-y: auto;
405
+ background: $off-canvas-bg;
406
+ z-index: 1002;
407
+ box-sizing: content-box;
408
+ -webkit-overflow-scrolling: touch;
409
+ @if $position == left {
410
+ @include translate3d(-100%,0,0);
411
+ left: 0;
412
+ }
413
+ @if $position == right {
414
+ @include translate3d(100%,0,0);
415
+ right: 0;
416
+ }
417
+ -webkit-transition: -webkit-#{$menu-slide};
418
+ -moz-transition: -moz-#{$menu-slide};
419
+ -ms-transition: -ms-#{$menu-slide};
420
+ -o-transition: -o-#{$menu-slide};
421
+ transition: #{$menu-slide};
422
+
423
+ //back button style like label
424
+ .back > a {
425
+ padding: $off-canvas-label-padding;
426
+ color: $off-canvas-label-color;
427
+ text-transform: $off-canvas-label-text-transform;
428
+ font-weight: $off-canvas-label-font-weight;
429
+ background: $off-canvas-back-bg;
430
+ border-top: $off-canvas-back-border-top;
431
+ border-bottom: $off-canvas-back-border-bottom;
432
+ &:hover {
433
+ background: $off-canvas-back-hover-bg;
434
+ border-top: $off-canvas-back-hover-border-top;
435
+ border-bottom: $off-canvas-back-hover-border-bottom;
436
+ }
437
+ margin: $off-canvas-label-margin;
438
+ @if $position == right {
439
+ @if $text-direction == rtl {
440
+ &:before {
441
+ @include icon-double-arrows($position: left);
442
+ }
443
+ } @else {
444
+ &:after {
445
+ @include icon-double-arrows($position: right);
446
+ }
447
+ }
448
+ }
449
+ @if $position == left {
450
+ @if $text-direction == rtl {
451
+ &:after {
452
+ @include icon-double-arrows($position: right);
453
+ }
454
+ } @else {
455
+ &:before {
456
+ @include icon-double-arrows($position: left);
457
+ }
458
+ }
459
+ }
460
+ }
461
+ }
462
+ //Left double angle quote or Right double angle quote chars
463
+ @mixin icon-double-arrows ($position){
464
+ @if $position == left {
465
+ content: "\AB";
466
+ @if $text-direction == rtl {
467
+ margin-left: 0.5rem;
468
+ } @else {
469
+ margin-right: 0.5rem;
470
+ }
471
+ }
472
+ @if $position == right {
473
+ content: "\BB";
474
+ @if $text-direction == rtl {
475
+ margin-right: 0.5rem;
476
+ } @else {
477
+ margin-left: 0.5rem;
478
+ }
479
+ }
480
+ display: inline;
481
+ }
482
+
483
+ @if $include-html-off-canvas-classes {
484
+ .left-submenu {
485
+ @include off-canvas-submenu($position: left);
486
+ &.move-right {
487
+ @include translate3d(0%,0,0);
488
+ }
489
+ }
490
+
491
+ .right-submenu {
492
+ @include off-canvas-submenu($position: right);
493
+ &.move-left {
494
+ @include translate3d(0%,0,0);
495
+ }
496
+ }
497
+
498
+ @if $text-direction == rtl {
499
+ .left-off-canvas-menu ul.off-canvas-list li.has-submenu > a:before {
500
+ @include icon-double-arrows($position: left);
501
+ }
502
+ .right-off-canvas-menu ul.off-canvas-list li.has-submenu > a:after {
503
+ @include icon-double-arrows($position: right);
504
+ }
505
+ } @else {
506
+ .left-off-canvas-menu ul.off-canvas-list li.has-submenu > a:after {
507
+ @include icon-double-arrows($position: right);
508
+ }
509
+ .right-off-canvas-menu ul.off-canvas-list li.has-submenu > a:before {
510
+ @include icon-double-arrows($position: left);
511
+ }
512
+ }
513
+ }