material-sass 0.0.4 → 1.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (106) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/fonts/MaterialIcons-Regular.eot +0 -0
  3. data/app/assets/fonts/MaterialIcons-Regular.ijmap +1 -0
  4. data/app/assets/fonts/MaterialIcons-Regular.ttf +0 -0
  5. data/app/assets/fonts/MaterialIcons-Regular.woff +0 -0
  6. data/app/assets/fonts/MaterialIcons-Regular.woff2 +0 -0
  7. data/app/assets/images/bg/amber.jpg +0 -0
  8. data/app/assets/images/bg/brand.jpg +0 -0
  9. data/app/assets/images/bg/green.jpg +0 -0
  10. data/app/assets/images/bg/purple.jpg +0 -0
  11. data/app/assets/images/bg/red.jpg +0 -0
  12. data/app/assets/images/bg/teal.jpg +0 -0
  13. data/app/assets/javascripts/material.js +664 -507
  14. data/app/assets/javascripts/material.min.js +2 -0
  15. data/app/assets/javascripts/material/_.js +6 -3
  16. data/app/assets/javascripts/material/bootstrap.js +6 -3
  17. data/app/assets/javascripts/material/datepicker.js +95 -64
  18. data/app/assets/javascripts/material/form-adv-label.js +49 -0
  19. data/app/assets/javascripts/material/form-adv-textarea.js +13 -0
  20. data/app/assets/javascripts/material/header.js +12 -56
  21. data/app/assets/javascripts/material/menu.js +188 -38
  22. data/app/assets/javascripts/material/modal.js +10 -8
  23. data/app/assets/javascripts/material/snackbar.js +116 -0
  24. data/app/assets/javascripts/material/tab.js +47 -27
  25. data/app/assets/javascripts/material/tile.js +169 -74
  26. data/app/assets/javascripts/material/wave.js +12 -7
  27. data/app/assets/stylesheets/material.min.css +13 -0
  28. data/app/assets/stylesheets/material/addons/_material-icons.scss +9 -0
  29. data/app/assets/stylesheets/material/addons/_waves.scss +44 -0
  30. data/app/assets/stylesheets/material/{addon/material-design-icon → addons/material-icons}/_core.scss +8 -8
  31. data/app/assets/stylesheets/material/{addon/material-design-icon → addons/material-icons}/_larger.scss +5 -2
  32. data/app/assets/stylesheets/material/addons/material-icons/_path.scss +11 -0
  33. data/app/assets/stylesheets/material/addons/material-icons/_variables.scss +3 -0
  34. data/app/assets/stylesheets/material/base.scss +39 -40
  35. data/app/assets/stylesheets/material/{_grid.scss → base/_grid.scss} +13 -12
  36. data/app/assets/stylesheets/material/{_reset.scss → base/_reset.scss} +160 -161
  37. data/app/assets/stylesheets/material/components/_avatar.scss +94 -0
  38. data/app/assets/stylesheets/material/{element → components}/_breadcrumb.scss +3 -4
  39. data/app/assets/stylesheets/material/components/_button-flat.scss +35 -0
  40. data/app/assets/stylesheets/material/components/_button-float.scss +187 -0
  41. data/app/assets/stylesheets/material/components/_button.scss +86 -0
  42. data/app/assets/stylesheets/material/components/_card.scss +175 -0
  43. data/app/assets/stylesheets/material/{_code.scss → components/_code.scss} +14 -12
  44. data/app/assets/stylesheets/material/components/_dropdown.scss +103 -0
  45. data/app/assets/stylesheets/material/components/_form-adv-checkbox.scss +161 -0
  46. data/app/assets/stylesheets/material/{element → components}/_form-adv-datepicker.scss +87 -108
  47. data/app/assets/stylesheets/material/{element → components}/_form-adv-label.scss +17 -23
  48. data/app/assets/stylesheets/material/components/_form-adv-switch.scss +96 -0
  49. data/app/assets/stylesheets/material/{element → components}/_form-adv-textarea.scss +1 -1
  50. data/app/assets/stylesheets/material/{element → components}/_form.scss +34 -95
  51. data/app/assets/stylesheets/material/components/_label.scss +23 -0
  52. data/app/assets/stylesheets/material/{element → components}/_modal.scss +43 -18
  53. data/app/assets/stylesheets/material/{element → components}/_nav.scss +15 -8
  54. data/app/assets/stylesheets/material/{element → components}/_progress-circular.scss +36 -32
  55. data/app/assets/stylesheets/material/{element → components}/_progress-loadbar.scss +15 -21
  56. data/app/assets/stylesheets/material/{element → components}/_progress.scss +40 -30
  57. data/app/assets/stylesheets/material/components/_snackbar.scss +60 -0
  58. data/app/assets/stylesheets/material/components/_tab.scss +85 -0
  59. data/app/assets/stylesheets/material/components/_table.scss +82 -0
  60. data/app/assets/stylesheets/material/components/_tile.scss +155 -0
  61. data/app/assets/stylesheets/material/elements/_content.scss +42 -0
  62. data/app/assets/stylesheets/material/elements/_footer.scss +10 -0
  63. data/app/assets/stylesheets/material/elements/_header.scss +145 -0
  64. data/app/assets/stylesheets/material/{theme → elements}/_menu.scss +92 -150
  65. data/app/assets/stylesheets/material/mixin/_grid.scss +1 -9
  66. data/app/assets/stylesheets/material/mixin/_responsive.scss +1 -1
  67. data/app/assets/stylesheets/material/mixin/_utilities.scss +1 -1
  68. data/app/assets/stylesheets/material/{_print.scss → utilities/_print.scss} +4 -4
  69. data/app/assets/stylesheets/material/{_utilities-responsive.scss → utilities/_utilities-responsive.scss} +1 -1
  70. data/app/assets/stylesheets/material/{_utilities.scss → utilities/_utilities.scss} +197 -110
  71. data/app/assets/stylesheets/material/var/_colours.scss +336 -0
  72. data/app/assets/stylesheets/material/var/_variables.scss +78 -0
  73. data/lib/material-sass/version.rb +1 -1
  74. metadata +55 -53
  75. data/app/assets/javascripts/material/content.js +0 -46
  76. data/app/assets/javascripts/material/dropdown.js +0 -18
  77. data/app/assets/javascripts/material/esc.js +0 -10
  78. data/app/assets/javascripts/material/footer.js +0 -6
  79. data/app/assets/javascripts/material/form-adv.js +0 -64
  80. data/app/assets/javascripts/material/get-target.js +0 -8
  81. data/app/assets/javascripts/material/toast.js +0 -79
  82. data/app/assets/javascripts/material/webfont.js +0 -47
  83. data/app/assets/javascripts/material/winresize.js +0 -28
  84. data/app/assets/stylesheets/material/_variable.scss +0 -120
  85. data/app/assets/stylesheets/material/addon/_material-design-icon.scss +0 -9
  86. data/app/assets/stylesheets/material/addon/_waves.scss +0 -45
  87. data/app/assets/stylesheets/material/addon/material-design-icon/_path.scss +0 -11
  88. data/app/assets/stylesheets/material/addon/material-design-icon/_variables.scss +0 -3
  89. data/app/assets/stylesheets/material/element/_avatar.scss +0 -67
  90. data/app/assets/stylesheets/material/element/_button-flat.scss +0 -32
  91. data/app/assets/stylesheets/material/element/_button-float.scss +0 -202
  92. data/app/assets/stylesheets/material/element/_button.scss +0 -95
  93. data/app/assets/stylesheets/material/element/_card.scss +0 -245
  94. data/app/assets/stylesheets/material/element/_dropdown.scss +0 -132
  95. data/app/assets/stylesheets/material/element/_form-adv-checkbox.scss +0 -109
  96. data/app/assets/stylesheets/material/element/_form-adv-switch.scss +0 -102
  97. data/app/assets/stylesheets/material/element/_label.scss +0 -22
  98. data/app/assets/stylesheets/material/element/_sortable.scss +0 -8
  99. data/app/assets/stylesheets/material/element/_tab.scss +0 -107
  100. data/app/assets/stylesheets/material/element/_table.scss +0 -48
  101. data/app/assets/stylesheets/material/element/_tile.scss +0 -193
  102. data/app/assets/stylesheets/material/element/_toast.scss +0 -67
  103. data/app/assets/stylesheets/material/project.scss +0 -8
  104. data/app/assets/stylesheets/material/theme/_content.scss +0 -74
  105. data/app/assets/stylesheets/material/theme/_footer.scss +0 -17
  106. data/app/assets/stylesheets/material/theme/_header.scss +0 -128
