luda 0.1.11 → 0.1.12

Sign up to get free protection for your applications and to get access to all the features.
Files changed (73) hide show
  1. checksums.yaml +4 -4
  2. data/assets/javascripts/luda-degradation.js +2 -2
  3. data/assets/javascripts/luda-degradation.min.js +2 -2
  4. data/assets/javascripts/luda-sprockets.js +2 -2
  5. data/assets/javascripts/luda.js +719 -250
  6. data/assets/javascripts/luda.js.map +1 -1
  7. data/assets/javascripts/luda.min.js +3 -3
  8. data/assets/javascripts/luda.min.js.map +1 -1
  9. data/assets/javascripts/luda/behaviors/{enter-click.js → enter.js} +8 -6
  10. data/assets/javascripts/luda/behaviors/focus.js +14 -8
  11. data/assets/javascripts/luda/behaviors/readonly.js +4 -4
  12. data/assets/javascripts/luda/behaviors/{radio-tab.js → tabulate.js} +8 -6
  13. data/assets/javascripts/luda/behaviors/toggle.js +72 -18
  14. data/assets/javascripts/luda/dom.js +62 -0
  15. data/assets/javascripts/luda/elements/form-file.js +13 -4
  16. data/assets/javascripts/luda/elements/form-select.js +9 -5
  17. data/assets/javascripts/luda/event.js +11 -3
  18. data/assets/javascripts/luda/{component.js → factory.js} +149 -55
  19. data/assets/javascripts/luda/index.js +4 -4
  20. data/assets/javascripts/luda/install.js +2 -2
  21. data/assets/javascripts/luda/patterns/carousel.js +85 -59
  22. data/assets/javascripts/luda/patterns/dropdown.js +86 -68
  23. data/assets/javascripts/luda/patterns/form-dropdown.js +8 -8
  24. data/assets/javascripts/luda/patterns/tab.js +62 -23
  25. data/assets/javascripts/luda/static.js +224 -0
  26. data/assets/stylesheets/luda/_core/_functions.sass +11 -19
  27. data/assets/stylesheets/luda/_core/_variables.sass +140 -131
  28. data/assets/stylesheets/luda/_core/behaviors/_focus.sass +2 -2
  29. data/assets/stylesheets/luda/_core/elements/_button.sass +1 -1
  30. data/assets/stylesheets/luda/_core/elements/_grid.sass +0 -3
  31. data/assets/stylesheets/luda/_core/elements/_scrollbar.sass +8 -2
  32. data/assets/stylesheets/luda/_core/elements/form/_form-check-radio.sass +22 -31
  33. data/assets/stylesheets/luda/_core/elements/form/_form-element.sass +1 -1
  34. data/assets/stylesheets/luda/_core/elements/form/_form-helper.sass +19 -19
  35. data/assets/stylesheets/luda/_core/elements/form/_form-range.sass +19 -19
  36. data/assets/stylesheets/luda/_core/elements/form/_form-row.sass +43 -59
  37. data/assets/stylesheets/luda/_core/elements/typography/_quote.sass +1 -1
  38. data/assets/stylesheets/luda/_core/elements/typography/_typography.sass +9 -9
  39. data/assets/stylesheets/luda/_core/mixins/_dropdown.sass +8 -6
  40. data/assets/stylesheets/luda/_core/mixins/_form.sass +12 -12
  41. data/assets/stylesheets/luda/_core/mixins/_media-query.sass +12 -12
  42. data/assets/stylesheets/luda/_core/mixins/_typography.sass +4 -4
  43. data/assets/stylesheets/luda/_core/patterns/_breadcrumb.sass +2 -2
  44. data/assets/stylesheets/luda/_core/patterns/_button-group.sass +1 -1
  45. data/assets/stylesheets/luda/_core/patterns/_button-icon.sass +2 -2
  46. data/assets/stylesheets/luda/_core/patterns/_carousel.sass +13 -13
  47. data/assets/stylesheets/luda/_core/patterns/_dropdown.sass +5 -1
  48. data/assets/stylesheets/luda/_core/patterns/_form-dropdown.sass +3 -3
  49. data/assets/stylesheets/luda/_core/patterns/_form-group.sass +11 -11
  50. data/assets/stylesheets/luda/_core/patterns/_form-icon.sass +13 -19
  51. data/assets/stylesheets/luda/_core/patterns/_navigation.sass +5 -5
  52. data/assets/stylesheets/luda/_core/patterns/_search-bar.sass +2 -2
  53. data/assets/stylesheets/luda/_core/patterns/_tab.sass +1 -3
  54. data/assets/stylesheets/luda/_core/utilities/_border.sass +15 -15
  55. data/assets/stylesheets/luda/_core/utilities/_color.sass +4 -1
  56. data/assets/stylesheets/luda/_core/utilities/_display.sass +1 -1
  57. data/assets/stylesheets/luda/_core/utilities/_flex.sass +3 -0
  58. data/assets/stylesheets/luda/_core/utilities/_shadow.sass +12 -12
  59. data/assets/stylesheets/luda/_core/utilities/_spacing.sass +227 -0
  60. data/assets/stylesheets/luda/_core/utilities/_visibility.sass +1 -1
  61. data/assets/stylesheets/luda/_default.sass +1 -1
  62. data/assets/stylesheets/luda/default/_banner.sass +2 -2
  63. data/assets/stylesheets/luda/default/index.sass +1 -1
  64. data/assets/stylesheets/luda/default/utilities/_border.sass +4 -4
  65. data/assets/stylesheets/luda/default/utilities/_shadow.sass +4 -4
  66. data/assets/stylesheets/luda/default/utilities/_spacing.sass +5 -0
  67. data/lib/luda/version.rb +1 -1
  68. metadata +9 -11
  69. data/assets/javascripts/luda/singleton.js +0 -77
  70. data/assets/stylesheets/luda/_core/patterns/_form-button.sass +0 -23
  71. data/assets/stylesheets/luda/_core/patterns/_nav.sass +0 -165
  72. data/assets/stylesheets/luda/default/patterns/_form-button.sass +0 -9
  73. data/assets/stylesheets/luda/default/patterns/_nav.sass +0 -10
