Skip to content

Commit

Permalink
changed sbanken medium and added medium--plus
Browse files Browse the repository at this point in the history
  • Loading branch information
snorrekim committed Oct 1, 2024
1 parent 1527d70 commit d375498
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

&__group {
--avatar-font-size-left--medium: var(--font-size-basis);
--avatar-font-size-left--large: var(--font-size-medium);
--avatar-font-size-left--x-large: var(--font-size-medium);
--avatar-font-size-left--large: var(--sb-font-size-medium--plus);
--avatar-font-size-left--x-large: var(--sb-font-size-medium--plus);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,11 @@
margin-top: calc(var(--dialog-icon-positioning) * -1);
margin-bottom: calc(var(--dialog-icon-positioning) * -1);
}

&__title {
@include allBetween(small, medium) {
font-size: var(--sb-font-size-medium--plus) !important;
line-height: var(--line-height-medium) !important;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,22 @@
--typography-h-default-font-family: var(--sb-font-family-headings);
--typography-h-xx-large-weight: var(--font-weight-regular);
--typography-h-x-large-weight: var(--font-weight-regular);
--typography-h-large-small-font-size: var(--sb-font-size-medium--plus);
--typography-h-large-weight: var(--font-weight-regular);
--typography-lead-small-font-size: var(--font-size-basis);
--typography-lead-weight: var(--font-weight-regular);
--typography-h-medium-font-size: var(--sb-font-size-medium--plus);
--typography-h-medium-small-font-size: var(--font-size-medium);
--typography-h-medium-weight: var(--font-weight-regular);

@include utilities.allBelow(small) {
--typography-h-xx-large-font-size: var(--font-size-x-large);
--typography-h-xx-large-line-height: var(--line-height-x-large);
--typography-h-x-large-font-size: var(--font-size-large);
--typography-h-x-large-line-height: var(--line-height-large);
--typography-h-large-font-size: var(--font-size-medium);
--typography-h-large-font-size: var(--sb-font-size-medium--plus);
--typography-h-large-line-height: var(--line-height-medium);
--typography-h-medium-font-size: var(--font-size-lead);
--typography-h-medium-font-size: var(--font-size-medium);
--typography-h-medium-line-height: var(--line-height-lead);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ export default {
'--sb-font-size-small': '0.875rem',
'--sb-font-size-basis': '1rem',
'--sb-font-size-basis--em': '1em',
'--sb-font-size-lead': '1.25rem',
'--sb-font-size-medium': '1.625rem',
'--sb-font-size-lead': 'var(--font-size-medium)',
'--sb-font-size-medium': '1.25rem',
'--sb-font-size-medium--plus': '1.625rem',
'--sb-font-size-large': '2rem',
'--sb-font-size-x-large': '2.375rem',
'--sb-font-size-xx-large': '3rem',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ export default {
'--sb-font-size-small': '0.875rem',
'--sb-font-size-basis': '1rem',
'--sb-font-size-basis--em': '1em',
'--sb-font-size-lead': '1.25rem',
'--sb-font-size-medium': '1.625rem',
'--sb-font-size-lead': 'var(--font-size-medium)',
'--sb-font-size-medium': '1.25rem',
'--sb-font-size-medium--plus': '1.625rem',
'--sb-font-size-large': '2rem',
'--sb-font-size-x-large': '2.375rem',
'--sb-font-size-xx-large': '3rem',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,16 @@
--sb-font-weight-bold: 700;

// Typography Sizes
--sb-font-size-x-small: 0.75rem;
--sb-font-size-small: 0.875rem;
--sb-font-size-basis: 1rem;
--sb-font-size-x-small: 0.75rem; // 12px
--sb-font-size-small: 0.875rem; // 14px
--sb-font-size-basis: 1rem; // 16px
--sb-font-size-basis--em: 1em;
--sb-font-size-lead: 1.25rem;
--sb-font-size-medium: 1.625rem;
--sb-font-size-large: 2rem;
--sb-font-size-x-large: 2.375rem;
--sb-font-size-xx-large: 3rem;
--sb-font-size-lead: var(--font-size-medium); // 20px
--sb-font-size-medium: 1.25rem; // 20px
--sb-font-size-medium--plus: 1.625rem; // 26px extra for Sbanken theme
--sb-font-size-large: 2rem; // 32px
--sb-font-size-x-large: 2.375rem; // 38px
--sb-font-size-xx-large: 3rem; // 48px

// Typography Line heights
--sb-line-height-x-small: 1.125rem;
Expand Down
5 changes: 3 additions & 2 deletions packages/dnb-eufemia/src/style/themes/theme-ui/properties.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ export default {
'--sb-font-size-small': '0.875rem',
'--sb-font-size-basis': '1rem',
'--sb-font-size-basis--em': '1em',
'--sb-font-size-lead': '1.25rem',
'--sb-font-size-medium': '1.625rem',
'--sb-font-size-lead': 'var(--font-size-medium)',
'--sb-font-size-medium': '1.25rem',
'--sb-font-size-medium--plus': '1.625rem',
'--sb-font-size-large': '2rem',
'--sb-font-size-x-large': '2.375rem',
'--sb-font-size-xx-large': '3rem',
Expand Down

0 comments on commit d375498

Please sign in to comment.