diff --git a/src/components/KeyResultValuesList.vue b/src/components/KeyResultValuesList.vue
index ad897e57c..2299a5051 100644
--- a/src/components/KeyResultValuesList.vue
+++ b/src/components/KeyResultValuesList.vue
@@ -4,10 +4,8 @@
{{ $t('widget.history.value') }} |
- {{ $t('widget.history.date') }} |
+ {{ $t('general.details') }} |
{{ $t('widget.history.comment') }} |
- {{ $t('widget.history.changedBy') }} |
- |
@@ -16,17 +14,17 @@
{{ formatValue(record.value) }}
-
- {{ dateExtraShort(record.timestamp.toDate()) }}
+
+ {{ dateTimeShort(record.timestamp.toDate()) }}
+
+ {{ addedBy(record) }}
+
|
- {{ record.comment }}
- |
-
- {{ addedBy(record) }}
- |
-
+
+ {{ record.comment }}
+
import { mapGetters } from 'vuex';
-import { dateExtraShort } from '@/util';
+import { dateTimeShort } from '@/util';
import { formatValue } from '@/util/keyResultProgress';
import { PktButton } from '@oslokommune/punkt-vue2';
@@ -69,7 +67,7 @@ export default {
methods: {
formatValue,
- dateExtraShort,
+ dateTimeShort,
addedBy(record) {
const user = record.editedBy || record.createdBy;
@@ -97,51 +95,38 @@ export default {
th {
padding: 0 1rem;
text-align: left;
- @include get-text('pkt-txt-14-medium');
-
- &:nth-child(1),
- &:nth-child(2) {
- text-align: center;
- }
-
- &:nth-child(4) {
- @include table-cell-desktop-up;
- }
+ @include get-text('pkt-txt-12-medium');
}
td {
padding: 1rem;
text-align: left;
text-wrap: balance;
+ vertical-align: top;
background-color: var(--color-white);
- @include get-text('pkt-txt-14');
+ @include get-text('pkt-txt-14-light');
&:nth-child(1) {
- @include get-text('pkt-txt-16-bold');
- padding: 1rem 2rem;
- color: var(--color-yellow-100);
- text-align: center;
text-wrap: nowrap;
- background: var(--color-yellow-50);
+ border-left: 0.125rem solid var(--color-yellow-50);
}
&:nth-child(2) {
- padding-left: 2rem;
- text-align: center;
+ @include bp('phablet-up') {
+ min-width: 10rem;
+ }
}
&:nth-child(3) {
+ position: relative;
width: 100%;
white-space: pre-line;
- }
-
- &:nth-child(4) {
- @include table-cell-desktop-up;
- min-width: 10rem;
- }
- &:nth-child(5) {
- padding-left: 0;
+ .pkt-btn {
+ position: absolute;
+ top: 0.5rem;
+ right: 0.5rem;
+ }
}
}
}
diff --git a/src/styles/main.scss b/src/styles/main.scss
index 7a2edbd98..451db6587 100644
--- a/src/styles/main.scss
+++ b/src/styles/main.scss
@@ -114,7 +114,6 @@ body.using-mouse :not([class^='pkt-'], [class*=' pkt-']):focus {
--color-red-100: #4d0800;
--color-red-20: #fad0cb;
--color-yellow-70: #966a1c;
- --color-yellow-100: #4d3000;
// Colors in RGB value - add more if needed. SCSS rgba() function
// can read hex numbers with CSS Variables.
|