locomotivecms_wagon 2.4.0.rc2 → 2.4.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (137) hide show
  1. checksums.yaml +4 -4
  2. data/generators/foundation/public/javascripts/vendor/foundation.js +10839 -6523
  3. data/generators/foundation/public/javascripts/vendor/foundation.min.js +5 -3
  4. data/generators/foundation/public/stylesheets/_settings.scss +455 -115
  5. data/generators/foundation/public/stylesheets/app.css +0 -3
  6. data/generators/foundation/public/stylesheets/app.scss +15 -6
  7. data/generators/foundation/public/stylesheets/foundation.css +4191 -1885
  8. data/generators/foundation/public/stylesheets/foundation6/_global.scss +106 -54
  9. data/generators/foundation/public/stylesheets/foundation6/components/_accordion-menu.scss +157 -14
  10. data/generators/foundation/public/stylesheets/foundation6/components/_accordion.scss +71 -28
  11. data/generators/foundation/public/stylesheets/foundation6/components/_badge.scss +17 -9
  12. data/generators/foundation/public/stylesheets/foundation6/components/_breadcrumbs.scss +33 -10
  13. data/generators/foundation/public/stylesheets/foundation6/components/_button-group.scss +168 -30
  14. data/generators/foundation/public/stylesheets/foundation6/components/_button.scss +165 -44
  15. data/generators/foundation/public/stylesheets/foundation6/components/_callout.scss +9 -18
  16. data/generators/foundation/public/stylesheets/foundation6/components/_card.scss +129 -0
  17. data/generators/foundation/public/stylesheets/foundation6/components/_close-button.scss +54 -13
  18. data/generators/foundation/public/stylesheets/foundation6/components/_drilldown.scss +108 -33
  19. data/generators/foundation/public/stylesheets/foundation6/components/_dropdown-menu.scss +215 -64
  20. data/generators/foundation/public/stylesheets/foundation6/components/_dropdown.scss +22 -7
  21. data/generators/foundation/public/stylesheets/foundation6/components/_flex-video.scss +1 -68
  22. data/generators/foundation/public/stylesheets/foundation6/components/_flex.scss +117 -0
  23. data/generators/foundation/public/stylesheets/foundation6/components/_float.scss +1 -1
  24. data/generators/foundation/public/stylesheets/foundation6/components/_label.scss +16 -8
  25. data/generators/foundation/public/stylesheets/foundation6/components/_media-object.scss +50 -10
  26. data/generators/foundation/public/stylesheets/foundation6/components/_menu-icon.scss +9 -0
  27. data/generators/foundation/public/stylesheets/foundation6/components/_menu.scss +373 -91
  28. data/generators/foundation/public/stylesheets/foundation6/components/_off-canvas.scss +418 -83
  29. data/generators/foundation/public/stylesheets/foundation6/components/_orbit.scss +17 -7
  30. data/generators/foundation/public/stylesheets/foundation6/components/_pagination.scss +77 -45
  31. data/generators/foundation/public/stylesheets/foundation6/components/_progress-bar.scss +16 -35
  32. data/generators/foundation/public/stylesheets/foundation6/components/_responsive-embed.scss +70 -0
  33. data/generators/foundation/public/stylesheets/foundation6/components/_reveal.scss +59 -34
  34. data/generators/foundation/public/stylesheets/foundation6/components/_slider.scss +17 -38
  35. data/generators/foundation/public/stylesheets/foundation6/components/_sticky.scss +5 -4
  36. data/generators/foundation/public/stylesheets/foundation6/components/_switch.scss +52 -36
  37. data/generators/foundation/public/stylesheets/foundation6/components/_table.scss +197 -79
  38. data/generators/foundation/public/stylesheets/foundation6/components/_tabs.scss +126 -67
  39. data/generators/foundation/public/stylesheets/foundation6/components/_thumbnail.scss +17 -4
  40. data/generators/foundation/public/stylesheets/foundation6/components/_title-bar.scss +61 -21
  41. data/generators/foundation/public/stylesheets/foundation6/components/_tooltip.scss +74 -24
  42. data/generators/foundation/public/stylesheets/foundation6/components/_top-bar.scss +128 -10
  43. data/generators/foundation/public/stylesheets/foundation6/components/_visibility.scss +6 -5
  44. data/generators/foundation/public/stylesheets/foundation6/forms/_checkbox.scss +14 -9
  45. data/generators/foundation/public/stylesheets/foundation6/forms/_error.scss +12 -5
  46. data/generators/foundation/public/stylesheets/foundation6/forms/_fieldset.scss +6 -6
  47. data/generators/foundation/public/stylesheets/foundation6/forms/_forms.scss +11 -9
  48. data/generators/foundation/public/stylesheets/foundation6/forms/_help-text.scss +1 -1
  49. data/generators/foundation/public/stylesheets/foundation6/forms/_input-group.scss +82 -10
  50. data/generators/foundation/public/stylesheets/foundation6/forms/_label.scss +2 -0
  51. data/generators/foundation/public/stylesheets/foundation6/forms/_meter.scss +116 -0
  52. data/generators/foundation/public/stylesheets/foundation6/forms/_progress.scss +94 -0
  53. data/generators/foundation/public/stylesheets/foundation6/forms/_range.scss +149 -0
  54. data/generators/foundation/public/stylesheets/foundation6/forms/_select.scss +36 -14
  55. data/generators/foundation/public/stylesheets/foundation6/forms/_text.scss +53 -27
  56. data/generators/foundation/public/stylesheets/foundation6/foundation.scss +59 -17
  57. data/generators/foundation/public/stylesheets/foundation6/grid/_classes.scss +100 -56
  58. data/generators/foundation/public/stylesheets/foundation6/grid/_column.scss +22 -22
  59. data/generators/foundation/public/stylesheets/foundation6/grid/_flex-grid.scss +164 -96
  60. data/generators/foundation/public/stylesheets/foundation6/grid/_grid.scss +19 -4
  61. data/generators/foundation/public/stylesheets/foundation6/grid/_gutter.scss +61 -10
  62. data/generators/foundation/public/stylesheets/foundation6/grid/_layout.scss +49 -5
  63. data/generators/foundation/public/stylesheets/foundation6/grid/_position.scss +14 -9
  64. data/generators/foundation/public/stylesheets/foundation6/grid/_row.scss +42 -15
  65. data/generators/foundation/public/stylesheets/foundation6/motion-ui/_classes.scss +11 -4
  66. data/generators/foundation/public/stylesheets/foundation6/motion-ui/effects/_fade.scss +4 -1
  67. data/generators/foundation/public/stylesheets/foundation6/motion-ui/effects/_zoom.scss +1 -1
  68. data/generators/foundation/public/stylesheets/foundation6/motion-ui/transitions/_slide.scss +1 -1
  69. data/generators/foundation/public/stylesheets/foundation6/motion-ui/util/_transition.scss +1 -1
  70. data/generators/foundation/public/stylesheets/foundation6/prototype/_arrow.scss +36 -0
  71. data/generators/foundation/public/stylesheets/foundation6/prototype/_border-box.scss +35 -0
  72. data/generators/foundation/public/stylesheets/foundation6/prototype/_border-none.scss +35 -0
  73. data/generators/foundation/public/stylesheets/foundation6/prototype/_bordered.scss +54 -0
  74. data/generators/foundation/public/stylesheets/foundation6/prototype/_box.scss +23 -0
  75. data/generators/foundation/public/stylesheets/foundation6/prototype/_display.scss +50 -0
  76. data/generators/foundation/public/stylesheets/foundation6/prototype/_font-styling.scss +95 -0
  77. data/generators/foundation/public/stylesheets/foundation6/prototype/_list-style-type.scss +95 -0
  78. data/generators/foundation/public/stylesheets/foundation6/prototype/_overflow.scss +72 -0
  79. data/generators/foundation/public/stylesheets/foundation6/prototype/_position.scss +114 -0
  80. data/generators/foundation/public/stylesheets/foundation6/prototype/_prototype.scss +87 -0
  81. data/generators/foundation/public/stylesheets/foundation6/prototype/_relation.scss +157 -0
  82. data/generators/foundation/public/stylesheets/foundation6/prototype/_rotate.scss +31 -0
  83. data/generators/foundation/public/stylesheets/foundation6/prototype/_rounded.scss +54 -0
  84. data/generators/foundation/public/stylesheets/foundation6/prototype/_separator.scss +96 -0
  85. data/generators/foundation/public/stylesheets/foundation6/prototype/_shadow.scss +43 -0
  86. data/generators/foundation/public/stylesheets/foundation6/prototype/_sizing.scss +73 -0
  87. data/generators/foundation/public/stylesheets/foundation6/prototype/_spacing.scss +204 -0
  88. data/generators/foundation/public/stylesheets/foundation6/prototype/_text-decoration.scss +48 -0
  89. data/generators/foundation/public/stylesheets/foundation6/prototype/_text-transformation.scss +48 -0
  90. data/generators/foundation/public/stylesheets/foundation6/prototype/_text-utilities.scss +88 -0
  91. data/generators/foundation/public/stylesheets/foundation6/settings/_settings.scss +454 -116
  92. data/generators/foundation/public/stylesheets/foundation6/typography/_alignment.scss +9 -8
  93. data/generators/foundation/public/stylesheets/foundation6/typography/_base.scss +128 -55
  94. data/generators/foundation/public/stylesheets/foundation6/typography/_helpers.scss +7 -4
  95. data/generators/foundation/public/stylesheets/foundation6/typography/_print.scss +22 -9
  96. data/generators/foundation/public/stylesheets/foundation6/typography/_typography.scss +0 -2
  97. data/generators/foundation/public/stylesheets/foundation6/util/_breakpoint.scss +213 -47
  98. data/generators/foundation/public/stylesheets/foundation6/util/_color.scss +105 -17
  99. data/generators/foundation/public/stylesheets/foundation6/util/_direction.scss +31 -0
  100. data/generators/foundation/public/stylesheets/foundation6/util/_flex.scss +85 -0
  101. data/generators/foundation/public/stylesheets/foundation6/util/_math.scss +72 -0
  102. data/generators/foundation/public/stylesheets/foundation6/util/_mixins.scss +161 -38
  103. data/generators/foundation/public/stylesheets/foundation6/util/_selector.scss +5 -3
  104. data/generators/foundation/public/stylesheets/foundation6/util/_typography.scss +26 -0
  105. data/generators/foundation/public/stylesheets/foundation6/util/_unit.scss +100 -17
  106. data/generators/foundation/public/stylesheets/foundation6/util/_util.scss +4 -5
  107. data/generators/foundation/public/stylesheets/foundation6/util/_value.scss +68 -25
  108. data/generators/foundation/public/stylesheets/foundation6/vendor/normalize-scss/sass/_normalize.scss +3 -0
  109. data/generators/foundation/public/stylesheets/foundation6/vendor/normalize-scss/sass/normalize/_import-now.scss +11 -0
  110. data/generators/foundation/public/stylesheets/foundation6/vendor/normalize-scss/sass/normalize/_normalize-mixin.scss +676 -0
  111. data/generators/foundation/public/stylesheets/foundation6/vendor/normalize-scss/sass/normalize/_variables.scss +36 -0
  112. data/generators/foundation/public/stylesheets/foundation6/vendor/normalize-scss/sass/normalize/_vertical-rhythm.scss +61 -0
  113. data/generators/foundation/public/stylesheets/foundation6/vendor/sassy-lists/stylesheets/functions/_contain.scss +31 -0
  114. data/generators/foundation/public/stylesheets/foundation6/vendor/sassy-lists/stylesheets/functions/_purge.scss +38 -0
  115. data/generators/foundation/public/stylesheets/foundation6/vendor/sassy-lists/stylesheets/functions/_remove.scss +31 -0
  116. data/generators/foundation/public/stylesheets/foundation6/vendor/sassy-lists/stylesheets/functions/_replace.scss +46 -0
  117. data/generators/foundation/public/stylesheets/foundation6/vendor/sassy-lists/stylesheets/functions/_to-list.scss +27 -0
  118. data/generators/foundation/public/stylesheets/foundation6/vendor/sassy-lists/stylesheets/helpers/_missing-dependencies.scss +25 -0
  119. data/generators/foundation/public/stylesheets/foundation6/vendor/sassy-lists/stylesheets/helpers/_true.scss +13 -0
  120. data/generators/foundation/public/stylesheets/foundation6/xy-grid/_cell.scss +169 -0
  121. data/generators/foundation/public/stylesheets/foundation6/xy-grid/_classes.scss +476 -0
  122. data/generators/foundation/public/stylesheets/foundation6/xy-grid/_collapse.scss +74 -0
  123. data/generators/foundation/public/stylesheets/foundation6/xy-grid/_frame.scss +85 -0
  124. data/generators/foundation/public/stylesheets/foundation6/xy-grid/_grid.scss +35 -0
  125. data/generators/foundation/public/stylesheets/foundation6/xy-grid/_gutters.scss +45 -0
  126. data/generators/foundation/public/stylesheets/foundation6/xy-grid/_layout.scss +33 -0
  127. data/generators/foundation/public/stylesheets/foundation6/xy-grid/_position.scss +28 -0
  128. data/generators/foundation/public/stylesheets/foundation6/xy-grid/_xy-grid.scss +51 -0
  129. data/lib/locomotive/wagon/tools/styled_yaml.rb +1 -1
  130. data/lib/locomotive/wagon/version.rb +1 -1
  131. data/locomotivecms_wagon.gemspec +2 -2
  132. data/spec/fixtures/cassettes/authenticate.yml +102 -48
  133. data/spec/fixtures/cassettes/delete.yml +519 -259
  134. data/spec/fixtures/cassettes/push.yml +2724 -1486
  135. metadata +61 -10
  136. data/generators/foundation/public/stylesheets/foundation6/motion-ui.scss +0 -4
  137. data/generators/foundation/public/stylesheets/foundation6/vendor/normalize.scss +0 -424
