From c1a0e8bae3ea4f206326e172a036293aedf9c634 Mon Sep 17 00:00:00 2001 From: Okke Harsta Date: Sat, 7 Oct 2023 09:10:47 +0200 Subject: [PATCH] Added missing lcale --- client/src/components/RoleCard.scss | 4 ---- client/src/components/UnitHeader.scss | 3 +++ client/src/locale/en.js | 3 ++- client/src/locale/nl.js | 3 ++- client/src/styles/mixins.scss | 13 +++++++------ 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/client/src/components/RoleCard.scss b/client/src/components/RoleCard.scss index 7907dee2..53211045 100644 --- a/client/src/components/RoleCard.scss +++ b/client/src/components/RoleCard.scss @@ -60,10 +60,6 @@ margin-right: 25px; cursor: pointer; - @media (max-width: $medium) { - margin: 0 0 20px 0; - } - input[type=checkbox]:not(:checked) + label { cursor: pointer; background-color: white; diff --git a/client/src/components/UnitHeader.scss b/client/src/components/UnitHeader.scss index 91169055..129f1d87 100644 --- a/client/src/components/UnitHeader.scss +++ b/client/src/components/UnitHeader.scss @@ -95,6 +95,9 @@ gap: 20px; margin-left: 25px; + @media (max-width: $medium) { + margin-top: 20px; + } button { width: 100%; min-width: 150px; diff --git a/client/src/locale/en.js b/client/src/locale/en.js index dc22dc28..8e0b67ed 100644 --- a/client/src/locale/en.js +++ b/client/src/locale/en.js @@ -217,7 +217,8 @@ const en = { statuses: { all: "All ({{nbr}})", open: "Open", - accepted: "Accepted" + accepted: "Accepted", + expired: "Expired" } }, forms: { diff --git a/client/src/locale/nl.js b/client/src/locale/nl.js index a3365080..99fc84c6 100644 --- a/client/src/locale/nl.js +++ b/client/src/locale/nl.js @@ -217,7 +217,8 @@ const nl = { statuses: { all: "All ({{nbr}})", open: "Open", - accepted: "Accepted" + accepted: "Geaccepteerd", + expired: "Verlopen" } }, forms: { diff --git a/client/src/styles/mixins.scss b/client/src/styles/mixins.scss index f0345334..4cd0c242 100644 --- a/client/src/styles/mixins.scss +++ b/client/src/styles/mixins.scss @@ -29,20 +29,21 @@ display: grid; grid-template-columns: [first] 1fr [second] 1fr; - .input-field, .select-field, .date-field, .error-indication, .sds--checkbox-container { + .input-field, .select-field, .date-field, .error-indication, .sds--checkbox-container { grid-column-start: first; } - .input-field, .select-field, .date-field, .sds--checkbox-container{ + .input-field, .select-field, .date-field, .sds--checkbox-container { margin-top: 20px; } - .sds--checkbox-container { + .user-role .sds--checkbox-container { + margin-top: 0; @media (max-width: $medium) { - margin-top: 0; + margin-bottom: 20px; } - } + .actions { grid-column-start: first; margin-top: 30px; @@ -56,7 +57,7 @@ margin-left: 25px; } - button.sds--btn--delete, button.sds--btn--delete--secondary { + button.sds--btn--delete, button.sds--btn--delete--secondary { margin-right: auto; margin-left: 0; }