Skip to content

Commit

Permalink
Merge pull request #3034 from uswds/update-display-font-var
Browse files Browse the repository at this point in the history
Change title to display in vars and mixins
  • Loading branch information
thisisdano committed Apr 16, 2019
2 parents 1c2b2ae + 80c0f5a commit 872dbec
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions src/stylesheets/core/mixins/_typography.scss
Expand Up @@ -86,19 +86,19 @@ Sets:
}
}

@mixin title {
@mixin display {
@include typeset(
'heading',
$theme-title-font-size,
$theme-display-font-size,
$theme-heading-line-height
);

font-weight: fw('bold');
}

@mixin typeset-title {
@mixin typeset-display {
@include typeset-heading;
@include title;
@include display;
}

@mixin h1 {
Expand Down
2 changes: 1 addition & 1 deletion src/stylesheets/elements/_typography.scss
Expand Up @@ -77,7 +77,7 @@ dfn {
}

@include at-media('tablet') {
@include typeset-title;
@include typeset-display;
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/stylesheets/settings/_settings-typography.scss
Expand Up @@ -407,7 +407,7 @@ $theme-h5-font-size: 'xs' !default;
$theme-h6-font-size: '3xs' !default;
$theme-heading-line-height: 2 !default;
$theme-small-font-size: '2xs' !default;
$theme-title-font-size: '3xl' !default;
$theme-display-font-size: '3xl' !default;

// Text and prose
$theme-text-measure-narrow: 1 !default;
Expand Down
2 changes: 1 addition & 1 deletion src/stylesheets/theme/_uswds-theme-typography.scss
Expand Up @@ -407,7 +407,7 @@ $theme-h5-font-size: 'xs';
$theme-h6-font-size: '3xs';
$theme-heading-line-height: 2;
$theme-small-font-size: '2xs';
$theme-title-font-size: '3xl';
$theme-display-font-size: '3xl';

// Text and prose
$theme-text-measure-narrow: 1;
Expand Down

0 comments on commit 872dbec

Please sign in to comment.