foundation-rails 6.2.4.0 → 6.3.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (114) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +2 -2
  3. data/Rakefile +2 -0
  4. data/bower.json +2 -2
  5. data/lib/foundation/rails/version.rb +1 -1
  6. data/lib/generators/foundation/templates/_settings.scss +117 -70
  7. data/lib/generators/foundation/templates/foundation_and_overrides.scss +2 -1
  8. data/vendor/assets/_vendor/normalize-scss/sass/_normalize.scss +3 -0
  9. data/vendor/assets/_vendor/normalize-scss/sass/normalize/_import-now.scss +11 -0
  10. data/vendor/assets/_vendor/normalize-scss/sass/normalize/_normalize-mixin.scss +676 -0
  11. data/vendor/assets/_vendor/normalize-scss/sass/normalize/_variables.scss +36 -0
  12. data/vendor/assets/_vendor/normalize-scss/sass/normalize/_vertical-rhythm.scss +61 -0
  13. data/vendor/assets/_vendor/sassy-lists/stylesheets/functions/_purge.scss +38 -0
  14. data/vendor/assets/_vendor/sassy-lists/stylesheets/functions/_remove.scss +31 -0
  15. data/vendor/assets/_vendor/sassy-lists/stylesheets/functions/_replace.scss +46 -0
  16. data/vendor/assets/_vendor/sassy-lists/stylesheets/functions/_to-list.scss +27 -0
  17. data/vendor/assets/_vendor/sassy-lists/stylesheets/helpers/_missing-dependencies.scss +25 -0
  18. data/vendor/assets/_vendor/sassy-lists/stylesheets/helpers/_true.scss +13 -0
  19. data/vendor/assets/js/foundation.abide.js.es6 +28 -0
  20. data/vendor/assets/js/foundation.accordion.js.es6 +1 -1
  21. data/vendor/assets/js/foundation.accordionMenu.js.es6 +9 -1
  22. data/vendor/assets/js/foundation.core.js.es6 +4 -4
  23. data/vendor/assets/js/foundation.drilldown.js.es6 +128 -14
  24. data/vendor/assets/js/foundation.dropdown.js.es6 +48 -42
  25. data/vendor/assets/js/foundation.dropdownMenu.js.es6 +20 -18
  26. data/vendor/assets/js/foundation.equalizer.js.es6 +12 -6
  27. data/vendor/assets/js/foundation.interchange.js.es6 +3 -2
  28. data/vendor/assets/js/foundation.js.es6 +2 -1
  29. data/vendor/assets/js/foundation.magellan.js.es6 +28 -9
  30. data/vendor/assets/js/foundation.offcanvas.js.es6 +90 -123
  31. data/vendor/assets/js/foundation.orbit.js.es6 +61 -10
  32. data/vendor/assets/js/foundation.responsiveMenu.js.es6 +2 -0
  33. data/vendor/assets/js/foundation.responsiveToggle.js.es6 +52 -12
  34. data/vendor/assets/js/foundation.reveal.js.es6 +48 -48
  35. data/vendor/assets/js/foundation.slider.js.es6 +124 -42
  36. data/vendor/assets/js/foundation.sticky.js.es6 +11 -9
  37. data/vendor/assets/js/foundation.tabs.js.es6 +164 -35
  38. data/vendor/assets/js/foundation.toggler.js.es6 +3 -0
  39. data/vendor/assets/js/foundation.tooltip.js.es6 +20 -10
  40. data/vendor/assets/js/foundation.util.box.js.es6 +2 -2
  41. data/vendor/assets/js/foundation.util.keyboard.js.es6 +37 -0
  42. data/vendor/assets/js/foundation.util.mediaQuery.js.es6 +16 -0
  43. data/vendor/assets/js/foundation.util.motion.js.es6 +7 -1
  44. data/vendor/assets/js/foundation.util.nest.js.es6 +10 -5
  45. data/vendor/assets/js/foundation.util.timerAndImageLoader.js.es6 +6 -4
  46. data/vendor/assets/js/foundation.util.triggers.js.es6 +54 -36
  47. data/vendor/assets/js/foundation.zf.responsiveAccordionTabs.js.es6 +240 -0
  48. data/vendor/assets/scss/_global.scss +25 -450
  49. data/vendor/assets/scss/components/_accordion-menu.scss +8 -4
  50. data/vendor/assets/scss/components/_accordion.scss +43 -22
  51. data/vendor/assets/scss/components/_badge.scss +17 -9
  52. data/vendor/assets/scss/components/_breadcrumbs.scss +7 -5
  53. data/vendor/assets/scss/components/_button-group.scss +54 -6
  54. data/vendor/assets/scss/components/_button.scss +27 -16
  55. data/vendor/assets/scss/components/_callout.scss +3 -2
  56. data/vendor/assets/scss/components/_card.scss +121 -0
  57. data/vendor/assets/scss/components/_close-button.scss +54 -13
  58. data/vendor/assets/scss/components/_drilldown.scss +19 -5
  59. data/vendor/assets/scss/components/_dropdown-menu.scss +23 -18
  60. data/vendor/assets/scss/components/_dropdown.scss +14 -7
  61. data/vendor/assets/scss/components/_flex-video.scss +1 -63
  62. data/vendor/assets/scss/components/_float.scss +1 -1
  63. data/vendor/assets/scss/components/_label.scss +16 -8
  64. data/vendor/assets/scss/components/_media-object.scss +2 -3
  65. data/vendor/assets/scss/components/_menu.scss +68 -33
  66. data/vendor/assets/scss/components/_off-canvas.scss +231 -80
  67. data/vendor/assets/scss/components/_orbit.scss +8 -6
  68. data/vendor/assets/scss/components/_pagination.scss +42 -22
  69. data/vendor/assets/scss/components/_progress-bar.scss +1 -1
  70. data/vendor/assets/scss/components/_responsive-embed.scss +66 -0
  71. data/vendor/assets/scss/components/_reveal.scss +17 -11
  72. data/vendor/assets/scss/components/_slider.scss +6 -1
  73. data/vendor/assets/scss/components/_sticky.scss +3 -3
  74. data/vendor/assets/scss/components/_switch.scss +47 -36
  75. data/vendor/assets/scss/components/_table.scss +83 -23
  76. data/vendor/assets/scss/components/_tabs.scss +54 -23
  77. data/vendor/assets/scss/components/_thumbnail.scss +17 -4
  78. data/vendor/assets/scss/components/_title-bar.scss +5 -6
  79. data/vendor/assets/scss/components/_tooltip.scss +15 -12
  80. data/vendor/assets/scss/components/_top-bar.scss +11 -8
  81. data/vendor/assets/scss/forms/_checkbox.scss +2 -1
  82. data/vendor/assets/scss/forms/_error.scss +10 -6
  83. data/vendor/assets/scss/forms/_fieldset.scss +7 -7
  84. data/vendor/assets/scss/forms/_input-group.scss +17 -11
  85. data/vendor/assets/scss/forms/_label.scss +2 -0
  86. data/vendor/assets/scss/forms/_meter.scss +9 -10
  87. data/vendor/assets/scss/forms/_progress.scss +9 -9
  88. data/vendor/assets/scss/forms/_range.scss +20 -15
  89. data/vendor/assets/scss/forms/_select.scss +26 -8
  90. data/vendor/assets/scss/forms/_text.scss +19 -16
  91. data/vendor/assets/scss/foundation.scss +19 -3
  92. data/vendor/assets/scss/grid/_classes.scss +31 -14
  93. data/vendor/assets/scss/grid/_column.scss +10 -24
  94. data/vendor/assets/scss/grid/_flex-grid.scss +84 -76
  95. data/vendor/assets/scss/grid/_grid.scss +0 -16
  96. data/vendor/assets/scss/grid/_gutter.scss +53 -5
  97. data/vendor/assets/scss/grid/_layout.scss +3 -3
  98. data/vendor/assets/scss/grid/_position.scss +3 -3
  99. data/vendor/assets/scss/grid/_row.scss +24 -19
  100. data/vendor/assets/scss/settings/_settings.scss +117 -70
  101. data/vendor/assets/scss/typography/_base.scss +110 -44
  102. data/vendor/assets/scss/typography/_helpers.scss +1 -0
  103. data/vendor/assets/scss/typography/_print.scss +7 -3
  104. data/vendor/assets/scss/typography/_typography.scss +0 -2
  105. data/vendor/assets/scss/util/_breakpoint.scss +28 -19
  106. data/vendor/assets/scss/util/_color.scss +69 -16
  107. data/vendor/assets/scss/util/_flex.scss +20 -3
  108. data/vendor/assets/scss/util/_math.scss +72 -0
  109. data/vendor/assets/scss/util/_mixins.scss +63 -26
  110. data/vendor/assets/scss/util/_selector.scss +3 -2
  111. data/vendor/assets/scss/util/_unit.scss +61 -4
  112. data/vendor/assets/scss/util/_util.scss +1 -0
  113. data/vendor/assets/scss/util/_value.scss +33 -0
  114. metadata +17 -2
