material_components_web-sass 0.7.0 → 0.8.0

Sign up to get free protection for your applications and to get access to all the features.
@@ -50,7 +50,10 @@
50
50
  user-select: none;
51
51
  box-sizing: border-box;
52
52
  -webkit-appearance: none;
53
- -webkit-tap-highlight-color: rgba(black, .18);
53
+
54
+ &:not(.mdc-ripple-upgraded) {
55
+ -webkit-tap-highlight-color: rgba(black, .18);
56
+ }
54
57
 
55
58
  @include mdc-theme-dark {
56
59
  @include mdc-ripple-base;
@@ -58,7 +61,9 @@
58
61
  @include mdc-ripple-fg((pseudo: "::after", base-color: white, opacity: .14));
59
62
  @include mdc-theme-prop(color, text-primary-on-dark);
60
63
 
61
- -webkit-tap-highlight-color: rgba(white, .18);
64
+ &:not(.mdc-ripple-upgraded) {
65
+ -webkit-tap-highlight-color: rgba(white, .18);
66
+ }
62
67
  }
63
68
 
64
69
  @each $theme-style in (primary, accent) {
@@ -189,4 +194,3 @@
189
194
  }
190
195
 
191
196
  // postcss-bem-linter: end
192
-
@@ -37,8 +37,6 @@ $mdc-dialog-dark-theme-bg-color: #303030 !default;
37
37
 
38
38
  &__surface {
39
39
  display: inline-flex;
40
- position: absolute;
41
- bottom: 50vh;
42
40
  flex-direction: column;
43
41
 
44
42
  @include mdc-elevation(24);
@@ -48,6 +46,7 @@ $mdc-dialog-dark-theme-bg-color: #303030 !default;
48
46
  max-width: 865px;
49
47
  transform: translateY(150px) scale(.8);
50
48
  transition: mdc-animation-enter(opacity, 120ms), mdc-animation-enter(transform, 120ms);
49
+ border-radius: 2px;
51
50
 
52
51
  @include mdc-theme-prop(background-color, background);
53
52
 
@@ -39,9 +39,12 @@
39
39
  fill: currentColor;
40
40
  -moz-appearance: none;
41
41
  -webkit-appearance: none;
42
- -webkit-tap-highlight-color: rgba(0, 0, 0, .18);
43
42
  overflow: hidden;
44
43
 
44
+ &:not(.mdc-ripple-upgraded) {
45
+ -webkit-tap-highlight-color: rgba(0, 0, 0, .18);
46
+ }
47
+
45
48
  @include mdc-theme-prop(background-color, accent);
46
49
  @include mdc-theme-prop(color, text-primary-on-accent);
47
50
  @include mdc-elevation(6);
@@ -59,33 +62,6 @@
59
62
  @include mdc-ripple-fg((pseudo: "::after"));
60
63
  }
61
64
 
62
- &::before {
63
- position: absolute;
64
- top: 0;
65
- left: 0;
66
- width: 100%;
67
- height: 100%;
68
- transition: mdc-animation-exit(opacity, 120ms);
69
- border-radius: inherit;
70
- background: rgba(0, 0, 0, .2);
71
- content: "";
72
- opacity: 0;
73
- }
74
-
75
- &:focus::before {
76
- transition: mdc-animation-enter(opacity, 120ms);
77
- opacity: .12;
78
- }
79
-
80
- &:active::before {
81
- transition: mdc-animation-enter(opacity, 120ms);
82
- opacity: .18;
83
- }
84
-
85
- &:active:focus::before {
86
- transition-timing-function: $mdc-animation-fast-out-slow-in-timing-function;
87
- }
88
-
89
65
  &:active,