@@ -1,7 +1,7 @@
1
1
  +install(shared-behavior-focus)
2
2
 
3
- \:focus
3
+ html:not([data-focus-disabled]) :focus
4
4
  outline: none
5
5
 
6
- .focus
6
+ html:not([data-focus-disabled]) .focus
7
7
  +_focus
@@ -37,7 +37,7 @@
37
37
  .btn-file label
38
38
  align-items: center
39
39
  justify-content: center
40
- padding: 0 $button-helvertical-padding-em
40
+ padding: 0 $button-horizontal-padding-em
41
41
  border: $button-border-style $button-border-width
42
42
  overflow: hidden
43
43
  border-radius: existing($button-border-radius, 0)
@@ -31,9 +31,6 @@
31
31
  margin-right: 0
32
32
  margin-left: 0
33
33
 
34
- .grid-edge.container
35
- padding: 0
36
-
37
34
 
38
35
 
39
36
  @each $breakpoint in map-keys($breakpoint-width-pxs)
@@ -3,7 +3,7 @@
3
3
  +media-width($scrollbar-width-breakpoint)
4
4
 
5
5
  html
6
- -ms-overflow-style: $scrollbar-ie-edge-overflow-style
6
+ -ms-overflow-style: $scrollbar-edge-overflow-style
7
7
 
8
8
  +browser-chrome-and-opera
9
9
 
@@ -18,4 +18,10 @@
18
18
 
19
19
  ::-webkit-scrollbar-thumb
20
20
  background: $scrollbar-thumb-background
21
- border-radius: $scrollbar-thumb-border-radius
21
+ border-radius: $scrollbar-thumb-border-radius
22
+
23
+ ::-webkit-scrollbar-corner
24
+ display: none
25
+
26
+ ::-webkit-resizer
27
+ display: none
@@ -3,7 +3,7 @@
3
3
  .fm-check label,
4
4
  .fm-radio label
5
5
  flex: 0 1 auto
6
- padding-left: $form-element-checkfield-height-em + 0.4em
6
+ padding-left: $form-element-checkfield-size-em + 0.4em
7
7
  line-height: typo-line-height($form-element-typography-size-level)