@@ -8,7 +8,11 @@
8
8
 
9
9
  /// Font color of text inputs.
10
10
  /// @type Color
11
- $input-color: $dark-gray !default;
11
+ $input-color: $black !default;
12
+
13
+ /// Font color of placeholder text within text inputs.
14
+ /// @type Color
15
+ $input-placeholder-color: $medium-gray !default;
12
16
 
13
17
  /// Font family of text inputs.
14
18
  /// @type Font
@@ -18,6 +22,14 @@ $input-font-family: inherit !default;
18
22
  /// @type Number
19
23
  $input-font-size: rem-calc(16) !default;
20
24
 
25
+ /// Font weight of text inputs.
26
+ /// @type Keyword
27
+ $input-font-weight: $global-weight-normal !default;
28
+
29
+ /// Line height of text inputs.
30
+ /// @type Keyword
31
+ $input-line-height: $global-lineheight !default;
32
+
21
33
  /// Background color of text inputs.
22
34
  /// @type Color
23
35
  $input-background: $white !default;
@@ -38,6 +50,10 @@ $input-border: 1px solid $medium-gray !default;
38
50
  /// @type Color
39
51
  $input-border-focus: 1px solid $dark-gray !default;
40
52
 
53
+ /// Padding of text inputs.
54
+ /// @type Color
55
+ $input-padding: $form-spacing / 2 !default;
56
+
41
57
  /// Box shadow inside text inputs when not focused.
