material-sass 4.0.0.alpha5 → 4.0.0.alpha6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (67) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/material/addons-materialise/textarea-autosize.js +7 -5
  3. data/app/assets/javascripts/material/addons-materialise/wave.js +11 -8
  4. data/app/assets/javascripts/material/src/floating-label.js +5 -5
  5. data/app/assets/javascripts/material/src/navdrawer.js +7 -7
  6. data/app/assets/javascripts/material/src/tab-switch.js +15 -18
  7. data/app/assets/javascripts/material/src/util.js +1 -1
  8. data/app/assets/javascripts/material.js +24 -27
  9. data/app/assets/stylesheets/material/_mixins.scss +2 -0
  10. data/app/assets/stylesheets/material/_utilities.scss +3 -0
  11. data/app/assets/stylesheets/material/_variables.scss +24 -2
  12. data/app/assets/stylesheets/material/base/_base.scss +5 -482
  13. data/app/assets/stylesheets/material/base/_grid.scss +11 -0
  14. data/app/assets/stylesheets/material/base/_normalize.scss +253 -0
  15. data/app/assets/stylesheets/material/base/_reboot.scss +239 -0
  16. data/app/assets/stylesheets/material/base/_typography.scss +0 -10
  17. data/app/assets/stylesheets/material/bootstrap/_alert.scss +0 -1
  18. data/app/assets/stylesheets/material/bootstrap/_breadcrumb.scss +15 -10
  19. data/app/assets/stylesheets/material/bootstrap/_button-group.scss +21 -42
  20. data/app/assets/stylesheets/material/bootstrap/_carousel.scss +81 -126
  21. data/app/assets/stylesheets/material/bootstrap/_close.scss +1 -4
  22. data/app/assets/stylesheets/material/bootstrap/_custom-form.scss +14 -16
  23. data/app/assets/stylesheets/material/bootstrap/_form.scss +95 -52
  24. data/app/assets/stylesheets/material/bootstrap/_media.scss +6 -67
  25. data/app/assets/stylesheets/material/bootstrap/_nav.scss +23 -45
  26. data/app/assets/stylesheets/material/bootstrap/_pagination.scss +4 -14
  27. data/app/assets/stylesheets/material/bootstrap/_popover.scss +7 -5
  28. data/app/assets/stylesheets/material/bootstrap/_responsive-embed.scss +18 -5
  29. data/app/assets/stylesheets/material/bootstrap/{_animation.scss → _transition.scss} +11 -2
  30. data/app/assets/stylesheets/material/material/_card.scss +185 -123
  31. data/app/assets/stylesheets/material/material/_chip.scss +12 -12
  32. data/app/assets/stylesheets/material/material/_data-table.scss +0 -2
  33. data/app/assets/stylesheets/material/material/_dialog.scss +23 -17
  34. data/app/assets/stylesheets/material/material/_expansion-panel.scss +42 -183
  35. data/app/assets/stylesheets/material/material/_menu.scss +19 -4
  36. data/app/assets/stylesheets/material/material/_navdrawer.scss +16 -12
  37. data/app/assets/stylesheets/material/material/_progress-circular.scss +2 -2
  38. data/app/assets/stylesheets/material/material/_progress.scss +68 -92
  39. data/app/assets/stylesheets/material/material/_selection-control.scss +11 -28
  40. data/app/assets/stylesheets/material/material/_tab.scss +52 -117
  41. data/app/assets/stylesheets/material/material/_text-field-floating-label.scss +9 -4
  42. data/app/assets/stylesheets/material/material/_text-field-input-group.scss +37 -35
  43. data/app/assets/stylesheets/material/material/_text-field.scss +41 -32
  44. data/app/assets/stylesheets/material/material/_toolbar.scss +192 -306
  45. data/app/assets/stylesheets/material/material/_tooltip.scss +19 -20
  46. data/app/assets/stylesheets/material/material.scss +2 -2
  47. data/app/assets/stylesheets/material/mixins/_border-radius.scss +9 -19
  48. data/app/assets/stylesheets/material/mixins/_breakpoint.scss +11 -3
  49. data/app/assets/stylesheets/material/mixins/_form.scss +15 -30
  50. data/app/assets/stylesheets/material/mixins/_grid-framework.scss +58 -0
  51. data/app/assets/stylesheets/material/mixins/_grid.scss +6 -78
  52. data/app/assets/stylesheets/material/mixins/_transform.scss +9 -0
  53. data/app/assets/stylesheets/material/utilities/_border.scss +31 -5
  54. data/app/assets/stylesheets/material/utilities/_display.scss +37 -8
  55. data/app/assets/stylesheets/material/utilities/_flex.scss +140 -0
  56. data/app/assets/stylesheets/material/utilities/_float.scss +5 -3
  57. data/app/assets/stylesheets/material/utilities/_position.scss +24 -0
  58. data/app/assets/stylesheets/material/utilities/_sizing.scss +16 -0
  59. data/app/assets/stylesheets/material/utilities/_spacing.scss +56 -46
  60. data/app/assets/stylesheets/material/utilities/_text.scss +5 -3
  61. data/app/assets/stylesheets/material/variables/_grid.scss +16 -10
  62. data/app/assets/stylesheets/material/variables/_spacer.scss +22 -3
  63. data/app/assets/stylesheets/material/variables/_typography.scss +2 -0
  64. data/app/assets/stylesheets/material/variables/_variable-bootstrap.scss +24 -17
  65. data/app/assets/stylesheets/material/variables/_variable-material.scss +47 -52
  66. data/lib/material-sass/version.rb +1 -1
  67. metadata +9 -2