8
8
  overflow: hidden
9
9
  -webkit-user-select: none
@@ -20,15 +20,15 @@
20
20
  $line-height-rem: typo-line-height($form-element-typography-size-level)
21
21
  $font-size-rem: typo-size($form-element-typography-size-level)
22
22
  $line-height-em: $line-height-rem / $font-size-rem * 1em
23
- $margin-top: ($line-height-em - $form-element-checkfield-height-em) / 2
24
- $margin-left: - $form-element-checkfield-height-em - 0.4em
23
+ $margin-top: ($line-height-em - $form-element-checkfield-size-em) / 2
24
+ $margin-left: - $form-element-checkfield-size-em - 0.4em
25
25
  float: left
26
26
  margin: $margin-top 0.4em 0 $margin-left
27
27
 
28
28
  .fm-check input,
29
29
  .fm-radio input
30
- width: $form-element-checkfield-height-em
31
- height: $form-element-checkfield-height-em
30
+ width: $form-element-checkfield-size-em
31
+ height: $form-element-checkfield-size-em
32
32
  border: $form-element-border-style $form-element-border-width $form-element-border-color
33
33
  background: $form-element-background
34
34
  box-shadow: $form-element-box-shadow
@@ -42,47 +42,38 @@
42
42
 
43
43
  .fm-check[data-error] input,
44
44
  .fm-radio[data-error] input
45
- background: $form-element-error-background
46
- border-color: $form-element-error-border-color
47
- box-shadow: $form-element-error-box-shadow
45
+ background: $form-element-background-on-error
46
+ border-color: $form-element-border-color-on-error
47
+ box-shadow: $form-element-box-shadow-on-error
48
48
 
49
49
  .fm.fm-check .focus,
50
50
  .fm.fm-radio .focus
51
- background: $form-element-focus-background
52
- border-color: $form-element-focus-border-color
53
- box-shadow: $form-element-focus-box-shadow
51
+ background: $form-element-background-on-focus
52
+ border-color: $form-element-border-color-on-focus
53
+ box-shadow: $form-element-box-shadow-on-focus
54
54
 
55
55
  .fm.fm-check input:checked,
56
56
  .fm.fm-radio input:checked
57
- +form-checkbox-or-radio-background-icon($form-element-checked-icon, $form-element-checked-icon-color, $form-element-background)
57
+ +form-element-checkfield-background($form-element-checked-icon, $form-element-checked-icon-color, $form-element-background)
58
58
 
59
- @if $form-element-error-background or $form-element-error-checked-icon-color
59
+ @if $form-element-background-on-error or $form-element-checked-icon-color-on-error
60
60
  // sass-lint:disable empty-args
61
61
  .fm.fm-check[data-error] input:checked,
62
62
  .fm.fm-radio[data-error] input:checked
63
- $icon-color: existing($form-element-error-checked-icon-color, $form-element-checked-icon-color)
64
- $background: form-error-background()
65
- +form-checkbox-or-radio-background-icon($form-element-checked-icon, $icon-color, $background)
63
+ $icon-color: existing($form-element-checked-icon-color-on-error, $form-element-checked-icon-color)
64
+ $background: form-element-background-on-error()
65
+ +form-element-checkfield-background($form-element-checked-icon, $icon-color, $background)
66
66
  // sass-lint:enable empty-args
67
67
 
68
- @if $form-element-focus-background or $form-element-focus-checked-icon-color
68
+ @if $form-element-background-on-focus or $form-element-checked-icon-color-on-focus
69
69
  // sass-lint:disable empty-args
70
70
  .fm.fm-check input.focus:checked,
71
71
  .fm.fm-radio input.focus:checked
72
- $icon-color: existing($form-element-focus-checked-icon-color, $form-element-checked-icon-color)
73
- $background: form-focus-background()
74
- +form-checkbox-or-radio-background-icon($form-element-checked-icon, $icon-color, $background)
72
+ $icon-color: existing($form-element-checked-icon-color-on-focus, $form-element-checked-icon-color)
73
+ $background: form-element-background-on-focus()
74
+ +form-element-checkfield-background($form-element-checked-icon, $icon-color, $background)
75
75
  // sass-lint:enable empty-args
