From 411546a6ab9efe872e559288d9420582a30e74ff Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 11 May 2026 10:37:44 +0300
Subject: [PATCH] move emoji picker's emoji button again

This partially reverts commit b8dabf3a6bf4ea1d49c2381612a090218200c316.
---
 src/components/emoji_input/emoji_input.vue    | 21 ++++++++-----------
 .../post_status_form/post_status_form.scss    | 11 +++++++---
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/components/emoji_input/emoji_input.vue b/src/components/emoji_input/emoji_input.vue
index dcf217abd..b362db32f 100644
--- a/src/components/emoji_input/emoji_input.vue
+++ b/src/components/emoji_input/emoji_input.vue
@@ -118,9 +118,10 @@
 
   .emoji-picker-icon {
     position: absolute;
-    top: 0;
+    bottom: 0;
     right: 0;
-    padding: 0.2em 0.25em;
+    height: 100%;
+    padding: 0 0.2em;
     font-size: 1.3em;
     cursor: pointer;
     line-height: 1.2em;
@@ -130,10 +131,11 @@
     }
   }
 
-  &.-textarea .emoji-picker-icon {
-    inset: auto;
-    bottom: 0;
-    left: 0;
+  &.-textarea {
+    .emoji-picker-icon {
+      height: auto;
+      padding: 0.2em;
+    }
   }
 
   .emoji-picker-panel {
@@ -157,16 +159,11 @@
     outline: none;
   }
 
-
   &.-with-picker {
+    textarea,
     input {
       padding-right: 2.4em;
     }
-
-    textarea {
-      padding-bottom: 0;
-      margin-bottom: 2.5em;
-    }
   }
 
   .hidden-overlay {
diff --git a/src/components/post_status_form/post_status_form.scss b/src/components/post_status_form/post_status_form.scss
index 077548d25..da8334d7c 100644
--- a/src/components/post_status_form/post_status_form.scss
+++ b/src/components/post_status_form/post_status_form.scss
@@ -208,11 +208,14 @@
     padding: 0;
   }
 
-  textarea.input.form-post-body {
+  .input.form-post-body {
     // TODO: make a resizable textarea component?
     box-sizing: content-box; // needed for easier computation of dynamic size
     overflow: hidden;
     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);
@@ -236,9 +239,11 @@
   .character-counter {
     position: absolute;
     bottom: 0;
-    right: 0;
+    right: 2.2em;
     padding: 0;
-    margin: 0 0.5em;
+    margin: 0;
+    line-height: 2.2em;
+    height: 2.2em;
 
     &.error {
       color: var(--cRed);