Merge branch 'fixes-roundup4' into shigusegubu-themes3

src/components/checkbox/checkbox.vue

@@ -85,6 +85,8 @@ export default {
     width: 1.2em;
     height: 1.2em;
     box-shadow: none;
+
+    --_shadow: var(--shadow);
   }
 
   &-indicator::before {
@@ -96,7 +98,7 @@ export default {
     width: 1.1em;
     height: 1.1em;
     border-radius: var(--roundness);
-    box-shadow: var(--shadow);
+    box-shadow: var(--_shadow);
     background-color: var(--background);
     vertical-align: top;
     text-align: center;

src/components/post_status_form/post_status_form.js

@@ -363,6 +363,12 @@ const PostStatusForm = {
       }
     },
     safeToSaveDraft () {
+      console.log('safe', (
+        this.newStatus.status ||
+        this.newStatus.spoilerText ||
+        this.newStatus.files?.length ||
+        this.newStatus.hasPoll
+      ) && this.saveable)
       return (
         this.newStatus.status ||
         this.newStatus.spoilerText ||

src/components/post_status_form/post_status_form.vue

@@ -334,22 +334,26 @@
                 class="dropdown-menu"
                 role="menu"
               >
-                <button
-                  v-if="!hideDraft || !disableDraft"
+                <div
                   class="menu-item dropdown-item"
-                  role="menu"
-                  :disabled="!safeToSaveDraft && saveable"
                   :class="{ disabled: !safeToSaveDraft }"
-                  @click.prevent="saveDraft"
-                  @click="close"
                 >
-                  <template v-if="closeable">
-                    {{ $t('post_status.save_to_drafts_and_close_button') }}
-                  </template>
-                  <template v-else>
-                    {{ $t('post_status.save_to_drafts_button') }}
-                  </template>
-                </button>
+                  <button
+                    v-if="!hideDraft || !disableDraft"
+                    class="main-button"
+                    role="menu"
+                    :disabled="!safeToSaveDraft"
+                    @click.prevent="saveDraft"
+                    @click="close"
+                  >
+                    <template v-if="closeable">
+                      {{ $t('post_status.save_to_drafts_and_close_button') }}
+                    </template>
+                    <template v-else>
+                      {{ $t('post_status.save_to_drafts_button') }}
+                    </template>
+                  </button>
+                </div>
               </div>
             </template>
           </Popover>

src/components/settings_modal/tabs/general_tab.vue

@@ -269,14 +269,17 @@
             {{ $t('settings.image_compression') }}
           </BooleanSetting>
         </li>
-        <li>
-          <BooleanSetting
-            path="alwaysUseJpeg"
-            expert="1"
-          >
-            {{ $t('settings.always_use_jpeg') }}
-          </BooleanSetting>
-        </li>
+        <ul class="setting-list suboptions">
+          <li>
+            <BooleanSetting
+              path="alwaysUseJpeg"
+              expert="1"
+              parent-path="imageCompression"
+            >
+              {{ $t('settings.always_use_jpeg') }}
+            </BooleanSetting>
+          </li>
+        </ul>
         <li>
           <BooleanSetting
             path="useContainFit"