@@ -0,0 +1,16 @@
1
+ // height and width
2
+ @each $prop, $prop-abbr in (height: h, width: w) {
3
+ @each $size, $value in $sizes {
4
+ .#{$prop-abbr}-#{$size} {
5
+ #{$prop}: $value !important;
6
+ }
7
+ }
8
+ }
9
+
10
+ .mh-100 {
11
+ max-height: 100% !important;
12
+ }
13
+
14
+ .mw-100 {
15
+ max-width: 100% !important;
16
+ }
@@ -1,65 +1,75 @@
1
- //
2
- // height and width
3
- //
4
- .h-100 {
5
- height: 100% !important;
6
- }
7
-
8
- .w-100 {
9
- width: 100% !important;
10
- }
11
-
12
1
  //
13
2
  // margin and padding
14
3
  //
15
- .mx-auto {
16
- margin-right: auto !important;
17
- margin-left: auto !important;
18
- }
4
+ @each $breakpoint in map-keys($grid-breakpoints) {
5
+ @include media-breakpoint-up($breakpoint) {
6
+ $infix: breakpoint-infix($breakpoint);
19
7
 
20
- @each $prop, $prop-abbr in (margin: m, padding: p) {
21
- @each $size, $values in $spacers {
22
- $length-x: map-get($values, x);
23
- $length-y: map-get($values, y);
8
+ .m#{$infix}-auto {
9
+ margin: auto !important;
10
+ }
24
11
 
25
- .#{$prop-abbr}-#{$size} {
26
- #{$prop}: $length-y $length-x !important;
12
+ .mt#{$infix}-auto {
13
+ margin-top: auto !important;
27
14
  }
28
15
 
29
- .#{$prop-abbr}t-#{$size} {
30
- #{$prop}-top: $length-y !important;
16
+ .mr#{$infix}-auto {
17
+ margin-right: auto !important;
31
18
  }
32
19
 
33
- .#{$prop-abbr}r-#{$size} {
34
- #{$prop}-right: $length-x !important;
20
+ .mb#{$infix}-auto {
21
+ margin-bottom: auto !important;
35
22
  }
36
23
 
37
- .#{$prop-abbr}b-#{$size} {
38
- #{$prop}-bottom: $length-y !important;
24
+ .ml#{$infix}-auto {
25
+ margin-left: auto !important;
39
26
  }
40
27
 
41
- .#{$prop-abbr}l-#{$size} {
42
- #{$prop}-left: $length-x !important;
28
+ .mx#{$infix}-auto {
29
+ margin-right: auto !important;
30
+ margin-left: auto !important;
43
31
  }
44
32
 
45
- .#{$prop-abbr}x-#{$size} {
46
- #{$prop}-right: $length-x !important;
47
- #{$prop}-left: $length-x !important;
33
+ .my#{$infix}-auto {
34
+ margin-top: auto !important;
35
+ margin-bottom: auto !important;
48
36
  }
