logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://anongit.hacktivis.me/git/pleroma-fe.git/
commit: b4a1bcd0707ba26c72411289b0a2e78a4396d142
parent f1468a3f5d5f2fd64e0310ea648cc8fa6d80325c
Author: Henry Jameson <me@hjkos.com>
Date:   Wed, 25 Sep 2024 23:20:31 +0300

Merge branch 'shadow-control-2.0' into themes3-grand-finale-maybe

Diffstat:

Msrc/components/shadow_control/shadow_control.js3+--
Msrc/components/shadow_control/shadow_control.scss8++++++++
Msrc/components/shadow_control/shadow_control.vue3++-
3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/components/shadow_control/shadow_control.js b/src/components/shadow_control/shadow_control.js @@ -34,12 +34,11 @@ const toModel = (object = {}) => ({ export default { props: [ - 'modelValue', 'fallback', 'separateInset' + 'modelValue', 'fallback', 'separateInset', 'noPreview' ], emits: ['update:modelValue'], data () { return { - lightGrid: false, selectedId: 0, // TODO there are some bugs regarding display of array (it's not getting updated when deleting for some reason) cValue: (this.modelValue ?? this.fallback ?? []).map(toModel) diff --git a/src/components/shadow_control/shadow_control.scss b/src/components/shadow_control/shadow_control.scss @@ -68,6 +68,14 @@ } } + &.-no-preview { + .shadow-tweak { + order: 0; + flex: 2 0 20em; + max-width: 100%; + } + } + .inset-alert { padding: 0.25em 0.5em; } diff --git a/src/components/shadow_control/shadow_control.vue b/src/components/shadow_control/shadow_control.vue @@ -1,9 +1,10 @@ <template> <div class="label shadow-control" - :class="{ disabled: !present }" + :class="{ disabled: !present, '-no-preview': noPreview }" > <ComponentPreview + v-if="!noPreview" class="shadow-preview" :shadow-control="true" :shadow="selected"