Skip to content

Commit

Permalink
Change font size
Browse files Browse the repository at this point in the history
  • Loading branch information
ManuelMoeri committed Nov 15, 2024
1 parent f89dd4f commit a35ffb5
Show file tree
Hide file tree
Showing 4 changed files with 142 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ <h3 class="fw-normal linebreak mb-3">{{ keyResult.title }}</h3>
<app-scoring [keyResult]="keyResult" [isDetail]="false" [attr.data-testId]="'scoring-component'"></app-scoring>
<div class="d-flex justify-content-between mt-2">
<div class="d-flex justify-content-center align-items-center flex-wrap">
<h5 class="text-nowrap me-2">Letztes Check-in</h5>
<h4 class="text-nowrap me-2">Letztes Check-in</h4>
<span class="keyResult-attribute-show">{{
keyResult.lastCheckIn == null ? "Keines" : (keyResult!.lastCheckIn!.createdOn | date: DATE_FORMAT)
}}</span>
</div>

<div class="d-flex align-items-center flex-wrap justify-content-end keyResult-overview-attribute">
<h5 class="me-2">Confidence</h5>
<h4 class="me-2">Confidence</h4>
<app-confidence
[edit]="false"
[isDetail]="false"
Expand Down
8 changes: 4 additions & 4 deletions frontend/src/app/shared/custom/scoring/scoring.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
<div class="scoring-container d-flex flex-row">
<div class="flex-fill">
<span class="okr-score-label">
<h4 class="text-center text-small">Fail</h4>
<h5 class="text-center text-small">Fail</h5>
</span>
<span class="okr-score-label okr-score-commit">
<h4 class="text-center text-small">Commit</h4>
<h5 class="text-center text-small">Commit</h5>
</span>
<span class="okr-score-label">
<h4 class="text-center text-small">Target</h4>
<h5 class="text-center text-small">Target</h5>
</span>
<div
[ngStyle]="{ display: stretched ? 'none' : 'flex' }"
Expand Down Expand Up @@ -40,7 +40,7 @@ <h4 class="text-center text-small">Target</h4>
</div>

<div class="okr-stretch d-flex flex-column align-items-center">
<h4 class="text-center stretch-label">Stretch</h4>
<h5 class="text-center stretch-label">Stretch</h5>
<img
[src]="'assets/icons/star-' + iconPath + '-icon.svg'"
[attr.data-testId]="'stretch'"
Expand Down
12 changes: 6 additions & 6 deletions frontend/src/style/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,35 +14,35 @@ body.okr {
--bs-body-font-family: "Roboto", "Helvetica Neue", sans-serif;

h1 {
font-size: 1.5rem;
font-size: 24px;
font-weight: 600;
}

h2 {
font-size: 1.25rem;
font-size: 21.5px;
font-weight: 600;
word-wrap: anywhere;
@extend .linebreak;
margin-bottom: 0;
}

h3 {
font-size: 1rem;
font-size: 19px;
font-weight: 600;
word-wrap: anywhere;
margin-bottom: 0;
}

h4 {
font-size: 0.875rem;
font-size: 16.5px;
font-weight: 400;
margin-bottom: 0;
}

h5 {
font-size: 0.875rem;
margin-bottom: 0;
font-size: 14px;
font-weight: 400;
margin-bottom: 0;
}

p {
Expand Down
130 changes: 130 additions & 0 deletions frontend/src/style/test.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
/* Custom eye 1 ---------------------------------------------------------------------------*/
h1 {
font-size: 1.5rem;
font-weight: 600;
}

h2 {
font-size: 1.25rem;
font-weight: 600;
word-wrap: anywhere;
@extend .linebreak;
margin-bottom: 0;
}

h3 {
font-size: 1rem;
font-weight: 600;
word-wrap: anywhere;
margin-bottom: 0;
}

h4 {
font-size: 0.875rem;
font-weight: 400;
margin-bottom: 0;
}

h5 {
font-size: 0.875rem;
margin-bottom: 0;
font-weight: 400;
}

/* Custom eye 2 ---------------------------------------------------------------------------*/
h1 {
font-size: 1.25rem;
font-weight: 600;
}

h2 {
font-size: 1.125rem;
font-weight: 600;
word-wrap: anywhere;
@extend .linebreak;
margin-bottom: 0;
}

h3 {
font-size: 1rem;
font-weight: 600;
word-wrap: anywhere;
margin-bottom: 0;
}

h4 {
font-size: 0.875rem;
font-weight: 400;
margin-bottom: 0;
}

h5 {
font-size: 0.875rem;
margin-bottom: 0;
font-weight: 400;
}

/*times 1.2x ---------------------------------------------------------------------------*/
h1 {
font-size: 24px;
font-weight: 600;
}

h2 {
font-size: 21.6px;
font-weight: 600;
word-wrap: anywhere;
@extend .linebreak;
margin-bottom: 0;
}

h3 {
font-size: 19.2px;
word-wrap: anywhere;
margin-bottom: 0;
}

h4 {
font-size: 16.8px;
font-weight: 400;
margin-bottom: 0;
}

h5 {
font-size: 12px;
margin-bottom: 0;
font-weight: 400;
}

/*Ladder: 2.5px ---------------------------------------------------------------------------*/
h1 {
font-size: 24px;
font-weight: 600;
}

h2 {
font-size: 21.5px;
font-weight: 600;
word-wrap: anywhere;
@extend .linebreak;
margin-bottom: 0;
}

h3 {
font-size: 19px;
font-weight: 600;
word-wrap: anywhere;
margin-bottom: 0;
}

h4 {
font-size: 16.5px;
font-weight: 400;
margin-bottom: 0;
}

h5 {
font-size: 14px;
font-weight: 400;
margin-bottom: 0;
}

0 comments on commit a35ffb5

Please sign in to comment.