76
76
 
77
- @if $form-element-error-background or $form-element-error-checked-icon-color
78
- // sass-lint:disable empty-args
79
- .fm.fm-check[data-error] input.focus:checked,
80
- .fm.fm-radio[data-error] input.focus:checked
81
- $icon-color: existing($form-element-focus-checked-icon-color, $form-element-error-checked-icon-color)
82
- $background: form-error-focus-background()
83
- +form-checkbox-or-radio-background-icon($form-element-checked-icon, $icon-color, $background)
84
- // sass-lint:enable empty-args
85
-
86
77
 
87
78
 
88
79
  .fm-small.fm-check label,
@@ -99,7 +90,7 @@
99
90
  $line-height-rem: typo-line-height($form-element-small-typography-size-level)
100
91
  $typo-size-rem: typo-size($form-element-small-typography-size-level)
101
92
  $line-height-em: $line-height-rem / $typo-size-rem * 1em
102
- $margin-top: ($line-height-em - $form-element-checkfield-height-em) / 2
93
+ $margin-top: ($line-height-em - $form-element-checkfield-size-em) / 2
103
94
  margin-top: $margin-top
104
95
 
105
96
  @if $form-element-large-typography-size-level
@@ -108,5 +99,5 @@
108
99
  $line-height-rem: typo-line-height($form-element-large-typography-size-level)
109
100
  $typo-size-rem: typo-size($form-element-large-typography-size-level)
110
101
  $line-height-em: $line-height-rem / $typo-size-rem * 1em
111
- $margin-top: ($line-height-em - $form-element-checkfield-height-em) / 2
102
+ $margin-top: ($line-height-em - $form-element-checkfield-size-em) / 2
112
103
  margin-top: $margin-top
@@ -17,7 +17,7 @@
17
17
  appearance: none
18
18
  display: block
19
19
 
20
- .fm .focus
20
+ html:not([data-focus-disabled]) .fm .focus
21
21
  outline: none
22
22
 
23
23
  // remove webkit number input buttons
@@ -1,37 +1,37 @@
1
1
  +install(shared-element-form-helper)
2
2
 
3
3
  .fm ::-webkit-input-placeholder
4
- color: $form-element-placeholder-color
4
+ color: $form-placeholder-color
5
5
 
6
6
  .fm ::-moz-placeholder
7
- color: $form-element-placeholder-color
7
+ color: $form-placeholder-color
8
8
 
9
9
  .fm :-ms-input-placeholder
10
- color: $form-element-placeholder-color
10
+ color: $form-placeholder-color
11
11
 
12
12
  .fm[data-error] ::-webkit-input-placeholder
13
- color: $form-element-error-placeholder-color
13
+ color: $form-placeholder-color-on-error
14
14
 
15
15
  .fm[data-error] ::-moz-placeholder
16
- color: $form-element-error-placeholder-color
16
+ color: $form-placeholder-color-on-error
17
17
 
18
18
  .fm[data-error] :-ms-input-placeholder
19
- color: $form-element-error-placeholder-color
19
+ color: $form-placeholder-color-on-error
20
20
 
21
21
  .fm input.focus::-webkit-input-placeholder,
22
22
  .fm textarea.focus::-webkit-input-placeholder,
23
23
  .fm .focus ~ input::-webkit-input-placeholder
24
- color: $form-element-focus-placeholder-color
24
+ color: $form-placeholder-color-on-focus
25
25
 
26
26
  .fm input.focus::-moz-placeholder,
27
27
  .fm textarea.focus::-moz-placeholder,
28
28
  .fm .focus ~ input::-moz-placeholder
29
- color: $form-element-focus-placeholder-color
29
+ color: $form-placeholder-color-on-focus
30
30
 
31
31
  .fm input.focus:-ms-input-placeholder,
32
32
  .fm textarea.focus:-ms-input-placeholder,
33
33
  .fm .focus ~ input:-ms-input-placeholder
34
- color: $form-element-focus-placeholder-color
34
+ color: $form-placeholder-color-on-focus
35
35
 
36
36
 
37
37
 
@@ -39,28 +39,28 @@
39
39
  .fm[data-hint]::after
40
40
  display: block
