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

Fix styling issues with the related-values display #21854

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
+30 −11
Open

Fix styling issues with the related-values display #21854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
328b3dc
change vertical padding to provide more space for render-template
formfcw Mar 14, 2024
fa43bdc
rename subdued to disabled and add pointer-events: none
formfcw Mar 14, 2024
0883c59
ensure correct alignment by setting .v-menu display to inline within …
formfcw Mar 14, 2024
c61c748
fix overlapping mouse-over issues within the render-template
formfcw Mar 14, 2024
05c2479
make height and padding of v-list-item.block more dynamic
formfcw Mar 14, 2024
cff5d8d
change vertical padding value to not conflict with dense listings
formfcw Mar 14, 2024
e4169e8
add changeset
formfcw Mar 14, 2024
5465a9e
apply prettier
formfcw Mar 15, 2024
8c4d31b
use existing vars for (vertical) padding
formfcw Apr 1, 2024
e7e5bbe
replace scss-vars with css vars
formfcw Apr 1, 2024
78f30f3
fix wrong css var
formfcw Apr 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/hip-jeans-fix.md
View file
Open in desktop
@@ -0,0 +1,5 @@
---

Check warning on line 1 in .changeset/hip-jeans-fix.md

View workflow job for this annotation

GitHub Actions / Lint 

File ignored by default.
'@directus/app': patch
---

Fixed styling issues with the related-values display
9 changes: 6 additions & 3 deletions app/src/components/v-list-item.vue
View file
Open in desktop
Expand Up @@ -258,7 +258,10 @@ function onClick(event: PointerEvent) {
&.block {
--v-icon-color: var(--v-icon-color, var(--theme--foreground-subdued));

padding: var(--v-list-item-padding, var(--theme--form--field--input--padding));
padding: var(
--v-list-item-padding,
calc(var(--theme--form--field--input--padding) / 2) var(--theme--form--field--input--padding)
);
position: relative;
display: flex;
height: var(--theme--form--field--input--height);
Expand Down Expand Up @@ -316,8 +319,8 @@ function onClick(event: PointerEvent) {
}

&.dense {
height: 44px;
padding: 4px 8px;
--theme--form--field--input--height: 44px;
padding: calc(var(--theme--form--field--input--padding) / 4) calc(var(--theme--form--field--input--padding) / 2);

& + & {
margin-top: var(--v-list-item-margin, 4px);
Expand Down
27 changes: 19 additions & 8 deletions app/src/displays/related-values/related-values.vue
View file
Open in desktop
Expand Up @@ -80,7 +80,7 @@ function getLinkForItem(item: any) {
:disabled="value?.length === 0"
>
<template #activator="{ toggle }">
<span class="toggle" :class="{ subdued: value?.length === 0 }" @click.stop="toggle">
<span class="toggle" :class="{ disabled: value?.length === 0 }" @click.stop="toggle">
<span class="label">
{{ value?.length }}
<template v-if="value?.length >= 100">+</template>
Expand Down Expand Up @@ -110,14 +110,16 @@ function getLinkForItem(item: any) {
<style lang="scss" scoped>
.toggle {
position: relative;
--toggle-px: 6px;
--toggle-py: 4px;

&::before {
position: absolute;
top: -6px;
left: -6px;
top: calc(-1 * var(--toggle-py));
left: calc(-1 * var(--toggle-px));
z-index: 1;
width: calc(100% + 12px);
height: calc(100% + 12px);
width: calc(100% + var(--toggle-px) * 2);
height: calc(100% + var(--toggle-py) * 2);
background-color: var(--theme--background-normal);
border-radius: var(--theme--border-radius);
opacity: 0;
Expand All @@ -130,17 +132,26 @@ function getLinkForItem(item: any) {
z-index: 2;
}

&:not(.subdued):hover::before {
&:not(.disabled):hover::before {
opacity: 1;
}

&:not(.subdued):active::before {
&:not(.disabled):active::before {
background-color: var(--theme--background-accent);
}

.render-template > .v-menu & {
margin: var(--toggle-py) var(--toggle-px);
}
}

.render-template > .v-menu {
display: inline;
}

.subdued {
.disabled {
color: var(--theme--foreground-subdued);
pointer-events: none;
}

.links {
Expand Down