-
Notifications
You must be signed in to change notification settings - Fork 4.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ui: Use base fonts throughout the app (#6881)
We've had a set of %placeholders in our base styles for quite a while but not butten the bullet to use them. This begins to use them. We had to make a small amount of tweaks to base whilst doing this, but its as we'd prefer there to be as few font placeholders as possible. We might/should be able to reduce these further at somepoint, or potentially rename them. We currently have six header fonts (or 4 header fonts/2 strong body fonts) and 3 body fonts. We also noticed an empty CSS file and deleted that while we were here. We also noticed that the bottom border of structure tabs was a pixel larger than ours so we tweaked that here also.
- Loading branch information
Showing
15 changed files
with
101 additions
and
124 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,6 @@ | ||
@import './base-variables'; | ||
@import '../color/base-variables'; | ||
@import '../color/semantic-variables'; | ||
@import '../typography/base-variables'; | ||
@import './system'; | ||
@import './minireset'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,131 +1,95 @@ | ||
%button { | ||
font-family: $typo-family-sans; | ||
} | ||
main p:not(:last-child), | ||
%modal-window p:not(:last-child) { | ||
margin-bottom: 1em; | ||
body, | ||
%form-element-textarea { | ||
@extend %typo-body; | ||
} | ||
%button, | ||
%form-element textarea, | ||
%form-element [type='text'], | ||
%form-element [type='password'] { | ||
line-height: 1.5; | ||
h1 { | ||
@extend %h1; | ||
font-size: $typo-header-100; | ||
} | ||
h3, | ||
%radio-group label { | ||
line-height: 1.25; | ||
h2 { | ||
@extend %h2; | ||
font-size: $typo-header-200; | ||
} | ||
%filter-bar [role='radiogroup'] label { | ||
line-height: 1.7; | ||
h3 { | ||
@extend %h3; | ||
font-size: $typo-header-300; | ||
} | ||
fieldset > header, | ||
%header-nav, | ||
%app-view-content div > dl > dt, | ||
%table caption, | ||
%tbody-th, | ||
%form-element > span { | ||
@extend %h4; | ||
} | ||
%internal-button, | ||
%breadcrumbs li > *, | ||
%tab-nav { | ||
letter-spacing: 0.03em; | ||
@extend %h5; | ||
} | ||
%footer { | ||
letter-spacing: -0.05em; | ||
%healthcheck-output dt, | ||
%table th, | ||
%table td strong, | ||
%tooltip-bubble, | ||
%sliding-toggle label span { | ||
@extend %h6; | ||
} | ||
|
||
pre code, | ||
%notice, | ||
%notice p, | ||
%filter-bar input, | ||
%phrase-editor input { | ||
@extend %p1; | ||
} | ||
.type-dialog, | ||
%table td p, | ||
%table td, | ||
%healthcheck-output dl > dd, | ||
%form-element-label, | ||
%stats-card header a span, | ||
%footer, | ||
%app-view h1 span.kind-proxy { | ||
@extend %p2; | ||
} | ||
.template-error > div, | ||
%button, | ||
%internal-button { | ||
font-family: $typo-family-sans; | ||
%main-content p, | ||
%app-view > div.disabled > div, | ||
%form-element-note, | ||
%form-element-error > strong { | ||
@extend %p3; | ||
} | ||
/* Weighting */ | ||
h1, | ||
%app-view-content div > dt, | ||
%header-drop-nav .is-active { | ||
font-weight: $typo-weight-bold; | ||
|
||
%button { | ||
font-weight: $typo-weight-semibold; | ||
} | ||
|
||
%radio-group label { | ||
line-height: $typo-lead-200; | ||
} | ||
h2, | ||
h3, | ||
fieldset > header, | ||
caption, | ||
%header-nav, | ||
%healthcheck-output dt, | ||
%copy-button, | ||
%app-view-content div > dl > dt, | ||
%tbody-th, | ||
%form-element > span, | ||
%toggle label span { | ||
font-weight: $typo-weight-semibold; | ||
%tab-nav { | ||
letter-spacing: 0.03em; | ||
} | ||
%button { | ||
font-weight: $typo-weight-semibold !important; | ||
%header-drop-nav .is-active { | ||
font-weight: $typo-weight-bold; | ||
} | ||
main label a[rel*='help'], | ||
%main-content label a[rel*='help'], | ||
%pill, | ||
%tbody-th em, | ||
%form-element > strong, | ||
%tbody-th em, | ||
%app-view h1 em { | ||
font-weight: $typo-weight-normal; | ||
} | ||
th, | ||
td strong, | ||
%breadcrumbs li > *, | ||
%action-group-action, | ||
%tab-nav, | ||
%tooltip-bubble { | ||
font-weight: $typo-weight-medium; | ||
} | ||
|
||
/* Styling */ | ||
%form-element > em, | ||
%tbody-th em, | ||
%app-view h1 em { | ||
font-style: normal; | ||
} | ||
|
||
/* Sizing */ | ||
%footer > * { | ||
font-size: inherit; | ||
} | ||
|
||
h1 { | ||
font-size: $typo-header-100; | ||
} | ||
h2 { | ||
font-size: $typo-header-200; | ||
} | ||
h3 { | ||
font-size: $typo-header-300; | ||
} | ||
%header-drop-nav .is-active, | ||
%app-view h1 em { | ||
font-size: $typo-size-500; | ||
} | ||
body, | ||
pre code, | ||
input, | ||
textarea, | ||
%internal-button, | ||
%action-group-action, | ||
%tbody-th { | ||
font-size: $typo-size-600; | ||
} | ||
th, | ||
td, | ||
caption, | ||
.type-dialog, | ||
%healthcheck-output dl > *, | ||
%form-element > span, | ||
%tooltip-bubble, | ||
%stats-card header a span, | ||
%footer, | ||
%app-view h1 span.kind-proxy { | ||
font-size: $typo-size-700; | ||
} | ||
%toggle label span { | ||
font-size: $typo-size-700 !important; | ||
} | ||
fieldset > p, | ||
.template-error > div, | ||
[role='tabpanel'] > p:only-child, | ||
.with-confirmation p, | ||
%app-view-content > p:only-child, | ||
%app-view > div.disabled > div, | ||
%button, | ||
%form-element > em, | ||
%form-element > strong, | ||
%feedback-dialog-inline p { | ||
font-size: $typo-size-800; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.