paint-rails 0.6.7 → 0.7.24

Sign up to get free protection for your applications and to get access to all the features.
Files changed (136) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +5 -4
  3. data/lib/paint-rails/version.rb +1 -1
  4. data/paint-rails.gemspec +2 -2
  5. data/vendor/assets/stylesheets/Brocfile.js +3 -0
  6. data/vendor/assets/stylesheets/Gemfile +3 -0
  7. data/vendor/assets/stylesheets/Gemfile.lock +14 -0
  8. data/vendor/assets/stylesheets/bin/ci +6 -0
  9. data/vendor/assets/stylesheets/bin/lint +5 -0
  10. data/vendor/assets/stylesheets/bin/setup +7 -0
  11. data/vendor/assets/stylesheets/bower_components/fontawesome/.bower.json +5 -5
  12. data/vendor/assets/stylesheets/bower_components/fontawesome/.gitignore +1 -0
  13. data/vendor/assets/stylesheets/bower_components/fontawesome/bower.json +1 -1
  14. data/vendor/assets/stylesheets/bower_components/fontawesome/css/font-awesome.css +133 -4
  15. data/vendor/assets/stylesheets/bower_components/fontawesome/css/font-awesome.css.map +7 -0
  16. data/vendor/assets/stylesheets/bower_components/fontawesome/css/font-awesome.min.css +2 -2
  17. data/vendor/assets/stylesheets/bower_components/fontawesome/fonts/FontAwesome.otf +0 -0
  18. data/vendor/assets/stylesheets/bower_components/fontawesome/fonts/fontawesome-webfont.eot +0 -0
  19. data/vendor/assets/stylesheets/bower_components/fontawesome/fonts/fontawesome-webfont.svg +53 -8
  20. data/vendor/assets/stylesheets/bower_components/fontawesome/fonts/fontawesome-webfont.ttf +0 -0
  21. data/vendor/assets/stylesheets/bower_components/fontawesome/fonts/fontawesome-webfont.woff +0 -0
  22. data/vendor/assets/stylesheets/bower_components/fontawesome/fonts/fontawesome-webfont.woff2 +0 -0
  23. data/vendor/assets/stylesheets/bower_components/fontawesome/less/{spinning.less → animated.less} +6 -1
  24. data/vendor/assets/stylesheets/bower_components/fontawesome/less/core.less +3 -1
  25. data/vendor/assets/stylesheets/bower_components/fontawesome/less/font-awesome.less +2 -2
  26. data/vendor/assets/stylesheets/bower_components/fontawesome/less/icons.less +45 -1
  27. data/vendor/assets/stylesheets/bower_components/fontawesome/less/mixins.less +3 -1
  28. data/vendor/assets/stylesheets/bower_components/fontawesome/less/path.less +1 -0
  29. data/vendor/assets/stylesheets/bower_components/fontawesome/less/variables.less +47 -2
  30. data/vendor/assets/stylesheets/bower_components/fontawesome/scss/{_spinning.scss → _animated.scss} +5 -0
  31. data/vendor/assets/stylesheets/bower_components/fontawesome/scss/_core.scss +3 -1
  32. data/vendor/assets/stylesheets/bower_components/fontawesome/scss/_icons.scss +45 -1
  33. data/vendor/assets/stylesheets/bower_components/fontawesome/scss/_mixins.scss +3 -1
  34. data/vendor/assets/stylesheets/bower_components/fontawesome/scss/_path.scss +2 -1
  35. data/vendor/assets/stylesheets/bower_components/fontawesome/scss/_variables.scss +47 -2
  36. data/vendor/assets/stylesheets/bower_components/fontawesome/scss/font-awesome.scss +2 -2
  37. data/vendor/assets/stylesheets/bower_components/foundation/.bower.json +5 -5
  38. data/vendor/assets/stylesheets/bower_components/foundation/bower.json +1 -1
  39. data/vendor/assets/stylesheets/bower_components/foundation/css/foundation.css +1855 -1667
  40. data/vendor/assets/stylesheets/bower_components/foundation/css/foundation.css.map +7 -0
  41. data/vendor/assets/stylesheets/bower_components/foundation/css/foundation.min.css +1 -0
  42. data/vendor/assets/stylesheets/bower_components/foundation/css/normalize.css +11 -12
  43. data/vendor/assets/stylesheets/bower_components/foundation/css/normalize.css.map +7 -0
  44. data/vendor/assets/stylesheets/bower_components/foundation/css/normalize.min.css +1 -0
  45. data/vendor/assets/stylesheets/bower_components/foundation/js/foundation/foundation.abide.js +156 -62
  46. data/vendor/assets/stylesheets/bower_components/foundation/js/foundation/foundation.accordion.js +35 -13
  47. data/vendor/assets/stylesheets/bower_components/foundation/js/foundation/foundation.alert.js +8 -8
  48. data/vendor/assets/stylesheets/bower_components/foundation/js/foundation/foundation.clearing.js +93 -65
  49. data/vendor/assets/stylesheets/bower_components/foundation/js/foundation/foundation.dropdown.js +203 -66
  50. data/vendor/assets/stylesheets/bower_components/foundation/js/foundation/foundation.equalizer.js +57 -27
  51. data/vendor/assets/stylesheets/bower_components/foundation/js/foundation/foundation.interchange.js +61 -46
  52. data/vendor/assets/stylesheets/bower_components/foundation/js/foundation/foundation.joyride.js +93 -78
  53. data/vendor/assets/stylesheets/bower_components/foundation/js/foundation/foundation.js +177 -77
  54. data/vendor/assets/stylesheets/bower_components/foundation/js/foundation/foundation.magellan.js +81 -55
  55. data/vendor/assets/stylesheets/bower_components/foundation/js/foundation/foundation.offcanvas.js +28 -28
  56. data/vendor/assets/stylesheets/bower_components/foundation/js/foundation/foundation.orbit.js +135 -131
  57. data/vendor/assets/stylesheets/bower_components/foundation/js/foundation/foundation.reveal.js +119 -65
  58. data/vendor/assets/stylesheets/bower_components/foundation/js/foundation/foundation.slider.js +113 -71
  59. data/vendor/assets/stylesheets/bower_components/foundation/js/foundation/foundation.tab.js +67 -35
  60. data/vendor/assets/stylesheets/bower_components/foundation/js/foundation/foundation.tooltip.js +76 -37
  61. data/vendor/assets/stylesheets/bower_components/foundation/js/foundation/foundation.topbar.js +71 -58
  62. data/vendor/assets/stylesheets/bower_components/foundation/js/foundation.js +1570 -919
  63. data/vendor/assets/stylesheets/bower_components/foundation/js/foundation.min.js +5 -4
  64. data/vendor/assets/stylesheets/bower_components/foundation/js/vendor/fastclick.js +8 -9
  65. data/vendor/assets/stylesheets/bower_components/foundation/js/vendor/jquery.js +10 -9
  66. data/vendor/assets/stylesheets/bower_components/foundation/js/vendor/modernizr.js +1 -1
  67. data/vendor/assets/stylesheets/bower_components/foundation/js/vendor/placeholder.js +2 -2
  68. data/vendor/assets/stylesheets/bower_components/foundation/package.json +53 -0
  69. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/_functions.scss +76 -22
  70. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/_settings.scss +152 -107
  71. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_accordion.scss +8 -8
  72. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_alert-boxes.scss +12 -12
  73. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_block-grid.scss +14 -13
  74. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_breadcrumbs.scss +18 -19
  75. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_button-groups.scss +35 -25
  76. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_buttons.scss +16 -19
  77. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_clearing.scss +60 -47
  78. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_dropdown-buttons.scss +15 -15
  79. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_dropdown.scss +42 -36
  80. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_flex-video.scss +7 -7
  81. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_forms.scss +103 -79
  82. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_global.scss +95 -53
  83. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_grid.scss +42 -25
  84. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_icon-bar.scss +371 -204
  85. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_inline-lists.scss +8 -8
  86. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_joyride.scss +40 -42
  87. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_keystrokes.scss +2 -3
  88. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_labels.scss +7 -7
  89. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_magellan.scss +2 -2
  90. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_offcanvas.scss +184 -179
  91. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_orbit.scss +90 -70
  92. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_pagination.scss +15 -15
  93. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_panels.scss +27 -15
  94. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_pricing-tables.scss +16 -16
  95. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_progress-bars.scss +4 -4
  96. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_range-slider.scss +28 -19
  97. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_reveal.scss +37 -50
  98. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_side-nav.scss +15 -11
  99. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_split-buttons.scss +26 -14
  100. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_sub-nav.scss +14 -12
  101. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_switches.scss +32 -21
  102. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_tables.scss +8 -8
  103. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_tabs.scss +50 -31
  104. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_thumbs.scss +8 -8
  105. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_tooltips.scss +25 -25
  106. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_top-bar.scss +197 -145
  107. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_type.scss +20 -81
  108. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_visibility.scss +99 -15
  109. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation.scss +37 -38
  110. data/vendor/assets/stylesheets/bower_components/foundation/scss/normalize.scss +8 -11
  111. data/vendor/assets/stylesheets/bower_components/jquery/.bower.json +5 -4
  112. data/vendor/assets/stylesheets/bower_components/jquery/bower.json +2 -1
  113. data/vendor/assets/stylesheets/bower_components/jquery/dist/jquery.js +9 -4
  114. data/vendor/assets/stylesheets/bower_components/jquery/dist/jquery.min.js +4 -4
  115. data/vendor/assets/stylesheets/bower_components/jquery/dist/jquery.min.map +1 -1
  116. data/vendor/assets/stylesheets/bower_components/jquery/src/core.js +6 -1
  117. data/vendor/assets/stylesheets/circle.yml +17 -0
  118. data/vendor/assets/stylesheets/components/_button.scss +120 -21
  119. data/vendor/assets/stylesheets/components/_dropdown.scss +316 -14
  120. data/vendor/assets/stylesheets/components/_flip-panel.scss +191 -0
  121. data/vendor/assets/stylesheets/components/_form.scss +346 -0
  122. data/vendor/assets/stylesheets/components/_layout.scss +261 -121
  123. data/vendor/assets/stylesheets/components/_panel.scss +91 -0
  124. data/vendor/assets/stylesheets/components/_quick-jump.scss +267 -0
  125. data/vendor/assets/stylesheets/components/_side-panel.scss +154 -0
  126. data/vendor/assets/stylesheets/components/_table.scss +105 -0
  127. data/vendor/assets/stylesheets/components/_typography.scss +34 -3
  128. data/vendor/assets/stylesheets/components/_vertical-align.scss +9 -0
  129. data/vendor/assets/stylesheets/globals/_functions.scss +69 -0
  130. data/vendor/assets/stylesheets/globals/_mixins.scss +23 -1
  131. data/vendor/assets/stylesheets/globals/_settings.scss +35 -36
  132. data/vendor/assets/stylesheets/paint.scss +22 -14
  133. metadata +29 -8
  134. data/vendor/assets/stylesheets/bower_components/fontawesome/less/extras.less +0 -2
  135. data/vendor/assets/stylesheets/bower_components/fontawesome/scss/_extras.scss +0 -44
  136. data/vendor/assets/stylesheets/bower_components/foundation/scss/foundation/components/_toolbar.scss +0 -70