41
41
  width: 100%
42
- font-size: typo-size($form-element-helper-typography-size-level)
43
- line-height: typo-line-height($form-element-helper-typography-size-level)
42
+ font-size: typo-size($form-helper-typography-size-level)
43
+ line-height: typo-line-height($form-helper-typography-size-level)
44
44
 
45
45
  .fm[data-hint]::after
46
46
  content: attr(data-hint)
47
- color: $form-element-hint-message-color
47
+ color: $form-hint-color
48
48
 
49
49
  .fm[data-error]::after,
50
50
  .fm[data-hint][data-error]::after
51
51
  content: attr(data-error)
52
- color: $form-element-error-message-color
52
+ color: $form-error-color
53
53
 
54
54
 
55
55
 
56
- @if $form-element-small-helper-typography-size-level
56
+ @if $form-helper-small-typography-size-level
57
57
  .fm-small.fm[data-hint]::after,
58
58
  .fm-small.fm[data-error]::after
59
- font-size: typo-size($form-element-small-helper-typography-size-level)
60
- line-height: typo-line-height($form-element-small-helper-typography-size-level)
59
+ font-size: typo-size($form-helper-small-typography-size-level)
60
+ line-height: typo-line-height($form-helper-small-typography-size-level)
61
61
 
62
- @if $form-element-large-helper-typography-size-level
62
+ @if $form-helper-large-typography-size-level
63
63
  .fm-large.fm[data-hint]::after,
64
64
  .fm-large.fm[data-error]::after
65
- font-size: typo-size($form-element-large-helper-typography-size-level)
66
- line-height: typo-line-height($form-element-large-helper-typography-size-level)
65
+ font-size: typo-size($form-helper-large-typography-size-level)
66
+ line-height: typo-line-height($form-helper-large-typography-size-level)
@@ -2,7 +2,7 @@
2
2
 
3
3
  .fm-range input
4
4
  width: 100%
5
- height: $form-element-textfield-height-rem
5
+ height: $form-element-height-rem
6
6
  background: none
7
7
 
8
8
  .fm-range ::-webkit-slider-runnable-track
@@ -25,7 +25,7 @@
25
25
  +_form-range-track-skin
26
26
 
27
27
  .fm-range ::-webkit-slider-thumb
28
- +_form-range-thumb-styles
28
+ +_form-thumb-styles
29
29
  -webkit-appearance: none
30
30
  -moz-appearance: none
31
31
  appearance: none
@@ -36,57 +36,57 @@
36
36
  margin-top: 0
37
37
 
38
38
  .fm-range ::-moz-range-thumb
39
- +_form-range-thumb-styles
39
+ +_form-thumb-styles
40
40
 
41
41
  .fm-range ::-ms-thumb
42
- +_form-range-thumb-styles
42
+ +_form-thumb-styles
43
43
 
44
44
  .fm-range ::-ms-tooltip
45
45
  display: none
46
46
 
47
47
  .fm-range[data-error] ::-webkit-slider-runnable-track
48
- background: $form-element-error-track-background
48
+ background: $form-element-track-background-on-error
49
49
 
50
50
  .fm-range[data-error] ::-moz-range-track
51
- background: $form-element-error-track-background
51
+ background: $form-element-track-background-on-error
52
52
 
53
53
  .fm-range[data-error] ::-ms-fill-lower
54
- background: $form-element-error-track-background
54
+ background: $form-element-track-background-on-error
55
55
 
56
56
  .fm-range[data-error] ::-ms-fill-upper
57
- background: $form-element-error-track-background
57
+ background: $form-element-track-background-on-error
58
58
 
59
59
  .fm-range[data-error] ::-webkit-slider-thumb
60
- +_form-range-error-thumb-skin
60
+ +_form-thumb-skin-on-error
61
61
 
62
62
  .fm-range[data-error] ::-moz-range-thumb
63
- +_form-range-error-thumb-skin
63
+ +_form-thumb-skin-on-error
64
64
 
65
65
  .fm-range[data-error] ::-ms-thumb
66
- +_form-range-error-thumb-skin
66
+ +_form-thumb-skin-on-error
67
67
 
68
68
  .fm-range input.focus::-webkit-slider-runnable-track