42
58
  /// @type Shadow
43
59
  $input-shadow: inset 0 1px 2px rgba($black, 0.1) !default;
@@ -48,13 +64,13 @@ $input-shadow-focus: 0 0 5px $medium-gray !default;
48
64
 
49
65
  /// Cursor to use when hovering over a disabled text input.
50
66
  /// @type Cursor
51
- $input-cursor-disabled: default !default;
67
+ $input-cursor-disabled: not-allowed !default;
52
68
 
53
69
  /// Properties to transition on text inputs.
54
70
  /// @type Transition
55
71
  $input-transition: box-shadow 0.5s, border-color 0.25s ease-in-out !default;
56
72
 
57
- /// Enables the up/down buttons that Chrome and Firefox add to `<input type="number">` elements.
73
+ /// Enables the up/down buttons that Chrome and Firefox add to `<input type='number'>` elements.
58
74
  /// @type Boolean
59
75
  $input-number-spinners: true !default;
60
76
 
@@ -62,36 +78,43 @@ $input-number-spinners: true !default;
62
78
  /// @type Border
63
79
  $input-radius: $global-radius !default;
64
80
 
81
+ /// Border radius for form buttons, defaulted to global-radius.
82
+ /// @type Number
83
+ $form-button-radius: $global-radius !default;
84
+
65
85
  @mixin form-element {
66
- $height: ($input-font-size + ($form-spacing * 1.5) - rem-calc(1));
86
+ $height: ($input-font-size * unitless-calc($input-line-height)) + (get-side($input-padding, 'top') + get-side($input-padding, 'bottom')) - rem-calc(1);
67
87
 
68
88
  display: block;
69
89
  box-sizing: border-box;
70
90
  width: 100%;
71
91
  height: $height;
72
- padding: $form-spacing / 2;
73
- border: $input-border;
74
92
  margin: 0 0 $form-spacing;
93
+ padding: $input-padding;
94
+
95
+ border: $input-border;
96
+ border-radius: $input-radius;
97
+ background-color: $input-background;
98
+ box-shadow: $input-shadow;
75
99
 
76
100
  font-family: $input-font-family;
77
101
  font-size: $input-font-size;
102
+ font-weight: $input-font-weight;
103
+ line-height: $input-line-height;
78
104
  color: $input-color;
79
- background-color: $input-background;
80
- box-shadow: $input-shadow;
81
- border-radius: $input-radius;
82
105
 
83
- @if hasvalue($input-transition) {
106
+ @if has-value($input-transition) {
84
107
  transition: $input-transition;
85
108
  }
86
109
 
87
110
  // Focus state
88
111
  &:focus {
89
- border: $input-border-focus;
90
- background: $input-background-focus;
91
112
  outline: none;
113
+ border: $input-border-focus;
114
+ background-color: $input-background-focus;
92
115
  box-shadow: $input-shadow-focus;
93
116
 
94
- @if hasvalue($input-transition) {
117
+ @if has-value($input-transition) {
95
118
  transition: $input-transition;
96
119
  }
97
120
  }
@@ -102,8 +125,7 @@ $input-radius: $global-radius !default;
102
125
  #{text-inputs()},
103
126
  textarea {
104
127
  @include form-element;
105
- -webkit-appearance: none;
106
- -moz-appearance: none;
128
+ appearance: none;
107
129
  }
108
130
 
109
131
  // Text areas
@@ -115,9 +137,14 @@ $input-radius: $global-radius !default;
115
137
  }
116
138
  }
117
139
 
118
- // Disabled/readonly state
119
140
  input,
120
141
  textarea {
142
+ // Placeholder text
143
+ &::placeholder {
144
+ color: $input-placeholder-color;
145
+ }
146
+
147
+ // Disabled/readonly state
121
148
  &:disabled,
122
149
  &[readonly] {
123
150
  background-color: $input-background-disabled;
@@ -126,26 +153,25 @@ $input-radius: $global-radius !default;
126
153
  }
127
154
 
128
155
  // Reset styles on button-like inputs
129
- [type="submit"],
130
- [type="button"] {
131
- border-radius: $global-radius;
132
- -webkit-appearance: none;
133
- -moz-appearance: none;
156
+ [type='submit'],
157
+ [type='button'] {
158
+ appearance: none;
159
+ border-radius: $form-button-radius;
134
160
  }
135
161
 
136
162
  // Reset Normalize setting content-box to search elements
137
- input[type="search"] {
163
+ input[type='search'] { // sass-lint:disable-line no-qualifying-elements
138
164
  box-sizing: border-box;
139
165
  }
140
166
 
141
167
  // Number input styles
142
168
  [type='number'] {
143
- @if not($input-number-spinners) {
144
- -moz-appearance: textfield;
169
+ @if not $input-number-spinners {
170
+ -moz-appearance: textfield; // sass-lint:disable-line no-vendor-prefix
145
171
 
146
- [type='number']::-webkit-inner-spin-button,
147
- [type='number']::-webkit-outer-spin-button {
148
- -webkit-appearance: none;
172
+ &::-webkit-inner-spin-button,
173
+ &::-webkit-outer-spin-button {
174
+ -webkit-appearance: none; // sass-lint:disable-line no-vendor-prefix
149
175
  margin: 0;
150
176
  }
151
177
  }
@@ -1,9 +1,24 @@
1
- // Foundation for Sites by ZURB
2
- // foundation.zurb.com
3
- // Licensed under MIT Open Source
1
+ /**
2
+ * Foundation for Sites by ZURB
3
+ * Version 6.4.3
4
+ * foundation.zurb.com
5
+ * Licensed under MIT Open Source
6
+ */
4
7
 
5
- // Third-party libraries
6
- @import 'vendor/normalize';
8
+ // Dependencies
9
+ @import 'vendor/normalize-scss/sass/normalize';
10
+ @import 'vendor/sassy-lists/stylesheets/helpers/missing-dependencies';
11
+ @import 'vendor/sassy-lists/stylesheets/helpers/true';
12
+ @import 'vendor/sassy-lists/stylesheets/functions/contain';
13
+ @import 'vendor/sassy-lists/stylesheets/functions/purge';
14
+ @import 'vendor/sassy-lists/stylesheets/functions/remove';
15
+ @import 'vendor/sassy-lists/stylesheets/functions/replace';
16
+ @import 'vendor/sassy-lists/stylesheets/functions/to-list';
17
+
18
+ // Settings
19
+ // import your own `settings` here or
20
+ // import and modify the default settings through
21
+ // @import 'settings/settings';
7
22
 
8
23
  // Sass utilities
9
24
  @import 'util/util';
@@ -13,6 +28,7 @@
13
28
 
14
29
  // Components
15
30
  @import 'grid/grid';
31
+ @import 'xy-grid/xy-grid';
16
32
  @import 'typography/typography';
17
33
  @import 'forms/forms';
18
34
  @import 'components/visibility';
@@ -24,14 +40,17 @@
24
40
  @import 'components/badge';
25
41
  @import 'components/breadcrumbs';
26
42
  @import 'components/callout';
43
+ @import 'components/card';
27
44
  @import 'components/close-button';
28
45
  @import 'components/drilldown';
29
46
  @import 'components/dropdown-menu';
30
47
  @import 'components/dropdown';
31
- @import 'components/flex-video';
48
+ @import 'components/flex';
49
+ @import 'components/responsive-embed';
32
50
  @import 'components/label';
33
51
  @import 'components/media-object';
34
52
  @import 'components/menu';
53
+ @import 'components/menu-icon';
35
54
  @import 'components/off-canvas';
36
55
  @import 'components/orbit';
37
56
  @import 'components/pagination';
@@ -46,34 +65,47 @@
46
65
  @import 'components/top-bar';
47
66
  @import 'components/thumbnail';
48
67
  @import 'components/tooltip';
68
+ @import 'prototype/prototype';
49
69
 
50
- // These styles are applied to <meta> tags, which are read by the Foundation JavaScript
51
- .foundation-mq {
52
- font-family: "#{-zf-bp-serialize($breakpoints)}";
53
- }
70
+ @mixin foundation-everything(
71
+ $flex: true,
72
+ $prototype: false
73
+ ) {
74
+ @if $flex {
75
+ $global-flexbox: true !global;
76
+ }
54
77
 
55
- @mixin foundation-everything {
56
78
  @include foundation-global-styles;
57
- @include foundation-grid;
79
+ @if not $flex {
80
+ @include foundation-grid;
81
+ }
82
+ @else {
83
+ @if $xy-grid {
84
+ @include foundation-xy-grid-classes;
85
+ }
86
+ @else {
87
+ @include foundation-flex-grid;
88
+ }
89
+ }
58
90
  @include foundation-typography;
59
- @include foundation-button;
60
91
  @include foundation-forms;
61
- @include foundation-visibility-classes;
62
- @include foundation-float-classes;
92
+ @include foundation-button;
63
93
  @include foundation-accordion;
64
94
  @include foundation-accordion-menu;
65
95
  @include foundation-badge;
66
96
  @include foundation-breadcrumbs;
67
97
  @include foundation-button-group;
68
98
  @include foundation-callout;
99
+ @include foundation-card;
69
100
  @include foundation-close-button;
101
+ @include foundation-menu;
102
+ @include foundation-menu-icon;
70
103
  @include foundation-drilldown-menu;
71
104
  @include foundation-dropdown;
72
105
  @include foundation-dropdown-menu;
73
- @include foundation-flex-video;
106
+ @include foundation-responsive-embed;
74
107
  @include foundation-label;
75
108
  @include foundation-media-object;
76
- @include foundation-menu;
77
109
  @include foundation-off-canvas;
78
110
  @include foundation-orbit;
79
111
  @include foundation-pagination;
@@ -88,4 +120,14 @@
88
120
  @include foundation-title-bar;
89
121
  @include foundation-tooltip;
90
122
  @include foundation-top-bar;
123
+ @include foundation-visibility-classes;
124
+ @include foundation-float-classes;
125
+
126
+ @if $flex {
127
+ @include foundation-flex-classes;
128
+ }
129
+
130
+ @if $prototype {
131
+ @include foundation-prototype-classes;
132
+ }
91
133
  }
@@ -12,16 +12,17 @@
12
12
  $row: 'row',
13
13
  $column: 'column',
14
14
  $column-row: 'column-row',
15
+ $gutter: 'gutter',
15
16
  $push: 'push',
16
17
  $pull: 'pull',
17
18
  $center: 'centered',
18
- $uncenter: 'uncenter',
19
+ $uncenter: 'uncentered',
19
20
  $collapse: 'collapse',
20
21
  $uncollapse: 'uncollapse',
21
22
  $offset: 'offset',
22
23
  $end: 'end',
23
24
  $expanded: 'expanded',
24
- $breakpoints: $breakpoint-classes
25
+ $block: 'block'
25
26
  ) {
26
27
  // Row
27
28
  .#{$row} {
@@ -29,34 +30,45 @@
29
30
 
30
31
  // Collapsing
31
32
  &.#{$collapse} {
32
- > .#{$column} { @include grid-col-collapse; }
33
+ > .#{$column} {
34
+ @include grid-col-collapse;
35
+ }
33
36
  }
34
37
 
35
38
  // Nesting
36
- & & {
37
- @include grid-row($behavior: nest, $cf: false);
39
+ & .#{$row} {
40
+ @include grid-row-nest($grid-column-gutter);
38
41
 
39
42
  &.#{$collapse} {
40
- @include grid-row($behavior: nest collapse, $cf: false);
43
+ margin-right: 0;
44
+ margin-left: 0;
41
45
  }
42
46
  }
43
47
 
44
- // Responsive collapsing
45
- @each $size in $breakpoint-classes {
46
- @include breakpoint($size) {
47
- &.#{$size}-#{$collapse} {
48
- > .#{$column} { @include grid-col-collapse; }
49
- }
48
+ // Expanded (full-width) row
49
+ &.#{$expanded} {
50
+ @include grid-row-size(expand);
50
51
 
51
- &.#{$size}-#{$uncollapse} {
52
- > .#{$column} { @include grid-col-uncollapse; }
53
- }
52
+ .#{$row} {
53
+ margin-right: auto;
54
+ margin-left: auto;
54
55
  }
55
56
  }
56
57
 
57
- // Expanded (full-width) row
58
- &.#{$expanded} {
59
- max-width: none;
58
+ &:not(.#{$expanded}) .#{$row} {
59
+ @include grid-row-size(expand);
60
+ }
61
+
62
+ @if type-of($grid-column-gutter) == 'map' {
63
+ // Static (unresponsive) row gutters
64
+ //
65
+ @each $breakpoint, $value in $grid-column-gutter {
66
+ &.#{$gutter}-#{$breakpoint} {
67
+ > .#{$column} {
68
+ @include grid-col-gutter($value);
69
+ }
70
+ }
71
+ }
60
72
  }
61
73
  }