@@ -8,17 +8,17 @@
8
8
  position: absolute;
9
9
  top: (($input-height - $font-size) / 2);
10
10
  left: 0;
11
- transition: color 0.3s $timing, font-size 0.3s $timing, top 0.3s $timing;
11
+ transform-origin: 0 0;
12
+ transition-duration: 0.3s;
13
+ transition-property: color, transform;
14
+ transition-timing-function: $timing;
12
15
  .form-group-label [class*="col-"] & {
13
16
  // position
14
17
  left: $grid-gutter;
15
18
  }
16
19
  .form-group-label.control-focus &,
17
20
  .form-group-label.control-highlight & {
18
- color: $black-sec;
19
- font-size: ($input-height - $line-height);
20
- // position
21
- top: (($input-height - $line-height) * -1);
21
+ transform: scale(($font-size-h6 / $font-size), ($font-size-h6 / $font-size)) translateY(($input-height - $line-height) * -1 - ($input-height - $font-size) / 2);
22
22
  }
23
23
  .form-group-label.control-focus & {
24
24
  color: $link-color;
@@ -26,39 +26,33 @@
26
26
  }
27
27
 
28
28
  .form-group-label {
29
- margin-top: ($line-height * 1.5);
30
- margin-bottom: ($line-height * 1.5);
29
+ margin-top: ($margin-md * 1.5);
30
+ margin-bottom: ($margin-md * 1.5);
31
31
  position: relative;
32
32
  .form-control {
33
33
  position: relative;
34
34
  z-index: 1;
35
35
  @include placeholder(transparent);
36
36
  }
37
+ legend + & {
38
+ margin-top: ($margin-md / 2);
39
+ }
37
40
  }