69
- background: $form-element-focus-track-background
69
+ background: $form-element-track-background-on-focus
70
70
 
71
71
  .fm-range input.focus::-moz-range-track
72
- background: $form-element-focus-track-background
72
+ background: $form-element-track-background-on-focus
73
73
 
74
74
  .fm-range input.focus::-ms-track
75
- background: $form-element-focus-track-background
75
+ background: $form-element-track-background-on-focus
76
76
 
77
77
  .fm-range input.focus::-webkit-slider-thumb
78
- +_form-range-focus-thumb-skin
78
+ +_form-thumb-skin-on-focus
79
79
 
80
80
  .fm-range input.focus::-moz-range-thumb
81
- +_form-range-focus-thumb-skin
81
+ +_form-thumb-skin-on-focus
82
82
 
83
83
  .fm-range input.focus::-ms-thumb
84
- +_form-range-focus-thumb-skin
84
+ +_form-thumb-skin-on-focus
85
85
 
86
86
 
87
87
 
88
88
  .fm-small.fm-range input
89
- height: $form-element-small-textfield-height-rem
89
+ height: $form-element-small-height-rem
90
90
 
91
91
  .fm-large.fm-range input
92
- height: $form-element-large-textfield-height-rem
92
+ height: $form-element-large-height-rem
@@ -16,36 +16,36 @@
16
16
  .fm-select input,
17
17
  .fm-file input,
18
18
  .fm-select select:not([multiple])
19
- height: $form-element-textfield-height-rem
19
+ height: $form-element-height-rem
20
20
  line-height: normal // fix safari blinking cursor not in input center
21
21
 
22
22
  .fm-text input,
23
23
  .fm-select select:not([multiple])
24
- padding: 0 $form-element-text-helvertical-padding-em
24
+ padding: 0 $form-element-horizontal-padding-em
25
25
  background: $form-element-background
26
26
 
27
27
  .fm-search input,
28
28
  .fm-select input,
29
29
  .fm-file input
30
- $padding-right: $form-element-icon-size-em + $form-element-text-helvertical-padding-em * 2
31
- padding: 0 $padding-right 0 $form-element-text-helvertical-padding-em
30
+ $padding-right: $form-element-icon-size-em + $form-element-horizontal-padding-em * 2
31
+ padding: 0 $padding-right 0 $form-element-horizontal-padding-em
32
32
 
33
33
  .fm-search input
34
- +form-row-background-icon($form-element-search-icon, $form-element-icon-color, $form-element-background)
34
+ +form-element-background($form-element-search-icon, $form-element-icon-color, $form-element-background)
35
35
 
36
36
  .fm-select input
37
- +form-row-background-icon($form-element-select-icon, $form-element-icon-color, $form-element-background)
37
+ +form-element-background($form-element-select-icon, $form-element-icon-color, $form-element-background)
38
38
 
39
39
  .fm-file input
40
- +form-row-background-icon($form-element-add-icon, $form-element-icon-color, $form-element-background)
40
+ +form-element-background($form-element-file-icon, $form-element-icon-color, $form-element-background)
41
41
 
42
42
  .fm-text textarea,
43
43
  .fm-select select[multiple]
44
44
  $padding-top: typo-padding-top($form-element-typography-size-level, $typography-main-baseline-offset-ratio)
45
45
  $padding-bottom: typo-padding-bottom($form-element-typography-size-level, $typography-main-baseline-offset-ratio)
46
- height: $form-element-textarea-height-rem
47
- min-height: $form-element-textarea-height-rem
48
- padding: $padding-top $form-element-text-helvertical-padding-em $padding-bottom
46
+ height: $form-element-multiple-rows-height-rem
47
+ min-height: $form-element-multiple-rows-height-rem
48
+ padding: $padding-top $form-element-horizontal-padding-em $padding-bottom
49
49
  line-height: typo-line-height($form-element-typography-size-level)
50
50
  overflow: auto
51
51
  -webkit-overflow-scrolling: touch
@@ -57,29 +57,29 @@
57
57
  .fm-file[data-error] input,
58
58
  .fm-text[data-error] textarea,
59
59
  .fm-select[data-error] select[multiple]