@@ -2,7 +2,7 @@
2
2
  // foundation.zurb.com
3
3
  // Licensed under MIT Open Source
4
4
 
5
- @import "global";
5
+ @import 'global';
6
6
 
7
7
 
8
8
  // @name
@@ -15,15 +15,22 @@ $include-html-icon-bar-classes: $include-html-classes !default;
15
15
  // We use these to style the icon-bar and items
16
16
  $icon-bar-bg: $oil !default;
17
17
  $icon-bar-font-color: $white !default;
18
+ $icon-bar-font-color-hover: $icon-bar-font-color !default;
18
19
  $icon-bar-font-size: 1rem !default;
19
20
  $icon-bar-hover-color: $primary-color !default;
20
21
  $icon-bar-icon-color: $white !default;
22
+ $icon-bar-icon-color-hover: $icon-bar-icon-color !default;
21
23
  $icon-bar-icon-size: 1.875rem !default;
22
24
  $icon-bar-image-width: 1.875rem !default;
23
25
  $icon-bar-image-height: 1.875rem !default;
24
26
  $icon-bar-active-color: $primary-color !default;
25
27
  $icon-bar-item-padding: 1.25rem !default;
26
28
 
29
+ // We use this to set default opacity and cursor for disabled icons.
30
+ $icon-bar-disabled-opacity: .7 !default;
31
+ $icon-bar-disabled-cursor: $cursor-disabled-value !default;
32
+
33
+
27
34
  //