38
41
 
39
42
  // colour
40
- @each $color in $palette-list {
41
- $i: index($palette-list, $color);
43
+ @each $color in $palette-list-class {
44
+ $i: index($palette-list-class, $color);
42
45
 
43
46
  .form-group-label.form-group-#{$color} .floating-label {
44
- color: nth($palette-color, $i);
47
+ color: nth($palette-list-color, $i);
45
48
  }
46
49
  }
47
50
 
48
51
  .form-icon-label {
49
52
  cursor: pointer;
50
53
  display: block;
51
- padding: (($input-height - $line-height) / 2) 0;
52
- .form-group-icon.control-focus & {
53
- color: $link-color;
54
- }
54
+ font-size: $font-size-h4;
55
+ line-height: $line-height-h4;
56
+ padding: (($input-height - $line-height-h4) / 2) 0;
57
+ transition: color 0.15s $timing;
55
58
  }
56
-
57
- // colour
58
- @each $color in $palette-list {
59
- $i: index($palette-list, $color);
60
-
61
- .form-group-icon.form-group-#{$color} .form-icon-label {
62
- color: nth($palette-color, $i);
63
- }
64
- }
@@ -0,0 +1,96 @@
1
+ .switch {
2
+ position: relative;
3
+ &.checkbox,
4
+ &.radiobtn {
5
+ label {
6
+ padding-left: ($font-size-h4 + ($font-size * 5 - $font-size-h4) / 4 + $grid-gutter / 2);
7
+ }
8
+ }
9
+ }
10
+
11
+ .switch-toggle {
12
+ background-color: $black-hint;
13
+ border-radius: ($font-size-h6 / 2);
14
+ cursor: pointer;
15
+ display: inline-block;
16
+ height: $font-size-h6;
17
+ margin-right: ($grid-gutter / 2);
18
+ position: relative;
19
+ transition: background-color 0.3s $timing;
20
+ vertical-align: middle;
21
+ width: ($font-size-h4 + ($font-size * 5 - $font-size-h4) / 4);
22
+ &:after,
23
+ &:before {
24
+ border-radius: 50%;
25
+ content: "";
26
+ display: block;
27
+ height: $font-size-h4;
28
+ position: absolute;
29
+ top:(($font-size-h4 - $font-size-h6) / -2);
30
+ left: 0;
31
+ width: $font-size-h4;
32
+ }
33
+ &:after {
34
+ box-shadow: 0 0 0 (($font-size * 5 - $font-size-h4) / 4) rgba(0, 0, 0, 0.1);
35
+ opacity: 0;
36
+ transition-duration: 0.3s;
37
+ transition-property: opacity, transform;
38
+ transition-timing-function: $timing;
39
+ }
40
+ &:active:after {
41
+ opacity: 1;
42
+ }
43
+ &:before {
44
+ background-color: $white;
45
+ box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.25);
46
+ transition-duration: 0.3s;
47
+ transition-property: background-color, transform;
48
+ transition-timing-function: $timing;
49
+ }
50
+ input[type="checkbox"]:checked + &,
51
+ input[type="radio"]:checked + & {
52
+ background-color: rgba(red($brand-color-accent), green($brand-color-accent), blue($brand-color-accent), 0.5);
53
+ &:after,
54
+ &:before {
55
+ transform: translateX(($font-size * 5 - $font-size-h4) / 4);
56
+ }
57
+ &:before {
58
+ background-color: $brand-color-accent;
59
+ }
60
+ }
61
+ input[type="checkbox"]:checked + &,
62
+ input[type="radio"]:checked + & {
63
+ &:active:after {
64
+ box-shadow: 0 0 0 (($font-size * 5 - $font-size-h4) / 4) rgba(red($brand-color-accent), green($brand-color-accent), blue($brand-color-accent), 0.25);
65
+ }
66
+ }
67
+ .checkbox.switch &,
68
+ .radiobtn.switch & {
69
+ position: absolute;
70
+ top: (($line-height - $font-size-h6) / 2);
71
+ left: 0;
72
+ }
73
+ }
74
+
75
+ // colour
76
+ @each $color in $palette-list-class {
77
+ $i: index($palette-list-class, $color);
78
+
79
+ @if $color != "brand-accent" {
80
+ .switch-toggle-#{$color} {
81
+ input[type="checkbox"]:checked + &,
82
+ input[type="radio"]:checked + & {
83
+ background-color: rgba(red(nth($palette-list-color, $i)), green(nth($palette-list-color, $i)), blue(nth($palette-list-color, $i)), 0.5);
84
+ &:before {
85
+ background-color: nth($palette-list-color, $i);
86
+ }
87
+ }
88
+ input[type="checkbox"]:checked + &,
89
+ input[type="radio"]:checked + & {
90
+ &:active:after {
91
+ box-shadow: 0 0 0 (($font-size * 5 - $font-size-h4) / 4) rgba(red(nth($palette-list-color, $i)), green(nth($palette-list-color, $i)), blue(nth($palette-list-color, $i)), 0.25);
92
+ }
93
+ }
94
+ }
95
+ }
96
+ }
@@ -1,4 +1,4 @@
1
1
  .textarea-autosize {
2
2
  min-height: $input-height;
3
3
  overflow-x: hidden;
4
- }
4
+ }
@@ -1,35 +1,5 @@
1
- legend {
2
- &[class*="col-xx-"] {
3
- padding-left: ($grid-gutter / 2);
4
- }
5
- // 480
6
- @include responsive(xs) {
7
- &[class*="col-xs-"] {
8
- padding-left: ($grid-gutter / 2);
9
- }
10
- }
11
- // 768
12
- @include responsive(sm) {
13
- &[class*="col-sm-"] {
14
- padding-left: ($grid-gutter / 2);
15
- }
16
- }
17
- // 992
18
- @include responsive(md) {
19
- &[class*="col-md-"] {
20
- padding-left: ($grid-gutter / 2);
21
- }
22
- }
23
- // 1440
24
- @include responsive(lg) {
25
- &[class*="col-lg-"] {
26
- padding-left: ($grid-gutter / 2);
27
- }
28
- }
29
- }
30
-
31
1
  .checkbox,
