diff --git a/src/components/ProgressIndicator/utils.jsx b/src/components/ProgressIndicator/utils.jsx index c60414d30..960b9cf03 100644 --- a/src/components/ProgressIndicator/utils.jsx +++ b/src/components/ProgressIndicator/utils.jsx @@ -25,7 +25,7 @@ const getStepsInfo = (formSteps, submission, currentPathname) => { to: `/stap/${step.slug}`, label: step.formDefinition, isCompleted: submission ? submission.steps[index].completed : false, - isApplicable: submission ? submission.steps[index].isApplicable : step.isApplicable ?? true, + isApplicable: submission ? submission.steps[index].isApplicable : (step.isApplicable ?? true), isCurrent: checkMatchesPath(currentPathname, step.slug), canNavigateTo: canNavigateToStep(index, submission), })); diff --git a/src/scss/_settings.scss b/src/scss/_settings.scss index 39bfabbbc..71c833696 100644 --- a/src/scss/_settings.scss +++ b/src/scss/_settings.scss @@ -279,7 +279,9 @@ $typography-style-border: solid !default; @font-face { font-family: 'Fira Sans'; src: url('../fonts/fira-sans-v11-latin-regular.eot'); - src: local(''), url('../fonts/fira-sans-v11-latin-regular.eot?#iefix') format('eot'), + src: + local(''), + url('../fonts/fira-sans-v11-latin-regular.eot?#iefix') format('eot'), url('../fonts/fira-sans-v11-latin-regular.ttf') format('truetype'), url('../fonts/fira-sans-v11-latin-regular.woff') format('woff'); font-weight: normal; @@ -289,7 +291,9 @@ $typography-style-border: solid !default; @font-face { font-family: 'Fira Sans'; src: url('../fonts/fira-sans-v11-latin-700.eot'); - src: local(''), url('../fonts/fira-sans-v11-latin-700.eot?#iefix') format('eot'), + src: + local(''), + url('../fonts/fira-sans-v11-latin-700.eot?#iefix') format('eot'), url('../fonts/fira-sans-v11-latin-700.ttf') format('truetype'), url('../fonts/fira-sans-v11-latin-700.woff') format('woff'); font-weight: bold; @@ -299,7 +303,9 @@ $typography-style-border: solid !default; @font-face { font-family: 'Fira Sans'; src: url('../fonts/fira-sans-v11-latin-italic.eot'); - src: local(''), url('../fonts/fira-sans-v11-latin-italic.eot?#iefix') format('eot'), + src: + local(''), + url('../fonts/fira-sans-v11-latin-italic.eot?#iefix') format('eot'), url('../fonts/fira-sans-v11-latin-italic.ttf') format('truetype'), url('../fonts/fira-sans-v11-latin-italic.woff') format('woff'); font-weight: normal; diff --git a/src/scss/components/_deprecated-select.scss b/src/scss/components/_deprecated-select.scss index 26935dafe..9f40cd342 100644 --- a/src/scss/components/_deprecated-select.scss +++ b/src/scss/components/_deprecated-select.scss @@ -45,7 +45,8 @@ $select-background-color: var(--of-select-background-color, $color-white); padding: 0 $list-hpadding; max-inline-size: calc( - var(--utrecht-select-max-inline-size, var(--utrecht-form-control-max-inline-size)) - 2 * #{$list-hpadding} + var(--utrecht-select-max-inline-size, var(--utrecht-form-control-max-inline-size)) - 2 * + #{$list-hpadding} ); &:focus-within { diff --git a/src/scss/components/_input-container.scss b/src/scss/components/_input-container.scss index 23ccae3b2..82e0d1d31 100644 --- a/src/scss/components/_input-container.scss +++ b/src/scss/components/_input-container.scss @@ -57,7 +57,11 @@ $affixes: 'prefix', 'suffix'; margin-inline-end: var( --of-input-container-prefix-margin-inline-end, calc( - -1 * var(--of-input-container-prefix-border-width, var(--of-input-container-affix-border-width)) + -1 * + var( + --of-input-container-prefix-border-width, + var(--of-input-container-affix-border-width) + ) ) ); } @@ -68,7 +72,11 @@ $affixes: 'prefix', 'suffix'; margin-inline-start: var( --of-input-container-prefix-margin-inline-start, calc( - -1 * var(--of-input-container-prefix-border-width, var(--of-input-container-affix-border-width)) + -1 * + var( + --of-input-container-prefix-border-width, + var(--of-input-container-affix-border-width) + ) ) ); } diff --git a/src/scss/components/_react-modal.scss b/src/scss/components/_react-modal.scss index 5d1d70707..35dc2e195 100644 --- a/src/scss/components/_react-modal.scss +++ b/src/scss/components/_react-modal.scss @@ -46,7 +46,9 @@ $modal-close-icon-offset: math.div($modal-padding, 2) !default; background: $modal-background; border: solid 1px #eee; outline: none; - box-shadow: 0 4px 8px 0 rgb(0 0 0 / 20%), 0 6px 20px 0 rgb(0 0 0 / 20%); + box-shadow: + 0 4px 8px 0 rgb(0 0 0 / 20%), + 0 6px 20px 0 rgb(0 0 0 / 20%); @include responsive(width, $value-mobile: 90vw, $value-tablet: null, $value-laptop: 50vw); @include responsive(min-height, $value-mobile: 20vh, $value-tablet: null, $value-laptop: 30vh); @@ -59,12 +61,14 @@ $modal-close-icon-offset: math.div($modal-padding, 2) !default; position: absolute; display: inline-block; top: calc( - $modal-close-icon-offset - var(--utrecht-button-padding-block-start) - - var(--_utrecht-button-border-width) + $modal-close-icon-offset - var(--utrecht-button-padding-block-start) - var( + --_utrecht-button-border-width + ) ); right: calc( - $modal-close-icon-offset - var(--utrecht-button-padding-inline-end) - - var(--_utrecht-button-border-width) + $modal-close-icon-offset - var(--utrecht-button-padding-inline-end) - var( + --_utrecht-button-border-width + ) ); inline-size: auto; cursor: pointer;