28
35
  // @mixins
29
36
  //
@@ -31,149 +38,176 @@ $icon-bar-item-padding: 1.25rem !default;
31
38
  // We use this mixin to create the base styles for our Icon bar element.
32
39
  //
33
40
  @mixin icon-bar-base() {
34
-
35
- width: 100%;
36
- font-size: 0;
37
- display: inline-block;
38
-
39
- & > * {
40
- text-align: center;
41
- font-size: $icon-bar-font-size;
42
- width: 25%;
43
- margin: 0 auto;
44
- display: block;
45
- padding: $icon-bar-item-padding;
46
- float: left;
47
-
48
- i, img {
49
- display: block;
50
- margin: 0 auto;
51
-
52
- & + label {
53
- margin-top: .0625rem;
54
- }
55
- }
56
-
57
- i {
58
- font-size: $icon-bar-icon-size;
59
- vertical-align: middle;
60
- }
61
-
62
- img {
63
- width: $icon-bar-image-width;
64
- height: $icon-bar-image-height;
65
- }
66
- }
67
-
68
- &.label-right > * {
69
-
70
- i, img {
71
- margin: 0 .0625rem 0 0;
72
- display: inline-block;
73
-
74
- & + label {
75
- margin-top: 0;
76
- }
77
- }
78
-
79
- label { display: inline-block; }
80
- }
81
-
82
- &.vertical.label-right > * {
83
- text-align: left;
84
- }
85
-
86
- &.vertical, &.small-vertical{
87
- height: 100%;
88
- width: auto;
89
-
90
- .item {
91
- width: auto;
92
- margin: auto;
93
- float: none;
94
- }
95
- }
96
-
97
- &.medium-vertical {
98
- @media #{$medium-up} {
99
- height: 100%;
100
- width: auto;
101
-
102
- .item {
103
- width: auto;
104
- margin: auto;
105
- float: none;
106
- }
107
- }
108
- }
109
- &.large-vertical {
110
- @media #{$large-up} {
111
- height: 100%;
112
- width: auto;
113
-
114
- .item {
115
- width: auto;
116
- margin: auto;
117
- float: none;
118
- }
119
- }
120
- }
41
+ display: inline-block;
42
+ font-size: 0;
43
+ width: 100%;
44
+
45
+ > * {
46
+ display: block;
47
+ float: left;
48
+ font-size: $icon-bar-font-size;
49
+ margin: 0 auto;
50
+ padding: $icon-bar-item-padding;
51
+ text-align: center;
52
+ width: 25%;
53
+
54
+ i, img {
55
+ display: block;
56
+ margin: 0 auto;
57
+
58
+ & + label {
59
+ margin-top: .0625rem;
60
+ }
61
+ }
62
+
63
+ i {
64
+ font-size: $icon-bar-icon-size;
65
+ vertical-align: middle;
66
+ }
67
+
68
+ img {
69
+ height: $icon-bar-image-height;
70
+ width: $icon-bar-image-width;
71
+ }
72
+ }
73
+
74
+ &.label-right > * {
75
+
76
+ i, img {
77
+ display: inline-block;
78
+ margin: 0 .0625rem 0 0;
79
+
80
+ & + label {
81
+ margin-top: 0;
82
+ }
83
+ }
84
+
85
+ label { display: inline-block; }
86
+ }
87
+
88
+ &.vertical.label-right > * {
89
+ text-align: left;
90
+ }
91
+
92
+ &.vertical, &.small-vertical{
93
+ height: 100%;
94
+ width: auto;
95
+
96
+ .item {
97
+ float: none;
98
+ margin: auto;
99
+ width: auto;
100
+ }
101
+ }
102
+
103
+ &.medium-vertical {
104
+ @media #{$medium-up} {
105
+ height: 100%;
106
+ width: auto;
107
+
108
+ .item {
109
+ float: none;
110
+ margin: auto;
111
+ width: auto;
112
+ }
113
+ }
114
+ }
115
+ &.large-vertical {
116
+ @media #{$large-up} {
117
+ height: 100%;
118
+ width: auto;
119
+
120
+ .item {
121
+ float: none;
122
+ margin: auto;
123
+ width: auto;
124
+ }
125
+ }
126
+ }
121
127
  }
