Skip to content

Commit

Permalink
Merge branch 'jm-mc-setup' of github.com:uswds/uswds-tutorial into cm…
Browse files Browse the repository at this point in the history
…-mc-part-3
  • Loading branch information
mahoneycm committed Mar 19, 2024
2 parents ff84bf9 + 4f86ef0 commit 84c6c51
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 12 deletions.
7 changes: 3 additions & 4 deletions _includes/sxs/02-extending/card.html
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@

<div class="usa-card position-sticky top-1">
<div class="usa-card">
<div class="usa-card__container">
<div class="usa-card__header">
<h2 class="usa-card__heading">Card component</h2>
</div>
<div class="usa-card__body">
<p>
This is a standard USWDS card component! Customize me!
Lorem ipsum dolor sit amet consectetur adipisicing elit. Facilis earum tenetur quo cupiditate, eaque qui officia recusandae.
</p>
</div>
<div class="usa-card__footer">
<a href="#" class="usa-button">Card button</a>
<a href="#" class="usa-button">Visit Florida Keys</a>
</div>
</div>
</div>
14 changes: 8 additions & 6 deletions _theme/_uswds-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ in the form $setting: value,
----------------------------------------
*/


@use "uswds-core" with (
$theme-show-notifications: false,
$theme-font-type-sans: "public-sans",
Expand All @@ -17,11 +16,14 @@ in the form $setting: value,
$theme-banner-max-width: none,
$theme-identifier-max-width: none,

// New styles for part two. Will be completed by the user.
$theme-card-border-color: "indigo-30",
$theme-card-border-radius: 3,
$theme-card-border-width: 1,
//
// Part two.
// ! Will be completed by the user.
//
// $theme-card-border-color: "indigo-30",
// $theme-card-border-radius: 3,
// $theme-card-border-width: 1,
// TODO: Change up updating sans font family to public-sans
// $theme-card-font-family: "serif",
$theme-card-header-typeset: "sans" "xl" 3
// $theme-card-header-typeset: "sans" "xl" 3
);
7 changes: 5 additions & 2 deletions pages/02-extending/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,13 @@
{% include "sxs/02-extending/part-three.html" %}
</div>
<div class="demo-display grid-col-5">
{% include "sxs/02-extending/testimonial.html" %}
<div class="position-sticky top-1">
{% include "sxs/02-extending/card.html" %}
{% include "sxs/02-extending/testimonial.html" %}
</div>
</div>
</div>
</div>
</main>
{% include "footer.html" %}
{% include "uswds/identifier.html" %}
{% include "uswds/identifier.html" %}

0 comments on commit 84c6c51

Please sign in to comment.