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,8 +2,8 @@
2
2
  // foundation.zurb.com
3
3
  // Licensed under MIT Open Source
4
4
 
5
- @import "global";
6
- @import "buttons";
5
+ @import 'global';
6
+ @import 'buttons';
7
7
 
8
8
  //
9
9
  // @variables
@@ -23,6 +23,7 @@ $form-label-small-transform: capitalize !default;
23
23
  $form-label-bottom-margin: 0 !default;
24
24
  $input-font-family: inherit !default;
25
25
  $input-font-color: rgba(0,0,0,0.75) !default;
26
+ $input-placeholder-font-color: #cccccc !default;
26
27
  $input-font-size: rem-calc(14) !default;
27
28
  $input-bg-color: $white !default;
28
29
  $input-focus-bg-color: scale-color($white, $lightness: -2%) !default;
@@ -34,7 +35,7 @@ $input-border-radius: $global-radius !default;
34
35
  $input-disabled-bg: $gainsboro !default;
35
36
  $input-disabled-cursor: $cursor-default-value !default;
36
37
  $input-box-shadow: inset 0 1px 2px rgba(0,0,0,0.1) !default;
37
- $input-include-glowing-effect: true !default;
38
+ $input-include-glowing-effect: false !default;
38
39
 
39
40
  // We use these to style the fieldset border and spacing.
40
41
  $fieldset-border-style: solid !default;
@@ -53,7 +54,7 @@ $input-prefix-bg: scale-color($white, $lightness: -5%) !default;
53
54
  $input-prefix-border-color: scale-color($white, $lightness: -20%) !default;
54
55
  $input-prefix-border-size: 1px !default;
55
56
  $input-prefix-border-type: solid !default;
56
- $input-prefix-overflow: hidden !default;
57
+ $input-prefix-overflow: visible !default;
57
58
  $input-prefix-font-color: $oil !default;
58
59
  $input-prefix-font-color-alt: $white !default;
59
60
 
@@ -67,12 +68,17 @@ $input-error-message-font-size: rem-calc(12) !default;
67
68
  $input-error-message-font-weight: $font-weight-normal !default;
68
69
  $input-error-message-font-style: italic !default;
69
70
  $input-error-message-font-color: $white !default;
71
+ $input-error-message-bg-color: $alert-color !default;
70
72
  $input-error-message-font-color-alt: $oil !default;
71
73
 
72
74
  // We use this to style the glowing effect of inputs when focused
73
- $glowing-effect-fade-time: 0.45s !default;
75
+ $glowing-effect-fade-time: .45s !default;
74
76
  $glowing-effect-color: $input-focus-border-color !default;
75
77
 
78
+ // We use this to style the transition when inputs are focused and when the glowing effect is disabled.
79
+ $input-transition-fade-time: 0.15s !default;
80
+ $input-transition-fade-timing-function: linear !default;
81
+
76
82
  // Select variables
77
83
  $select-bg-color: $ghost !default;
78
84
  $select-hover-bg-color: scale-color($select-bg-color, $lightness: -3%) !default;