122
128
 
123
129
  // We use this mixin to create the size styles for icon bars.
124
130
  @mixin icon-bar-size(
125
- $padding: $icon-bar-item-padding,
126
- $font-size: $icon-bar-font-size,
127
- $icon-size: $icon-bar-icon-size,
128
- $image-width: $icon-bar-image-width,
129
- $image-height: $icon-bar-image-height) {
131
+ $padding: $icon-bar-item-padding,
132
+ $font-size: $icon-bar-font-size,
133
+ $icon-size: $icon-bar-icon-size,
134
+ $image-width: $icon-bar-image-width,
135
+ $image-height: $icon-bar-image-height) {
130
136
 
131
- & > * {
132
- font-size: $font-size;
133
- padding: $padding;
137
+ > * {
138
+ font-size: $font-size;
139
+ padding: $padding;
134
140
 
135
- i, img {
141
+ i, img {
136
142
 
137
- & + label {
138
- margin-top: .0625rem;
139
- }
140
- }
143
+ & + label {
144
+ margin-top: .0625rem;
145
+ font-size: $font-size;
146
+ }
147
+ }
141
148
 
142
- i {
143
- font-size: $icon-size;
144
- }
149
+ i {
150
+ font-size: $icon-size;
151
+ }
145
152
 
146
- img {
147
- width: $image-width;
148
- height: $image-height;
149
- }
150
- }
153
+ img {
154
+ height: $image-height;
155
+ width: $image-width;
156
+ }
157
+ }
151
158
 
152
159
  }
