-
Notifications
You must be signed in to change notification settings - Fork 2.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat(card): Add theme mixins; remove content layouts #2025
Changes from 64 commits
f9e256f
d7c537f
1cbe378
d3bace3
51fa44d
d363411
4c08741
aac2ca2
3604c49
da234a4
059a325
b6a5993
e27c1c1
e41ddbf
bb574cc
0bcb922
aeaa446
482dbe8
06c0920
1750a9f
c9b6278
86f2083
6fb8e12
0cb61b0
4bbfd02
dc4c5c3
6f4acb8
6836c5e
1f32dcd
974edd6
8ce2bac
5a72bf1
6c5970f
dafbd04
8f0db4d
9fdced1
45e98de
414c981
87980a4
c0f4e51
b7627db
49469c0
24b794b
fa9073b
420a1ec
ff57974
f4731c1
70e7c49
3364d96
75f81dc
137b74d
7c0f775
51de056
689290d
1503a2f
90840cf
0a81243
3c5f572
fc36930
f177ce0
25a70ca
3a74182
d26281d
8e24e56
cf07755
4ed5f6a
d36e518
8f000b6
02d4e85
f1e773d
7da8ad4
36f93b8
67be91a
52e13ed
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -360,46 +360,35 @@ <h3 class="mdc-typography--headline demo-component-section__heading"> | |
|
||
<div class="demo-card-wrapper"> | ||
<div class="mdc-card"> | ||
<section class="mdc-card__primary"> | ||
<h1 class="mdc-card__title mdc-card__title--large">Title goes here</h1> | ||
<h3 class="mdc-card__subtitle">Subtitle here</h3> | ||
</section> | ||
<section class="mdc-card__supporting-text"> | ||
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. | ||
Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. | ||
</section> | ||
<section class="mdc-card__actions"> | ||
<button class="mdc-button mdc-button--compact mdc-card__action">Action 1</button> | ||
<button class="mdc-button mdc-button--compact mdc-card__action">Action 2</button> | ||
</section> | ||
</div> | ||
</div> | ||
|
||
<div class="demo-card-wrapper"> | ||
<div class="mdc-card demo-card--with-avatar"> | ||
<section class="mdc-card__primary"> | ||
<div class="demo-card__avatar"></div> | ||
<h1 class="mdc-card__title">Title</h1> | ||
<h3 class="mdc-card__subtitle">Subhead</h3> | ||
</section> | ||
<section class="mdc-card__supporting-text"> | ||
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor. | ||
</section> | ||
<section class="mdc-card__actions"> | ||
<button class="mdc-button mdc-button--compact mdc-card__action">Action 1</button> | ||
<button class="mdc-button mdc-button--compact mdc-card__action">Action 2</button> | ||
</section> | ||
</div> | ||
</div> | ||
|
||
<div class="demo-card-wrapper"> | ||
<div class="mdc-card demo-card--small"> | ||
<section class="mdc-card__media"> | ||
<h1 class="mdc-card__title mdc-card__title--large">Title</h1> | ||
</section> | ||
<section class="mdc-card__actions"> | ||
<button class="mdc-button mdc-button--compact mdc-card__action">Action 1</button> | ||
</section> | ||
<div class="mdc-card__media mdc-card__media--16-9 demo-card__media"></div> | ||
<div class="mdc-card__actions"> | ||
<div class="mdc-card__action-buttons"> | ||
<button class="mdc-button mdc-card__action mdc-card__action--button">Read</button> | ||
<button class="mdc-button mdc-card__action mdc-card__action--button">Bookmark</button> | ||
</div> | ||
<div class="mdc-card__action-icons"> | ||
<i class="mdc-icon-toggle material-icons mdc-card__action mdc-card__action--icon" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same comment here as above RE unbounded/bounded ripples next to each other There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done |
||
tabindex="0" | ||
role="button" | ||
aria-pressed="false" | ||
aria-label="Add to favorites" | ||
title="Add to favorites" | ||
data-toggle-on='{"content": "favorite", "label": "Remove from favorites"}' | ||
data-toggle-off='{"content": "favorite_border", "label": "Add to favorites"}'> | ||
favorite_border | ||
</i> | ||
<i class="material-icons mdc-card__action mdc-card__action--icon mdc-ripple-surface" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can we do something to make the padding of these consistent with the icon-toggle? They currently mismatch (and I'm fixing the unbounded ripple size in #2092 which will make the icon-toggle ripple the correct size). There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done |
||
tabindex="0" | ||
role="button" | ||
data-mdc-ripple-is-unbounded | ||
title="Share">share</i> | ||
<i class="material-icons mdc-card__action mdc-card__action--icon mdc-ripple-surface" | ||
tabindex="0" | ||
role="button" | ||
data-mdc-ripple-is-unbounded | ||
title="More options">more_vert</i> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
</section> | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would it make more sense to just apply these styles to
.demo-card-article
instead?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Potentially, but if we ever decide to add another card example that uses
demo-card__ripple-surface
on a different element, it won't get the benefit of theIE/Edge workaround (
position: relative
).