From 4b7f751a861dac32cfafff95dba1969fd0594cbe Mon Sep 17 00:00:00 2001 From: Nitwel Date: Fri, 2 Oct 2020 14:56:34 +0200 Subject: [PATCH 1/9] added subdued prop --- app/src/components/v-list/v-list-item.vue | 39 +++++++++++++++++-- .../docs/components/navigation-item.vue | 8 +++- 2 files changed, 42 insertions(+), 5 deletions(-) diff --git a/app/src/components/v-list/v-list-item.vue b/app/src/components/v-list/v-list-item.vue index 5d442c023d..94113c1ef0 100644 --- a/app/src/components/v-list/v-list-item.vue +++ b/app/src/components/v-list/v-list-item.vue @@ -14,6 +14,7 @@ 'one-line': lines === 1, disabled, dashed, + subdued, }" :href="href" :download="download" @@ -34,6 +35,10 @@ export default defineComponent({ type: Boolean, default: false, }, + subdued: { + type: Boolean, + default: false, + }, lines: { type: Number as PropType<1 | 2 | 3>, default: null, @@ -147,18 +152,18 @@ body { transition-property: background-color, color; user-select: none; - &:not(.disabled):hover { + &:not(.disabled):not(.subdued):hover { color: var(--v-list-item-color-hover); background-color: var(--v-list-item-background-color-hover); } - &:not(.disabled):active { + &:not(.disabled):not(.subdued):active { color: var(--v-list-item-color-active); background-color: var(--v-list-item-background-color-active); } } - &.active { + &:not(.subdued).active { color: var(--v-list-item-color-active); background-color: var(--v-list-item-background-color-active); } @@ -169,6 +174,19 @@ body { cursor: not-allowed; } + &.subdued { + ::v-deep .v-list-item-title { + color: var(--foreground-subdued); + } + + &:hover, + &.active { + ::v-deep .v-list-item-title { + color: var(--primary); + } + } + } + @at-root { .v-list, #{$this}, @@ -204,7 +222,7 @@ body { } .v-list.nav { - & #{$this} { + #{$this} { --v-list-item-padding: 0 8px; --v-list-item-border-radius: 4px; &:not(:last-child):not(:only-child) { @@ -213,9 +231,22 @@ body { } &.dense #{$this}, #{$this}.dense { + --v-list-item-min-height: var(--v-list-item-one-line-min-height-dense); + + margin: var(--v-list-item-margin-dense); + padding: var(--v-list-item-padding-dense); &:not(:last-child):not(:only-child) { --v-list-item-margin-bottom: 4px; } + &.one-line { + --v-list-item-min-height: var(--v-list-item-one-line-min-height-dense); + } + &.two-line { + --v-list-item-min-height: var(--v-list-item-two-line-min-height-dense); + } + &.three-line { + --v-list-item-min-height: var(--v-list-item-three-line-min-height-dense); + } } } } diff --git a/app/src/modules/docs/components/navigation-item.vue b/app/src/modules/docs/components/navigation-item.vue index 4a2fc16be6..b56d22919e 100644 --- a/app/src/modules/docs/components/navigation-item.vue +++ b/app/src/modules/docs/components/navigation-item.vue @@ -1,5 +1,5 @@ @@ -45,6 +47,10 @@ export default defineComponent({ type: Boolean, default: false, }, + subdued: { + type: Boolean, + default: false, + }, }, }); From de55e1a18e2311e132e48fe98592a4dc0d773de6 Mon Sep 17 00:00:00 2001 From: Nitwel Date: Mon, 5 Oct 2020 18:13:56 +0200 Subject: [PATCH 2/9] Update props of v-list --- .../v-field-select/v-field-select.vue | 2 +- .../v-field-template/v-field-template.vue | 2 +- app/src/components/v-form/form-field-menu.vue | 2 +- .../components/v-list/v-list-item-content.vue | 4 +- .../components/v-list/v-list-item-hint.vue | 34 ++++---- .../components/v-list/v-list-item-icon.vue | 34 ++++---- app/src/components/v-list/v-list-item.vue | 81 +++++++------------ app/src/components/v-list/v-list.vue | 11 +-- app/src/components/v-select/v-select.vue | 2 +- app/src/components/v-tabs/v-tabs.vue | 2 +- .../related-values/related-values.vue | 2 +- app/src/interfaces/file/file.vue | 2 +- .../interfaces/many-to-one/many-to-one.vue | 2 +- app/src/interfaces/user/user.vue | 2 +- app/src/layouts/cards/components/header.vue | 2 +- .../activity/components/navigation.vue | 2 +- .../components/navigation-bookmark.vue | 2 +- .../collections/components/navigation.vue | 2 +- .../modules/docs/components/navigation.vue | 2 +- .../files/components/folder-picker.vue | 2 +- .../files/components/navigation-folder.vue | 2 +- .../modules/files/components/navigation.vue | 2 +- .../settings/components/navigation.vue | 2 +- .../components/collection-options.vue | 2 +- .../field-detail/components/languages.vue | 2 +- .../components/relationship-m2m.vue | 8 +- .../components/relationship-m2o.vue | 2 +- .../components/relationship-o2m.vue | 4 +- .../field-detail/components/translations.vue | 8 +- .../fields/components/field-select.vue | 4 +- .../fields/components/fields-management.vue | 2 +- .../permissions-overview-toggle.vue | 2 +- .../modules/users/components/navigation.vue | 2 +- .../comment-item-header.vue | 2 +- .../filter-drawer-detail/field-filter.vue | 2 +- .../filter-drawer-detail.vue | 2 +- .../components/image-editor/image-editor.vue | 2 +- .../revisions-modal-picker.vue | 2 +- .../components/save-options/save-options.vue | 2 +- 39 files changed, 111 insertions(+), 137 deletions(-) diff --git a/app/src/components/v-field-select/v-field-select.vue b/app/src/components/v-field-select/v-field-select.vue index 9fba4853dc..2f5ffc57f2 100644 --- a/app/src/components/v-field-select/v-field-select.vue +++ b/app/src/components/v-field-select/v-field-select.vue @@ -22,7 +22,7 @@ - + - + diff --git a/app/src/components/v-form/form-field-menu.vue b/app/src/components/v-form/form-field-menu.vue index b48830a569..125393e8ed 100644 --- a/app/src/components/v-form/form-field-menu.vue +++ b/app/src/components/v-form/form-field-menu.vue @@ -1,5 +1,5 @@