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

[Darkside] Quality assurance P5 (border-radius and font-weight) #3519

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

[Darkside] Quality assurance P5 (border-radius and font-weight) #3519

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
ea9c032
:lipstick: Update border-radius based on Figma
KenAJoh Jan 22, 2025
fda5b69
Merge branch 'main' into darkside-border-radius
KenAJoh Jan 22, 2025
a46c898
:lipstick: More border-radius adjustments
KenAJoh Jan 22, 2025
4dd2478
:lipstick: Bolder medium+ headings
KenAJoh Jan 22, 2025
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
6 changes: 3 additions & 3 deletions @navikt/core/css/darkside/action-menu.darkside.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* --------------------------- ActionMenu content --------------------------- */
.navds-action-menu__content {
overflow: hidden;
border-radius: var(--ax-border-radius-large);
border-radius: var(--ax-border-radius-xlarge);
border: 1px solid var(--ax-border-subtleA);
box-shadow: var(--ax-shadow-dialog);
transition: transform 250ms cubic-bezier(0, 0, 0, 1) allow-discrete;
Expand Down Expand Up @@ -39,7 +39,7 @@
--__axc-action-menu-item-pl: var(--ax-space-8);
--__axc-action-menu-item-height: 2rem;

border-radius: var(--ax-border-radius-large);
border-radius: var(--ax-border-radius-xlarge);
background-color: var(--ax-bg-raised);
min-width: 128px;
max-width: min(95vw, 640px);
Expand All @@ -60,7 +60,7 @@
gap: var(--ax-space-8);
min-height: var(--__axc-action-menu-item-height);
cursor: default;
border-radius: var(--ax-border-radius-medium);
border-radius: var(--ax-border-radius-large);
position: relative;
padding-left: var(--__axc-action-menu-item-pl);
padding-right: var(--__axc-action-menu-item-pr);
Expand Down
24 changes: 12 additions & 12 deletions @navikt/core/css/darkside/baseline/fonts.darkside.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
@font-face {
font-family: "Source Sans 3";
font-style: italic;
font-weight: 400 600;
font-weight: 400 650;
font-display: swap;
src: url(https://cdn.nav.no/aksel/fonts/SourceSans3-italic-cyrillic_ext.woff2) format("woff2");
unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
Expand All @@ -12,7 +12,7 @@
@font-face {
font-family: "Source Sans 3";
font-style: italic;
font-weight: 400 600;
font-weight: 400 650;
font-display: swap;
src: url(https://cdn.nav.no/aksel/fonts/SourceSans3-italic-cyrillic.woff2) format("woff2");
unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
Expand All @@ -22,7 +22,7 @@
@font-face {
font-family: "Source Sans 3";
font-style: italic;
font-weight: 400 600;
font-weight: 400 650;
font-display: swap;
src: url(https://cdn.nav.no/aksel/fonts/SourceSans3-italic-latin_ext.woff2) format("woff2");
unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113,
Expand All @@ -33,7 +33,7 @@
@font-face {
font-family: "Source Sans 3";
font-style: italic;
font-weight: 400 600;
font-weight: 400 650;
font-display: swap;
src: url(https://cdn.nav.no/aksel/fonts/SourceSans3-italic.woff2) format("woff2");
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F,
Expand All @@ -44,7 +44,7 @@
@font-face {
font-family: "Source Sans 3";
font-style: normal;
font-weight: 400 600;
font-weight: 400 650;
font-display: swap;
src: url(https://cdn.nav.no/aksel/fonts/SourceSans3-normal-cyrillic_ext.woff2) format("woff2");
unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
Expand All @@ -54,7 +54,7 @@
@font-face {
font-family: "Source Sans 3";
font-style: normal;
font-weight: 400 600;
font-weight: 400 650;
font-display: swap;
src: url(https://cdn.nav.no/aksel/fonts/SourceSans3-normal-cyrillic.woff2) format("woff2");
unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
Expand All @@ -64,7 +64,7 @@
@font-face {
font-family: "Source Sans 3";
font-style: normal;
font-weight: 400 600;
font-weight: 400 650;
font-display: swap;
src: url(https://cdn.nav.no/aksel/fonts/SourceSans3-normal-latin_ext.woff2) format("woff2");
unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113,
Expand All @@ -75,7 +75,7 @@
@font-face {
font-family: "Source Sans 3";
font-style: normal;
font-weight: 400 600;
font-weight: 400 650;
font-display: swap;
src: url(https://cdn.nav.no/aksel/fonts/SourceSans3-normal.woff2) format("woff2");
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F,
Expand All @@ -88,7 +88,7 @@
@font-face {
font-family: "Source Sans Pro";
font-style: italic;
font-weight: 400 600;
font-weight: 400 650;
font-display: swap;
src: url(https://cdn.nav.no/aksel/fonts/SourceSans3-italic-latin_ext.woff2) format("woff2");
unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113,
Expand All @@ -99,7 +99,7 @@
@font-face {
font-family: "Source Sans Pro";
font-style: italic;
font-weight: 400 600;
font-weight: 400 650;
font-display: swap;
src: url(https://cdn.nav.no/aksel/fonts/SourceSans3-italic.woff2) format("woff2");
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F,
Expand All @@ -110,7 +110,7 @@
@font-face {
font-family: "Source Sans Pro";
font-style: normal;
font-weight: 400 600;
font-weight: 400 650;
font-display: swap;
src: url(https://cdn.nav.no/aksel/fonts/SourceSans3-normal-latin_ext.woff2) format("woff2");
unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113,
Expand All @@ -121,7 +121,7 @@
@font-face {
font-family: "Source Sans Pro";
font-style: normal;
font-weight: 400 600;
font-weight: 400 650;
font-display: swap;
src: url(https://cdn.nav.no/aksel/fonts/SourceSans3-normal.woff2) format("woff2");
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F,
Expand Down
2 changes: 1 addition & 1 deletion @navikt/core/css/darkside/button.darkside.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
--__axc-button-border-width: 2px;

padding: var(--ax-space-12) var(--ax-space-20);
border-radius: var(--ax-border-radius-medium);
border-radius: var(--ax-border-radius-large);
display: inline-flex;
cursor: pointer;
text-decoration: none;
Expand Down
2 changes: 1 addition & 1 deletion @navikt/core/css/darkside/copybutton.darkside.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
margin: 0;
text-decoration: none;
border: none;
border-radius: var(--ax-border-radius-medium);
border-radius: var(--ax-border-radius-large);
padding: var(--__axc-copybutton-padding);
display: grid;
place-content: center;
Expand Down
14 changes: 6 additions & 8 deletions @navikt/core/css/darkside/date.darkside.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,21 +35,19 @@
width: 2.5rem;
height: 2.5rem;
text-align: center;
border-radius: var(--ax-border-radius-medium);
border-radius: var(--ax-border-radius-large);
}

.rdp-day_range_start {
border-radius: var(--ax-border-radius-xlarge) var(--ax-border-radius-medium) var(--ax-border-radius-medium)
var(--ax-border-radius-xlarge);
border-radius: 100% var(--ax-border-radius-xlarge) var(--ax-border-radius-xlarge) 100%;
}

.rdp-day_range_end:not(.rdp-day_range_start) {
border-radius: var(--ax-border-radius-medium) var(--ax-border-radius-xlarge) var(--ax-border-radius-xlarge)
var(--ax-border-radius-medium);
border-radius: var(--ax-border-radius-large) 100% 100% var(--ax-border-radius-large);
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TIL that border-radius: 9999px behaves wildly different than 100% in some edgecases

}

.rdp-day_range_start.rdp-day_range_end {
border-radius: var(--ax-border-radius-xlarge);
border-radius: var(--ax-border-radius-large);
}

.navds-date__field {
Expand Down Expand Up @@ -142,7 +140,7 @@
width: 3rem;
height: 3rem;
text-transform: capitalize;
border-radius: var(--ax-border-radius-medium);
border-radius: var(--ax-border-radius-large);
cursor: pointer;
}

Expand Down Expand Up @@ -192,7 +190,7 @@
text-decoration: none;
border: none;
background: none;
border-radius: calc(var(--ax-border-radius-medium) - 1px);
border-radius: calc(var(--ax-border-radius-large) - 1px);
padding: var(--ax-space-12);
align-items: center;
justify-content: center;
Expand Down
7 changes: 3 additions & 4 deletions @navikt/core/css/darkside/form/combobox.darkside.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
flex-direction: column;
width: 100%;
position: relative;
border-radius: var(--ax-border-radius-medium);
border-radius: var(--ax-border-radius-large);
}

.navds-form-field:not(:is(.navds-combobox--disabled, .navds-combobox--readonly)) {
Expand Down Expand Up @@ -81,7 +81,7 @@

.navds-combobox__wrapper-inner {
border: 1px solid var(--ax-border-default);
border-radius: var(--ax-border-radius-medium);
border-radius: var(--ax-border-radius-large);

&:has(.navds-combobox__input:focus-visible) {
outline: 3px solid var(--ax-border-focus);
Expand Down Expand Up @@ -215,7 +215,6 @@
}

.navds-combobox__button-toggle-list {
border-radius: var(--ax-border-radius-medium);
color: var(--ax-text-default);
display: flex;
justify-content: center;
Expand Down Expand Up @@ -273,7 +272,7 @@
justify-content: space-between;
padding-block: var(--__axc-combobox-list-item-padding-block);
padding-inline: var(--__axc-combobox-list-item-padding-inline);
border-radius: var(--ax-border-radius-medium);
border-radius: var(--ax-border-radius-large);
border: 0;
margin-inline: var(--ax-space-8);
margin-block: var(--ax-space-2);
Expand Down
2 changes: 1 addition & 1 deletion @navikt/core/css/darkside/form/form-progress.darkside.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@

.navds-form-progress__stepper {
border: 1px solid var(--ax-border-subtle);
border-radius: var(--ax-border-radius-large);
border-radius: var(--ax-border-radius-xlarge);
padding: var(--ax-space-16) var(--ax-space-20);
margin-top: var(--ax-space-4);
background: var(--ax-bg-raised);
Expand Down
6 changes: 3 additions & 3 deletions @navikt/core/css/darkside/form/search.darkside.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
.navds-search__wrapper {
display: inline-flex;
align-items: center;
border-radius: var(--ax-border-radius-medium);
border-radius: var(--ax-border-radius-large);

/* We have to outline the whole container to include the Search-buttons */
&:has(.navds-search__input:focus-visible) {
Expand Down Expand Up @@ -97,8 +97,8 @@
.navds-search__button-search {
flex-shrink: 0;
border-radius: 0;
border-top-right-radius: var(--ax-border-radius-medium);
border-bottom-right-radius: var(--ax-border-radius-medium);
border-top-right-radius: var(--ax-border-radius-large);
border-bottom-right-radius: var(--ax-border-radius-large);
}

.navds-search__button-search.navds-button--secondary {
Expand Down
2 changes: 1 addition & 1 deletion @navikt/core/css/darkside/form/select.darkside.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.navds-select__input {
appearance: none;
background-color: var(--ax-bg-input);
border-radius: var(--ax-border-radius-medium);
border-radius: var(--ax-border-radius-large);
border: 1px solid var(--ax-border-default);
color: var(--ax-text-default);
width: 100%;
Expand Down
2 changes: 1 addition & 1 deletion @navikt/core/css/darkside/form/text-field.darkside.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
appearance: none;
padding: var(--ax-space-8);
background: var(--ax-bg-input);
border-radius: var(--ax-border-radius-medium);
border-radius: var(--ax-border-radius-large);
border: 1px solid var(--ax-border-default);
min-height: 3rem;
width: 100%;
Expand Down
2 changes: 1 addition & 1 deletion @navikt/core/css/darkside/form/textarea.darkside.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
appearance: none;
padding: var(--ax-space-8);
background-color: var(--ax-bg-input);
border-radius: var(--ax-border-radius-medium);
border-radius: var(--ax-border-radius-large);
border: 1px solid var(--ax-border-default);
resize: none;
width: 100%;
Expand Down
4 changes: 2 additions & 2 deletions @navikt/core/css/darkside/toggle-group.darkside.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

/* Main Togglegroup */
.navds-toggle-group {
border-radius: var(--ax-border-radius-medium);
border-radius: var(--ax-border-radius-large);
background-color: transparent;
box-shadow: inset 0 0 0 1px var(--ax-border-default);
display: inline-grid;
Expand All @@ -30,7 +30,7 @@
cursor: pointer;
background-color: transparent;
color: var(--ax-text-default);
border-radius: var(--ax-border-radius-medium);
border-radius: var(--ax-border-radius-large);
min-width: fit-content;
position: relative;

Expand Down
3 changes: 3 additions & 0 deletions @navikt/core/css/darkside/typography.darkside.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
font-size: var(--ax-font-size-heading-2xlarge);
letter-spacing: -0.01em;
line-height: var(--ax-font-line-height-heading-2xlarge);
font-weight: 650;
}

.navds-heading--xlarge.navds-typo--spacing {
Expand All @@ -18,6 +19,7 @@
font-size: var(--ax-font-size-heading-xlarge);
letter-spacing: -0.008em;
line-height: var(--ax-font-line-height-heading-xlarge);
font-weight: 650;
}

.navds-heading--large.navds-typo--spacing {
Expand Down Expand Up @@ -51,6 +53,7 @@
font-size: var(--ax-font-size-heading-medium);
letter-spacing: -0.002em;
line-height: var(--ax-font-line-height-heading-medium);
font-weight: 650;
}

.navds-heading--medium.navds-typo--spacing {
Expand Down
Loading