Skip to content
This repository was archived by the owner on Mar 16, 2025. It is now read-only.

Commit d202d21

Browse files
authored
Merge pull request #138 from material-components/v6-update
fix: update 101, 102, and 103 to v6
2 parents bd84faf + f660835 commit d202d21

File tree

20 files changed

+748
-998
lines changed

20 files changed

+748
-998
lines changed

mdc-101/complete/index.html

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,17 @@ <h1>SHRINE</h1>
2525
</section>
2626

2727
<form action="home.html">
28-
<label class="mdc-text-field username">
28+
<label class="mdc-text-field mdc-text-field--filled username">
29+
<span class="mdc-text-field__ripple"></span>
2930
<input type="text" class="mdc-text-field__input" aria-labelledby="username-label" name="username" required>
3031
<span class="mdc-floating-label" id="username-label">Username</span>
31-
<div class="mdc-line-ripple"></div>
32+
<span class="mdc-line-ripple"></span>
3233
</label>
33-
<label class="mdc-text-field password">
34+
<label class="mdc-text-field mdc-text-field--filled password">
35+
<span class="mdc-text-field__ripple"></span>
3436
<input type="password" class="mdc-text-field__input" aria-labelledby="password-label" name="password" required minlength="8">
3537
<span class="mdc-floating-label" id="password-label">Password</span>
36-
<div class="mdc-line-ripple"></div>
38+
<span class="mdc-line-ripple"></span>
3739
</label>
3840
<div class="button-container">
3941
<button type="button" class="mdc-button cancel">

mdc-101/complete/login.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
.username,
1717
.password {
18-
display: block;
18+
display: flex;
1919
width: 300px;
2020
margin: 20px auto;
2121
}

mdc-101/complete/package-lock.json

Lines changed: 115 additions & 105 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mdc-101/complete/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
"webpack-dev-server": "^2.4.3"
2121
},
2222
"dependencies": {
23-
"@material/button": "^4.0.0",
24-
"@material/ripple": "^4.0.0",
25-
"@material/textfield": "^4.0.0"
23+
"@material/button": "^6.0.0",
24+
"@material/ripple": "^6.0.0",
25+
"@material/textfield": "^6.0.0"
2626
}
2727
}

mdc-102/complete/index.html

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,17 @@ <h1>SHRINE</h1>
2525
</section>
2626

2727
<form action="home.html">
28-
<label class="mdc-text-field username">
28+
<label class="mdc-text-field mdc-text-field--filled username">
29+
<span class="mdc-text-field__ripple"></span>
2930
<input type="text" class="mdc-text-field__input" aria-labelledby="username-label" name="username" required>
3031
<span class="mdc-floating-label" id="username-label">Username</span>
31-
<div class="mdc-line-ripple"></div>
32+
<span class="mdc-line-ripple"></span>
3233
</label>
33-
<label class="mdc-text-field password">
34+
<label class="mdc-text-field mdc-text-field--filled password">
35+
<span class="mdc-text-field__ripple"></span>
3436
<input type="password" class="mdc-text-field__input" aria-labelledby="password-label" name="password" required minlength="8">
3537
<span class="mdc-floating-label" id="password-label">Password</span>
36-
<div class="mdc-line-ripple"></div>
38+
<span class="mdc-line-ripple"></span>
3739
</label>
3840
<div class="button-container">
3941
<button type="button" class="mdc-button cancel">

mdc-102/complete/login.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
.username,
1717
.password {
18-
display: block;
18+
display: flex;
1919
width: 300px;
2020
margin: 20px auto;
2121
}

0 commit comments

Comments
 (0)