diff --git a/frontend/src/app/components/keyresult-detail/keyresult-detail.component.html b/frontend/src/app/components/keyresult-detail/keyresult-detail.component.html index b31b83d0bd..96b5c0fd93 100644 --- a/frontend/src/app/components/keyresult-detail/keyresult-detail.component.html +++ b/frontend/src/app/components/keyresult-detail/keyresult-detail.component.html @@ -8,7 +8,7 @@

{{ keyResult.title }}

-
+

{{ "KEY_RESULT_TYPE." + keyResult.keyResultType | translate }}

@@ -19,7 +19,7 @@

{{ owner.firstname }} {{ owner.lastname }}<

{{ quarter.label }}

-
+

Confidence

@@ -31,7 +31,7 @@

Confidence

-
+

@@ -83,8 +83,10 @@

Stretch

-
-

Letztes Check-in ({{ checkIn.createdOn | date: DATE_FORMAT }})

+
+

+ Letztes Check-in ({{ checkIn.createdOn | date: DATE_FORMAT }}) +

{{ checkIn.changeInfo }}

-
-
+
+

Beschrieb

{{ keyResult.description || "-" }}

@@ -112,7 +114,7 @@

Action Plan

checkbox - {{ action.action }} + {{ action.action }}
diff --git a/frontend/src/app/components/keyresult-detail/keyresult-detail.component.scss b/frontend/src/app/components/keyresult-detail/keyresult-detail.component.scss index b0c3a256fd..da200da15e 100644 --- a/frontend/src/app/components/keyresult-detail/keyresult-detail.component.scss +++ b/frontend/src/app/components/keyresult-detail/keyresult-detail.component.scss @@ -90,3 +90,7 @@ .action-list-checked-item { text-indent: -1.3rem; } + +.mb-2-rem { + margin-bottom: 2rem !important; +} diff --git a/frontend/src/app/components/keyresult/keyresult.component.html b/frontend/src/app/components/keyresult/keyresult.component.html index a39ba63848..4b03c588bc 100644 --- a/frontend/src/app/components/keyresult/keyresult.component.html +++ b/frontend/src/app/components/keyresult/keyresult.component.html @@ -5,7 +5,7 @@ class="key-result rounded-2 p-3 w-100 focus-outline" tabindex="0" > -

{{ keyResult.title }}

+

{{ keyResult.title }}

diff --git a/frontend/src/app/components/keyresult/keyresult.component.scss b/frontend/src/app/components/keyresult/keyresult.component.scss index 7bfb87d523..f99afa0e47 100644 --- a/frontend/src/app/components/keyresult/keyresult.component.scss +++ b/frontend/src/app/components/keyresult/keyresult.component.scss @@ -1,6 +1,6 @@ @import "../style/variables"; .key-result { - background-color: $dark-grey; + background-color: $soft-grey; border: 1px solid $dark-grey-border; word-wrap: break-word; diff --git a/frontend/src/app/components/overview/overview.component.html b/frontend/src/app/components/overview/overview.component.html index 9cfe539a04..7103ade284 100644 --- a/frontend/src/app/components/overview/overview.component.html +++ b/frontend/src/app/components/overview/overview.component.html @@ -7,7 +7,7 @@

Kein Team ausgewählt

- +
diff --git a/frontend/src/app/shared/sidepanel/sidepanel.component.scss b/frontend/src/app/shared/sidepanel/sidepanel.component.scss index e2ebee50f6..cc8b211b4b 100644 --- a/frontend/src/app/shared/sidepanel/sidepanel.component.scss +++ b/frontend/src/app/shared/sidepanel/sidepanel.component.scss @@ -1,6 +1,6 @@ @import "../style/variables"; .sidebar__content { - padding: 18px; + padding: 32px; } .sidepanel { diff --git a/frontend/src/assets/fonts/Roboto.scss b/frontend/src/assets/fonts/Roboto.scss index 9becdd1a28..2bc9790548 100644 --- a/frontend/src/assets/fonts/Roboto.scss +++ b/frontend/src/assets/fonts/Roboto.scss @@ -1,9 +1,9 @@ @font-face { - font-family: Roboto, sans-serif; + font-family: Roboto; font-display: swap; font-style: normal; - font-weight: 300; - src: url('./Roboto/Roboto-Regular.ttf') format('ttf'), - url('./Roboto/Roboto-Regular.woff2') format('woff2'), - url('./Roboto/Roboto-Regular.woff') format('woff'); + font-weight: 400; + src: url('./Roboto/RobotoFlex-Regular.ttf') format('ttf'), + url('./Roboto/RobotoFlex-Regular.woff2') format('woff2'), + url('./Roboto/RobotoFlex-Regular.woff') format('woff'); } diff --git a/frontend/src/assets/fonts/Roboto/RobotoFlex-Regular.ttf b/frontend/src/assets/fonts/Roboto/RobotoFlex-Regular.ttf new file mode 100644 index 0000000000..6cf3b2a47c Binary files /dev/null and b/frontend/src/assets/fonts/Roboto/RobotoFlex-Regular.ttf differ diff --git a/frontend/src/assets/fonts/Roboto/RobotoFlex-Regular.woff b/frontend/src/assets/fonts/Roboto/RobotoFlex-Regular.woff new file mode 100644 index 0000000000..838bd2d960 Binary files /dev/null and b/frontend/src/assets/fonts/Roboto/RobotoFlex-Regular.woff differ diff --git a/frontend/src/assets/fonts/Roboto/RobotoFlex-Regular.woff2 b/frontend/src/assets/fonts/Roboto/RobotoFlex-Regular.woff2 new file mode 100644 index 0000000000..d6b60c2a1c Binary files /dev/null and b/frontend/src/assets/fonts/Roboto/RobotoFlex-Regular.woff2 differ diff --git a/frontend/src/style/_variables.scss b/frontend/src/style/_variables.scss index 58c52163cb..3a0e3f75f6 100644 --- a/frontend/src/style/_variables.scss +++ b/frontend/src/style/_variables.scss @@ -5,6 +5,7 @@ $error: #ba3838; $eggshell: #f6f7f8; $light-grey: #f8f8f8; +$soft-grey: #f5f5f5; $dark-grey: #e5e8eb; $dark-grey-border: #5d6974; diff --git a/frontend/src/style/styles.scss b/frontend/src/style/styles.scss index 6ebff4ac77..130d3e4395 100644 --- a/frontend/src/style/styles.scss +++ b/frontend/src/style/styles.scss @@ -10,8 +10,8 @@ body.okr { margin: 0; padding: 0; background-color: $overview-bg; - font-family: Roboto, sans-serif; - --bs-body-font-family: Roboto, "Helvetica Neue", sans-serif; + font-family: "Roboto", sans-serif; + --bs-body-font-family: "Roboto", "Helvetica Neue", sans-serif; h1 { font-size: 1.5rem;