153
160
 
154
161
  @mixin icon-bar-style(
155
162
  $bar-bg:$icon-bar-bg,
156
163
  $bar-font-color:$icon-bar-font-color,
164
+ $bar-font-color-hover:$icon-bar-font-color-hover,
157
165
  $bar-hover-color:$icon-bar-hover-color,
158
166
  $bar-icon-color:$icon-bar-icon-color,
167
+ $bar-icon-color-hover:$icon-bar-icon-color-hover,
159
168
  $bar-active-color:$icon-bar-active-color,
160
- $base-style:true) {
169
+ $base-style:true,
170
+ $disabled:false) {
171
+
172
+ @if $base-style {
161
173
 
162
- @if $base-style {
163
-
164
- background: $bar-bg;
174
+ background: $bar-bg;
165
175
 
166
- & > * {
176
+ > * {
177
+ label { color: $bar-font-color; }
178
+
179
+ i { color: $bar-icon-color; }
180
+ }
167
181
 
168
- &:hover { background: $bar-hover-color; }
182
+ > a:hover {
183
+
184
+ background: $bar-hover-color;
185
+
186
+ label { color: $bar-font-color-hover; }
187
+
188
+ i { color: $bar-icon-color-hover; }
189
+ }
169
190
 
170
- label { color: $bar-font-color; }
191
+ > a.active {
171
192
 
172
- i {
173
- color: $bar-icon-color;
174
- }
175
- }
176
- }
193
+ background: $bar-active-color;
194
+
195
+ label { color: $bar-font-color-hover; }
196
+
197
+ i { color: $bar-icon-color-hover; }
198
+ }
199
+ }
200
+ @if $disabled {
201
+ .item.disabled {
202
+ cursor: $icon-bar-disabled-cursor;
203
+ opacity: $icon-bar-disabled-opacity;
204
+ pointer-events: none;
205
+ >* {
206
+ opacity: $icon-bar-disabled-opacity;
207
+ cursor: $icon-bar-disabled-cursor;
208
+ }
209
+ }
210
+ }
177
211
 
178
212
  }