90
66
  &:focus {
91
67
  outline: none;
@@ -20,46 +20,37 @@
20
20
 
21
21
  @keyframes mdc-ripple-fg-radius-in {
22
22
  from {
23
- transform: translate(0) scale(1);
23
+ // NOTE: For these keyframes, we do not need custom property fallbacks because they are only
24
+ // used in conjunction with `.mdc-ripple-upgraded`. Since MDCRippleFoundation checks to ensure
25
+ // that custom properties are supported within the browser before adding this class, we can
26
+ // safely use them without a fallback.
24
27
  transform: translate(var(--mdc-ripple-fg-translate-start, 0)) scale(1);
25
28
  animation-timing-function: $mdc-animation-fast-out-slow-in-timing-function;
26
29
  }
27
30
 
28
31
  to {
29
- transform: translate(0) scale(0);
30
- transform: translate(var(--mdc-ripple-fg-translate-end, 0)) scale(var(--mdc-ripple-fg-scale, 0));
32
+ transform: translate(var(--mdc-ripple-fg-translate-end, 0)) scale(var(--mdc-ripple-fg-scale, 1));
31
33
  }
32
34
  }
33
35
 
34
- @keyframes mdc-ripple-fg-opacity-out {
36
+ @keyframes mdc-ripple-fg-opacity-in {
35
37
  from {
36
- opacity: 1;
38
+ opacity: 0;
37
39
  animation-timing-function: linear;
38
40
  }
39
41
 
40
42
  to {
41
- opacity: 0;
43
+ opacity: 1;
42
44
  }
43
45
  }
44
46
 
45
- @keyframes mdc-ripple-fg-unbounded-opacity-deactivate {
47
+ @keyframes mdc-ripple-fg-opacity-out {
46
48
  from {
47
49
  opacity: 1;
50
+ animation-timing-function: linear;
48
51
  }
49
52
 
50
53
  to {
51
54
  opacity: 0;
52
55
  }
53
56
  }
54
-
55
- @keyframes mdc-ripple-fg-unbounded-transform-deactivate {
56
- from {
57
- transform: 0;
58
- transform: var(--mdc-ripple-fg-approx-xf, 0);
59
- }
60
-
61
- to {
62
- transform: scale(0);
63
- transform: scale(var(--mdc-ripple-fg-scale, 0));
64
- }
65
- }
@@ -8,7 +8,8 @@
8
8
  // http://www.apache.org/licenses/LICENSE-2.0
9
9
  //
10
10
  // Unless required by applicable law or agreed to in writing, software
11
- // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11
+ // distributed under the License is distributed on an "AS IS" BASIS,
12
+ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
13
  // See the License for the specific language governing permissions and
13
14
  // limitations under the License.
14
15
  //
@@ -28,17 +29,14 @@
28
29
  }
29
30
 
30
31
  @mixin mdc-ripple-base() {
32
+ --mdc-ripple-surface-width: 0;
33
+ --mdc-ripple-surface-height: 0;
34
+ --mdc-ripple-fg-size: 0;
31
35
  --mdc-ripple-left: 0;
32
36
  --mdc-ripple-top: 0;
33
- --mdc-ripple-fg-size: 0;
34
- --mdc-ripple-surface-height: 0;
35
- --mdc-ripple-surface-width: 0;
36
- --mdc-ripple-fg-unbounded-transform-duration: 0ms;
37
- --mdc-ripple-xfo-x: center;
38
- --mdc-ripple-xfo-y: center;
39
- --mdc-ripple-fg-unbounded-opacity-duration: 0ms;
40
- --mdc-ripple-fg-unbounded-transform-duration: 0ms;
41
- --mdc-ripple-fg-approx-xf: 0;
37
+ --mdc-ripple-fg-scale: 1;
38
+ --mdc-ripple-fg-translate-end: 0;
39
+ --mdc-ripple-fg-translate-start: 0;
42
40
 
43
41
  will-change: transform, opacity;
44
42
  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
@@ -121,18 +119,11 @@
121
119
  transform: scale(var(--mdc-ripple-fg-scale, 0));
122
120
  }
123
121
 
124
- &.mdc-ripple-upgraded--background-active#{$pseudo} {
122
+ &.mdc-ripple-upgraded--background-focused#{$pseudo} {
125
123
  opacity: .99999;
126
124
  }
127
125
 
128
- // When an element goes active, a foreground ripple will be triggered.
129
- // Therefore, we adjust the transition duration for the correct "wind-
130
- // up" animation.
131
- &.mdc-ripple-upgraded--background-active:active#{$pseudo} {
132
- transition-duration: 600ms;
133
- }
134
-
135
- &.mdc-ripple-upgraded--background-bounded-active-fill#{$pseudo} {
126
+ &.mdc-ripple-upgraded--background-active-fill#{$pseudo} {
136
127
  transition-duration: 120ms;
137
128
  opacity: 1;
138
129
  }
@@ -215,29 +206,13 @@
215
206
  transform-origin: center center;
216
207
  }
217
208
 
218
- &.mdc-ripple-upgraded--foreground-bounded-active-fill#{$pseudo} {
219
- animation-fill-mode: forwards;
220
- animation: 300ms mdc-ripple-fg-radius-in, 400ms mdc-ripple-fg-opacity-out;
221
- }
222
-
223
- &.mdc-ripple-upgraded--unbounded.mdc-ripple-upgraded--foreground-unbounded-activation#{$pseudo} {
224
- transform: scale(0);
225
- transform: scale(var(--mdc-ripple-fg-scale, 0));
226
- transition:
227
- opacity 110ms linear,
228
- transform 0 linear 80ms;
229
- transition:
230
- opacity 110ms linear,
231
- transform var(--mdc-ripple-fg-unbounded-transform-duration, 0) linear 80ms;
232
- opacity: 1;
209
+ &.mdc-ripple-upgraded--foreground-activation#{$pseudo} {
210
+ animation: 300ms mdc-ripple-fg-radius-in forwards, 83ms mdc-ripple-fg-opacity-in forwards;
233
211
  }
234
212
 