62
74
 
@@ -64,8 +76,10 @@
64
76
  .#{$column} {
65
77
  @include grid-col;
66
78
 
67
- &.#{$end} {
68
- @include grid-col-end;
79
+ @if $grid-column-align-edge {
80
+ &.#{$end} {
81
+ @include grid-col-end;
82
+ }
69
83
  }
70
84
  }
71
85
 
@@ -75,57 +89,87 @@
75
89
  float: none;
76
90
  }
77
91
 
78
- @each $size in $breakpoints {
79
- @include breakpoint($size) {
80
- @for $i from 1 through $grid-column-count {
81
- // Column width
82
- .#{$size}-#{$i} {
83
- @include grid-col-size($i);
84
- }
92
+ // To properly nest a column row, padding and margin is removed
93
+ .#{$row} .#{$column}.#{$row}.#{$row} {
94
+ margin-right: 0;
95
+ margin-left: 0;
96
+ padding-right: 0;
97
+ padding-left: 0;
98
+ }
85
99
 
86
- // Source ordering
87
- @if $i < $grid-column-count {
88
- .#{$size}-#{$push}-#{$i} {
89
- @include grid-col-pos($i);
90
- }
100
+ @include -zf-each-breakpoint {
101
+ @for $i from 1 through $grid-column-count {
102
+ // Column width
103
+ .#{$-zf-size}-#{$i} {
104
+ @include grid-col-size($i);
105
+ }
91
106
 
92
- .#{$size}-#{$pull}-#{$i} {
93
- @include grid-col-pos(-$i);
94
- }
107
+ // Source ordering
108
+ @if $i < $grid-column-count {
109
+ .#{$-zf-size}-#{$push}-#{$i} {
110
+ @include grid-col-pos($i);
95
111
  }
96
112
 
97
- // Offsets
98
- $o: $i - 1;
99
-
100
- .#{$size}-#{$offset}-#{$o} {
101
- @include grid-col-off($o);
113
+ .#{$-zf-size}-#{$pull}-#{$i} {
114
+ @include grid-col-pos(-$i);
102
115
  }
