Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refresh the measurements page design a tad #839

Merged
merged 3 commits into from
Aug 25, 2023
Merged

Refresh the measurements page design a tad #839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ade858e
Refresh the measurements page design a tad
simenheg Aug 17, 2023
6732d39
Use Punkt typography classes directly
simenheg Aug 25, 2023
ead169f
Use the KPI details margin only on laptop size+
simenheg Aug 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/components/KpiDetails.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="kpi-details">
<header class="kpi-details__header">
<div>
<h2 class="title-1">{{ kpi.name }}</h2>
<h2 class="pkt-txt-30">{{ kpi.name }}</h2>
<pkt-button
v-if="hasEditRights"
skin="tertiary"
Expand All @@ -13,7 +13,7 @@
{{ $t('kpi.newValue') }}
</pkt-button>
</div>
<p v-if="kpi.description" class="description">{{ kpi.description }}</p>
<p v-if="kpi.description" class="pkt-txt-14-light">{{ kpi.description }}</p>
</header>

<widget-kpi-progress-graph :kpi="kpi" :progress="progress" :goals="goals" />
Expand Down Expand Up @@ -152,6 +152,12 @@ export default {
</script>

<style lang="scss" scoped>
@include bp('laptop-up') {
.kpi-details {
margin-left: 3rem;
}
}

.kpi-details__header {
gap: 0.25rem;
margin-bottom: 1rem;
Expand All @@ -165,7 +171,7 @@ export default {
white-space: nowrap;
}

.title-1 {
h2 {
margin: 0;
}

Expand Down
13 changes: 7 additions & 6 deletions src/components/KpiWidgetGroup.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div :class="['kpi-widget-group', { 'kpi-widget-group--compact': compact }]">
<div class="kpi-widget-group__title">
<h2>{{ title }}</h2>
<h2 class="pkt-txt-16">{{ title }}</h2>
<template v-if="!compact">
<span v-if="selectedPeriod.startDate && selectedPeriod.endDate">
{{ $t('general.period') }}: {{ periodDates(selectedPeriod) }}
Expand Down Expand Up @@ -151,8 +151,6 @@ export default {

h2 {
flex-grow: 1;
font-weight: 500;
font-size: typography.$font-size-3;
}

span {
Expand All @@ -177,17 +175,20 @@ export default {
border-color: var(--color-white);
}

::v-deep .widget__header h3 {
::v-deep .widget__header h3,
::v-deep .period-trend-tag__value {
color: var(--color-hover);
}
}

.kpi-card-widget {
&:hover {
background: var(--color-gray-light);
border-color: var(--color-gray);

::v-deep {
.widget__header h3 {
.widget__header h3,
.period-trend-tag__value {
color: var(--color-hover);
}

Expand All @@ -206,7 +207,7 @@ export default {
}

&--compact {
gap: 0.5rem;
gap: 0.125rem;
margin-bottom: 1rem;

.kpi-widget-group__title h2 {
Expand Down
2 changes: 1 addition & 1 deletion src/components/widgets/PeriodTrendTag.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ export default {
gap: 0.5rem;
align-items: center;
justify-content: space-around;
font-weight: 500;
font-weight: 400;
white-space: nowrap;

@include bp('phablet-up') {
Expand Down
8 changes: 3 additions & 5 deletions src/components/widgets/WidgetKpiProgressStats.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<widget>
<div class="progressStatistics">
<div>
<span class="progressStatistics__title">
<span class="progressStatistics__title pkt-txt-14">
<template v-if="latestProgressRecord">
{{
$t('kpi.latestValueTitle', {
Expand All @@ -22,7 +22,7 @@
</div>

<div v-if="goal">
<span class="progressStatistics__title">
<span class="progressStatistics__title pkt-txt-14">
{{
$t('kpi.goals.goalTitle', {
formattedDateRange: formatDateRange(goal.fromDate, goal.toDate),
Expand Down Expand Up @@ -154,9 +154,7 @@ export default {
}

&__title {
color: var(--color-grayscale-40);
font-weight: 500;
font-size: typography.$font-size-1;
color: var(--color-dark-blue);
}

&__value {
Expand Down
2 changes: 1 addition & 1 deletion src/components/widgets/WidgetWrapper.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
>
<slot v-if="$slots.header" name="header" />
<template v-else>
<h3 :class="size === 'small' ? 'pkt-txt-16-medium' : 'pkt-txt-18-medium'">
<h3 :class="size === 'small' ? 'pkt-txt-16' : 'pkt-txt-20'">
{{ title }}
</h3>
<div v-if="$slots['title-actions']" class="widget__actions">
Expand Down