Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Use ex unit for measure values #2964

Merged
merged 4 commits into from
Mar 18, 2019
Merged

Use ex unit for measure values #2964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
94616ac
Update measure tokens to ex units and add measure-6
thisisdano Mar 18, 2019
5d3f106
Update settings to new measure values
thisisdano Mar 18, 2019
cf9a862
Update docs to use proper values
thisisdano Mar 18, 2019
72e8172
Merge branch 'release-2.0' into dw-update-measure
thisisdano Mar 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/01-type/typesetting.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="usa-line-length-example usa-prose">
<h6 class="usa-heading-alt">Line length</h6>
<section class="typography-example usa-prose margin-top-1">
<p><strong>75 characters (66ch) max-width:</strong> Yosemite National Park is set within California’s Sierra Nevada mountains. It’s famed for its giant, ancient sequoias, and for Tunnel View, the iconic vista of towering Bridalveil Fall and the granite cliffs of El Capitan and Half Dome.</p>
<p><strong>75 characters (68ex) max-width:</strong> Yosemite National Park is set within California’s Sierra Nevada mountains. It’s famed for its giant, ancient sequoias, and for Tunnel View, the iconic vista of towering Bridalveil Fall and the granite cliffs of El Capitan and Half Dome.</p>
</section>
</div>

Expand Down
1 change: 1 addition & 0 deletions src/stylesheets/core/_properties.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,7 @@ $system-properties: (
3: $system-measure-base,
4: $system-measure-large,
5: $system-measure-larger,
6: $system-measure-largest,
'none': none,
),
extended: (),
Expand Down
11 changes: 6 additions & 5 deletions src/stylesheets/core/_system-tokens.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,11 +369,12 @@ Measure
----------------------------------------
*/

$system-measure-smaller: 40ch;
$system-measure-small: 60ch;
$system-measure-base: 66ch;
$system-measure-large: 72ch;
$system-measure-larger: 77ch;
$system-measure-smaller: 44ex;
$system-measure-small: 60ex;
$system-measure-base: 64ex;
$system-measure-large: 68ex;
$system-measure-larger: 74ex;
$system-measure-largest: 88ex;

/*
----------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion src/stylesheets/settings/_settings-components.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ $theme-accordion-font-family: 'body' !default;
$theme-alert-bar-width: 1 !default;
$theme-alert-font-family: 'ui' !default;
$theme-alert-icon-size: 4 !default;
$theme-alert-measure: 3 !default;
$theme-alert-measure: 5 !default;
$theme-alert-padding-x: 2.5 !default;

// Banner
Expand Down
17 changes: 9 additions & 8 deletions src/stylesheets/settings/_settings-typography.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,11 +381,12 @@ Font role tokens
----------------------------------------
Measure (max-width) tokens
----------------------------------------
1: 40ch
2: 60ch
3: 66ch
4: 72ch
5: 77ch
1: 44ex
2: 60ex
3: 64ex
4: 68ex
5: 74ex
6: 88ex
none: none
----------------------------------------
*/
Expand All @@ -411,12 +412,12 @@ $theme-title-font-size: '3xl' !default;

// Text and prose
$theme-text-measure-narrow: 1 !default;
$theme-text-measure: 3 !default;
$theme-text-measure-wide: 4 !default;
$theme-text-measure: 4 !default;
$theme-text-measure-wide: 6 !default;
$theme-prose-font-family: 'body' !default;

// Lead text
$theme-lead-font-family: 'heading' !default;
$theme-lead-font-size: 'lg' !default;
$theme-lead-line-height: 6 !default;
$theme-lead-measure: 5 !default;
$theme-lead-measure: 6 !default;
2 changes: 1 addition & 1 deletion src/stylesheets/theme/_uswds-theme-components.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ $theme-accordion-font-family: 'body';
$theme-alert-bar-width: 1;
$theme-alert-font-family: 'ui';
$theme-alert-icon-size: 4;
$theme-alert-measure: 3;
$theme-alert-measure: 5;
$theme-alert-padding-x: 2.5;

// Banner
Expand Down
19 changes: 10 additions & 9 deletions src/stylesheets/theme/_uswds-theme-typography.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
========================================
========================================
----------------------------------------
USWDS 2.0.0 Beta 6
USWDS 2.0.0 Beta 5
----------------------------------------
TYPOGRAPHY SETTINGS
----------------------------------------
Expand Down Expand Up @@ -381,11 +381,12 @@ Font role tokens
----------------------------------------
Measure (max-width) tokens
----------------------------------------
1: 40ch
2: 60ch
3: 66ch
4: 72ch
5: 77ch
1: 44ex
2: 60ex
3: 64ex
4: 68ex
5: 74ex
6: 88ex
none: none
----------------------------------------
*/
Expand All @@ -411,12 +412,12 @@ $theme-title-font-size: '3xl';

// Text and prose
$theme-text-measure-narrow: 1;
$theme-text-measure: 3;
$theme-text-measure-wide: 4;
$theme-text-measure: 4;
$theme-text-measure-wide: 6;
$theme-prose-font-family: 'body';

// Lead text
$theme-lead-font-family: 'heading';
$theme-lead-font-size: 'lg';
$theme-lead-line-height: 6;
$theme-lead-measure: 5;
$theme-lead-measure: 6;
4 changes: 2 additions & 2 deletions src/stylesheets/utilities/rules/measure.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ output:
max-width: [value];
----------------------------------------
example:
.measure-base {
max-width: 66ch; }
.measure-4 {
max-width: 68ex; }
----------------------------------------
*/

Expand Down