103
116
  }
104
117
 
105
- // Block grid
106
- @for $i from 1 through $block-grid-max {
107
- .#{$size}-up-#{$i} {
108
- @include grid-layout($i);
109
- }
118
+ // Offsets
119
+ $o: $i - 1;
120
+
121
+ .#{$-zf-size}-#{$offset}-#{$o} {
122
+ @include grid-col-off($o);
110
123
  }
124
+ }
111
125
 
112
- // Positioning
113
- .#{$column}.#{$size}-#{$center} {
114
- @include grid-col-pos(center);
126
+ // Block grid
127
+ @for $i from 1 through $block-grid-max {
128
+ .#{$-zf-size}-up-#{$i} {
129
+ @include grid-layout($i, '.#{$column}');
115
130
  }
131
+ }
116
132
 
117
- // Gutter adjustment
118
- .#{$size}-#{$uncenter},
119
- .#{$size}-#{$push}-0,
120
- .#{$size}-#{$pull}-0 {
121
- @include grid-col-unpos;
133
+ // Responsive collapsing
134
+ .#{$-zf-size}-#{$collapse} {
135
+ > .#{$column} { @include grid-col-collapse; }
136
+
137
+ .#{$row} {
138
+ margin-right: 0;
139
+ margin-left: 0;
122
140
  }