60
- color: $form-element-error-color
61
- border-color: $form-element-error-border-color
62
- box-shadow: $form-element-error-box-shadow
60
+ color: $form-element-color-on-error
61
+ border-color: $form-element-border-color-on-error
62
+ box-shadow: $form-element-box-shadow-on-error
63
63
 
64
64
  .fm-text[data-error] input,
65
65
  .fm-text[data-error] textarea,
66
66
  .fm-select[data-error] select[multiple]
67
- background: $form-element-error-background
67
+ background: $form-element-background-on-error
68
68
 
69
- @if $form-element-error-background or $form-element-error-icon-color
69
+ @if $form-element-background-on-error or $form-element-icon-color-on-error
70
70
  // sass-lint:disable empty-args
71
- $icon-color: form-error-icon-color()
72
- $background: form-error-background()
71
+ $icon-color: form-element-icon-color-on-error()
72
+ $background: form-element-background-on-error()
73
73
  // sass-lint:enable empty-args
74
74
 
75
75
  .fm-search[data-error] input
76
- +form-row-background-icon($form-element-search-icon, $icon-color, $background)
76
+ +form-element-background($form-element-search-icon, $icon-color, $background)
77
77
 
78
78
  .fm-select[data-error] input
79
- +form-row-background-icon($form-element-select-icon, $icon-color, $background)
79
+ +form-element-background($form-element-select-icon, $icon-color, $background)
80
80
 
81
81
  .fm-file[data-error] input
82
- +form-row-background-icon($form-element-add-icon, $icon-color, $background)
82
+ +form-element-background($form-element-file-icon, $icon-color, $background)
83
83
  +_sass-lint-fix-if-else
84
84
 
85
85
  .fm.fm-text input.focus,
@@ -89,47 +89,31 @@
89
89
  .fm.fm-file .focus ~ input,
90
90
  .fm.fm-text textarea.focus,
91
91
  .fm.fm-select select[multiple].focus
92
- color: $form-element-focus-color
93
- border-color: $form-element-focus-border-color
94
- box-shadow: $form-element-focus-box-shadow
92
+ color: $form-element-color-on-focus
93
+ border-color: $form-element-border-color-on-focus
94
+ box-shadow: $form-element-box-shadow-on-focus
95
95
 
96
96
  .fm.fm-text input.focus,
97
97
  .fm.fm-text textarea.focus,
98
98
  .fm.fm-select select[multiple].focus
99
- background: $form-element-focus-background
99
+ background: $form-element-background-on-focus
100
100
 
101
- @if $form-element-focus-background or $form-element-focus-icon-color
101
+ @if $form-element-background-on-focus or $form-element-icon-color-on-focus
102
102
  // sass-lint:disable empty-args
103
- $icon-color: form-focus-icon-color()
104
- $background: form-focus-background()
103
+ $icon-color: form-element-icon-color-on-focus()
104
+ $background: form-element-background-on-focus()
105
105
  // sass-lint:enable empty-args
106
106
 
107
107
  .fm.fm-search input.focus
108
- +form-row-background-icon($form-element-search-icon, $icon-color, $background)
108
+ +form-element-background($form-element-search-icon, $icon-color, $background)
109
109
 
110
110
  .fm.fm-select .focus ~ input,
111
111
  .fm.fm-select input.focus
112
- +form-row-background-icon($form-element-select-icon, $icon-color, $background)
112
+ +form-element-background($form-element-select-icon, $icon-color, $background)
113
113
 
114
114
  .fm.fm-file .focus ~ input
115
- +form-row-background-icon($form-element-add-icon, $icon-color, $background)
116
-
117
- @if $form-element-error-background or $form-element-error-icon-color
118
- // sass-lint:disable empty-args
119
- $focus-icon-color: form-error-focus-icon-color()
120
- $focus-background: form-error-focus-background()
121
- // sass-lint:enable empty-args
122
-
123
- .fm.fm-search[data-error] input.focus
124
- +form-row-background-icon($form-element-search-icon, $focus-icon-color, $focus-background)
125
-
126
- .fm.fm-select[data-error] .focus ~ input,
127
- .fm.fm-select[data-error] input.focus
128
- +form-row-background-icon($form-element-select-icon, $focus-icon-color, $focus-background)
129
-
130
- .fm.fm-file[data-error] .focus ~ input
131
- +form-row-background-icon($form-element-add-icon, $focus-icon-color, $focus-background)
132
- +_sass-lint-fix-if-else
115
+ +form-element-background($form-element-file-icon, $icon-color, $background)
116
+ +_sass-lint-fix-if-else
133
117
 