32
- .radio {
2
+ .radiobtn {
33
3
  display: block;
34
4
  position: relative;
35
5
  .form-group & {
@@ -52,35 +22,34 @@ legend {
52
22
  }
53
23
 
54
24
  .checkbox input[type="checkbox"],
55
- .radio input[type="radio"] {
25
+ .radiobtn input[type="radio"] {
56
26
  margin-left: ($line-height * -1);
57
27
  position: absolute;
58
28
  }
59
29
 
60
30
  .checkbox-inline,
61
- .radio-inline {
31
+ .radiobtn-inline {
62
32
  display: inline-block;
63
33
  margin-right: $grid-gutter;
64
34
  }
65
35
 
66
36
  .form {
67
- margin-top: $line-height;
68
- margin-bottom: $line-height;
37
+ margin-top: $margin-md;
38
+ margin-bottom: $margin-md;
69
39
  }
70
40
 
71
41
  .form-control {
72
42
  background-color: transparent;
73
43
  background-image: none;
74
44
  border: 0;
75
- border-bottom: 1px solid $black-hint;
45
+ border-bottom: 1px solid $black-divider;
76
46
  border-radius: 0;
77
- color: $black-text;
47
+ color: inherit;
78
48
  display: block;
79
49
  font-size: $font-size;
80
50
  height: $input-height;
81
51
  line-height: $line-height;
82
52
  padding: (($input-height - $line-height) / 2) 0 (($input-height - $line-height) / 2 - 1);
83
- transition: border-bottom-color 0.15s $timing;
84
53
  width: 100%;
85
54
  @include placeholder($black-hint);
86
55
  &:focus {
@@ -102,11 +71,9 @@ legend {
102
71
  vertical-align: middle;
103
72
  width: auto;
104
73
  }
105
- &.form-control-default,
106
- .form-control-default & {
107
- border: 1px solid $black-hint;
74
+ &.form-control-default {
75
+ border: 1px solid $black-divider;
108
76
  padding: (($input-height - $line-height) / 2 - 1) ($grid-gutter / 2);
109
- transition: none;
110
77
  &:focus {
111
78
  border: 1px solid $link-color;
112
79
  padding: (($input-height - $line-height) / 2 - 1) ($grid-gutter / 2);
@@ -114,46 +81,36 @@ legend {
114
81
  &[disabled],
115
82
  &[readonly],
116
83
  fieldset[disabled] & {
117
- background-color: $white-bg-dark;
84
+ background-color: $offwhite;
118
85
  }
119
86
  }
120
87
  }
121
88
 
122
89
  // colour
123
- @each $color in $palette-list {
124
- $i: index($palette-list, $color);
90
+ @each $color in $palette-list-class {
91
+ $i: index($palette-list-class, $color);
125
92
 
126
93
  .form-group-#{$color} {
127
94
  .form-control,
128
95
  .form-control:focus {
129
- border-color: nth($palette-color, $i);
96
+ border-color: nth($palette-list-color, $i);
130
97
  }
131
98
  }
132
99
  }
133
100
 
134
- input[type="color"].form-control-default,
135
- .form-control-default input[type="color"] {
101
+ input[type="color"].form-control-default {
136
102
  min-width: ($grid-gutter + $line-height + 2);
137
103
  }
138
104
 
139
- label + .form-control.form-control-default,
140
- .form-control-default label + .form-control {
141
- margin-top: ($line-height / 4);
142
- }
143
-
144
- label.access-hide + .form-control.form-control-default,
145
- .form-control-default label.access-hide + .form-control {
146
- margin-top: 0;
147
- }
148
-
149
105
  select.form-control {
150
106
  -webkit-appearance: none;
151
- @include responsive("(-webkit-min-device-pixel-ratio: 0)") {
152
- background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAkCAMAAACg5NohAAAAZlBMVEUAAABlZWXLy8vg4OB6enrX19fg4OCdnZ2KiopsbGzn5+dzc3Pt7e3GxsbPz89ubm7u7u5ycnLY2NiJiYmGhoZoaGjq6up/f3+WlpaGhoaZmZllZWVhYWFYWFhaWlpdXV1bW1tWVlaZeqNTAAAAHHRSTlMA+WVC31BEqMzyNekpcGDpKNxJzcjkL9CjwZ/yNlWBeQAAALBJREFUKM/NztkWwiAMRdFQoNparR2cGf//J8UFNdXEd8/rXrkAq9rLoIGt3Vkn9A8xJoiaSqeSJGskuXlJNs2sFRPjWo7lptzVVEoO7VyEWofvoEn8NTUUxuZo2KyCPjo2+wB9m7ZM01zB/9feN2zXEVS0bLEHZQ1b6EE2jhNvDsBbMBWkampepJtizNpi4UPyGrEimBbhLT4L2nLnzR6+ksnIGm7iGjXv8xq14bSWJwymLjvMk/6KAAAAAElFTkSuQmCC);
107
+ -moz-appearance: none;
108
+ @include responsive("(-webkit-min-device-pixel-ratio: 0), (min--moz-device-pixel-ratio: 0)") {
109
+ background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo1ODZCNTU1QkIxQkUxMUU1OEYzRkZEMkE1Q0Y3MDFBNyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo1ODZCNTU1Q0IxQkUxMUU1OEYzRkZEMkE1Q0Y3MDFBNyI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjU4NkI1NTU5QjFCRTExRTU4RjNGRkQyQTVDRjcwMUE3IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjU4NkI1NTVBQjFCRTExRTU4RjNGRkQyQTVDRjcwMUE3Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+TozEogAAAGxJREFUeNrs1DEOgDAIheHH4XpqDocdiInYVqA6mEBC2P5vg0QEXw4VUMCPACJq/bSXuty7bAEosIuwAhgBuwjrYgVkkTPuAaLIJe4FvMgtHgGekGE8CsyQaTwDWGQZzwIwAEJAPbsC0nMIMADa5XjRmvnODAAAAABJRU5ErkJggg==);
153
110
  background-position: 100% (($input-height - 12) / 2 - 1);
154
111
  background-repeat: no-repeat;
155
- background-size: auto 12px;
156
- padding-right: 12px;
112
+ background-size: 12px 12px;
113
+ padding-right: ($grid-gutter / 2 + 12);
157
114
  &[multiple],
158
115
  &[size] {
159
116
  background-image: none;
@@ -162,15 +119,13 @@ select.form-control {
162
119
  }
163
120
  }
164
121
 
165
- select.form-control-default,
166
- .form-control-default select {
167
- @include responsive("(-webkit-min-device-pixel-ratio: 0)") {
168
- background-position: 99% (($input-height - 12) / 2 - 1);
122
+ select.form-control-default {
123
+ @include responsive("(-webkit-min-device-pixel-ratio: 0), (min--moz-device-pixel-ratio: 0)") {
169
124
  background-position: calc(100% - #{$grid-gutter / 2}) (($input-height - 12) / 2 - 1);
170
- padding-right: ($grid-gutter * 1.5);
125
+ padding-right: ($grid-gutter + 12) !important;
171
126
  &[multiple],
172
127
  &[size] {
173
- padding-right: ($grid-gutter / 2);
128
+ padding-right: ($grid-gutter / 2) !important;
174
129
  }
175
130
  }
176
131
  }
@@ -179,16 +134,11 @@ textarea.form-control {
179
134
  height: auto;
180
135
  }
181
136
 
182
- .form-control-inverse {
183
- color: $white;
184
- @include placeholder($white-bg);
185
- }
186
-
187
137
  .form-control-static {
188
- border-bottom: 1px solid $black-hint;
138
+ border-bottom: 1px solid $black-divider;
189
139
  display: block;
190
140
  font-size: $font-size;
191
- font-weight: $font-weight;
141
+ font-weight: $font-weight-normal;
192
142
  line-height: $line-height;
193
143
  margin-top: 0;
194
144
  margin-bottom: 0;
@@ -200,27 +150,20 @@ textarea.form-control {
200
150
  }
201
151
 
202
152
  .form-group {
203
- margin-top: $line-height;
204
- margin-bottom: $line-height;
153
+ margin-top: $margin-md;
154
+ margin-bottom: $margin-md;
205
155
  legend + & {
206
156
  margin-top: 0;
207
157
  }
208
158
  }
209
159
 
210
- .form-group-btn {
211
- margin-bottom: $line-height;
212
- .btn {
213
- margin-top: $line-height;
214
- margin-right: $grid-gutter;
215
- }
216
- }
217
-
218
160
  .form-help {
219
161
  display: block;
220
162
  font-size: $font-size-h6;
221
- font-weight: $font-weight;
222
- margin-top: ($line-height / 2);
223
- margin-bottom: ($line-height / 2);
163
+ font-weight: $font-weight-normal;
164
+ line-height: $line-height;
165
+ margin-top: $margin-base;
166
+ margin-bottom: $margin-sm;
224
167
  position: relative;
225
168
  }
226
169
 
@@ -263,14 +206,10 @@ textarea.form-control {
263
206
  }
264
207
 
265
208
  // colour
266
- @each $color in $palette-list {
267
- $i: index($palette-list, $color);
209
+ @each $color in $palette-list-class {
210
+ $i: index($palette-list-class, $color);
268
211
 
269
212
  .form-group-#{$color} .form-label {
270
- color: nth($palette-color, $i);
213
+ color: nth($palette-list-color, $i);
271
214
  }
272
215
  }
273
-
274
- .label {
275
- margin-bottom: ($line-height / 2);
276
- }
@@ -0,0 +1,23 @@
1
+ .label {
2
+ background-color: $black-hint;
3
+ border-radius: 2px;
4
+ color: $white-text-solid;
5
+ display: inline;
6
+ font-size: 75%;
7
+ font-style: normal;
8
+ font-weight: $font-weight-normal;
9
+ line-height: 1;
10
+ padding: 0.2em 0.6em;
11
+ vertical-align: baseline;
12
+ white-space: nowrap;
13
+ }
14
+
15
+ // colour
16
+ @each $color in $palette-list-class {
17
+ $i: index($palette-list-class, $color);
18
+
19
+ .label-#{$color} {
20
+ background-color: nth($palette-list-color, $i);
21
+ color: nth($palette-list-text, $i);
22
+ }
23
+ }
@@ -29,12 +29,18 @@
29
29
  transition: opacity 0.3s $timing;
30
30
  z-index: ($top-base - 1);
31
31
  &.fade.in {
32
- opacity: 0.5;
32
+ opacity: 0.54;
33
+ }
34
+ .menu ~ & {
35
+ z-index: $header-base;
36
+ &.in {
37
+ opacity: 0.54;
38
+ }
33
39
  }
34
40
  }
35
41
 
36
42
  .modal-close {
37
- color: $black-sec;
43
+ color: $black-sec-solid;
38
44
  cursor: pointer;
39
45
  display: block;
40
46
  float: right;
@@ -61,23 +67,18 @@
61
67
  }
62
68
 
63
69
  .modal-dialog {
64
- margin: ($line-height * 2) $grid-gutter;
70
+ margin: $margin-lg $grid-gutter;
65
71
  position: relative;
66
72
  &.modal-full {
67
73
  height: 100%;
68
- height: calc(100% - #{$line-height * 4});
74
+ height: calc(100% - #{$margin-lg * 2});
69
75
  .modal-content {
70
76
  height: 100%;
71
- overflow-x: hidden;
72
- overflow-y: auto;
73
- -webkit-overflow-scrolling: touch;
74
- -ms-overflow-style: -ms-autohiding-scrollbar;
75
77
  }
76
78
  }
77
79
  .modal.fade & {
78
80
  transform: scale(0, 0);
79
- transition: all 0.3s $timing;
80
- transition-property: transform;
81
+ transition: transform 0.3s $timing;
81
82
  }
82
83
  .modal.fade.in & {
83
84
  transform: scale(1, 1);
@@ -103,8 +104,8 @@
103
104
  }
104
105
 
105
106
  .modal-footer {
106
- padding-right: ($grid-gutter * 2);
107
- padding-left: ($grid-gutter * 2);
107
+ padding-right: ($grid-gutter * 1.5);
108
+ padding-left: ($grid-gutter * 1.5);
108
109
  .btn + .btn {
109
110
  margin-right: $grid-gutter;
110
111
  }
@@ -115,15 +116,18 @@
115
116
  }
116
117
 
117
118
  .modal-heading {
118
- padding-top: $line-height;
119
- padding-right: ($grid-gutter * 2);
120
- padding-left: ($grid-gutter * 2);
119
+ margin-top: $margin-md;
120
+ margin-bottom: $margin-md;
121
+ padding-right: ($grid-gutter * 1.5);
122
+ padding-left: ($grid-gutter * 1.5);
121
123
  position: relative;
122
124
  }
123
125
 
124
126
  .modal-inner {
125
- padding-right: ($grid-gutter * 2);
126
- padding-left: ($grid-gutter * 2);
127
+ margin-top: $margin-md;
128
+ margin-bottom: $margin-md;
129
+ padding-right: ($grid-gutter * 1.5);
130
+ padding-left: ($grid-gutter * 1.5);
127
131
  }
128
132
 
129
133
  .modal-open {
@@ -135,5 +139,26 @@
135
139
  line-height: $line-height-h4;
136
140
  margin-top: 0;
137
141
  margin-right: ($grid-gutter + 12);
138
- margin-bottom: $line-height;
142
+ margin-bottom: $margin-md;
143
+ }
144
+
145
+ .modal-va-middle {
146
+ align-items: center;
147
+ .modal-dialog {
148
+ flex-grow: 1;
149
+ // 480
150
+ @include responsive(xs) {
151
+ &.modal-xs {
152
+ flex-grow: 0;
153
+ }
154
+ }
155
+ // 992
156
+ @include responsive(md) {
157
+ flex-grow: 0;
158
+ }
159
+ }
160
+ }
161
+
162
+ .modal-va-middle-show {
163
+ display: flex;
139
164
  }