49
- .#{$prop-abbr}y-#{$size} {
50
- #{$prop}-top: $length-y !important;
51
- #{$prop}-bottom: $length-y !important;
37
+
38
+ @each $prop, $prop-abbr in (margin: m, padding: p) {
39
+ @each $size, $values in $spacers {
40
+ $length-x: map-get($values, x);
41
+ $length-y: map-get($values, y);
42
+
43
+ .#{$prop-abbr}#{$infix}-#{$size} {
44
+ #{$prop}: $length-y $length-x !important;
45
+ }
46
+
47
+ .#{$prop-abbr}t#{$infix}-#{$size} {
48
+ #{$prop}-top: $length-y !important;
49
+ }
50
+
51
+ .#{$prop-abbr}r#{$infix}-#{$size} {
52
+ #{$prop}-right: $length-x !important;
53
+ }
54
+
55
+ .#{$prop-abbr}b#{$infix}-#{$size} {
56
+ #{$prop}-bottom: $length-y !important;
57
+ }
58
+
59
+ .#{$prop-abbr}l#{$infix}-#{$size} {
60
+ #{$prop}-left: $length-x !important;
61
+ }
62
+
63
+ .#{$prop-abbr}x#{$infix}-#{$size} {
64
+ #{$prop}-right: $length-x !important;
65
+ #{$prop}-left: $length-x !important;
66
+ }
67
+
68
+ .#{$prop-abbr}y#{$infix}-#{$size} {
69
+ #{$prop}-top: $length-y !important;
70
+ #{$prop}-bottom: $length-y !important;
71
+ }
72
+ }
52
73
  }
53
74
  }
54
75
  }
55
-
56
- //
57
- // positioning
58
- //
59
- .pos-f-t {
60
- position: fixed;
61
- top: 0;
62
- right: 0;
63
- left: 0;
64
- z-index: map-get($toolbar-elevation-shadow, elevation);
65
- }
@@ -14,15 +14,17 @@
14
14
  // horizontal
15
15
  @each $breakpoint in map-keys($grid-breakpoints) {
16
16
  @include media-breakpoint-up($breakpoint) {
17
- .text-#{$breakpoint}-center {
17
+ $infix: breakpoint-infix($breakpoint);
18
+
19
+ .text#{$infix}-center {
18
20
  text-align: center !important;
19
21
  }
20
22
 
21
- .text-#{$breakpoint}-left {
23
+ .text#{$infix}-left {
22
24
  text-align: left !important;
23
25
  }
24
26
 
25
- .text-#{$breakpoint}-right {
27
+ .text#{$infix}-right {
26
28
  text-align: right !important;
27
29
  }
28
30
  }
@@ -1,13 +1,13 @@
1
- $grid-columns: 12 !default;
2
- $grid-gutter-width: 1rem !default;
3
- $grid-gutter-width-md-up: 1.5rem !default;
1
+ $grid-columns: 12 !default;
2
+ $grid-gutter-width-base: 16px !default;
3
+ $grid-gutter-width-desktop: 24px !default;
4
4
 
5
5
  $grid-gutter-widths: (
6
- xs: $grid-gutter-width,
7
- sm: $grid-gutter-width,
8
- md: $grid-gutter-width-md-up,
9
- lg: $grid-gutter-width-md-up,
10
- xl: $grid-gutter-width-md-up
6
+ xs: $grid-gutter-width-base,
7
+ sm: $grid-gutter-width-base,
8
+ md: $grid-gutter-width-desktop,
9
+ lg: $grid-gutter-width-desktop,
10
+ xl: $grid-gutter-width-desktop
11
11
  ) !default;
12
12
 
13
13
  //
@@ -19,14 +19,20 @@ $grid-gutter-widths: (
19
19
  sm: 600px,
20
20
  md: 960px,
21
21
  lg: 1280px,
22
- xl: 1600px
22
+ xl: 1920px
23
23
  ) !default;
24
+
24
25
  @include _assert-ascending($grid-breakpoints, "$grid-breakpoints");
26
+ @include _assert-starts-at-zero($grid-breakpoints);
25
27
 
26
28
  //
27
29
  // container
28
30
  //
29
31
  $container-max-widths: (
30
- xl: 1920px
32
+ sm: 600px,
33
+ md: 840px,
34
+ lg: 1024px,
35
+ xl: 1600px
31
36
  ) !default;
37
+
32
38
  @include _assert-ascending($container-max-widths, "$container-max-widths");
@@ -3,9 +3,20 @@
3
3
  //
4
4
  $border-color: $black-divider !default;
5
5
  $border-color-inverse: $white-divider !default;
6
+ $border-color-solid: $black-divider-solid !default;
6
7
  $border-radius: 2px !default;
7
8
  $border-width: 1px !default;
8
9
 
10
+ //
11
+ // size
12
+ //
13
+ $sizes: (
14
+ 25: 25%,
15
+ 50: 50%,
16
+ 75: 75%,
17
+ 100: 100%
18
+ ) !default;
19
+
9
20
  //
10
21
  // spacer
11
22
  //
@@ -38,15 +49,23 @@
38
49
  x: 0,