235
- &.mdc-ripple-upgraded--unbounded.mdc-ripple-upgraded--foreground-unbounded-deactivation#{$pseudo} {
236
- animation:
237
- mdc-ripple-fg-unbounded-opacity-deactivate 0 linear,
238
- mdc-ripple-fg-unbounded-transform-deactivate 0 $mdc-animation-fast-out-slow-in-timing-function;
239
- animation:
240
- mdc-ripple-fg-unbounded-opacity-deactivate var(--mdc-ripple-fg-unbounded-opacity-duration, 0) linear,
241
- mdc-ripple-fg-unbounded-transform-deactivate var(--mdc-ripple-fg-unbounded-transform-duration, 0) $mdc-animation-fast-out-slow-in-timing-function;
213
+ &.mdc-ripple-upgraded--foreground-deactivation#{$pseudo} {
214
+ // Retain transform from mdc-ripple-fg-radius-in activation
215
+ transform: translate(var(--mdc-ripple-fg-translate-end, 0)) scale(var(--mdc-ripple-fg-scale, 1));
216
+ animation: 250ms mdc-ripple-fg-opacity-out;
242
217
  }
243
218
  }
@@ -90,6 +90,7 @@
90
90
  max-height: 100%;
91
91
  transform-origin: center center;
92
92
  overflow-y: scroll;
93
+ z-index: 4; // Should pop up above everything else. temporary-drawer is next highest at 3.
93
94
  }
94
95
 
95
96
  &__selected-text {
@@ -19,9 +19,9 @@
19
19
  @import "@material/theme/mixins";
20
20
  @import "@material/typography/mixins";
21
21
 
22
- $mdc-toolbar-height: 64px;
23
- $mdc-toolbar-mobile-height: 56px;
24
- $mdc-toolbar-padding: 24px 16px;
22
+ $mdc-toolbar-row-height: 64px;
23
+ $mdc-toolbar-mobile-row-height: 56px;
24
+ $mdc-toolbar-padding: 20px 28px;
25
25
  $mdc-toolbar-mobile-padding: 16px;
26
26
 
27
27
  $mdc-toolbar-mobile-breakpoint: 599px;
@@ -30,27 +30,35 @@ $mdc-toolbar-mobile-breakpoint: 599px;
30
30
  .mdc-toolbar {
31
31
  display: flex;
32
32
  position: relative;
33
- align-items: center;
33
+ flex-direction: column;
34
34
  justify-content: space-between;
35
35
  width: 100%;
36
- height: $mdc-toolbar-height;
37
- padding: $mdc-toolbar-padding;
38
36
  box-sizing: border-box;
39
37
 
40
38
  @include mdc-theme-prop(background-color, primary);
41
39
  @include mdc-theme-prop(color, text-primary-on-primary);
42
40
 
43
- // TODO: refactor this out when #23 is implemented
44
- @media (max-width: $mdc-toolbar-mobile-breakpoint) {
45
- height: $mdc-toolbar-mobile-height;
46
- padding: $mdc-toolbar-mobile-padding;
41
+ &__row {
42
+ display: flex;
43
+ position: relative;
44
+ width: 100%;
45
+ height: $mdc-toolbar-row-height;
46
+ padding: $mdc-toolbar-padding;
47
+ box-sizing: border-box;
48
+
49
+ // TODO: refactor this out when #23 is implemented
50
+ @media (max-width: $mdc-toolbar-mobile-breakpoint) {
51
+ height: $mdc-toolbar-mobile-row-height;
52
+ padding: $mdc-toolbar-mobile-padding;
53
+ }
47
54
  }
48
55
 
49
56
  &__section {
50
57
  display: inline-flex;
51
58
  flex: 1;
52
- align-items: center;
59
+ align-items: flex-start;
53
60
  justify-content: center;
61
+ z-index: 1;
54
62
 
55
63
  &--align-start {
56
64
  justify-content: flex-start;
@@ -61,12 +69,13 @@ $mdc-toolbar-mobile-breakpoint: 599px;
61
69
  justify-content: flex-end;
62
70
  order: 1;
63
71
  }
72
+ }
64
73
 
65
- .mdc-toolbar__title {
66
- @include mdc-typography(title);
74
+ &__title {
75
+ @include mdc-typography(title);
67
76
 
68
- margin: 0;
69
- }
77
+ margin: 0;
78
+ line-height: 1.5rem;
70
79
  }
71
80
  }
72
81
 
@@ -82,9 +91,9 @@ $mdc-toolbar-mobile-breakpoint: 599px;
82
91
  // postcss-bem-linter: end
83
92
 
84
93
  .mdc-toolbar-fixed-adjust {
85
- margin-top: $mdc-toolbar-height;
94
+ margin-top: $mdc-toolbar-row-height;
86
95
 
87
96
  @media (max-width: 599px) {
88
- margin-top: $mdc-toolbar-mobile-height;
97
+ margin-top: $mdc-toolbar-mobile-row-height;
89
98
  }
90
99
  }
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: material_components_web-sass
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.0
4
+ version: 0.8.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dmitriy Tarasov
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2017-03-21 00:00:00.000000000 Z
11
+ date: 2017-04-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: autoprefixer-rails