Merge branch 'develop' into dep-update

Reviewed-on: #398

.woodpecker.yml

@@ -48,8 +48,8 @@ steps:
     - SCW_DEFAULT_ORGANIZATION_ID
     commands:
       - apt-get update && apt-get install -y rclone wget zip
-      - wget https://github.com/scaleway/scaleway-cli/releases/download/v2.5.1/scaleway-cli_2.5.1_linux_amd64
-      - mv scaleway-cli_2.5.1_linux_amd64 scaleway-cli
+      - wget https://github.com/scaleway/scaleway-cli/releases/download/v2.30.0/scaleway-cli_2.30.0_linux_amd64
+      - mv scaleway-cli_2.30.0_linux_amd64 scaleway-cli
       - chmod +x scaleway-cli
       - ./scaleway-cli object config install type=rclone
       - zip akkoma-fe.zip -r dist
@@ -71,8 +71,8 @@ steps:
     - SCW_DEFAULT_ORGANIZATION_ID
     commands:
     - apt-get update && apt-get install -y rclone wget git zip
-    - wget https://github.com/scaleway/scaleway-cli/releases/download/v2.5.1/scaleway-cli_2.5.1_linux_amd64
-    - mv scaleway-cli_2.5.1_linux_amd64 scaleway-cli
+    - wget https://github.com/scaleway/scaleway-cli/releases/download/v2.30.0/scaleway-cli_2.30.0_linux_amd64
+    - mv scaleway-cli_2.30.0_linux_amd64 scaleway-cli
     - chmod +x scaleway-cli
     - ./scaleway-cli object config install type=rclone
     - cd docs
@@ -80,4 +80,4 @@ steps:
     - mkdocs build
     - zip -r docs.zip site/*
     - cd site
-    - rclone copy . scaleway:akkoma-docs/frontend/$CI_COMMIT_BRANCH/
+    - rclone copy . scaleway:akkoma-docs/frontend/$CI_COMMIT_BRANCH/ 

src/components/post_status_form/post_status_form.vue

@@ -190,6 +190,7 @@
         <div
           v-if="!disableScopeSelector"
           class="visibility-tray"
+          :class="{ 'visibility-tray-edit': isEdit }"
         >
           <scope-selector
             v-if="!disableVisibilitySelector"
@@ -200,47 +201,50 @@
           />
 
           <div
-            class="language-selector"
-          >
-            <Select
-              id="post-language"
-              v-model="newStatus.language"
-              class="form-control"
-            >
-              <option
-                v-for="language in postLanguageOptions"
-                :key="language.key"
-                :value="language.value"
+            class="format-selector-container">
+            <div
+              class="format-selector"
               >
-                {{ language.label }}
-              </option>
-            </Select>
-          </div>
-          <div
-            v-if="postFormats.length > 1"
-            class="text-format"
-          >
-            <Select
-              id="post-content-type"
-              v-model="newStatus.contentType"
-              class="form-control"
-            >
-              <option
-                v-for="postFormat in postFormats"
-                :key="postFormat"
-                :value="postFormat"
+              <Select
+                id="post-language"
+                v-model="newStatus.language"
+                class="form-control"
               >
-                {{ $t(`post_status.content_type["${postFormat}"]`) }}
-              </option>
-            </Select>
-          </div>
-          <div
-            v-if="postFormats.length === 1 && postFormats[0] !== 'text/plain'"
-            class="text-format"
-          >
-            <span class="only-format">
-              {{ $t(`post_status.content_type["${postFormats[0]}"]`) }}
-            </span>
+                <option
+                  v-for="language in postLanguageOptions"
+                  :key="language.key"
+                  :value="language.value"
+                >
+                  {{ language.label }}
+                </option>
+              </Select>
+            </div>
+            <div
+              v-if="postFormats.length > 1"
+              class="text-format format-selector"
+            >
+              <Select
+                id="post-content-type"
+                v-model="newStatus.contentType"
+                class="form-control"
+              >
+                <option
+                  v-for="postFormat in postFormats"
+                  :key="postFormat"
+                  :value="postFormat"
+                >
+                  {{ $t(`post_status.content_type["${postFormat}"]`) }}
+                </option>
+              </Select>
+            </div>
+            <div
+              v-if="postFormats.length === 1 && postFormats[0] !== 'text/plain'"
+              class="text-format format-selector"
+            >
+              <span class="only-format">
+                {{ $t(`post_status.content_type["${postFormats[0]}"]`) }}
+              </span>
+            </div>
           </div>
         </div>
       </div>
@@ -460,6 +464,10 @@
     align-items: baseline;
   }
 
+  .visibility-tray-edit {
+    justify-content: right;
+  }
+
   .visibility-notice.edit-warning {
     > :first-child {
       margin-top: 0;
@@ -470,6 +478,12 @@
     }
   }
 
+  .format-selector-container {
+    .format-selector {
+      display: inline-block;
+    }
+  }
+
   .media-upload-icon, .poll-icon, .emoji-icon, .spoiler-icon {
     font-size: 1.85em;
     line-height: 1.1;