diff --git a/src/components/BalanceCard.vue b/src/components/BalanceCard.vue index 88a026e3..8ec3e402 100644 --- a/src/components/BalanceCard.vue +++ b/src/components/BalanceCard.vue @@ -101,11 +101,11 @@ function signed(v: number): string { } :deep(.ring__value) { - font-size: 30px; + font-size: var(--absence-font-size-figure); } :deep(.ring__unit) { - font-size: 12px; + font-size: var(--font-size-small); } } @@ -113,7 +113,7 @@ function signed(v: number): string { .card__notice { flex-basis: 100%; margin: 0; - font-size: 0.85rem; + font-size: var(--font-size-small); text-align: end; color: var(--color-warning-text, var(--color-warning)); } @@ -126,7 +126,7 @@ function signed(v: number): string { // Push the ledger to the right edge of the card. margin-inline-start: auto; padding: 0; - font-size: 0.85rem; + font-size: var(--font-size-small); &__row { display: flex; @@ -144,7 +144,7 @@ function signed(v: number): string { } dt { - font-weight: normal; + font-weight: 400; text-align: start; } @@ -165,7 +165,7 @@ function signed(v: number): string { &--available { border-top: 1px solid var(--color-border); color: var(--color-main-text); - font-weight: 700; + font-weight: 600; dd { color: var(--type-color, var(--color-main-text)); diff --git a/src/components/BalanceRing.vue b/src/components/BalanceRing.vue index 99db94d0..dde1b18e 100644 --- a/src/components/BalanceRing.vue +++ b/src/components/BalanceRing.vue @@ -148,14 +148,14 @@ function format(v: number): string { } &__value { - font-size: 26px; - font-weight: 700; + font-size: var(--absence-font-size-figure); + font-weight: 600; text-anchor: middle; fill: var(--color-main-text); } &__unit { - font-size: 11px; + font-size: var(--font-size-small); text-anchor: middle; fill: var(--color-text-maxcontrast); } @@ -168,7 +168,7 @@ function format(v: number): string { } &__meta { - font-size: 0.82rem; + font-size: var(--font-size-small); color: var(--color-text-maxcontrast); } diff --git a/src/components/CoveragePanel.vue b/src/components/CoveragePanel.vue index c2e00b0e..b205b179 100644 --- a/src/components/CoveragePanel.vue +++ b/src/components/CoveragePanel.vue @@ -57,7 +57,7 @@ defineProps<{ &__title { margin: 0; - font-size: 0.95rem; + font-size: var(--default-font-size); } } diff --git a/src/components/DefaultEntitlementDialog.vue b/src/components/DefaultEntitlementDialog.vue index 6cdb41e5..df6d448a 100644 --- a/src/components/DefaultEntitlementDialog.vue +++ b/src/components/DefaultEntitlementDialog.vue @@ -102,8 +102,8 @@ async function apply(): Promise { } &__days { - font-size: 1.6rem; - font-weight: bold; + font-size: var(--absence-font-size-figure); + font-weight: 600; &--old { color: var(--color-text-maxcontrast); diff --git a/src/components/DonutChart.vue b/src/components/DonutChart.vue index 09796d51..d02db89e 100644 --- a/src/components/DonutChart.vue +++ b/src/components/DonutChart.vue @@ -141,18 +141,16 @@ function fmt(v: number): string { } &__total { - font-size: 26px; - font-weight: 700; + font-size: var(--absence-font-size-figure); + font-weight: 600; text-anchor: middle; fill: var(--color-main-text); } &__unit { - font-size: 11px; + font-size: var(--font-size-small); text-anchor: middle; fill: var(--color-text-maxcontrast); - text-transform: uppercase; - letter-spacing: 0.06em; } &__legend { @@ -168,7 +166,7 @@ function fmt(v: number): string { display: flex; align-items: center; gap: 8px; - font-size: 0.88rem; + font-size: var(--font-size-small); } } diff --git a/src/components/EmployeesJsonDialog.vue b/src/components/EmployeesJsonDialog.vue index 6046cb3d..8de086b3 100644 --- a/src/components/EmployeesJsonDialog.vue +++ b/src/components/EmployeesJsonDialog.vue @@ -302,7 +302,7 @@ async function apply() { border-radius: var(--border-radius-large); background: var(--color-background-hover); font-family: var(--font-face-monospace, monospace); - font-size: 0.85rem; + font-size: var(--font-size-small); overflow: hidden; } @@ -323,7 +323,7 @@ async function apply() { &--error { color: var(--color-error-text); - font-weight: bold; + font-weight: 600; } } @@ -372,11 +372,9 @@ async function apply() { } th { - font-size: 0.76rem; + font-size: var(--font-size-small); font-weight: 600; color: var(--color-text-maxcontrast); - text-transform: uppercase; - letter-spacing: 0.05em; } } diff --git a/src/components/EntitlementDialog.vue b/src/components/EntitlementDialog.vue index cfaaafcd..1cddb4a6 100644 --- a/src/components/EntitlementDialog.vue +++ b/src/components/EntitlementDialog.vue @@ -281,13 +281,13 @@ async function save() { } &__prorata-why { - font-size: 0.85rem; + font-size: var(--font-size-small); color: var(--color-text-maxcontrast); } &__hint { margin: -4px 0 0; - font-size: 0.85rem; + font-size: var(--font-size-small); color: var(--color-text-maxcontrast); } } @@ -299,7 +299,7 @@ async function save() { &__title { margin: 0 0 8px; - font-size: 0.9rem; + font-size: var(--default-font-size); color: var(--color-text-maxcontrast); } @@ -325,7 +325,7 @@ async function save() { flex: 0 0 auto; min-width: 3.2em; text-align: end; - font-weight: bold; + font-weight: 600; font-variant-numeric: tabular-nums; &--up { color: var(--color-success-text); } @@ -344,7 +344,7 @@ async function save() { &__meta, &__empty { - font-size: 0.85rem; + font-size: var(--font-size-small); color: var(--color-text-maxcontrast); } diff --git a/src/components/LeaveTypeChip.vue b/src/components/LeaveTypeChip.vue index a5cd938e..fa17b2a9 100644 --- a/src/components/LeaveTypeChip.vue +++ b/src/components/LeaveTypeChip.vue @@ -30,7 +30,7 @@ const type = computed(() => leaveTypesStore.leaveType(props.typeId)) gap: 6px; padding: 2px 10px; border-radius: var(--border-radius-pill, 16px); - font-size: 0.8rem; + font-size: var(--font-size-small); font-weight: 600; // The type colour is arbitrary (set by HR), so pull the text toward the // foreground colour for guaranteed contrast in both light and dark themes, diff --git a/src/components/RegionCodeField.vue b/src/components/RegionCodeField.vue index b9380984..f0455e42 100644 --- a/src/components/RegionCodeField.vue +++ b/src/components/RegionCodeField.vue @@ -261,7 +261,7 @@ function storeCode() { &__hint { color: var(--color-text-maxcontrast); - font-size: 0.9rem; + font-size: var(--font-size-small); margin: 8px 0; } } @@ -298,14 +298,14 @@ function storeCode() { align-items: center; gap: 8px; margin: 0 0 4px; - font-size: 1rem; + font-size: var(--default-font-size); font-weight: 600; } &__count { padding: 0 8px; border-radius: var(--border-radius-pill); - font-size: 0.85rem; + font-size: var(--font-size-small); } &__column--lost &__count { @@ -321,7 +321,7 @@ function storeCode() { &__year { margin: 8px 0 2px; color: var(--color-text-maxcontrast); - font-size: 0.8rem; + font-size: var(--font-size-small); font-weight: 600; } @@ -352,7 +352,7 @@ function storeCode() { &__tag { margin-inline-start: 4px; color: var(--color-text-maxcontrast); - font-size: 0.8rem; + font-size: var(--font-size-small); } } diff --git a/src/components/RegionReminderDialog.vue b/src/components/RegionReminderDialog.vue index 88ea6092..5e5ff640 100644 --- a/src/components/RegionReminderDialog.vue +++ b/src/components/RegionReminderDialog.vue @@ -208,7 +208,7 @@ async function send() { &__label { margin-bottom: 6px; color: var(--color-text-maxcontrast); - font-size: 0.85rem; + font-size: var(--font-size-small); } &__notification { @@ -247,7 +247,7 @@ async function send() { align-items: center; gap: 8px; margin: 0 0 8px; - font-size: 1rem; + font-size: var(--default-font-size); font-weight: 600; } @@ -255,7 +255,7 @@ async function send() { padding: 0 8px; border-radius: var(--border-radius-pill); background: var(--color-background-dark); - font-size: 0.85rem; + font-size: var(--font-size-small); &--send { color: var(--color-primary-element-text); @@ -285,18 +285,18 @@ async function send() { &__code { color: var(--color-text-maxcontrast); - font-size: 0.85rem; + font-size: var(--font-size-small); } &__when { color: var(--color-text-maxcontrast); - font-size: 0.85rem; + font-size: var(--font-size-small); } &__footer { margin: 0; color: var(--color-text-maxcontrast); - font-size: 0.9rem; + font-size: var(--font-size-small); } } diff --git a/src/components/RequestDialog.vue b/src/components/RequestDialog.vue index 5ea3f75f..b9b69cd8 100644 --- a/src/components/RequestDialog.vue +++ b/src/components/RequestDialog.vue @@ -1085,7 +1085,7 @@ async function submit() { &__label { font-weight: 600; - font-size: 0.9rem; + font-size: var(--default-font-size); } &__req { @@ -1093,14 +1093,14 @@ async function submit() { } &__optional { - font-weight: normal; - font-size: 0.8rem; + font-weight: 400; + font-size: var(--font-size-small); color: var(--color-text-maxcontrast); } &__hint { margin: 4px 0 0; - font-size: 0.8rem; + font-size: var(--font-size-small); color: var(--color-text-maxcontrast); } @@ -1134,13 +1134,13 @@ async function submit() { } &__count { - font-size: 1.8rem; + font-size: var(--absence-font-size-figure); font-weight: 600; color: var(--type-color); } &__caption { - font-size: 0.8rem; + font-size: var(--font-size-small); color: var(--color-text-maxcontrast); } @@ -1150,7 +1150,7 @@ async function submit() { flex-direction: column; align-items: flex-end; gap: 4px; - font-size: 0.85rem; + font-size: var(--font-size-small); color: var(--color-text-maxcontrast); } diff --git a/src/components/RequestSidebar.vue b/src/components/RequestSidebar.vue index 9c3a38e7..e17e3905 100644 --- a/src/components/RequestSidebar.vue +++ b/src/components/RequestSidebar.vue @@ -766,12 +766,12 @@ async function postComment() { dt { color: var(--color-text-maxcontrast); - font-size: 0.85rem; + font-size: var(--font-size-small); } dd { margin: 0; - font-weight: 500; + font-weight: 600; } &__decided { @@ -800,12 +800,12 @@ async function postComment() { &__title { margin: 0 0 6px; - font-size: 0.95rem; + font-size: var(--default-font-size); } &__hint { - font-weight: normal; - font-size: 0.75rem; + font-weight: 400; + font-size: var(--font-size-small); color: var(--color-text-maxcontrast); margin-inline-start: 6px; } @@ -835,7 +835,7 @@ async function postComment() { &__meta { color: var(--color-text-maxcontrast); - font-size: 0.8rem; + font-size: var(--font-size-small); flex-shrink: 0; } @@ -891,7 +891,7 @@ async function postComment() { display: flex; align-items: center; gap: 8px; - font-size: 0.85rem; + font-size: var(--font-size-small); } &__time { @@ -960,7 +960,7 @@ async function postComment() { } &__time { - font-size: 0.78rem; + font-size: var(--font-size-small); color: var(--color-text-maxcontrast); white-space: nowrap; } @@ -969,7 +969,7 @@ async function postComment() { display: flex; align-items: center; gap: 6px; - font-size: 0.85rem; + font-size: var(--font-size-small); color: var(--color-text-maxcontrast); margin-top: 2px; } @@ -979,7 +979,7 @@ async function postComment() { padding: 6px 10px; background: var(--color-background-hover); border-radius: var(--border-radius, 8px); - font-size: 0.88rem; + font-size: var(--font-size-small); white-space: pre-wrap; overflow-wrap: anywhere; } diff --git a/src/components/RequestStepper.vue b/src/components/RequestStepper.vue index e56da0ae..25da9104 100644 --- a/src/components/RequestStepper.vue +++ b/src/components/RequestStepper.vue @@ -104,7 +104,7 @@ const steps = computed(() => { } &__label { - font-size: 0.75rem; + font-size: var(--font-size-small); text-align: center; color: var(--color-text-maxcontrast); } diff --git a/src/components/StatTile.vue b/src/components/StatTile.vue index 3dcad1d7..d658e896 100644 --- a/src/components/StatTile.vue +++ b/src/components/StatTile.vue @@ -45,8 +45,8 @@ withDefaults(defineProps<{ } &__value { - font-size: 2rem; - font-weight: 700; + font-size: var(--absence-font-size-figure); + font-weight: 600; line-height: 1.1; color: var(--color-main-text); font-variant-numeric: tabular-nums; @@ -54,12 +54,12 @@ withDefaults(defineProps<{ &__label { color: var(--color-main-text); - font-size: 0.9rem; + font-size: var(--default-font-size); } &__caption { color: var(--color-text-maxcontrast); - font-size: 0.8rem; + font-size: var(--font-size-small); } } diff --git a/src/components/StatusChip.vue b/src/components/StatusChip.vue index bcc71712..cad4c9cd 100644 --- a/src/components/StatusChip.vue +++ b/src/components/StatusChip.vue @@ -29,7 +29,7 @@ const meta = computed(() => statusMeta(props.status)) gap: 4px; padding: 2px 10px; border-radius: var(--border-radius-pill, 16px); - font-size: 0.8rem; + font-size: var(--font-size-small); font-weight: 600; // Contrast-optimised text on a solid tinted background (not transparent), so // readability doesn't depend on whatever surface sits behind the chip. diff --git a/src/components/TeamTimeline.vue b/src/components/TeamTimeline.vue index 2a585c72..30d7cefb 100644 --- a/src/components/TeamTimeline.vue +++ b/src/components/TeamTimeline.vue @@ -319,7 +319,7 @@ $day-min-w: 24px; } &__month { - font-size: 1.1rem; + font-size: var(--default-font-size); min-width: 150px; text-align: center; } @@ -376,10 +376,8 @@ $day-min-w: 24px; border-inline-end: 1px solid var(--color-border); &--head { - font-size: 0.8rem; + font-size: var(--font-size-small); color: var(--color-text-maxcontrast); - text-transform: uppercase; - letter-spacing: 0.04em; } } @@ -414,7 +412,7 @@ $day-min-w: 24px; top: 50%; transform: translateY(-50%); text-align: center; - font-size: 0.72rem; + font-size: var(--font-size-small); color: var(--color-text-maxcontrast); &--today { @@ -457,7 +455,7 @@ $day-min-w: 24px; border-radius: var(--border-radius-pill, 14px); background: var(--pill); color: var(--pill-text, #fff); - font-size: 0.85rem; + font-size: var(--font-size-small); box-shadow: 0 1px 3px rgba(0, 0, 0, 0.18); overflow: hidden; z-index: 1; @@ -509,7 +507,7 @@ $day-min-w: 24px; display: flex; flex-wrap: wrap; gap: 14px; - font-size: 0.8rem; + font-size: var(--font-size-small); color: var(--color-text-maxcontrast); &__item { diff --git a/src/components/YearInReview.vue b/src/components/YearInReview.vue index 24b67f70..92831ba8 100644 --- a/src/components/YearInReview.vue +++ b/src/components/YearInReview.vue @@ -134,7 +134,7 @@ function format(v: number): string { &__title { margin: 0; - font-size: 1.1rem; + font-size: var(--default-font-size); } &__grid { @@ -151,7 +151,7 @@ function format(v: number): string { // One size for numbers and the month name, so values and labels line up. &__value { - font-size: calc(var(--default-font-size) * 1.6); + font-size: var(--absence-font-size-figure); font-weight: 600; line-height: 1.2; color: var(--color-main-text); @@ -163,7 +163,7 @@ function format(v: number): string { } &__label { - font-size: 0.82rem; + font-size: var(--font-size-small); color: var(--color-text-maxcontrast); } } diff --git a/src/styles/page.scss b/src/styles/page.scss index 58862fda..693c64ba 100644 --- a/src/styles/page.scss +++ b/src/styles/page.scss @@ -19,6 +19,22 @@ * `.app-absence .page`, so which one won would come down to stylesheet order. */ +/* + * The app's whole type scale. Nothing else sets a font size: page titles, one + * size for big figures, and Nextcloud's body and small sizes for everything + * else. Headings below the page title differ by weight, not size. On :root so + * dialogs, which render outside the app container, get them too. + */ +:root { + --absence-font-size-title: calc(var(--default-font-size) * 4 / 3); + --absence-font-size-figure: calc(var(--default-font-size) * 1.6); +} + +.app-absence :is(h2, h3, h4, h5, h6) { + font-size: var(--default-font-size); + font-weight: 600; +} + /* * Every view starts at the same left edge, the title included. The app-navigation * toggle floats over the top-left corner of the content, so the page keeps clear @@ -92,7 +108,7 @@ .page__title { margin: 0; - font-size: 1.6rem; + font-size: var(--absence-font-size-title); } .page__tools { @@ -137,7 +153,7 @@ .page__hint { margin: -12px 0 0; color: var(--color-text-maxcontrast); - font-size: 0.9rem; + font-size: var(--font-size-small); } /* @@ -167,11 +183,9 @@ th:last-child, td:last-child { padding-inline-end: 18px; } th { - font-size: 0.76rem; + font-size: var(--font-size-small); font-weight: 600; color: var(--color-text-maxcontrast); - text-transform: uppercase; - letter-spacing: 0.05em; white-space: nowrap; background: var(--color-background-hover); border-bottom-color: var(--color-border-dark, var(--color-border)); diff --git a/src/views/ApprovalsView.vue b/src/views/ApprovalsView.vue index b69b967a..72a5706d 100644 --- a/src/views/ApprovalsView.vue +++ b/src/views/ApprovalsView.vue @@ -145,7 +145,7 @@ async function reload(): Promise { .group__title { margin: 0 0 12px; - font-size: 1.1rem; + font-size: var(--default-font-size); } .list { diff --git a/src/views/HolidaysView.vue b/src/views/HolidaysView.vue index 6d05e72c..bc005243 100644 --- a/src/views/HolidaysView.vue +++ b/src/views/HolidaysView.vue @@ -547,7 +547,7 @@ function download(): void { &__region { font-variant-numeric: tabular-nums; - font-weight: bold; + font-weight: 600; } &__who { @@ -561,7 +561,7 @@ function download(): void { &__byline, &__when { color: var(--color-text-maxcontrast); - font-size: 0.85em; + font-size: var(--font-size-small); } &__when { diff --git a/src/views/MyLeave.vue b/src/views/MyLeave.vue index c3e1702f..243dc926 100644 --- a/src/views/MyLeave.vue +++ b/src/views/MyLeave.vue @@ -368,14 +368,12 @@ function celebrateNewApprovals(): void { } &__eyebrow { - font-size: 0.78rem; - text-transform: uppercase; - letter-spacing: 0.06em; + font-size: var(--font-size-small); color: var(--color-text-maxcontrast); } &__headline { - font-size: 1.25rem; + font-size: var(--default-font-size); // Proportional digits make a ticking clock jitter as the glyph widths change. &--ticking { @@ -385,7 +383,7 @@ function celebrateNewApprovals(): void { } &__sub { - font-size: 0.9rem; + font-size: var(--font-size-small); color: var(--color-text-maxcontrast); } } @@ -423,7 +421,7 @@ function celebrateNewApprovals(): void { .requests { &__title { margin: 0 0 12px; - font-size: 1.1rem; + font-size: var(--default-font-size); } &__list { diff --git a/src/views/ProfileView.vue b/src/views/ProfileView.vue index 1c137af3..d265d2eb 100644 --- a/src/views/ProfileView.vue +++ b/src/views/ProfileView.vue @@ -351,7 +351,7 @@ function onContractSaved(): void { h3 { margin: 0 0 10px; - font-size: 1.1rem; + font-size: var(--default-font-size); font-weight: 600; } @@ -366,7 +366,7 @@ function onContractSaved(): void { } &__figure { - font-size: 1.1rem; + font-size: var(--default-font-size); margin: 12px 0 4px; } diff --git a/src/views/hr/HrEmployees.vue b/src/views/hr/HrEmployees.vue index bbf6b77d..a48fb848 100644 --- a/src/views/hr/HrEmployees.vue +++ b/src/views/hr/HrEmployees.vue @@ -442,7 +442,7 @@ async function onSaved(): Promise { &__muted, &__note { color: var(--color-text-maxcontrast); - font-size: 0.85rem; + font-size: var(--font-size-small); } &__note { diff --git a/src/views/hr/HrInsights.vue b/src/views/hr/HrInsights.vue index fc8aacf0..62ae9fe8 100644 --- a/src/views/hr/HrInsights.vue +++ b/src/views/hr/HrInsights.vue @@ -379,7 +379,7 @@ function rateColor(rate: number): string { &__label { color: var(--color-text-maxcontrast); - font-size: 0.85rem; + font-size: var(--font-size-small); } &__select { @@ -407,13 +407,13 @@ function rateColor(rate: number): string { align-items: center; gap: 8px; margin: 0 0 4px; - font-size: 1.05rem; + font-size: var(--default-font-size); } &__lead { margin: 0 0 16px; color: var(--color-text-maxcontrast); - font-size: 0.88rem; + font-size: var(--font-size-small); max-width: 60ch; } } @@ -429,9 +429,7 @@ function rateColor(rate: number): string { } th { - font-size: 0.75rem; - text-transform: uppercase; - letter-spacing: 0.05em; + font-size: var(--font-size-small); color: var(--color-text-maxcontrast); font-weight: 600; } @@ -456,7 +454,7 @@ function rateColor(rate: number): string { display: inline-block; padding: 1px 8px; border-radius: var(--border-radius-pill, 999px); - font-size: 0.8rem; + font-size: var(--font-size-small); &--warn { background: color-mix(in srgb, var(--color-warning) 22%, transparent); @@ -473,7 +471,7 @@ function rateColor(rate: number): string { &__title { margin: 0 0 8px; - font-size: 0.95rem; + font-size: var(--default-font-size); } &__list { @@ -491,7 +489,7 @@ function rateColor(rate: number): string { padding: 8px 12px; border-radius: var(--border-radius, 8px); background: var(--color-background-hover); - font-size: 0.9rem; + font-size: var(--font-size-small); } } } @@ -509,8 +507,8 @@ function rateColor(rate: number): string { } &__value { - font-size: 2rem; - font-weight: 700; + font-size: var(--absence-font-size-figure); + font-weight: 600; line-height: 1.1; &--warn { diff --git a/src/views/hr/HrSettings.vue b/src/views/hr/HrSettings.vue index 82c74ad8..920dcc30 100644 --- a/src/views/hr/HrSettings.vue +++ b/src/views/hr/HrSettings.vue @@ -625,7 +625,7 @@ async function changeEmployeesGroup(): Promise { h3 { margin: 0; - font-size: 1.1rem; + font-size: var(--default-font-size); } &__title { @@ -678,12 +678,12 @@ async function changeEmployeesGroup(): Promise { &__hint { margin: 4px 0 0; color: var(--color-text-maxcontrast); - font-size: 0.9em; + font-size: var(--font-size-small); } &__muted { color: var(--color-text-maxcontrast); - font-size: 0.9em; + font-size: var(--font-size-small); } } diff --git a/src/views/hr/HrSickLeave.vue b/src/views/hr/HrSickLeave.vue index e424a5e4..25500db8 100755 --- a/src/views/hr/HrSickLeave.vue +++ b/src/views/hr/HrSickLeave.vue @@ -376,7 +376,7 @@ async function reload(): Promise { } .strong { - font-weight: bold; + font-weight: 600; } .opt { diff --git a/src/views/hr/HrStatistics.vue b/src/views/hr/HrStatistics.vue index bf722d28..3adf5e6a 100644 --- a/src/views/hr/HrStatistics.vue +++ b/src/views/hr/HrStatistics.vue @@ -368,7 +368,7 @@ async function reload(): Promise { &__caption { margin: 2px 0 12px; color: var(--color-text-maxcontrast); - font-size: 0.85rem; + font-size: var(--font-size-small); } &__list {