Skip to content

Commit

Permalink
Merge pull request #138 from material-components/v6-update
Browse files Browse the repository at this point in the history 
fix: update 101, 102, and 103 to v6
  • Loading branch information
@asyncLiz
asyncLiz authored May 5, 2020
2 parents bd84faf + f660835 commit d202d21
Show file tree
Hide file tree
Showing 20 changed files with 748 additions and 998 deletions.
10 changes: 6 additions & 4 deletions mdc-101/complete/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,17 @@ <h1>SHRINE</h1>
</section>

<form action="home.html">
<label class="mdc-text-field username">
<label class="mdc-text-field mdc-text-field--filled username">
<span class="mdc-text-field__ripple"></span>
<input type="text" class="mdc-text-field__input" aria-labelledby="username-label" name="username" required>
<span class="mdc-floating-label" id="username-label">Username</span>
<div class="mdc-line-ripple"></div>
<span class="mdc-line-ripple"></span>
</label>
<label class="mdc-text-field password">
<label class="mdc-text-field mdc-text-field--filled password">
<span class="mdc-text-field__ripple"></span>
<input type="password" class="mdc-text-field__input" aria-labelledby="password-label" name="password" required minlength="8">
<span class="mdc-floating-label" id="password-label">Password</span>
<div class="mdc-line-ripple"></div>
<span class="mdc-line-ripple"></span>
</label>
<div class="button-container">
<button type="button" class="mdc-button cancel">
Expand Down
2 changes: 1 addition & 1 deletion mdc-101/complete/login.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

.username,
.password {
display: block;
display: flex;
width: 300px;
margin: 20px auto;
}
Expand Down
220 changes: 115 additions & 105 deletions mdc-101/complete/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions mdc-101/complete/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"webpack-dev-server": "^2.4.3"
},
"dependencies": {
"@material/button": "^4.0.0",
"@material/ripple": "^4.0.0",
"@material/textfield": "^4.0.0"
"@material/button": "^6.0.0",
"@material/ripple": "^6.0.0",
"@material/textfield": "^6.0.0"
}
}
10 changes: 6 additions & 4 deletions mdc-102/complete/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,17 @@ <h1>SHRINE</h1>
</section>

<form action="home.html">
<label class="mdc-text-field username">
<label class="mdc-text-field mdc-text-field--filled username">
<span class="mdc-text-field__ripple"></span>
<input type="text" class="mdc-text-field__input" aria-labelledby="username-label" name="username" required>
<span class="mdc-floating-label" id="username-label">Username</span>
<div class="mdc-line-ripple"></div>
<span class="mdc-line-ripple"></span>
</label>
<label class="mdc-text-field password">
<label class="mdc-text-field mdc-text-field--filled password">
<span class="mdc-text-field__ripple"></span>
<input type="password" class="mdc-text-field__input" aria-labelledby="password-label" name="password" required minlength="8">
<span class="mdc-floating-label" id="password-label">Password</span>
<div class="mdc-line-ripple"></div>
<span class="mdc-line-ripple"></span>
</label>
<div class="button-container">
<button type="button" class="mdc-button cancel">
Expand Down
2 changes: 1 addition & 1 deletion mdc-102/complete/login.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

.username,
.password {
display: block;
display: flex;
width: 300px;
margin: 20px auto;
}
Expand Down
Loading

1 comment on commit d202d21

@DennyDaVjncj
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm very excited to dive in to these labs!

Please sign in to comment.