pleroma-fe

commit: 596a1e4961f32e1b09721c5a6dba0bbe75cd748f
parent b599407b6701f0c9824611ee0042a28a125166ad
Author: Henry Jameson <me@hjkos.com>
Date:   Sun, 29 Sep 2024 19:24:02 +0300

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

Diffstat:
M
src/components/component_preview/component_preview.vue
3
+++
M
src/components/select/select.vue
3
++-
M
src/components/shadow_control/shadow_control.js
8
++++++--

3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/components/component_preview/component_preview.vue b/src/components/component_preview/component_preview.vue
@@ -168,6 +168,7 @@
     }
 
     .preview-block {
+      background: var(--background, var(--bg));
       display: flex;
       justify-content: center;
       align-items: center;
@@ -178,6 +179,8 @@
       border-width: 0;
       border-style: solid;
       border-color: var(--border);
+      border-radius: var(--roundness);
+      box-shadow: var(--shadow);
     }
   }
 }
diff --git a/src/components/select/select.vue b/src/components/select/select.vue
@@ -61,12 +61,13 @@ label.Select {
   &:disabled {
     background-color: var(--background);
     opacity: 1; /* override browser */
+    color: var(--faint);
 
     select {
       &[multiple],
       &[size] {
         option.-active {
-          color: var(--text);
+          color: var(--faint);
           background: transparent;
         }
       }
diff --git a/src/components/shadow_control/shadow_control.js b/src/components/shadow_control/shadow_control.js
@@ -36,7 +36,7 @@ export default {
   props: [
     'modelValue', 'fallback', 'separateInset', 'noPreview', 'disabled'
   ],
-  emits: ['update:modelValue'],
+  emits: ['update:modelValue', 'subShadowSelected'],
   data () {
     return {
       selectedId: 0,
@@ -93,9 +93,13 @@ export default {
       }
     }
   },
+  watch: {
+    selected (value) {
+      this.$emit('subShadowSelected', this.selectedId)
+    }
+  },
   methods: {
     updateProperty: throttle(function (prop, value) {
-      console.log(prop, value)
       this.cValue[this.selectedId][prop] = value
       if (prop === 'inset' && value === false && this.separateInset) {
         this.cValue[this.selectedId].spread = 0