179
213
 
@@ -185,22 +219,127 @@ $icon-bar-item-padding: 1.25rem !default;
185
219
  // $bar-icon-color - maybe we could skip explaining them all? Okay this one does change icon color if you use an icon font
186
220
  // $bar-active-color - the color of an active / hover state
187
221
  // $base-style - Apply base styles? Default: true.
222
+ // $disabled - Allow disabled icons? Default: false.
188
223
 
189
224
  @mixin icon-bar(
190
225
  $bar-bg:$icon-bar-bg,
191
226
  $bar-font-color:$icon-bar-font-color,
227
+ $bar-font-color-hover:$icon-bar-font-color-hover,
192
228
  $bar-hover-color:$icon-bar-hover-color,
193
229
  $bar-icon-color:$icon-bar-icon-color,
230
+ $bar-icon-color-hover:$icon-bar-icon-color-hover,
194
231
  $bar-active-color:$icon-bar-active-color,
195
232
  $padding: $icon-bar-item-padding,
196
- $font-size: $icon-bar-font-size,
197
- $icon-size: $icon-bar-icon-size,
198
- $image-width: $icon-bar-image-width,
199
- $image-height: $icon-bar-image-height,
200
- $base-style:true) {
233
+ $font-size: $icon-bar-font-size,
234
+ $icon-size: $icon-bar-icon-size,
235
+ $image-width: $icon-bar-image-width,
236
+ $image-height: $icon-bar-image-height,
237
+ $base-style:true,
238
+ $disabled:true) {
201
239
  @include icon-bar-base();
202
240
  @include icon-bar-size($padding, $font-size, $icon-size, $image-width, $image-height);
203
- @include icon-bar-style($bar-bg, $bar-font-color, $bar-hover-color, $bar-icon-color, $bar-active-color, $base-style);
241
+ @include icon-bar-style($bar-bg, $bar-font-color, $bar-font-color-hover, $bar-hover-color, $bar-icon-color, $bar-icon-color-hover, $bar-active-color, $base-style, $disabled);
242
+
243
+ // Counts
244
+
245
+ &.two-up {
246
+ .item { width: 50%; }
247
+ &.vertical .item, &.small-vertical .item { width: auto; }
248
+ &.medium-vertical .item {
249
+ @media #{$medium-up} {
250
+ width: auto;
251
+ }
252
+ }
253
+ &.large-vertical .item {
254
+ @media #{$large-up} {
255
+ width: auto;
256
+ }
257
+ }
258
+ }
259
+ &.three-up {
260
+ .item { width: 33.3333%; }
261
+ &.vertical .item, &.small-vertical .item { width: auto; }
262
+ &.medium-vertical .item {
263
+ @media #{$medium-up} {
264
+ width: auto;
265
+ }
266
+ }
267
+ &.large-vertical .item {
268
+ @media #{$large-up} {
269
+ width: auto;
270
+ }
271
+ }
272
+ }
273
+ &.four-up {
274
+ .item { width: 25%; }
275
+ &.vertical .item, &.small-vertical .item { width: auto; }
276
+ &.medium-vertical .item {
277
+ @media #{$medium-up} {
278
+ width: auto;
279
+ }
280
+ }
281
+ &.large-vertical .item {
282
+ @media #{$large-up} {
283
+ width: auto;
284
+ }
285
+ }
286
+ }
287
+ &.five-up {
288
+ .item { width: 20%; }
289
+ &.vertical .item, &.small-vertical .item { width: auto; }
290
+ &.medium-vertical .item {
291
+ @media #{$medium-up} {
292
+ width: auto;
293
+ }
294
+ }
295
+ &.large-vertical .item {
296
+ @media #{$large-up} {
297
+ width: auto;
298
+ }
299
+ }
300
+ }
301
+ &.six-up {
302
+ .item { width: 16.66667%; }
303
+ &.vertical .item, &.small-vertical .item { width: auto; }
304
+ &.medium-vertical .item {
305
+ @media #{$medium-up} {
306
+ width: auto;
307
+ }
308
+ }
309
+ &.large-vertical .item {
310
+ @media #{$large-up} {
311
+ width: auto;
312
+ }
313
+ }
314
+ }
315
+ &.seven-up {
316
+ .item { width: 14.28571%; }
317
+ &.vertical .item, &.small-vertical .item { width: auto; }
318
+ &.medium-vertical .item {
319
+ @media #{$medium-up} {
320
+ width: auto;
321
+ }
322
+ }
323
+ &.large-vertical .item {
324
+ @media #{$large-up} {
325
+ width: auto;
326
+ }
327
+ }
328
+ }
329
+ &.eight-up {
330
+ .item { width: 12.5%; }
331
+ &.vertical .item, &.small-vertical .item { width: auto; }
332
+ &.medium-vertical .item {
333
+ @media #{$medium-up} {
334
+ width: auto;
335
+ }
336
+ }
337
+ &.large-vertical .item {
338
+ @media #{$large-up} {
339
+ width: auto;
340
+ }
341
+ }
342
+ }
204
343
  }
