commit: 32ed09bae56a9a10e50906fc80cdd0f2357bceb3
parent 39c4672175f226a099872ea74131bab197be1828
Author: HJ <30-hj@users.noreply.git.pleroma.social>
Date: Tue, 15 Dec 2020 18:27:59 +0000
Merge branch 'prevent-textarea-resize-in-bio' into 'develop'
Disable horizontal textarea resize
Closes #741
See merge request pleroma/pleroma-fe!1312
Diffstat:
4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Changed
- Errors when fetching are now shown with popup errors instead of "Error fetching updates" in panel headers
- Made reply/fav/repeat etc buttons easier to hit
+- Disabled horizontal textarea resize
## [2.2.1] - 2020-11-11
diff --git a/src/App.scss b/src/App.scss
@@ -332,6 +332,10 @@ input, textarea, .select, .input {
box-sizing: border-box;
}
}
+
+ &.resize-height {
+ resize: vertical;
+ }
}
option {
diff --git a/src/components/settings_modal/tabs/filtering_tab.vue b/src/components/settings_modal/tabs/filtering_tab.vue
@@ -75,6 +75,7 @@
<p>{{ $t('settings.filtering_explanation') }}</p>
<textarea
id="muteWords"
+ class="resize-height"
v-model="muteWordsString"
/>
</div>
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
@@ -11,7 +11,7 @@
<input
id="username"
v-model="newName"
- classname="name-changer"
+ class="name-changer"
>
</EmojiInput>
<p>{{ $t('settings.bio') }}</p>
@@ -22,7 +22,7 @@
>
<textarea
v-model="newBio"
- classname="bio"
+ class="bio resize-height"
/>
</EmojiInput>
<p>