Merge branch 'profile-overhaul' into shigusegubu-themes3

src/components/settings_modal/tabs/general_tab.vue

@@ -69,6 +69,22 @@
             {{ $t('settings.user_popover_avatar_overlay') }}
           </BooleanSetting>
         </li>
+        <li>
+          <BooleanSetting
+            path="userCardLeftJustify"
+            expert="1"
+          >
+            {{ $t('settings.user_card_left_justify') }}
+          </BooleanSetting>
+        </li>
+        <li>
+          <BooleanSetting
+            path="userCardHidePersonalMarks"
+            expert="1"
+          >
+            {{ $t('settings.user_card_hide_personal_marks') }}
+          </BooleanSetting>
+        </li>
         <li>
           <BooleanSetting
             path="alwaysShowNewPostButton"

src/components/user_card/user_card.scss

@@ -6,6 +6,12 @@
     padding-bottom: 0;
   }
 
+  .user-card-bio {
+    &.-justify-left {
+      text-align: start;
+    }
+  }
+
   &:hover {
     --_still-image-img-visibility: visible;
     --_still-image-canvas-visibility: hidden;

src/components/user_card/user_card.vue

@@ -236,7 +236,7 @@
         </div>
       </div>
     </div>
-    <div class="personal-marks" v-if="loggedIn && isOtherUser && (hasNote || !hideBio)">
+    <div class="personal-marks" v-if="loggedIn && isOtherUser && (hasNote || !hideBio) && !mergedConfig.userCardHidePersonalMarks">
       <UserNote
         v-if="hasNote || (hasNoteEditor && supportsNote)"
         :user="user"
@@ -281,6 +281,7 @@
     <RichContent
       v-if="!hideBio"
       class="user-card-bio"
+      :class="{ '-justify-left': mergedConfig.userCardLeftJustify }"
       :html="user.description_html"
       :emoji="user.emoji"
       :handle-links="true"

src/components/user_popover/user_popover.vue

@@ -26,7 +26,9 @@
 <style lang="scss">
 /* popover styles load on-demand, so we need to override */
 /* stylelint-disable block-no-empty */
-.user-popover{
+.user-popover {
+  margin-bottom: 0.6em;
+
   .user-card-inner {
     display: flex;
   }

src/i18n/en.json

@@ -797,6 +797,8 @@
     "user_popover_avatar_action_close": "Close the popover",
     "user_popover_avatar_action_open": "Open profile",
     "user_popover_avatar_overlay": "Show user popover over user avatar",
+    "user_card_left_justify": "Justify user bio to the left",
+    "user_card_hide_personal_marks": "Hide personal marks (highlight/note) in user profiles",
     "fun": "Fun",
     "greentext": "Meme arrows",
     "show_yous": "Show (You)s",

src/modules/default_config_state.js

@@ -126,6 +126,8 @@ export const defaultState = {
   showScrollbars: false,
   userPopoverAvatarAction: 'open',
   userPopoverOverlay: false,
+  userCardLeftJustify: false,
+  userCardHidePersonalMarks: false,
   sidebarColumnWidth: '25rem',
   contentColumnWidth: '45rem',
   notifsColumnWidth: '25rem',