pleroma-fe

commit: 54c740c2525368ac5bbd8162c45555d6e2443955
parent 707ed633e48047fa6b2478a3d3d8ae42a366dc8f
Author: Henry Jameson <me@hjkos.com>
Date:   Tue,  8 Oct 2024 22:25:55 +0300

layout

Diffstat:
M
src/components/select/select.vue
1
+
M
src/components/settings_modal/tabs/style_tab/style_tab.js
11
+++++++++--
M
src/components/settings_modal/tabs/style_tab/style_tab.scss
18
+++++++++++-------
M
src/components/settings_modal/tabs/style_tab/style_tab.vue
7
+++++++
M
src/components/shadow_control/shadow_control.scss
2
--
M
src/i18n/en.json
1
+

6 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/src/components/select/select.vue b/src/components/select/select.vue
@@ -49,6 +49,7 @@ label.Select {
       option {
         background-color: transparent;
 
+        &:checked,
         &.-active {
           color: var(--selectionText);
           background-color: var(--selectionBackground);
diff --git a/src/components/settings_modal/tabs/style_tab/style_tab.js b/src/components/settings_modal/tabs/style_tab/style_tab.js
@@ -33,7 +33,13 @@ import {
 } from 'src/services/export_import/export_import.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
-import { faFloppyDisk, faFolderOpen, faFile, faArrowsRotate } from '@fortawesome/free-solid-svg-icons'
+import {
+  faFloppyDisk,
+  faFolderOpen,
+  faFile,
+  faArrowsRotate,
+  faCheck
+} from '@fortawesome/free-solid-svg-icons'
 
 // helper for debugging
 // eslint-disable-next-line no-unused-vars
@@ -46,7 +52,8 @@ library.add(
   faFile,
   faFloppyDisk,
   faFolderOpen,
-  faArrowsRotate
+  faArrowsRotate,
+  faCheck
 )
 
 export default {
diff --git a/src/components/settings_modal/tabs/style_tab/style_tab.scss b/src/components/settings_modal/tabs/style_tab/style_tab.scss
@@ -66,14 +66,14 @@
     &.heading {
       display: grid;
       grid-template:
-        "meta meta preview"
-        "meta meta preview"
-        "meta meta preview"
-        "meta meta preview"
-        "new  new  preview"
-        "load save refresh";
+        "meta meta preview preview"
+        "meta meta preview preview"
+        "meta meta preview preview"
+        "meta meta preview preview"
+        "new  new  preview preview"
+        "load save refresh apply";
       grid-gap: 0.5em;
-      grid-template-columns: min-content min-content 6fr;
+      grid-template-columns: min-content min-content 6fr max-content;
       grid-template-rows: repeat(4, min-content) repeat(2, 2em);
 
       ul.setting-list {
@@ -116,6 +116,10 @@
       .button-refresh {
         grid-area: refresh;
       }
+
+      .button-apply {
+        grid-area: apply;
+      }
     }
   }
 
diff --git a/src/components/settings_modal/tabs/style_tab/style_tab.vue b/src/components/settings_modal/tabs/style_tab/style_tab.vue
@@ -39,6 +39,13 @@
         <FAIcon icon="arrows-rotate" />
         {{ $t('settings.style.themes3.editor.refresh_preview') }}
       </button>
+      <button
+        class="btn button-default button-apply"
+        @click="applyTheme"
+      >
+        <FAIcon icon="check" />
+        {{ $t('settings.style.themes3.editor.apply_preview') }}
+      </button>
       <ul class="setting-list style-metadata">
         <li>
           <StringSetting class="meta-field" v-model="name">
diff --git a/src/components/shadow_control/shadow_control.scss b/src/components/shadow_control/shadow_control.scss
@@ -5,8 +5,6 @@
   grid-template-areas: "selector preview tweak";
   grid-gap: 0.5em;
   justify-content: stretch;
-  margin-bottom: 1em;
-  width: 100%;
 
   &.-compact {
     grid-template-columns: 10em 1fr;
diff --git a/src/i18n/en.json b/src/i18n/en.json
@@ -800,6 +800,7 @@
           "include_in_rule": "Add to rule",
           "test_string": "TEST",
           "refresh_preview": "Refresh preview",
+          "apply_preview": "Apply",
           "text_auto": {
             "label": "Auto-contrast",
             "no-preserve": "Black or White",