205
344
 
206
345
  @include exports("icon-bar") {
@@ -213,81 +352,109 @@ $icon-bar-item-padding: 1.25rem !default;
213
352
 
214
353
  @if $include-html-icon-bar-classes {
215
354
 
216
- // toolbar styles
217
-
218
- .icon-bar {
219
-
220
- // Counts
221
-
222
- &.two-up {
223
- .item { width: 50%; }
224
- &.vertical .item, &.small-vertical .item { width: auto; }
225
- &.medium-vertical .item {
226
- @media #{$medium-up} {
227
- width: auto;
228
- }
229
- }
230
- &.large-vertical .item {
231
- @media #{$large-up} {
232
- width: auto;
233
- }
234
- }
235
- }
236
- &.three-up {
237
- .item { width: 33.3333%; }
238
- &.vertical .item, &.small-vertical .item { width: auto; }
239
- &.medium-vertical .item {
240
- @media #{$medium-up} {
241
- width: auto;
242
- }
243
- }
244
- &.large-vertical .item {
245
- @media #{$large-up} {
246
- width: auto;
247
- }
248
- }
249
- }
250
- &.four-up {
251
- .item { width: 25%; }
252
- &.vertical .item, &.small-vertical .item { width: auto; }
253
- &.medium-vertical .item {
254
- @media #{$medium-up} {
255
- width: auto;
256
- }
257
- }
258
- &.large-vertical .item {
259
- @media #{$large-up} {
260
- width: auto;
261
- }
262
- }
263
- }
264
- &.five-up {
265
- .item { width: 20%; }
266
- &.vertical .item, &.small-vertical .item { width: auto; }
267
- &.medium-vertical .item {
268
- @media #{$medium-up} {
269
- width: auto;
270
- }
271
- }
272
- &.large-vertical .item {
273
- @media #{$large-up} {
274
- width: auto;
275
- }
276
- }
277
- }
278
- &.six-up {
279
- .item { width: 16.66667%; }
280
- &.vertical .item, &.small-vertical .item { width: auto; }
281
- &.medium-vertical .item {
282
- @media #{$medium-up} {
283
- width: auto;
284
- }
285
- }
286
- &.large-vertical .item {
287
- @media #{$large-up} {
288
- width: auto;
289
- }
290
- }
291
- }
292
- }
355
+ // toolbar styles
356
+
357
+ .icon-bar {
358
+
359
+ // Counts
360
+
361
+ &.two-up {
362
+ .item { width: 50%; }
363
+ &.vertical .item, &.small-vertical .item { width: auto; }
364
+ &.medium-vertical .item {
365
+ @media #{$medium-up} {
366
+ width: auto;
367
+ }
368
+ }
369
+ &.large-vertical .item {
370
+ @media #{$large-up} {
371
+ width: auto;
372
+ }
373
+ }
374
+ }
375
+ &.three-up {
376
+ .item { width: 33.3333%; }
377
+ &.vertical .item, &.small-vertical .item { width: auto; }
378
+ &.medium-vertical .item {
379
+ @media #{$medium-up} {
380
+ width: auto;
381
+ }
382
+ }
383
+ &.large-vertical .item {
384
+ @media #{$large-up} {
385
+ width: auto;
386
+ }
387
+ }
388
+ }
389
+ &.four-up {
390
+ .item { width: 25%; }
391
+ &.vertical .item, &.small-vertical .item { width: auto; }
392
+ &.medium-vertical .item {
393
+ @media #{$medium-up} {
394
+ width: auto;
395
+ }
396
+ }
397
+ &.large-vertical .item {
398
+ @media #{$large-up} {
399
+ width: auto;
400
+ }
401
+ }
402
+ }
403
+ &.five-up {
404
+ .item { width: 20%; }
405
+ &.vertical .item, &.small-vertical .item { width: auto; }
406
+ &.medium-vertical .item {
407
+ @media #{$medium-up} {
408
+ width: auto;
409
+ }
410
+ }
411
+ &.large-vertical .item {
412
+ @media #{$large-up} {
413
+ width: auto;
414
+ }
415
+ }
416
+ }
417
+ &.six-up {
418
+ .item { width: 16.66667%; }
419
+ &.vertical .item, &.small-vertical .item { width: auto; }
420
+ &.medium-vertical .item {
421
+ @media #{$medium-up} {
422
+ width: auto;
423
+ }
424
+ }
425
+ &.large-vertical .item {
426
+ @media #{$large-up} {
427
+ width: auto;
428
+ }
429
+ }
430
+ }
431
+ &.seven-up {
432
+ .item { width: 14.28571%; }
433
+ &.vertical .item, &.small-vertical .item { width: auto; }
434
+ &.medium-vertical .item {
435
+ @media #{$medium-up} {
436
+ width: auto;
437
+ }
438
+ }
439
+ &.large-vertical .item {
440
+ @media #{$large-up} {
441
+ width: auto;
442
+ }
443
+ }
444
+ }
445
+ &.eight-up {
446
+ .item { width: 12.5%; }
447
+ &.vertical .item, &.small-vertical .item { width: auto; }
448
+ &.medium-vertical .item {
449
+ @media #{$medium-up} {
450
+ width: auto;
451
+ }
452
+ }
453
+ &.large-vertical .item {
454
+ @media #{$large-up} {
455
+ width: auto;
456
+ }
457
+ }
458
+ }
459
+ }
293
460
  }
