Merge branch 'master' into textfield-host-label

material-components · May 4, 2020 · 38669b7 · 38669b7
2 parents 0feffec + 50c53a6
commit 38669b7
Show file tree

Hide file tree

Showing 26 changed files with 1,344 additions and 935 deletions.
diff --git a/mdc-101/complete/index.html b/mdc-101/complete/index.html
@@ -37,11 +37,13 @@ <h1>SHRINE</h1>
     </label>
     <div class="button-container">
       <button type="button" class="mdc-button cancel">
+        <div class="mdc-button__ripple"></div>
         <span class="mdc-button__label">
           Cancel
         </span>
       </button>
       <button class="mdc-button mdc-button--raised next">
+        <div class="mdc-button__ripple"></div>
         <span class="mdc-button__label">
           Next
         </span>

diff --git a/mdc-101/complete/package-lock.json b/mdc-101/complete/package-lock.json
diff --git a/mdc-101/complete/package.json b/mdc-101/complete/package.json
@@ -11,7 +11,7 @@
     "babel-loader": "^7.0.0",
     "babel-preset-env": "^1.7.0",
     "css-loader": "^0.28.0",
-    "dart-sass": "^1.17.2",
+    "dart-sass": "^1.25.0",
     "extract-loader": "^1.0.2",
     "fibers": "^4.0.0",
     "file-loader": "^1.1.11",
@@ -20,8 +20,8 @@
     "webpack-dev-server": "^2.4.3"
   },
   "dependencies": {
-    "@material/button": "^1.0.1",
-    "@material/ripple": "^1.0.1",
-    "@material/textfield": "^1.0.1"
+    "@material/button": "^4.0.0",
+    "@material/ripple": "^4.0.0",
+    "@material/textfield": "^4.0.0"
   }
 }
diff --git a/mdc-101/starter/package-lock.json b/mdc-101/starter/package-lock.json
diff --git a/mdc-101/starter/package.json b/mdc-101/starter/package.json
@@ -11,7 +11,7 @@
     "babel-loader": "^7.0.0",
     "babel-preset-env": "^1.7.0",
     "css-loader": "^0.28.0",
-    "dart-sass": "^1.17.2",
+    "dart-sass": "^1.25.0",
     "extract-loader": "^1.0.2",
     "fibers": "^4.0.0",
     "file-loader": "^1.1.11",

diff --git a/mdc-102/complete/index.html b/mdc-102/complete/index.html
@@ -37,11 +37,13 @@ <h1>SHRINE</h1>
     </label>
     <div class="button-container">
       <button type="button" class="mdc-button cancel">
+        <div class="mdc-button__ripple"></div>
         <span class="mdc-button__label">
           Cancel
         </span>
       </button>
       <button class="mdc-button mdc-button--raised next">
+        <div class="mdc-button__ripple"></div>
         <span class="mdc-button__label">
           Next
         </span>