134
118
 
135
119
 
@@ -138,12 +122,12 @@
138
122
  .fm-small.fm-select input,
139
123
  .fm-small.fm-file input,
140
124
  .fm-small.fm-select select:not([multiple])
141
- height: $form-element-small-textfield-height-rem
125
+ height: $form-element-small-height-rem
142
126
 
143
127
  .fm-small.fm-text textarea,
144
128
  .fm-small.fm-select select[multiple]
145
- height: $form-element-small-textarea-height-rem
146
- min-height: $form-element-small-textarea-height-rem
129
+ height: $form-element-multiple-rows-small-height-rem
130
+ min-height: $form-element-multiple-rows-small-height-rem
147
131
  padding-top: typo-padding-top($form-element-small-typography-size-level, $typography-main-baseline-offset-ratio)
148
132
  padding-bottom: typo-padding-bottom($form-element-small-typography-size-level, $typography-main-baseline-offset-ratio)
149
133
  line-height: typo-line-height($form-element-small-typography-size-level)
@@ -153,12 +137,12 @@
153
137
  .fm-large.fm-select input,
154
138
  .fm-large.fm-file input,
155
139
  .fm-large.fm-select select:not([multiple])
156
- height: $form-element-large-textfield-height-rem
140
+ height: $form-element-large-height-rem
157
141
 
158
142
  .fm-large.fm-text textarea,
159
143
  .fm-large.fm-select select[multiple]
160
- height: $form-element-large-textarea-height-rem
161
- min-height: $form-element-large-textarea-height-rem
144
+ height: $form-element-multiple-rows-large-height-rem
145
+ min-height: $form-element-multiple-rows-large-height-rem
162
146
  padding-top: typo-padding-top($form-element-large-typography-size-level, $typography-main-baseline-offset-ratio)
163
147
  padding-bottom: typo-padding-bottom($form-element-large-typography-size-level, $typography-main-baseline-offset-ratio)
164
148
  line-height: typo-line-height($form-element-large-typography-size-level)
@@ -168,7 +152,7 @@
168
152
  .fm-select select:not([multiple]),
169
153
  .fm-file [type=file]
170
154
  width: 100%
171
- margin-bottom: - $form-element-textfield-height-rem
155
+ margin-bottom: - $form-element-height-rem
172
156
  // opacity: 0
173
157
 
174
158
  .fm.fm-select select:not([multiple]),
@@ -182,11 +166,11 @@
182
166
 
183
167
  .fm-small.fm-select select:not([multiple]),
184
168
  .fm-small.fm-file [type=file]
185
- margin-bottom: - $form-element-small-textfield-height-rem
169
+ margin-bottom: - $form-element-small-height-rem
186
170
 
187
171
  .fm-large.fm-select select:not([multiple]),
188
172
  .fm-large.fm-file [type=file]
189
- margin-bottom: - $form-element-large-textfield-height-rem
173
+ margin-bottom: - $form-element-large-height-rem
190
174
 
191
175
 
192
176
 
@@ -210,11 +194,11 @@
210
194
  .fm-select select[multiple] option.fm-select-multiple-placeholder:disabled
211
195
  overflow: hidden
212
196
  opacity: 1
213
- color: $form-element-placeholder-color
197
+ color: $form-placeholder-color
214
198
  text-overflow: ellipsis
215
199
 
216
200
  .fm-select[data-error] select[multiple] option.fm-select-multiple-placeholder:disabled
217
- color: $form-element-error-placeholder-color
201
+ color: $form-placeholder-color-on-error
218
202
 
219
203
  .fm.fm-select select[multiple].focus option.fm-select-multiple-placeholder:disabled
220
- color: $form-element-focus-placeholder-color
204
+ color: $form-placeholder-color-on-focus