39
50
  y: 0
40
51
  ),
52
+ 1: (
53
+ x: $spacer-xs-x,
54
+ y: $spacer-xs-y
55
+ ),
41
56
  xs: (
42
57
  x: $spacer-xs-x,
43
58
  y: $spacer-xs-y
44
59
  ),
60
+ 2: (
61
+ x: $spacer-sm-x,
62
+ y: $spacer-sm-y
63
+ ),
45
64
  sm: (
46
65
  x: $spacer-sm-x,
47
66
  y: $spacer-sm-y
48
67
  ),
49
- 1: (
68
+ 3: (
50
69
  x: $spacer-x,
51
70
  y: $spacer-y
52
71
  ),
@@ -54,7 +73,7 @@
54
73
  x: $spacer-x,
55
74
  y: $spacer-y
56
75
  ),
57
- 2: (
76
+ 4: (
58
77
  x: $spacer-lg-x,
59
78
  y: $spacer-lg-y
60
79
  ),
@@ -62,7 +81,7 @@
62
81
  x: $spacer-lg-x,
63
82
  y: $spacer-lg-y
64
83
  ),
65
- 3: (
84
+ 5: (
66
85
  x: $spacer-xl-x,
67
86
  y: $spacer-xl-y
68
87
  ),
@@ -16,6 +16,8 @@
16
16
  $font-weight-light: 300 !default;
17
17
  $font-weight-thin: 100 !default; // not used
18
18
 
19
+ $font-weight-base: $font-weight-regular !default;
20
+
19
21
  // font styles
20
22
  // based on https://material.google.com/style/typography.html#typography-styles
21
23
  $font-size-base: 0.875rem !default; // 14px
@@ -1,8 +1,3 @@
1
- $enable-flex: false !default;
2
- $enable-grid-classes: true !default;
3
- $enable-hover-media-query: false !default;
4
- $enable-rounded: true !default;
5
-
6
1
  // alert
7
2
  $alert-link-font-weight: $font-weight-medium !default;
8
3
 
@@ -12,13 +7,14 @@ $enable-rounded: true !default;
12
7
 
13
8
  // breadcrumb
14
9
  $breadcrumb-bg: $offwhite !default;
15
- $breadcrumb-divider: "chevron_right" !default;
10
+ $breadcrumb-divider: url("data:image/svg+xml;charset=utf8,%3Csvg fill='#000000' fill-opacity='0.54' height='24' viewBox='0 0 24 24' width='24' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z'/%3E%3Cpath d='M0 0h24v24H0z' fill='none'/%3E%3C/svg%3E") !default;
11
+ $breadcrumb-height: 3.5rem !default;
16
12
  $breadcrumb-item-color: $black-secondary !default;
17
13
  $breadcrumb-item-color-active: $black-primary !default;
18
14
  $breadcrumb-item-padding: $spacer-sm-x !default;
19
15
  $breadcrumb-margin-bottom: $spacer-md-y !default;
20
16
  $breadcrumb-padding-x: $spacer-md-x !default;
21
- $breadcrumb-padding-y: $spacer-md-y !default;
17
+ $breadcrumb-padding-y: 0.625rem !default;
22
18
 
23
19
  // button group
24
20
  $btn-group-bg: $offwhite !default;
@@ -32,10 +28,13 @@ $enable-rounded: true !default;
32
28
  $caret-width: 0.4em !default;
33
29
 
34
30
  // carousel
35
- $carousel-caption-color: $white-primary !default;
36
- $carousel-caption-width: 50% !default;
37
- $carousel-indicator-color: $black-divider !default;
38
- $carousel-indicator-size: 0.5rem !default;
31
+ $carousel-caption-color: $white-primary !default;
32
+ $carousel-caption-width: 50% !default;
33
+ $carousel-control-icon-opacity: 0.38 !default;
34
+ $carousel-control-next-icon-bg: url("data:image/svg+xml;charset=utf8,%3Csvg fill='#000000' height='24' viewBox='0 0 24 24' width='24' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z'/%3E%3Cpath d='M0 0h24v24H0z' fill='none'/%3E%3C/svg%3E") !default;
35
+ $carousel-control-prev-icon-bg: url("data:image/svg+xml;charset=utf8,%3Csvg fill='#000000' height='24' viewBox='0 0 24 24' width='24' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12z'/%3E%3Cpath d='M0 0h24v24H0z' fill='none'/%3E%3C/svg%3E") !default;
36
+ $carousel-indicator-color: $black-divider !default;
37
+ $carousel-indicator-size: 0.5rem !default;
39
38
 
40
39
  // close
41
40
  $close-color: $black-hint !default;
@@ -60,14 +59,23 @@ $enable-rounded: true !default;
60
59
  $cursor-disabled: not-allowed !default;
61
60
 
62
61
  // form
63
- $custom-file-width: 14rem !default;
64
- $custom-file-text: (button-label: (en: "attach_file"), placeholder: (en: "Choose file...")) !default;
62
+ $custom-file-button-bg: url("data:image/svg+xml;charset=utf8,%3Csvg fill='#000000' height='24' viewBox='0 0 24 24' width='24' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M2 12.5C2 9.46 4.46 7 7.5 7H18c2.21 0 4 1.79 4 4s-1.79 4-4 4H9.5C8.12 15 7 13.88 7 12.5S8.12 10 9.5 10H17v2H9.41c-.55 0-.55 1 0 1H18c1.1 0 2-.9 2-2s-.9-2-2-2H7.5C5.57 9 4 10.57 4 12.5S5.57 16 7.5 16H17v2H7.5C4.46 18 2 15.54 2 12.5z'/%3E%3Cpath d='M0 0h24v24H0V0z' fill='none'/%3E%3C/svg%3E") !default;
63
+ $custom-file-button-opacity: 0.38 !default;
64
+ $custom-file-button-opacity-visible: 0.54 !default;
65
+ $custom-file-width: 14rem !default;
66
+ $custom-file-text: (en: "Choose file...") !default;
67
+
68
+ $form-check-inline-margin-x: $spacer-sm-x !default;
69
+ $form-check-input-margin-x: $spacer-xs-x !default;
70
+
71
+ $form-group-label-font-size: $font-size-caption !default;
72
+ $form-group-margin-bottom: $spacer-lg-y !default;
65
73
 
66
- $form-group-margin-bottom: $spacer-md-y !default;
74
+ $input-group-addon-margin-x: $spacer-md-x !default;
67
75
 
68
76
  // jumbotron
69
- $jumbotron-bg: $brand-color !default;
70
- $jumbotron-color: $brand-text-color !default;
77
+ $jumbotron-bg: $brand-color !default;
78
+ $jumbotron-color: $brand-text-color !default;
71
79
 
72
80
  // link
73
81
  $link-color: $brand-color !default;
@@ -108,7 +116,6 @@ $enable-rounded: true !default;
108
116
 
109
117
  // nav
110
118
  $nav-inline-item-spacer: $spacer-md-x !default;
111
- $nav-item-margin: 1px !default;
112
119
  $nav-link-bg-active: $black-divider !default;
113
120
  $nav-link-color: $black-secondary !default;
114
121
  $nav-link-color-active: $black-primary !default;
@@ -2,23 +2,23 @@
2
2
  // appbar / toolbar (navbar)
3
3
  // based on https://material.google.com/components/toolbars.html#toolbars-usage
4
4
  //
5
- $toolbar-border-color: $border-color !default;
6
- $toolbar-border-width: $border-width !default;
7
- $toolbar-color-dark: $white-primary !default;
8
- $toolbar-color-light: $black-primary !default;
9
- $toolbar-elevation-shadow: $elevation-shadow-4dp !default;
10
- $toolbar-height: 3.5rem !default;
11
- $toolbar-inner-spacer: $spacer-md !default;
12
- $toolbar-link-font-size: 1rem !default;
13
- $toolbar-link-height: 2.25rem !default;
14
- $toolbar-link-opacity: 0.7 !default;
15
- $toolbar-link-padding-x: $spacer-md-x !default;
16
- $toolbar-link-padding-y: (($toolbar-link-height - $toolbar-link-font-size) / 2) !default;
17
- $toolbar-padding-x: $spacer-md-x !default;
18
- $toolbar-padding-y: (($toolbar-height - $toolbar-link-height) / 2) !default;
19
- $toolbar-toggler-bg-dark: url("data:image/svg+xml;charset=utf8,%3Csvg fill='#ffffff' height='24' viewBox='0 0 24 24' width='24' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M0 0h24v24H0z' fill='none'/%3E%3Cpath d='M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z'/%3E%3C/svg%3E") !default;
20
- $toolbar-toggler-bg-light: url("data:image/svg+xml;charset=utf8,%3Csvg fill='#000000' fill-opacity='0.87' height='24' viewBox='0 0 24 24' width='24' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M0 0h24v24H0z' fill='none'/%3E%3Cpath d='M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z'/%3E%3C/svg%3E") !default;
21
- $toolbar-waterfall-bg: $brand-color !default;
5
+ $toolbar-color-dark: $black-primary !default;
6
+ $toolbar-color-light: $white-primary !default;
7
+ $toolbar-element-bg-dark: $black-divider !default;
8
+ $toolbar-element-bg-light: $white-divider !default;
9
+ $toolbar-elevation-shadow: $elevation-shadow-4dp !default;
10
+ $toolbar-height: 3.5rem !default;
11
+ $toolbar-link-font-size: 1rem !default;
12
+ $toolbar-link-height: 2.25rem !default;
13
+ $toolbar-link-opacity: 0.7 !default;
14
+ $toolbar-link-opacity-active: 1 !default;
15
+ $toolbar-link-padding-x: $spacer-md-x !default;
16
+ $toolbar-link-padding-y: (($toolbar-link-height - $toolbar-link-font-size) / 2) !default;
17
+ $toolbar-padding-x: $spacer-md-x !default;
18
+ $toolbar-padding-y: (($toolbar-height - $toolbar-link-height) / 2) !default;
19
+ $toolbar-toggler-bg-dark: url("data:image/svg+xml;charset=utf8,%3Csvg fill='#000000' fill-opacity='0.87' height='24' viewBox='0 0 24 24' width='24' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M0 0h24v24H0z' fill='none'/%3E%3Cpath d='M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z'/%3E%3C/svg%3E") !default;
20
+ $toolbar-toggler-bg-light: url("data:image/svg+xml;charset=utf8,%3Csvg fill='#ffffff' height='24' viewBox='0 0 24 24' width='24' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M0 0h24v24H0z' fill='none'/%3E%3Cpath d='M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z'/%3E%3C/svg%3E") !default;
21
+ $toolbar-waterfall-bg: $brand-color !default;
22
22
 
23
23
  //
24
24
  // button
@@ -96,7 +96,6 @@
96
96
  $card-spacer-inner-y: $spacer-md-y !default;
97
97
  $card-spacer-outer-x: $spacer-sm-x !default;
98
98
  $card-spacer-outer-y: $spacer-sm-y !default;
99
- $card-title-additonal-margin: $spacer-sm-y !default;
100
99
 
101
100
  //
102
101
  // chip (label)
@@ -135,7 +134,7 @@
135
134
  $table-bg: $white-primary !default;
136
135
  $table-bg-accent: $palette-grey-100 !default;
137
136
  $table-bg-hover: $palette-grey-200 !default;
138
- $table-border-color: $border-color !default;
137
+ $table-border-color: $border-color-solid !default;
139
138
  $table-border-width: $border-width !default;
140
139
  $table-cell-padding-x: 1.75rem !default;
141
140
  $table-cell-padding-x-alt: $spacer-lg-x !default;
@@ -184,24 +183,17 @@
184
183
  $expansion-panel-bg: $white-primary !default;
185
184
  $expansion-panel-bg-active: $palette-grey-200 !default;
186
185
  $expansion-panel-bg-disabled: $expansion-panel-bg !default;
187
- $expansion-panel-body-spacer-x: $spacer-lg-x !default;
188
- $expansion-panel-body-spacer-y: $spacer-md-y !default;
189
186
  $expansion-panel-border-color: $border-color !default;
190
187
  $expansion-panel-border-width: $border-width !default;
191
188
  $expansion-panel-color: $black-primary !default;
189
+ $expansion-panel-color-active: $expansion-panel-color !default;
192
190
  $expansion-panel-color-disabled: $black-hint !default;
193
191
  $expansion-panel-elevation-shadow: $elevation-shadow-2dp !default;
194
192
  $expansion-panel-font-size: 0.9375rem !default;
195
193
  $expansion-panel-font-size-secondary: 0.75rem !default;
196
- $expansion-panel-footer-spacer-x: $spacer-sm-x !default;
197
- $expansion-panel-footer-spacer-y: $spacer-md-y !default;
198
194
  $expansion-panel-height: 3rem !default;
199
- $expansion-panel-icon-color: $black-hint !default;
200
- $expansion-panel-icon-color-active: $black-secondary !default;
201
- $expansion-panel-margin-between: 1rem !default;
202
- $expansion-panel-margin-bottom: $spacer-md-y !default;
203
- $expansion-panel-spacer-x: $spacer-lg-x !default;
204
- $expansion-panel-spacer-y: (($expansion-panel-height - $expansion-panel-font-size * $line-height-base) / 2) !default;
195
+ $expansion-panel-inner-spacer-x: $spacer-lg-x !default;
196
+ $expansion-panel-inner-spacer-y: ($expansion-panel-inner-spacer-x / 2) !default;
205
197
 
206
198
  //
207
199
  // menu (dropdown)
@@ -222,6 +214,8 @@
222
214
  $menu-link-height-cascading: 2rem !default;
223
215
  $menu-link-padding: (($menu-link-height - $menu-line-height) / 2) $spacer-md-x !default;
224
216
  $menu-link-padding-cascading: (($menu-link-height-cascading - $menu-line-height-cascading) / 2) $spacer-lg-x !default;
217
+ $menu-min-width: 7rem !default;
218
+ $menu-min-width-cascading: 20rem !default;
225
219
  $menu-padding-y: $spacer-sm-y !default;
226
220
  $menu-padding-y-cascading: $spacer-md-y !default;
227
221
 
@@ -284,12 +278,12 @@
284
278
  // progress
285
279
  // based on https://material.google.com/components/progress-activity.html#progress-activity-types-of-indicators
286
280
  //
287
- $progress-bar-color: $palette-indigo-500 !default;
281
+ $progress-bar-bg: $palette-indigo-500 !default;
282
+ $progress-bar-mask: $white-secondary !default;
288
283
  $progress-height: 0.25rem !default;
289
- $progress-margin-bottom: $spacer-md-y !default;
290
284
 
291
285
  // circular
292
- $progress-circular-color: $progress-bar-color !default;
286
+ $progress-circular-bg: $progress-bar-bg !default;
293
287
  $progress-circular-height: 2.5rem !default;
294
288
  $progress-circular-spinner-width: 0.25rem !default;
295
289
 
@@ -347,18 +341,19 @@
347
341
  // tab (nav-tab)
348
342
  // based on https://material.google.com/components/tabs.html#tabs-specs
349
343
  //
350
- $nav-tab-border-color: $black-divider !default;
351
- $nav-tab-indicator-bg: $brand-color-accent !default;
352
- $nav-tab-indicator-height: 2px !default;
353
- $nav-tab-link-font-size: 0.875rem !default;
354
- $nav-tab-link-font-weight: $font-weight-medium !default;
355
- $nav-tab-link-height: 3rem !default;
356
- $nav-tab-link-opacity: 0.7 !default;
357
- $nav-tab-link-max-width: 16.5rem !default;
358
- $nav-tab-link-min-width: 4.5rem !default;
359
- $nav-tab-link-min-width-lg: 10rem !default;
360
- $nav-tab-link-padding-x: 0.75rem !default;
361
- $nav-tab-link-padding-x-lg: 1.5rem !default;
344
+ $nav-tab-border-color: $black-divider !default;
345
+ $nav-tab-indicator-bg: $brand-color-accent !default;
346
+ $nav-tab-indicator-height: 2px !default;
347
+ $nav-tab-link-font-size: 0.875rem !default;
348
+ $nav-tab-link-font-weight: $font-weight-medium !default;
349
+ $nav-tab-link-height: 3rem !default;
350
+ $nav-tab-link-opacity: 0.7 !default;
351
+ $nav-tab-link-opacity-visible: 1 !default;
352
+ $nav-tab-link-max-width: 16.5rem !default;
353
+ $nav-tab-link-min-width: 4.5rem !default;
354
+ $nav-tab-link-min-width-lg: 10rem !default;
355
+ $nav-tab-link-padding-x: 0.75rem !default;
356
+ $nav-tab-link-padding-x-lg: 1.5rem !default;
362
357
 
363
358
  //
364
359
  // text field (form)
@@ -375,18 +370,18 @@
375
370
  $textfield-font-size: 1rem !default;
376
371
  $textfield-font-size-lg: 2.125rem !default;
377
372
  $textfield-font-size-sm: 0.8125rem !default;
378
- $textfield-height: 2.5rem !default;
373
+ $textfield-height: 2.25rem !default;
379
374
  $textfield-height-lg: 3.75rem !default;
380
- $textfield-height-sm: 2.25rem !default;
381
- $textfield-line-height: 1.5rem !default;
382
- $textfield-line-height-lg: 2.5rem !default;
383
- $textfield-line-height-sm: 1.125rem !default;
375
+ $textfield-height-sm: 2rem !default;
384
376
  $textfield-margin-bottom: 0.5rem !default;
385
377
  $textfield-margin-bottom-lg: 0.75rem !default;
386
378
  $textfield-margin-bottom-sm: 0.25rem !default;
387
- $textfield-padding-top: 0.75rem !default;
388
- $textfield-padding-top-lg: 0.875rem !default;
389
- $textfield-padding-top-sm: 0.625rem !default;
379
+ $textfield-padding-bottom: 0.5rem !default;
380
+ $textfield-padding-bottom-lg: 0.5rem !default;
381
+ $textfield-padding-bottom-sm: 0.5rem !default;
382
+ $textfield-padding-top: 0.5rem !default;
383
+ $textfield-padding-top-lg: 0.5rem !default;
384
+ $textfield-padding-top-sm: 0.25rem !default;
390
385
 
391
386
  //
392
387
  // text field: floating label (form: floating label)
@@ -1,5 +1,5 @@
1
1
  module Material
2
2
  module Sass
3
- VERSION = '4.0.0.alpha5'
3
+ VERSION = '4.0.0.alpha6'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: material-sass
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.0.0.alpha5
4
+ version: 4.0.0.alpha6
5
5
  platform: ruby
6
6
  authors:
7
7
  - mkhairi
@@ -103,9 +103,10 @@ files:
103
103
  - app/assets/stylesheets/material/_variables.scss
104
104
  - app/assets/stylesheets/material/base/_base.scss
105
105
  - app/assets/stylesheets/material/base/_grid.scss
106
+ - app/assets/stylesheets/material/base/_normalize.scss
107
+ - app/assets/stylesheets/material/base/_reboot.scss
106
108
  - app/assets/stylesheets/material/base/_typography.scss
107
109
  - app/assets/stylesheets/material/bootstrap/_alert.scss
108
- - app/assets/stylesheets/material/bootstrap/_animation.scss
109
110
  - app/assets/stylesheets/material/bootstrap/_breadcrumb.scss
110
111
  - app/assets/stylesheets/material/bootstrap/_button-group.scss
111
112
  - app/assets/stylesheets/material/bootstrap/_carousel.scss
@@ -120,6 +121,7 @@ files:
120
121
  - app/assets/stylesheets/material/bootstrap/_pagination.scss
121
122
  - app/assets/stylesheets/material/bootstrap/_popover.scss
122
123
  - app/assets/stylesheets/material/bootstrap/_responsive-embed.scss
124
+ - app/assets/stylesheets/material/bootstrap/_transition.scss
123
125
  - app/assets/stylesheets/material/material.scss
124
126
  - app/assets/stylesheets/material/material/_button-flat.scss
125
127
  - app/assets/stylesheets/material/material/_button-float.scss
@@ -148,6 +150,7 @@ files:
148
150
  - app/assets/stylesheets/material/mixins/_breakpoint.scss
149
151
  - app/assets/stylesheets/material/mixins/_clearfix.scss
150
152
  - app/assets/stylesheets/material/mixins/_form.scss
153
+ - app/assets/stylesheets/material/mixins/_grid-framework.scss
151
154
  - app/assets/stylesheets/material/mixins/_grid.scss
152
155
  - app/assets/stylesheets/material/mixins/_hex-to-rgba.scss
153
156
  - app/assets/stylesheets/material/mixins/_hover.scss
@@ -162,6 +165,7 @@ files:
162
165
  - app/assets/stylesheets/material/mixins/_text-emphasis.scss
163
166
  - app/assets/stylesheets/material/mixins/_text-hide.scss
164
167
  - app/assets/stylesheets/material/mixins/_text-truncate.scss
168
+ - app/assets/stylesheets/material/mixins/_transform.scss
165
169
  - app/assets/stylesheets/material/mixins/_transition.scss
166
170
  - app/assets/stylesheets/material/mixins/_typography.scss
167
171
  - app/assets/stylesheets/material/utilities/_align.scss
@@ -169,9 +173,12 @@ files:
169
173
  - app/assets/stylesheets/material/utilities/_border.scss
170
174
  - app/assets/stylesheets/material/utilities/_clearfix.scss
171
175
  - app/assets/stylesheets/material/utilities/_display.scss
176
+ - app/assets/stylesheets/material/utilities/_flex.scss
172
177
  - app/assets/stylesheets/material/utilities/_float.scss
173
178
  - app/assets/stylesheets/material/utilities/_material-icons.scss
179
+ - app/assets/stylesheets/material/utilities/_position.scss
174
180
  - app/assets/stylesheets/material/utilities/_screenreader.scss
181
+ - app/assets/stylesheets/material/utilities/_sizing.scss
175
182
  - app/assets/stylesheets/material/utilities/_spacing.scss
176
183
  - app/assets/stylesheets/material/utilities/_text.scss
177
184
  - app/assets/stylesheets/material/utilities/_visibility.scss