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

(#788) Atlas adjust font sizes #797

Merged
merged 1 commit into from
Apr 16, 2018
Merged

(#788) Atlas adjust font sizes #797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/clay/src/scss/atlas/variables/_alerts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ $alert-border-width: 0.0625rem !default;

$alert-close-opacity: 1 !default;

$alert-font-size: 0.8125rem !default; // 13px
$alert-font-size: 0.875rem !default; // 14px

$alert-lead-font-size: $alert-font-size !default;
$alert-lead-font-weight: $font-weight-semi-bold !default;
Expand Down
2 changes: 1 addition & 1 deletion packages/clay/src/scss/atlas/variables/_application-bar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$application-bar-size: () !default;
$application-bar-size: map-merge((
title-font-size: 1.0625rem
title-font-size: 1.125rem // 18px
), $application-bar-size);

$application-bar-dark: () !default;
Expand Down
2 changes: 1 addition & 1 deletion packages/clay/src/scss/atlas/variables/_badges.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
$badge-border-radius: 10rem !default;
$badge-font-size: 0.6875rem !default; // 11px
$badge-font-size: 0.625rem !default; // 10px
$badge-font-weight: $font-weight-semi-bold !default;
$badge-line-height: 0.875rem !default // 14px
$badge-padding-x: 0.25rem !default; // 4px
Expand Down
2 changes: 1 addition & 1 deletion packages/clay/src/scss/atlas/variables/_breadcrumbs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
$breadcrumb-bg: transparent !default;
$breadcrumb-font-size: 0.8125rem !default; // 13px
$breadcrumb-font-size: 0.875rem !default; // 14px
$breadcrumb-padding-x: 0.125rem !default; // 2px

$breadcrumb-link-color: $secondary !default;
Expand Down
16 changes: 8 additions & 8 deletions packages/clay/src/scss/atlas/variables/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$btn-box-shadow: none !default;
$btn-font-weight: $font-weight-semi-bold !default;
$btn-padding-x: 0.9375rem !default; // 15px
$btn-padding-y: 0.53125rem !default; // 8.5px
$btn-padding-y: 0.4375rem !default; // 7px

$btn-disabled-opacity: 0.26 !default;

Expand All @@ -15,16 +15,16 @@ $btn-inline-item-font-size: 1rem !default; // 16px
// Button Sizes

$btn-border-radius-lg: $border-radius !default;
$btn-font-size-lg: $font-size-lg !default; // 15px
$btn-padding-x-lg: 1.25rem !default; // 20px
$btn-padding-y-lg: 0.75rem !default; // 12px
$btn-inline-item-font-size-lg: 1.125rem !default; // 18px
$btn-font-size-lg: $font-size-lg !default; // 18px
$btn-padding-x-lg: 1.5rem !default; // 24px
$btn-padding-y-lg: 0.59375rem !default; // 9.5px
$btn-inline-item-font-size-lg: $font-size-lg !default; // 18px

$btn-font-size-sm: $font-size-sm !default; // 13px
$btn-font-size-sm: $font-size-sm !default; // 14px
$btn-line-height-sm: 1 !default;
$btn-padding-x-sm: 0.5rem !default; // 8px
$btn-padding-y-sm: 0.53125rem !default; // 8.5px
$btn-inline-item-font-size-sm: 1rem !default; // 16px
$btn-padding-y-sm: 0.5rem !default; // 8px
$btn-inline-item-font-size-sm: $font-size-sm !default; // 14px

// Button Monospaced

Expand Down
4 changes: 2 additions & 2 deletions packages/clay/src/scss/atlas/variables/_cards.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ $card-inner-border-radius: if($card-border-width > 0, calc(#{$card-border-radius
$card-title: () !default;
$card-title: map-merge((
color: $body-color,
font-size: $font-size-base // 14px
font-size: 0.875rem // 14px
), $card-title);

$card-title-link: () !default;
Expand All @@ -26,7 +26,6 @@ $card-title-link: map-merge((

$card-subtitle: () !default;
$card-subtitle: map-merge((
font-size: $font-size-sm, // 13px
font-weight: $font-weight-normal
), $card-subtitle);

Expand All @@ -40,6 +39,7 @@ $card-subtitle-link: map-merge((
$card-link: () !default;
$card-link: map-merge((
color: $secondary,
font-size: 0.875rem, // 14px
hover-color: $secondary,
hover-text-decoration: underline
), $card-link);
Expand Down
4 changes: 3 additions & 1 deletion packages/clay/src/scss/atlas/variables/_dropdowns.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
$dropdown-border-color: lighten(saturate(adjust-hue($secondary, 3), 6.13), 46.08) !default;
$dropdown-border-width: 0 !default;
$dropdown-box-shadow: 0 1px 10px -3px transparentize(#000, 0.7) !default;
$dropdown-font-size: 0.875rem !default; // 14px

$dropdown-padding-y: 0.375rem !default; // 6px
$dropdown-min-height: 40px !default;
Expand All @@ -11,8 +12,9 @@ $dropdown-item-padding-x: 1.25rem !default; // 20px
$dropdown-item-padding-y: 0.5rem !default; // 8px

$dropdown-header-color: $secondary !default;
$dropdown-header-font-size: 0.875rem !default; // 14px

$dropdown-subheader-font-size: 0.6875rem !default; // 11px
$dropdown-subheader-font-size: 0.75rem !default; // 12px

$dropdown-link-color: $secondary !default;
$dropdown-link-hover-color: $body-color !default;
Expand Down
7 changes: 3 additions & 4 deletions packages/clay/src/scss/atlas/variables/_forms.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$input-font-size-mobile: 1rem !default; // 16px

$input-label-font-size: 0.8125rem !default; // 13px
$input-label-font-size: 0.875rem !default; // 14px
$input-label-font-weight: $font-weight-semi-bold !default;
$input-label-margin-bottom: 0.25rem !default; // 4px

Expand Down Expand Up @@ -28,8 +28,7 @@ $input-height-inner-lg: $input-height-lg - $input-height-border !default;
$input-height-sm: 2rem !default; // 32px
$input-height-inner-sm: $input-height-sm - $input-height-border !default;

$form-feedback-font-size: 0.8125rem !default; // 13px
$form-feedback-font-weight: $font-weight-semi-bold !default;
$form-feedback-font-size: 0.875rem !default; // 14px

$form-text-color: $secondary !default;

Expand Down Expand Up @@ -110,7 +109,7 @@ $input-select-icon-disabled: clay-icon(caret-double-l, $input-select-icon-disabl
$form-control-label-size: () !default;
$form-control-label-size: map-merge((
border-width: 0.0625rem,
font-size: 0.8125rem, // 13px
font-size: $input-label-font-size, // 14px
height: 1.5rem, // 24px
padding-x: 0.625rem, // 10px
text-transform: none
Expand Down
11 changes: 6 additions & 5 deletions packages/clay/src/scss/atlas/variables/_globals.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,16 @@ $container-max-widths: (

$grid-gutter-width: 24px !default;

$font-size-base: 0.875rem !default; // 14px
$font-size-lg: 0.9375rem !default; // 15px
$font-size-sm: 0.8125rem !default; // 13px
$font-size-base: 1rem !default; // 16px
$font-size-lg: 1.125rem !default; // 18px
$font-size-sm: 0.875rem !default; // 14px

$font-weight-light: 300 !default;
$font-weight-normal: normal !default;
$font-weight-normal: 400 !default;
$font-weight-semi-bold: 600 !default;
$font-weight-bold: bold !default;
$font-weight-bold: 700 !default;
$font-weight-bolder: 900 !default;

$headings-font-weight: $font-weight-semi-bold !default;

$h1-font-size: 1.625rem !default; // 26px
Expand Down
4 changes: 2 additions & 2 deletions packages/clay/src/scss/atlas/variables/_labels.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
$label-border-radius: 0.125rem !default; // 2px
$label-font-size: 0.6875rem !default; // 11px
$label-font-size: 0.625rem !default; // 10px
$label-font-weight: $font-weight-semi-bold !default;
$label-height: 1rem !default; // 16px
$label-padding-x: 0.5rem !default; // 8px
Expand All @@ -13,7 +13,7 @@ $label-link-text-decoration: none !default;
$label-link-hover-text-decoration: underline !default;

$label-lg: (
font-size: 0.8125rem, // 13px
font-size: 0.75rem, // 13px
height: 1.5rem, // 24px
padding-x: 0.625rem // 10px
) !default;
Expand Down
11 changes: 5 additions & 6 deletions packages/clay/src/scss/atlas/variables/_list-group.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,19 @@ $list-group-active-bg: $list-group-hover-bg !default;
$list-group-active-border-color: $list-group-border-color !default;
$list-group-active-color: !default;

$list-group-font-size: 0.875rem !default; // 14px
$list-group-item-padding-x: 1rem !default; // 16px
$list-group-item-padding-y: 1rem !default; // 16px

// List Group Header

$list-group-header-bg: lighten(saturate(adjust-hue($secondary, -27), 6.13), 51.57) !default;
$list-group-header-padding-y: 0.53125rem !default; // 8.5px
$list-group-header-padding-y: 0.5rem !default; // 8px

$list-group-header-title: () !default;
$list-group-header-title: map-merge((
color: $secondary,
font-size: 0.6875rem, // 11px
font-size: 0.75rem, // 12px
text-transform: uppercase
), $list-group-header-title);

Expand All @@ -30,8 +31,8 @@ $list-group-title-link: map-merge((
$list-group-title: () !default;
$list-group-title: map-merge((
color: $body-color,
font-size: 0.9375rem, // 15px
line-height: 1.35
font-size: 0.875rem, // 14px
line-height: 1.45
), $list-group-title);

// List Group Subtitle
Expand All @@ -45,7 +46,6 @@ $list-group-subtitle-link: map-merge((

$list-group-text: () !default;
$list-group-text: map-merge((
font-size: 0.875rem, // 14px
line-height: 1.45
), $list-group-text);

Expand All @@ -58,7 +58,6 @@ $list-group-text-link: map-merge((

$list-group-subtext: () !default;
$list-group-subtext: map-merge((
font-size: 0.875rem, // 14px
line-height: 1.45
), $list-group-subtext);

Expand Down
1 change: 1 addition & 0 deletions packages/clay/src/scss/atlas/variables/_modals.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ $modal-header-border-color: lighten(saturate(adjust-hue($secondary, 3), 6.13), 4
$modal-header-padding: 1.5rem !default; // 24px

$modal-title-font-size: 1.25rem !default; // 20px
$modal-title-font-weight: $font-weight-bold !default;

// Modal specific btn-monospaced is deprecated in v2.0.0-rc.12

Expand Down
3 changes: 3 additions & 0 deletions packages/clay/src/scss/atlas/variables/_multi-step-nav.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
$multi-step-icon-bg: lighten(saturate(adjust-hue($secondary, -12), 8.51), 49.61) !default;
$multi-step-icon-color: $secondary !default;
$multi-step-icon-border-radius: 100px !default;
$multi-step-icon-font-size: 0.875rem !default;
$multi-step-icon-font-weight: $font-weight-semi-bold !default;

$multi-step-icon-hover-color: $multi-step-icon-color !default;

$multi-step-indicator-label-color: $secondary !default;
$multi-step-indicator-label-font-size: 0.875rem !default;
$multi-step-indicator-label-font-weight: $font-weight-semi-bold !default;

$multi-step-title-color: $secondary !default;
$multi-step-title-font-size: 0.875rem !default;
$multi-step-title-font-weight: $font-weight-semi-bold !default;

$multi-step-icon-disabled-bg: $multi-step-icon-bg !default;
Expand Down
2 changes: 2 additions & 0 deletions packages/clay/src/scss/atlas/variables/_navbar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
$navbar-font-size: 0.875rem !default; // 14px

$navbar-underline-active-bg: lighten($component-active-bg, 22.94) !default;

// Navbar Light
Expand Down
2 changes: 2 additions & 0 deletions packages/clay/src/scss/atlas/variables/_navs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
$nav-font-size: 0.875rem !default;

$nav-link-disabled-color: lighten(saturate(adjust-hue($secondary, -3), 5.39), 23.92) !default;

$nav-link-padding-x: 1rem !default; // 16px
Expand Down
24 changes: 12 additions & 12 deletions packages/clay/src/scss/atlas/variables/_pagination.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
$pagination-font-size: 0.8125rem !default; // 13px
$pagination-font-size: 0.875rem !default; // 14px

$pagination-item-height: 32px !default;
$pagination-item-height: 2rem !default; // 32px
$pagination-item-margin-x: 0.125rem !default;

$pagination-link-border-radius: 4px !default;

$pagination-bg: transparent !default;
$pagination-border-color: $pagination-bg !default;
$pagination-border-width: 1px !default;
$pagination-border-width: 0.0625rem !default; // 1px
$pagination-color: $secondary !default;
$pagination-padding-x: 10px !default;
$pagination-padding-x: 0.625rem !default; // 10px
$pagination-padding-y: 0 !default;
$pagination-line-height: $pagination-item-height - ($pagination-border-width * 2) !default;

Expand All @@ -26,21 +26,21 @@ $pagination-disabled-border-color: $pagination-disabled-bg !default;
$pagination-disabled-color: $secondary !default;
$pagination-disabled-opacity: 0.5 !default;

$pagination-dropdown-menu-spacer-y: 10px !default;
$pagination-dropdown-menu-spacer-y: 0.625rem !default; // 10px

$pagination-results-color: $pagination-color !default;

// Sizes

$pagination-link-border-radius-sm: 3px !default;
$pagination-font-size-sm: 12px !default;
$pagination-item-height-sm: 24px !default;
$pagination-link-border-radius-sm: 0.3125rem !default;
$pagination-font-size-sm: 0.75rem !default; // 12px
$pagination-item-height-sm: 1.5rem !default; // 24px
$pagination-line-height-sm: $pagination-item-height-sm - ($pagination-border-width * 2) !default;
$pagination-padding-y-sm: 0 !default;

$pagination-link-border-radius-lg: 5px !default;
$pagination-font-size-lg: 18px !default;
$pagination-item-height-lg: 44px !default;
$pagination-link-border-radius-lg: 0.3125rem !default; // 5px
$pagination-font-size-lg: 1.125rem !default; // 18px
$pagination-item-height-lg: 2.75rem !default; //44px
$pagination-line-height-lg: $pagination-item-height-lg - ($pagination-border-width * 2) !default;
$pagination-padding-x-lg: 16px !default;
$pagination-padding-x-lg: 1rem !default; // 16px
$pagination-padding-y-lg: 0 !default;
2 changes: 1 addition & 1 deletion packages/clay/src/scss/atlas/variables/_panels.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ $panel-footer-border-top-width: 0 !default;

// Panel Title

$panel-title-font-size: 0.8125rem !default; // 13px
$panel-title-font-size: 0.875rem !default; // 14px
$panel-title-text-transform: uppercase !default;

// Panel Collapse Icon
Expand Down
1 change: 1 addition & 0 deletions packages/clay/src/scss/atlas/variables/_progress-bars.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ $progress-group-subtitle: map-merge((
font-weight: $font-weight-normal
), $progress-group-subtitle);

$progress-group-addon-font-size: 0.875rem !default;
$progress-group-addon-font-weight: $font-weight-semi-bold !default;
2 changes: 1 addition & 1 deletion packages/clay/src/scss/atlas/variables/_sheets.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ $sheet-title-margin-bottom-mobile: 1rem !default; // 16px

$sheet-subtitle-color: $body-color !default;
$sheet-subtitle-border-color: lighten(saturate(adjust-hue($secondary, -3), 5.39), 23.92) !default;
$sheet-subtitle-font-size: 0.8125rem !default // 13px
$sheet-subtitle-font-size: 0.875rem !default // 14px
$sheet-subtitle-padding-y: 0.5rem !default; // 8px
$sheet-subtitle-margin-bottom-mobile: 1rem !default; // 16px

Expand Down
4 changes: 2 additions & 2 deletions packages/clay/src/scss/atlas/variables/_sidebar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ $sidebar-header-component-subtitle: map-merge((

$sidebar-dt: () !default;
$sidebar-dt: map-merge((
font-size: 0.6875rem // 11px
font-size: 0.75rem // 12px
), $sidebar-dt);

// Sidebar DD

$sidebar-dd: () !default;
$sidebar-dd: map-merge((
font-size: 0.75rem // 12px
font-size: 0.875rem // 14px
), $sidebar-dd);

// Sidebar List Group
Expand Down
2 changes: 1 addition & 1 deletion packages/clay/src/scss/atlas/variables/_stickers.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$sticker-font-size: 0.6875rem !default; // 11px
$sticker-font-size: 0.625rem !default; // 10px
$sticker-font-weight: $font-weight-bold !default;

$sticker-inside-offset: 1rem !default; // 16px
Expand Down
Loading