From 69726895b11998172b9e1d02b45c0db5c6267d4b Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 14 Aug 2025 18:19:57 +0300
Subject: [PATCH 1/3] changelog

---
 changelog.d/visual.change | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 changelog.d/visual.change

diff --git a/changelog.d/visual.change b/changelog.d/visual.change
new file mode 100644
index 000000000..c2e743cd4
--- /dev/null
+++ b/changelog.d/visual.change
@@ -0,0 +1,4 @@
+Combined subject and content fields in post form (visually)
+Fixes for some elements not scaling with user UI scale
+Moved post form's emoji button into input field
+Minor visual changes and fixes

From 9f481052d074b17c1bb86809808f1cb3af5d24c4 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 14 Aug 2025 21:03:25 +0300
Subject: [PATCH 2/3] restore border for visibility notice

---
 src/components/post_status_form/post_status_form.scss | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/components/post_status_form/post_status_form.scss b/src/components/post_status_form/post_status_form.scss
index ac223edb1..f54edd00f 100644
--- a/src/components/post_status_form/post_status_form.scss
+++ b/src/components/post_status_form/post_status_form.scss
@@ -108,6 +108,12 @@
     align-items: baseline;
   }
 
+  .visibility-notice {
+    border: 1px solid var(--border);
+    border-radius: var(--roundness);
+    padding: 0.5em 1em
+  }
+
   .visibility-notice.edit-warning {
     > :first-child {
       margin-top: 0;

From 9b58b8c29048caf23467f5841e4bcd6f59b6e289 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 14 Aug 2025 23:15:06 +0300
Subject: [PATCH 3/3] better paddings

---
 src/components/post_status_form/post_status_form.scss | 5 +++++
 src/components/post_status_form/post_status_form.vue  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/post_status_form/post_status_form.scss b/src/components/post_status_form/post_status_form.scss
index f54edd00f..78b93fd28 100644
--- a/src/components/post_status_form/post_status_form.scss
+++ b/src/components/post_status_form/post_status_form.scss
@@ -201,6 +201,10 @@
     line-height: 1.85;
   }
 
+  .inputs-wrapper {
+    padding: 0;
+  }
+
   .input.form-post-body {
     // TODO: make a resizable textarea component?
     box-sizing: content-box; // needed for easier computation of dynamic size
@@ -208,6 +212,7 @@
     transition: min-height 200ms 100ms;
     // stock padding + 1 line of text (for counter)
     padding-bottom: calc(var(--_padding) + var(--post-line-height) * 1em);
+    padding-right: 1.5em;
     // two lines of text
     height: calc(var(--post-line-height) * 1em);
     min-height: calc(var(--post-line-height) * 1em);
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 37371f1de..f661a980d 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -156,7 +156,7 @@
             class="preview-status"
           />
         </div>
-        <div class="input">
+        <div class="input inputs-wrapper">
           <EmojiInput
             v-if="!disableSubject && (newStatus.spoilerText || alwaysShowSubject)"
             v-model="newStatus.spoilerText"