@@ -2,7 +2,7 @@
2
2
  // foundation.zurb.com
3
3
  // Licensed under MIT Open Source
4
4
 
5
- // scss-lint:disable MergeableSelector, QualifyingElement
5
+ // sass-lint:disable force-element-nesting, no-qualifying-elements
6
6
 
7
7
  ////
8
8
  /// @group table
@@ -36,6 +36,10 @@ $table-row-hover: darken($table-background, $table-hover-scale) !default;
36
36
  /// @type List
37
37
  $table-row-stripe-hover: darken($table-background, $table-color-scale + $table-hover-scale) !default;
38
38
 
39
+ /// If `true`, tables are striped by default and an .unstriped class is created. If `false`, a .striped class is created.
40
+ /// @type Boolean
41
+ $table-is-striped: true !default;
42
+
39
43
  /// Default background color for striped rows.
40
44
  /// @type Color
41
45
  $table-striped-background: smart-scale($table-background, $table-color-scale) !default;
@@ -72,7 +76,34 @@ $table-foot-font-color: $body-font-color !default;
72
76
  /// @type Boolean
73
77
  $show-header-for-stacked: false !default;
74
78
 
75
- @mixin -zf-table-children-styles($stripe: $table-stripe) {
79
+ @mixin -zf-table-stripe($stripe: $table-stripe) {
80
+ tr {
81
+ // If stripe is set to even, darken the even rows.
82
+ @if $stripe == even {
83
+ &:nth-child(even) {
84
+ border-bottom: 0;
85
+ background-color: $table-striped-background;
86
+ }
87
+ }
88
+
89
+ // If stripe is set to odd, darken the odd rows.
90
+ @else if $stripe == odd {
91
+ &:nth-child(odd) {
92
+ background-color: $table-striped-background;
93
+ }
94
+ }
95
+ }
96
+ }
97
+
98
+ @mixin -zf-table-unstripe() {
99
+ tr {
100
+ border-bottom: 0;
101
+ border-bottom: $table-border;
102
+ background-color: $table-background;
103
+ }
104
+ }
105
+
106
+ @mixin -zf-table-children-styles($stripe: $table-stripe, $is-striped: $table-is-striped) {
76
107
  thead,
77
108
  tbody,
78
109
  tfoot {
@@ -82,10 +113,10 @@ $show-header-for-stacked: false !default;
82
113
 
83
114
  // Caption
84
115
  caption {
85
- font-weight: $global-weight-bold;
86
116
  padding: $table-padding;
117
+ font-weight: $global-weight-bold;
87
118
  }
88
-
119
+
89
120
  // Table head
90
121
  thead {
91
122
  background: $table-head-background;
@@ -117,25 +148,36 @@ $show-header-for-stacked: false !default;
117
148
 
118
149
  // Table rows
119
150
  tbody {
120
- tr {
121
- // If stripe is set to even, darken the even rows.
122
- @if $stripe == even {
123
- &:nth-child(even) {
124
- background-color: $table-striped-background;
125
- }
126
- }
151
+ th,
152
+ td {
153
+ padding: $table-padding;
154
+ }
155
+ }
156
+
157
+ // If tables are striped
158
+ @if $is-striped == true {
159
+ tbody {
160
+ @include -zf-table-stripe($stripe);
161
+ }
127
162
 
128
- // If stripe is set to odd, darken the odd rows.
129
- @else if $stripe == odd {
130
- &:nth-child(odd) {
131
- background-color: $table-striped-background;
132
- }
163
+ &.unstriped {
164
+ tbody {
165
+ @include -zf-table-unstripe();
166
+ background-color: $table-background;
133
167
  }
134
168
  }
169
+ }
135
170
 
136
- th,
137
- td {
138
- padding: $table-padding;
171
+ // If tables are not striped
172
+ @else if $is-striped == false {
173
+ tbody {
174
+ @include -zf-table-unstripe();
175
+ }
176
+
177
+ &.striped {
178
+ tbody {
179
+ @include -zf-table-stripe($stripe);
180
+ }
139
181
  }
140
182
  }
141
183
  }
@@ -188,17 +230,35 @@ $show-header-for-stacked: false !default;
188
230
  &:hover {
189
231
  background-color: $table-row-hover;
190
232
  }
233
+ }
234
+
235
+ @if $table-is-striped == true {
236
+ // Darkens the even striped table rows.
237
+ @if($table-stripe == even) {
238
+ &:not(.unstriped) tr:nth-of-type(even):hover {
239
+ background-color: $table-row-stripe-hover;
240
+ }
241
+ }
242
+
243
+ // Darkens the odd striped table rows.
244
+ @elseif($table-stripe == odd) {
245
+ &:not(.unstriped) tr:nth-of-type(odd):hover {
246
+ background-color: $table-row-stripe-hover;
247
+ }
248
+ }
249
+ }
191
250
 
192
- //Darkens the even striped table rows.
251
+ @else if $table-is-striped == false {
252
+ // Darkens the even striped table rows.
193
253
  @if($table-stripe == even) {
194
- &:nth-of-type(even):hover {
254
+ &.striped tr:nth-of-type(even):hover {
195
255
  background-color: $table-row-stripe-hover;
196
256
  }
197
257
  }
198
258
 
199
- //Darkens the odd striped table rows.
259
+ // Darkens the odd striped table rows.
200
260
  @elseif($table-stripe == odd) {
201
- &:nth-of-type(odd):hover {
261
+ &.striped tr:nth-of-type(odd):hover {
202
262
  background-color: $table-row-stripe-hover;
203
263
  }
204
264
  }
@@ -14,10 +14,18 @@ $tab-margin: 0 !default;
14
14
  /// @type Color
15
15
  $tab-background: $white !default;
16
16
 
17
- /// active background color of a tab bar.
17
+ /// Font color of tab item.
18
+ /// @type Color
19
+ $tab-color: $primary-color !default;
20
+
21
+ /// Active background color of a tab bar.
18
22
  /// @type Color
19
23
  $tab-background-active: $light-gray !default;
20
24
 
25
+ /// Active font color of tab item.
26
+ /// @type Color
27
+ $tab-active-color: $primary-color !default;
28
+
21
29
  /// Font size of tab items.
22
30
  /// @type Number
23
31
  $tab-item-font-size: rem-calc(12) !default;
@@ -43,71 +51,94 @@ $tab-content-border: $light-gray !default;
43
51
 
44
52
  /// Default text color of tab content.
45
53
  /// @type Color
46
- $tab-content-color: foreground($tab-background, $primary-color) !default;
54
+ $tab-content-color: $body-font-color !default;
47
55
 
48
56
  /// Default padding for tab content.
49
57
  /// @type Number | List
50
58
  $tab-content-padding: 1rem !default;
51
59
 
52
60
  /// Adds styles for a tab container. Apply this to a `<ul>`.
53
- @mixin tabs-container {
61
+ @mixin tabs-container (
62
+ $margin: $tab-margin,
63
+ $background: $tab-background,
64
+ $border-color: $tab-content-border
65
+ ) {
54
66
  @include clearfix;
55
- margin: $tab-margin;
67
+ margin: $margin;
68
+ border: 1px solid $border-color;
69
+ background: $background;
56
70
  list-style-type: none;
57
- background: $tab-background;
58
- border: 1px solid $tab-content-border;
59
71
  }
60
72
 
61
73
  /// Augments a tab container to have vertical tabs. Use this in conjunction with `tabs-container()`.
62
74
  @mixin tabs-container-vertical {
63
75
  > li {
64
- width: auto;
65
- float: none;
66
76
  display: block;
77
+ float: none;
78
+ width: auto;
67
79
  }
68
80
  }
69
81
 
70
82
  /// Adds styles for the links within a tab container. Apply this to the `<li>` elements inside a tab container.
71
- @mixin tabs-title {
83
+ @mixin tabs-title (
84
+ $padding: $tab-item-padding,
85
+ $font-size: $tab-item-font-size,
86
+ $color: $tab-color,
87
+ $color-active: $tab-active-color,
88
+ $background-hover: $tab-item-background-hover,
89
+ $background-active: $tab-background-active
90
+ ) {
72
91
  float: #{$global-left};
73
92
 
74
93
  > a {
75
94
  display: block;
76
- padding: $tab-item-padding;
95
+ padding: $padding;
96
+ font-size: $font-size;
77
97
  line-height: 1;
78
- font-size: $tab-item-font-size;
98
+ color: $color;
79
99
 
80
100
  &:hover {
81
- background: $tab-item-background-hover;
101
+ background: $background-hover;
102
+ color: scale-color($color, $lightness: -14%);
82
103
  }
83
104
 
84
105
  &:focus,
85
106
  &[aria-selected='true'] {
86
- background: $tab-background-active;
107
+ background: $background-active;
108
+ color: $color-active;
87
109
  }
88
110
  }
89
111
  }
90
112
 
91
113
  /// Adds styles for the wrapper that surrounds a tab group's content panes.
92
- @mixin tabs-content {
93
- background: $tab-content-background;
94
- transition: all 0.5s ease;
95
- border: 1px solid $tab-content-border;
114
+ @mixin tabs-content (
115
+ $background: $tab-content-background,
116
+ $color: $tab-content-color,
117
+ $border-color: $tab-content-border
118
+ ) {
119
+ border: 1px solid $border-color;
96
120
  border-top: 0;
121
+ background: $background;
122
+ color: $color;
123
+ transition: all 0.5s ease;
97
124
  }
98
125
 
99
126
  /// Augments a tab content container to have a vertical style, by shifting the border around. Use this in conjunction with `tabs-content()`.
100
- @mixin tabs-content-vertical {
101
- border: 1px solid $tab-content-border;
127
+ @mixin tabs-content-vertical (
128
+ $border-color: $tab-content-border
129
+ ) {
130
+ border: 1px solid $border-color;
102
131
  border-#{$global-left}: 0;
103
132
  }
104
133
 
105
134
  /// Adds styles for an individual tab content panel within the tab content container.
106
- @mixin tabs-panel {
135
+ @mixin tabs-panel (
136
+ $padding: $tab-content-padding
137
+ ) {
107
138
  display: none;
108
- padding: $tab-content-padding;
139
+ padding: $padding;
109
140
 
110
- &.is-active {
141
+ &[aria-hidden="false"] {
111
142
  display: block;
112
143
  }
113
144
  }
@@ -138,7 +169,7 @@ $tab-content-padding: 1rem !default;
138
169
  background: $primary-color;
139
170
 
140
171
  > li > a {
141
- color: foreground($primary-color);
172
+ color: color-pick-contrast($primary-color);
142
173
 
143
174
  &:hover,
144
175
  &:focus {
@@ -32,23 +32,36 @@ $thumbnail-radius: $global-radius !default;
32
32
 
33
33
  /// Adds thumbnail styles to an element.
34
34
  @mixin thumbnail {
35
+ display: inline-block;
36
+ max-width: 100%;
37
+ margin-bottom: $thumbnail-margin-bottom;
38
+
35
39
  border: $thumbnail-border;
40
+ border-radius: $thumbnail-radius;
36
41
  box-shadow: $thumbnail-shadow;
37
- display: inline-block;
42
+
38
43
  line-height: 0;
39
- max-width: 100%;
44
+ }
45
+
46
+ @mixin thumbnail-link {
40
47
  transition: $thumbnail-transition;
41
- border-radius: $thumbnail-radius;
42
- margin-bottom: $thumbnail-margin-bottom;
43
48
 
44
49
  &:hover,
45
50
  &:focus {
46
51
  box-shadow: $thumbnail-shadow-hover;
47
52
  }
53
+
54
+ image {
55
+ box-shadow: none;
56
+ }
48
57
  }
49
58
 
50
59
  @mixin foundation-thumbnail {
51
60
  .thumbnail {
52
61
  @include thumbnail;
53
62
  }
63
+
64
+ a.thumbnail {
65
+ @include thumbnail-link;
66
+ }
54
67
  }
@@ -36,14 +36,14 @@ $titlebar-icon-spacing: 0.25rem !default;
36
36
 
37
37
  @mixin foundation-title-bar {
38
38
  .title-bar {
39
+ padding: $titlebar-padding;
39
40
  background: $titlebar-background;
40
41
  color: $titlebar-color;
41
- padding: $titlebar-padding;
42
42
 
43
43
  @if $global-flexbox {
44
44
  display: flex;
45
- align-items: center;
46
45
  justify-content: space-between;
46
+ align-items: center;
47
47
  }
48
48
  @else {
49
49
  @include clearfix;
@@ -56,10 +56,9 @@ $titlebar-icon-spacing: 0.25rem !default;
56
56
  }
57
57
 
58
58
  @if $global-flexbox {
59
- // scss-lint:disable ZeroUnit
60
59
  .title-bar-left,
61
60
  .title-bar-right {
62
- flex: 1 1 0px;
61
+ flex: 1 1 0px; // sass-lint:disable-line zero-unit
63
62
  }
64
63
 
65
64
  .title-bar-right {
@@ -78,8 +77,8 @@ $titlebar-icon-spacing: 0.25rem !default;
78
77
  }
79
78
 
80
79
  .title-bar-title {
81
- font-weight: $titlebar-text-font-weight;
82
- vertical-align: middle;
83
80
  display: inline-block;
81
+ vertical-align: middle;
82
+ font-weight: $titlebar-text-font-weight;
84
83
  }
85
84
  }
@@ -43,28 +43,31 @@ $tooltip-pip-height: $tooltip-pip-width * 0.866 !default;
43
43
  $tooltip-radius: $global-radius !default;
44
44
 
45
45
  @mixin has-tip {
46
- border-bottom: $has-tip-border-bottom;
47
- font-weight: $has-tip-font-weight;
48
46
  position: relative;
49
47
  display: inline-block;
48
+
49
+ border-bottom: $has-tip-border-bottom;
50
+ font-weight: $has-tip-font-weight;
50
51
  cursor: help;
51
52
  }
52
53
 
53
54
  @mixin tooltip {
54
- background-color: $tooltip-background-color;
55
- color: $tooltip-color;
56
- font-size: $tooltip-font-size;
57
- padding: $tooltip-padding;
58
55
  position: absolute;
59
- z-index: 10;
60
56
  top: calc(100% + #{$tooltip-pip-height});
61
- max-width: 10rem !important;
57
+ z-index: 1200;
58
+
59
+ max-width: 10rem;
60
+ padding: $tooltip-padding;
61
+
62
62
  border-radius: $tooltip-radius;
63
+ background-color: $tooltip-background-color;
64
+ font-size: $tooltip-font-size;
65
+ color: $tooltip-color;
63
66
 
64
67
  &::before {
65
68
  @include css-triangle($tooltip-pip-width, $tooltip-background-color, up);
66
- bottom: 100%;
67
69
  position: absolute;
70
+ bottom: 100%;
68
71
  left: 50%;
69
72
  transform: translateX(-50%);
70
73
  }
@@ -77,18 +80,18 @@ $tooltip-radius: $global-radius !default;
77
80
 
78
81
  &.left::before {
79
82
  @include css-triangle($tooltip-pip-width, $tooltip-background-color, right);
83
+ top: 50%;
80
84
  bottom: auto;
81
85
  left: 100%;
82
- top: 50%;
83
86
  transform: translateY(-50%);
84
87
  }
85
88
 
86
89
  &.right::before {
87
90
  @include css-triangle($tooltip-pip-width, $tooltip-background-color, left);
91
+ top: 50%;
92
+ right: 100%;
88
93
  bottom: auto;
89
94
  left: auto;
90
- right: 100%;
91
- top: 50%;
92
95
  transform: translateY(-50%);
93
96
  }
94
97
  }
@@ -20,7 +20,7 @@ $topbar-submenu-background: $topbar-background !default;
20
20
 
21
21
  /// Spacing for the top bar title.
22
22
  /// @type Number
23
- $topbar-title-spacing: 1rem !default;
23
+ $topbar-title-spacing: 0.5rem 1rem 0.5rem 0 !default;
24
24
 
25
25
  /// Maximum width of `<input>` elements inside the top bar.
26
26
  /// @type Number
@@ -34,9 +34,9 @@ $topbar-unstack-breakpoint: medium !default;
34
34
  @mixin top-bar-container {
35
35
  @if $global-flexbox {
36
36
  display: flex;
37
- align-items: center;
38
- justify-content: space-between;
39
37
  flex-wrap: nowrap;
38
+ justify-content: space-between;
39
+ align-items: center;
40
40
  }
41
41
  @else {
42
42
  @include clearfix;
@@ -68,8 +68,7 @@ $topbar-unstack-breakpoint: medium !default;
68
68
  margin-#{$global-right}: 0;
69
69
  }
70
70
 
71
- // scss-lint:disable QualifyingElement
72
- input.button {
71
+ input.button { // sass-lint:disable-line no-qualifying-elements
73
72
  width: auto;
74
73
  }
75
74
  }
@@ -100,10 +99,10 @@ $topbar-unstack-breakpoint: medium !default;
100
99
  @if $global-flexbox {
101
100
  flex-wrap: nowrap;
102
101
 
103
- // scss-lint:disable ZeroUnit
104
102
  .top-bar-left {
105
103
  flex: 1 1 auto;
106
104
  }
105
+
107
106
  .top-bar-right {
108
107
  flex: 0 1 auto;
109
108
  }
@@ -144,7 +143,7 @@ $topbar-unstack-breakpoint: medium !default;
144
143
  @if $global-flexbox {
145
144
  .top-bar-title {
146
145
  flex: 0 0 auto;
147
- margin-right: $topbar-title-spacing;
146
+ margin: $topbar-title-spacing;
148
147
  }
149
148
 
150
149
  .top-bar-left,
@@ -154,9 +153,13 @@ $topbar-unstack-breakpoint: medium !default;
154
153
  }
155
154
  @else {
156
155
  .top-bar-title {
156
+ display: inline-block;
157
157
  float: left;
158
- margin-right: $topbar-title-spacing;
158
+ padding: $topbar-title-spacing;
159
159
 
160
+ .menu-icon {
161
+ bottom: 2px;
162
+ }
160
163
  }
161
164
 
162
165
  .top-bar-left {