@@ -86,7 +92,7 @@ $select-hover-bg-color: scale-color($select-bg-color, $lightness: -3%) !default;
86
92
  .row { margin: 0 ((-$form-spacing) / 2);
87
93
 
88
94
  .column,
89
- .columns { padding: 0 $form-spacing / 2; }
95
+ .columns { padding: 0 ($form-spacing / 2); }
90
96
 
91
97
  // Use this to collapse the margins of a form row
92
98
  &.collapse { margin: 0;
@@ -102,7 +108,7 @@ $select-hover-bg-color: scale-color($select-bg-color, $lightness: -3%) !default;
102
108
  input.column,
103
109
  input.columns,
104
110
  textarea.column,
105
- textarea.columns { padding-#{$default-float}: $form-spacing / 2; }
111
+ textarea.columns { padding-#{$default-float}: ($form-spacing / 2); }
106
112
  }
107
113
 
108
114
  // @MIXIN
@@ -110,7 +116,6 @@ $select-hover-bg-color: scale-color($select-bg-color, $lightness: -3%) !default;
110
116
  // We use this mixin to give all basic form elements their style
111
117
  @mixin form-element {
112
118
  background-color: $input-bg-color;
113
- font-family: $input-font-family;
114
119
  border: {
115
120
  style: $input-border-style;
116
121
  width: $input-border-width;
@@ -119,10 +124,11 @@ $select-hover-bg-color: scale-color($select-bg-color, $lightness: -3%) !default;
119
124
  box-shadow: $input-box-shadow;
120
125
  color: $input-font-color;
121
126
  display: block;
127
+ font-family: $input-font-family;
122
128
  font-size: $input-font-size;
129
+ height: ($input-font-size + ($form-spacing * 1.5) - rem-calc(1));
123
130
  margin: 0 0 $form-spacing 0;
124
131
  padding: $form-spacing / 2;
125
- height: ($input-font-size + ($form-spacing * 1.5) - rem-calc(1));
126
132
  width: 100%;
127
133
  @include box-sizing(border-box);
128
134
  @if $input-include-glowing-effect {
@@ -134,7 +140,7 @@ $select-hover-bg-color: scale-color($select-bg-color, $lightness: -3%) !default;
134
140
  border-color: $input-focus-border-color;
135
141
  outline: none;
136
142
  }
137
- // Disbaled Styles
143
+ // Disabled Styles
138
144
  &:disabled {
139
145
  background-color: $input-disabled-bg;
140
146
  cursor: $input-disabled-cursor;
@@ -159,10 +165,10 @@ $select-hover-bg-color: scale-color($select-bg-color, $lightness: -3%) !default;
159
165
 
160
166
  // Control whether or not the base styles come through.
161
167
  @if $base-style {
162
- font-size: $form-label-font-size;
163
168
  color: $form-label-font-color;
164
169
  cursor: $form-label-pointer;
165
170
  display: block;
171
+ font-size: $form-label-font-size;
166
172
  font-weight: $form-label-font-weight;
167
173
  line-height: $form-label-line-height;
168
174
  margin-bottom: $form-label-bottom-margin;
@@ -181,19 +187,19 @@ $select-hover-bg-color: scale-color($select-bg-color, $lightness: -3%) !default;
181
187
 
182
188
  // We use this mixin to create postfix/prefix form Labels
183
189
  @mixin prefix-postfix-base {
184
- display: block;
185
- position: relative;
186
- z-index: 2;
187
- text-align: center;
188
- width: 100%;
189
- padding-top: 0;
190
- padding-bottom: 0;
191
190
  border-style: $input-prefix-border-type;
192
191
  border-width: $input-prefix-border-size;
193
- overflow: $input-prefix-overflow;
192
+ display: block;
194
193
  font-size: $form-label-font-size;
195
194
  height: ($input-font-size + ($form-spacing * 1.5) - rem-calc(1));
196
195
  line-height: ($input-font-size + ($form-spacing * 1.5) - rem-calc(1));
196
+ overflow: $input-prefix-overflow;
197
+ padding-bottom: 0;
198
+ padding-top: 0;
199
+ position: relative;
200
+ text-align: center;
201
+ width: 100%;
202
+ z-index: 2;
197
203
  }
198
204
 
199
205
  // @MIXIN
@@ -219,13 +225,12 @@ $select-hover-bg-color: scale-color($select-bg-color, $lightness: -3%) !default;
219
225
  }
220
226
 
221
227
  @if $is-button {
228
+ border: none;
222
229
  padding-#{$default-float}: 0;
223
230
  padding-#{$opposite-direction}: 0;
224
- padding-top: 0;
225
231
  padding-bottom: 0;
232
+ padding-top: 0;
226
233
  text-align: center;
227
- line-height: rem-calc(34);
228
- border: none;
229
234
  }
230
235
 
231
236
  }
@@ -235,12 +240,14 @@ $select-hover-bg-color: scale-color($select-bg-color, $lightness: -3%) !default;
235
240
  // We use this mixin to create postfix label styles
236
241
  // $bg - Default:$input-prefix-bg || scale-color($white, $lightness: -5%) !default;
237
242
  // $is-button - Toggle position settings if prefix is a button. Default: false
238
- @mixin postfix($bg:$input-prefix-bg, $border:$input-prefix-border-color, $is-button:false) {
243
+ @mixin postfix($bg:$input-prefix-bg, $border-left-hidden:false, $border:$input-prefix-border-color, $is-button:false) {
239
244
 
240
245
  @if $bg {
241
246
  $bg-lightness: lightness($bg);
242
247
  background: $bg;
243
- border-#{$default-float}: none;
248
+ @if $border-left-hidden {
249
+ border-#{$default-float}: none;
250
+ }
244
251
 
245
252
  // Control the font color based on background brightness
246
253
  @if $bg-lightness > 70% or $bg == yellow { color: $input-prefix-font-color; }
@@ -252,13 +259,12 @@ $select-hover-bg-color: scale-color($select-bg-color, $lightness: -3%) !default;
252
259
  }
253
260
 
254
261
  @if $is-button {
262
+ border: none;
255
263
  padding-#{$default-float}: 0;
256
264
  padding-#{$opposite-direction}: 0;
257
- padding-top: 0;
258
265
  padding-bottom: 0;
266
+ padding-top: 0;
259
267
  text-align: center;
260
- line-height: rem-calc(34);
261
- border: none;
262
268
  }
263
269
 
264
270
  }
@@ -266,16 +272,16 @@ $select-hover-bg-color: scale-color($select-bg-color, $lightness: -3%) !default;
266
272
  // We use this mixin to style fieldsets
267
273
  @mixin fieldset {
268
274
  border: $fieldset-border-width $fieldset-border-style $fieldset-border-color;
269
- padding: $fieldset-padding;
270
275
  margin: $fieldset-margin;
276
+ padding: $fieldset-padding;
271
277
 
272
278
  // and legend styles
273
279
  legend {
274
- font-weight: $legend-font-weight;
275
280
  background: $legend-bg;
276
- padding: $legend-padding;
277
- margin: 0;
281
+ font-weight: $legend-font-weight;
278
282
  margin-#{$default-float}: rem-calc(-3);
283
+ margin: 0;
284
+ padding: $legend-padding;
279
285
  }
280
286
  }
281
287
 
@@ -284,8 +290,8 @@ $select-hover-bg-color: scale-color($select-bg-color, $lightness: -3%) !default;
284
290
  // We use this mixin to control border and background color of error inputs
285
291
  // $color - Default: $alert-color (found in settings file)
286
292
  @mixin form-error-color($color:$alert-color) {
293
+ background-color: rgba($color, .1);
287
294
  border-color: $color;
288
- background-color: rgba($color, 0.1);
289
295
 
290
296
  // Go back to normal on focus
291
297
  &:focus {
@@ -304,14 +310,14 @@ $select-hover-bg-color: scale-color($select-bg-color, $lightness: -3%) !default;
304
310
  //
305
311
  // We use this mixin to create error message styles
306
312
  // $bg - Default: $alert-color (Found in settings file)
307
- @mixin form-error-message($bg:$alert-color) {
313
+ @mixin form-error-message($bg:$input-error-message-bg-color) {
308
314
  display: block;
309
- padding: $input-error-message-padding;
310
- margin-top: $input-error-message-top;
311
- margin-bottom: $form-spacing;
312
315
  font-size: $input-error-message-font-size;
313
- font-weight: $input-error-message-font-weight;
314
316
  font-style: $input-error-message-font-style;
317
+ font-weight: $input-error-message-font-weight;
318
+ margin-bottom: $form-spacing;
319
+ margin-top: $input-error-message-top;
320
+ padding: $input-error-message-padding;
315
321
 
316
322
  // We can control the text color based on the brightness of the background.
317
323
  $bg-lightness: lightness($bg);
@@ -323,15 +329,16 @@ $select-hover-bg-color: scale-color($select-bg-color, $lightness: -3%) !default;
323
329
  // We use this mixin to style select elements
324
330
  @mixin form-select {
325
331
  -webkit-appearance: none !important;
326
- -webkit-border-radius: 0px;
332
+ -moz-appearance: none !important;
327
333
  background-color: $select-bg-color;
334
+ border-radius: 0;
328
335
 
329
336
  // Hide the dropdown arrow shown in newer IE versions
330
337
  &::-ms-expand {
331
338
  display: none;
332
339
  }
333
340
 
334
- // The custom arrow have some fake horizontal padding so we can align it
341
+ // The custom arrow has some fake horizontal padding so we can align it
335
342
  // from the right side of the element without relying on CSS3
336
343
  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZlcnNpb249IjEuMSIgeD0iMTJweCIgeT0iMHB4IiB3aWR0aD0iMjRweCIgaGVpZ2h0PSIzcHgiIHZpZXdCb3g9IjAgMCA2IDMiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDYgMyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+PHBvbHlnb24gcG9pbnRzPSI1Ljk5MiwwIDIuOTkyLDMgLTAuMDA4LDAgIi8+PC9zdmc+);
337
344
 
@@ -344,11 +351,11 @@ $select-hover-bg-color: scale-color($select-bg-color, $lightness: -3%) !default;
344
351
  width: $input-border-width;
345
352
  color: $input-border-color;
346
353
  }
347
- padding: $form-spacing / 2;
348
- font-size: $input-font-size;
349
- font-family: $body-font-family;
350
354
  color: $input-font-color;
355
+ font-family: $input-font-family;
356
+ font-size: $input-font-size;
351
357
  line-height: normal;
358
+ padding: ($form-spacing / 2);
352
359
  @include radius(0);
353
360
  &.radius { @include radius($global-radius); }
354
361
  &:hover {
@@ -384,8 +391,8 @@ $select-hover-bg-color: scale-color($select-bg-color, $lightness: -3%) !default;
384
391
 
385
392
  /* Label Styles */
386
393
  label { @include form-label;
387
- &.right { @include form-label(right,false); }
388
- &.inline { @include form-label(inline,false); }
394
+ &.right { @include form-label(right, false); }
395
+ &.inline { @include form-label(inline, false); }
389
396
  /* Styles for required inputs */
390
397
  small {
391
398
  text-transform: $form-label-small-transform;
@@ -398,8 +405,8 @@ $select-hover-bg-color: scale-color($select-bg-color, $lightness: -3%) !default;
398
405
  .postfix { @include prefix-postfix-base; }
399
406
 
400
407
  /* Adjust padding, alignment and radius if pre/post element is a button */
401
- .postfix.button { @include button-size(false,false); @include postfix(false, false, true); }
402
- .prefix.button { @include button-size(false,false); @include prefix(false, false, true); }
408
+ .postfix.button { @include button-size(false, false); @include postfix(false, false, true); }
409
+ .prefix.button { @include button-size(false, false); @include prefix(false, false, true); }
403
410
 
404
411
  .prefix.button.radius { @include radius(0); @include side-radius($default-float, $button-radius); }
405
412
  .postfix.button.radius { @include radius(0); @include side-radius($opposite-direction, $button-radius); }
@@ -407,30 +414,21 @@ $select-hover-bg-color: scale-color($select-bg-color, $lightness: -3%) !default;
407
414
  .postfix.button.round { @include radius(0); @include side-radius($opposite-direction, $button-round); }
408
415
 
409
416
  /* Separate prefix and postfix styles when on span or label so buttons keep their own */
410
- span.prefix,label.prefix { @include prefix(); }
411
- span.postfix,label.postfix { @include postfix(); }
417
+ span.prefix, label.prefix { @include prefix(); }
418
+ span.postfix, label.postfix { @include postfix(); }
412
419
 
413
420
  /* We use this to get basic styling on all basic form elements */
414
- input[type="text"],
415
- input[type="password"],
416
- input[type="date"],
417
- input[type="datetime"],
418
- input[type="datetime-local"],
419
- input[type="month"],
420
- input[type="week"],
421
- input[type="email"],
422
- input[type="number"],
423
- input[type="search"],
424
- input[type="tel"],
425
- input[type="time"],
426
- input[type="url"],
427
- input[type="color"],
428
- textarea {
421
+ #{text-inputs(all, 'input')} {
429
422
  -webkit-appearance: none;
430
- -webkit-border-radius: 0px;
423
+ -moz-appearance: none;
424
+ border-radius: 0;
431
425
  @include form-element;
432
426
  @if $input-include-glowing-effect == false {
433
- @include single-transition(all, 0.15s, linear);
427
+ -webkit-transition: border-color $input-transition-fade-time $input-transition-fade-timing-function, background $input-transition-fade-time $input-transition-fade-timing-function;
428
+ -moz-transition: border-color $input-transition-fade-time $input-transition-fade-timing-function, background $input-transition-fade-time $input-transition-fade-timing-function;
429
+ -ms-transition: border-color $input-transition-fade-time $input-transition-fade-timing-function, background $input-transition-fade-time $input-transition-fade-timing-function;
430
+ -o-transition: border-color $input-transition-fade-time $input-transition-fade-timing-function, background $input-transition-fade-time $input-transition-fade-timing-function;
431
+ transition: border-color $input-transition-fade-time $input-transition-fade-timing-function, background $input-transition-fade-time $input-transition-fade-timing-function;
434
432
  }
435
433
  &.radius {
436
434
  @include radius($input-border-radius);
@@ -442,25 +440,29 @@ $select-hover-bg-color: scale-color($select-bg-color, $lightness: -3%) !default;
442
440
  .prefix-radius.row.collapse {
443
441
  input,
444
442
  textarea,
445
- select { @include radius(0); @include side-radius($opposite-direction, $button-radius); }
443
+ select,
444
+ button { @include radius(0); @include side-radius($opposite-direction, $button-radius); }
446
445
  .prefix { @include radius(0); @include side-radius($default-float, $button-radius); }
447
446
  }
448
447
  .postfix-radius.row.collapse {
449
448
  input,
450
449
  textarea,
451
- select { @include radius(0); @include side-radius($default-float, $button-radius); }
450
+ select,
451
+ button { @include radius(0); @include side-radius($default-float, $button-radius); }
452
452
  .postfix { @include radius(0); @include side-radius($opposite-direction, $button-radius); }
453
453
  }
454
454
  .prefix-round.row.collapse {
455
455
  input,
456
456
  textarea,
457
- select { @include radius(0); @include side-radius($opposite-direction, $button-round); }
457
+ select,
458
+ button { @include radius(0); @include side-radius($opposite-direction, $button-round); }
458
459
  .prefix { @include radius(0); @include side-radius($default-float, $button-round); }
459
460
  }
460
461
  .postfix-round.row.collapse {
461
462
  input,
462
463
  textarea,
463
- select { @include radius(0); @include side-radius($default-float, $button-round); }
464
+ select,
465
+ button { @include radius(0); @include side-radius($default-float, $button-round); }
464
466
  .postfix { @include radius(0); @include side-radius($opposite-direction, $button-round); }
465
467
  }
466
468
  }
@@ -468,7 +470,8 @@ $select-hover-bg-color: scale-color($select-bg-color, $lightness: -3%) !default;
468
470
 
469
471
  input[type="submit"] {
470
472
  -webkit-appearance: none;
471
- -webkit-border-radius: 0px;
473
+ -moz-appearance: none;
474
+ border-radius: 0;
472
475
  }
473
476
 
474
477
  /* Respect enforced amount of rows for textarea */
@@ -476,15 +479,36 @@ $select-hover-bg-color: scale-color($select-bg-color, $lightness: -3%) !default;
476
479
  height: auto;
477
480
  }
478
481
 
479
- /* Not allow resize out of parent */
480
- textarea {
481
- max-width: 100%;
482
- }
482
+ /* Not allow resize out of parent */
483
+ textarea {
484
+ max-width: 100%;
485
+ }
486
+
487
+ // style placeholder text cross browser
488
+ ::-webkit-input-placeholder {
489
+ color: $input-placeholder-font-color;
490
+ }
491
+
492
+ :-moz-placeholder { /* Firefox 18- */
493
+ color: $input-placeholder-font-color;
494
+ }
495
+
496
+ ::-moz-placeholder { /* Firefox 19+ */
497
+ color: $input-placeholder-font-color;
498
+ }
499
+
500
+ :-ms-input-placeholder {
501
+ color: $input-placeholder-font-color;
502
+ }
503
+
483
504
 
484
505
  /* Add height value for select elements to match text input height */
485
506
  select {
486
507
  @include form-select;
487
508
  height: ($input-font-size + ($form-spacing * 1.5) - rem-calc(1));
509
+ &[multiple] {
510
+ height: auto;
511
+ }
488
512
  }
489
513
 
490
514
  /* Adjust margin for form elements below */
@@ -559,14 +583,14 @@ $select-hover-bg-color: scale-color($select-bg-color, $lightness: -3%) !default;
559
583
 
560
584
  > label {
561
585
  > small {
562
- color: scale-color($form-label-font-color, $lightness: 15%);
563
586
  background: transparent;
564
- padding: 0;
565
- text-transform: $form-label-small-transform;
566
- font-style: normal;
587
+ color: scale-color($form-label-font-color, $lightness: 15%);
588
+ display: inline;
567
589
  font-size: 60%;
590
+ font-style: normal;
568
591
  margin: 0;
569
- display: inline;
592
+ padding: 0;
593
+ text-transform: $form-label-small-transform;
570
594
  }
571
595
  }
572
596