From 476bf0afe1c890b0f08587b3942981c8c591c7be Mon Sep 17 00:00:00 2001
From: shpuld <shp@cock.li>
Date: Thu, 31 Jan 2019 17:00:31 +0200
Subject: Fix media timeline attachments being small by adding an option to not
 render background tabs in tab switcher

---
 src/components/user_settings/user_settings.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/components/user_settings/user_settings.vue')

diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue
index 253bbd34..993675ba 100644
--- a/src/components/user_settings/user_settings.vue
+++ b/src/components/user_settings/user_settings.vue
@@ -130,7 +130,7 @@
           <div class="setting-item">
             <h2>{{$t('settings.follow_import')}}</h2>
             <p>{{$t('settings.import_followers_from_a_csv_file')}}</p>
-            <form v-model="followImportForm">
+            <form>
               <input type="file" ref="followlist" v-on:change="followListChange"></input>
             </form>
             <i class=" icon-spin4 animate-spin uploading" v-if="followListUploading"></i>
-- 
cgit v1.2.3-70-g09d2


From 9eddaf6c3eebcae5b260c798385b09039e43e2d8 Mon Sep 17 00:00:00 2001
From: Joshua Burch <xruselfmadex@yahoo.com>
Date: Fri, 1 Feb 2019 16:12:14 -0500
Subject: fix #209 make name field length as wide as the bio field

---
 src/components/user_settings/user_settings.vue | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/components/user_settings/user_settings.vue')

diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue
index 993675ba..2a5af99c 100644
--- a/src/components/user_settings/user_settings.vue
+++ b/src/components/user_settings/user_settings.vue
@@ -179,5 +179,9 @@
     font-size: 1.5em;
     margin: 0.25em;
   }
+
+  .name-changer {
+    width: 100%;
+  }
 }
 </style>
-- 
cgit v1.2.3-70-g09d2


From d8ad494081d2e8fa7bfc0942f19e282186392bf5 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Sat, 2 Feb 2019 20:39:41 -0500
Subject: Add avatar size instruction notice

---
 src/components/user_settings/user_settings.vue | 1 +
 src/i18n/en.json                               | 1 +
 2 files changed, 2 insertions(+)

(limited to 'src/components/user_settings/user_settings.vue')

diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue
index 2a5af99c..82e1e56c 100644
--- a/src/components/user_settings/user_settings.vue
+++ b/src/components/user_settings/user_settings.vue
@@ -41,6 +41,7 @@
           </div>
           <div class="setting-item">
             <h2>{{$t('settings.avatar')}}</h2>
+            <p class="visibility-notice">{{$t('settings.avatar_size_instruction')}}</p>
             <p>{{$t('settings.current_avatar')}}</p>
             <img :src="user.profile_image_url_original" class="old-avatar"></img>
             <p>{{$t('settings.set_new_avatar')}}</p>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index b1356aaa..4b36db5a 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -118,6 +118,7 @@
     "delete_account_description": "Permanently delete your account and all your messages.",
     "delete_account_error": "There was an issue deleting your account. If this persists please contact your instance administrator.",
     "delete_account_instructions": "Type your password in the input below to confirm account deletion.",
+    "avatar_size_instruction": "The recommended minimum size for avatar images is 150x150 pixels.",
     "export_theme": "Save preset",
     "filtering": "Filtering",
     "filtering_explanation": "All statuses containing these words will be muted, one per line",
-- 
cgit v1.2.3-70-g09d2