@@ -2,7 +2,7 @@
2
2
  // foundation.zurb.com
3
3
  // Licensed under MIT Open Source
4
4
 
5
- @import "global";
5
+ @import 'global';
6
6
 
7
7
  //
8
8
  // @variables
@@ -32,19 +32,19 @@ $inline-list-children-display: block !default;
32
32
  //
33
33
  // We use this mixin to create inline lists
34
34
  @mixin inline-list {
35
- margin: $inline-list-top-margin auto $inline-list-bottom-margin auto;
35
+ list-style: none;
36
36
  margin-#{$default-float}: $inline-list-default-float-margin;
37
37
  margin-#{$opposite-direction}: $inline-list-opposite-margin;
38
- padding: $inline-list-padding;
39
- list-style: none;
38
+ margin: $inline-list-top-margin auto $inline-list-bottom-margin auto;
40
39
  overflow: $inline-list-overflow;
40
+ padding: $inline-list-padding;
41
41
 
42
- & > li {
43
- list-style: none;
42
+ > li {
43
+ display: $inline-list-display;
44
44
  float: $default-float;
45
+ list-style: none;
45
46
  margin-#{$default-float}: $inline-list-default-float-list-margin;
46
- display: $inline-list-display;
47
- &>* { display: $inline-list-children-display; }
47
+ > * { display: $inline-list-children-display; }
48
48
  }
49
49
  }
50
50