123
141
  }
142
+
143
+ .#{$expanded}.#{$row} .#{$-zf-size}-#{$collapse}.#{$row} {
144
+ margin-right: 0;
145
+ margin-left: 0;
146
+ }
147
+
148
+ .#{$-zf-size}-#{$uncollapse} {
149
+ > .#{$column} { @include grid-col-gutter($-zf-size); }
150
+ }
151
+
152
+ // Positioning
153
+ .#{$-zf-size}-#{$center} {
154
+ @include grid-col-pos(center);
155
+ }
156
+
157
+ // Gutter adjustment
158
+ .#{$-zf-size}-#{$uncenter},
159
+ .#{$-zf-size}-#{$push}-0,
160
+ .#{$-zf-size}-#{$pull}-0 {
161
+ @include grid-col-unpos;
162
+ }
163
+ }
164
+
165
+ // Block grid columns
166
+ .#{$column}-#{$block} {
167
+ @include grid-column-margin;
124
168
  }
125
169
 
126
- @if $column == 'column' {
127
- .columns {
128
- // scss-lint:disable PlaceholderInExtend
170
+ @if $column == 'column' and has-value($grid-column-alias) {
171
+ .#{$grid-column-alias} {
172
+ // sass-lint:disable-block placeholder-in-extend
129
173
  @extend .column;
130
174
  }
131
175
  }