Skip to content
This repository has been archived by the owner on May 20, 2023. It is now read-only.

Commit

Permalink
Import MDC Web 0.40.0
Browse files Browse the repository at this point in the history 
Includes the following patched changes
material-components/material-components-web#3952
material-components/material-components-web#3982
material-components/material-components-web#3992
material-components/material-components-web#3993
material-components/material-components-web#3994

PiperOrigin-RevId: 219194917
  • Loading branch information
@nshahan
Googler authored and nshahan committed Nov 2, 2018
1 parent bfaad9b commit a0d6a10
Show file tree
Hide file tree
Showing 20 changed files with 352 additions and 84 deletions.
4 changes: 2 additions & 2 deletions angular_components/lib/css/mdc_web/animation/_functions.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions://
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.//
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
Expand Down
4 changes: 2 additions & 2 deletions angular_components/lib/css/mdc_web/animation/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions://
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.//
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
Expand Down
9 changes: 5 additions & 4 deletions angular_components/lib/css/mdc_web/card/_mixins.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions://
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.//
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
Expand All @@ -21,6 +21,7 @@
//

@import "../theme/mixins";
@import "../shape/mixins";
@import "./variables";

//
Expand All @@ -35,8 +36,8 @@
border: $thickness solid mdc-theme-prop-value($color);
}

@mixin mdc-card-corner-radius($radius) {
border-radius: $radius;
@mixin mdc-card-shape-radius($radius, $rtl-reflexive: false) {
@include mdc-shape-radius($radius, $rtl-reflexive);
}

@mixin mdc-card-media-aspect-ratio($x, $y) {
Expand Down
4 changes: 2 additions & 2 deletions angular_components/lib/css/mdc_web/card/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions://
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.//
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
Expand Down
6 changes: 3 additions & 3 deletions angular_components/lib/css/mdc_web/card/mdc-card.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions://
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.//
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
Expand All @@ -31,7 +31,7 @@

.mdc-card {
@include mdc-card-fill-color(surface);
@include mdc-card-corner-radius(2px);
@include mdc-card-shape-radius(small);
@include mdc-elevation(2);
@include mdc-card-container-layout_;
}
Expand Down
4 changes: 2 additions & 2 deletions angular_components/lib/css/mdc_web/elevation/_mixins.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions://
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.//
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
Expand Down
4 changes: 2 additions & 2 deletions angular_components/lib/css/mdc_web/elevation/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions://
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.//
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
Expand Down
4 changes: 2 additions & 2 deletions angular_components/lib/css/mdc_web/ripple/_functions.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions://
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.//
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
Expand Down
4 changes: 2 additions & 2 deletions angular_components/lib/css/mdc_web/ripple/_keyframes.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions://
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.//
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
Expand Down
11 changes: 7 additions & 4 deletions angular_components/lib/css/mdc_web/ripple/_mixins.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions://
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.//
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
Expand Down Expand Up @@ -46,7 +46,10 @@
}

&::before {
transition: opacity $mdc-states-wash-duration linear;
// Also transition background-color to avoid unnatural color flashes when toggling activated/selected state
transition:
opacity $mdc-states-wash-duration linear,
background-color $mdc-states-wash-duration linear;
z-index: 1; // Ensure that the ripple wash for hover/focus states is displayed on top of positioned child elements
}

Expand Down Expand Up @@ -144,7 +147,7 @@

// Simple mixin for base states which automatically selects opacity values based on whether the ink color is
// light or dark.
@mixin mdc-states($color: black, $has-nested-focusable-element: false) {
@mixin mdc-states($color: mdc-theme-prop-value(on-surface), $has-nested-focusable-element: false) {
@include mdc-states-interactions_($color, $has-nested-focusable-element);
}

Expand Down
4 changes: 2 additions & 2 deletions angular_components/lib/css/mdc_web/ripple/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions://
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.//
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
Expand Down
Loading

0 comments on commit a0d6a10

Please sign in to comment.