logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://anongit.hacktivis.me/git/pleroma-fe.git/
commit: 2bd16bedcea4cef113c008bd6368f1094c808b3a
parent cf7fab71036cd72abe6df4d68f7ac499626e27e7
Author: Pleroma User <66706-pleromian@users.noreply.git.pleroma.social>
Date:   Tue, 22 Oct 2024 08:24:06 +0000

Markup inconsistencies

Diffstat:

Achangelog.d/misc-markup.fix1+
Achangelog.d/user-link.add1+
Msrc/components/announcements_page/announcements_page.vue4++--
Msrc/components/bookmark_folder_edit/bookmark_folder_edit.vue4++--
Msrc/components/bookmark_folders/bookmark_folders.vue4++--
Msrc/components/chat_list/chat_list.vue4++--
Msrc/components/conversation/conversation.vue4+++-
Msrc/components/dialog_modal/dialog_modal.vue4++--
Msrc/components/edit_status_modal/edit_status_modal.vue4+++-
Msrc/components/features_panel/features_panel.vue4++--
Msrc/components/follow_requests/follow_requests.vue4++--
Msrc/components/interactions/interactions.vue4++--
Msrc/components/lists/lists.vue4+++-
Msrc/components/login_form/login_form.vue2+-
Msrc/components/mfa_form/recovery_form.vue4+++-
Msrc/components/mfa_form/totp_form.vue4+++-
Msrc/components/mobile_nav/mobile_nav.vue4++--
Msrc/components/notifications/notifications.vue4++--
Msrc/components/password_reset/password_reset.vue4+++-
Msrc/components/post_status_modal/post_status_modal.vue4+++-
Msrc/components/registration/registration.vue4+++-
Msrc/components/remote_user_resolver/remote_user_resolver.vue4+++-
Msrc/components/search/search.vue4++--
Msrc/components/settings_modal/settings_modal.vue4++--
Msrc/components/settings_modal/tabs/theme_tab/theme_preview.vue4++--
Msrc/components/shout_panel/shout_panel.vue4++--
Msrc/components/status_history_modal/status_history_modal.vue4+++-
Msrc/components/timeline_menu/timeline_menu.vue4++--
Msrc/components/update_notification/update_notification.vue4++--
Msrc/components/user_link/user_link.vue20++++++++++++--------
Msrc/components/user_profile/user_profile.vue4++--
Msrc/components/user_reporting_modal/user_reporting_modal.vue2+-
Msrc/components/who_to_follow/who_to_follow.vue4+++-
Msrc/components/who_to_follow_panel/who_to_follow_panel.vue4++--
Msrc/panel.scss2++
35 files changed, 87 insertions(+), 57 deletions(-)

diff --git a/changelog.d/misc-markup.fix b/changelog.d/misc-markup.fix @@ -0,0 +1 @@ +Fix small markup inconsistencies diff --git a/changelog.d/user-link.add b/changelog.d/user-link.add @@ -0,0 +1 @@ +Make UserLink wrappable diff --git a/src/components/announcements_page/announcements_page.vue b/src/components/announcements_page/announcements_page.vue @@ -1,9 +1,9 @@ <template> <div class="panel panel-default announcements-page"> <div class="panel-heading"> - <span> + <h1 class="title"> {{ $t('announcements.page_header') }} - </span> + </h1> </div> <div class="panel-body"> <section diff --git a/src/components/bookmark_folder_edit/bookmark_folder_edit.vue b/src/components/bookmark_folder_edit/bookmark_folder_edit.vue @@ -13,7 +13,7 @@ icon="chevron-left" /> </button> - <div class="title"> + <h1 class="title"> <i18n-t v-if="id" keypath="bookmark_folders.editing_folder" @@ -26,7 +26,7 @@ v-else keypath="bookmark_folders.creating_folder" /> - </div> + </h1> </div> <div class="panel-body"> <div class="input-wrap"> diff --git a/src/components/bookmark_folders/bookmark_folders.vue b/src/components/bookmark_folders/bookmark_folders.vue @@ -1,9 +1,9 @@ <template> <div class="Bookmark-folders panel panel-default"> <div class="panel-heading"> - <div class="title"> + <h1 class="title"> {{ $t('nav.bookmark_folders') }} - </div> + </h1> <router-link :to="{ name: 'bookmark-folder-new' }" class="button-default btn new-folder-button" diff --git a/src/components/chat_list/chat_list.vue b/src/components/chat_list/chat_list.vue @@ -7,9 +7,9 @@ class="chat-list panel panel-default" > <div class="panel-heading -sticky"> - <span class="title"> + <h1 class="title"> {{ $t("chats.chats") }} - </span> + </h1> <button class="button-default" @click="newChat" diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue @@ -9,7 +9,9 @@ v-if="isExpanded" class="panel-heading conversation-heading -sticky" > - <span class="title"> {{ $t('timeline.conversation') }} </span> + <h1 class="title"> + {{ $t('timeline.conversation') }} + </h1> <button v-if="collapsable" class="button-unstyled -link" diff --git a/src/components/dialog_modal/dialog_modal.vue b/src/components/dialog_modal/dialog_modal.vue @@ -8,9 +8,9 @@ @click.stop="" > <div class="panel-heading dialog-modal-heading"> - <div class="title"> + <h1 class="title"> <slot name="header" /> - </div> + </h1> </div> <div class="panel-body dialog-modal-content"> <slot name="default" /> diff --git a/src/components/edit_status_modal/edit_status_modal.vue b/src/components/edit_status_modal/edit_status_modal.vue @@ -6,7 +6,9 @@ > <div class="edit-form-modal-panel panel"> <div class="panel-heading"> - {{ $t('post_status.edit_status') }} + <h1 class="title"> + {{ $t('post_status.edit_status') }} + </h1> </div> <PostStatusForm class="panel-body" diff --git a/src/components/features_panel/features_panel.vue b/src/components/features_panel/features_panel.vue @@ -2,9 +2,9 @@ <div class="features-panel"> <div class="panel panel-default base01-background"> <div class="panel-heading timeline-heading base02-background base04"> - <div class="title"> + <h1 class="title"> {{ $t('features_panel.title') }} - </div> + </h1> </div> <div class="panel-body features-panel"> <ul> diff --git a/src/components/follow_requests/follow_requests.vue b/src/components/follow_requests/follow_requests.vue @@ -1,9 +1,9 @@ <template> <div class="settings panel panel-default"> <div class="panel-heading"> - <div class="title"> + <h1 class="title"> {{ $t('nav.friend_requests') }} - </div> + </h1> </div> <div class="panel-body"> <FollowRequestCard diff --git a/src/components/interactions/interactions.vue b/src/components/interactions/interactions.vue @@ -1,9 +1,9 @@ <template> <div class="panel panel-default"> <div class="panel-heading"> - <div class="title"> + <h1 class="title"> {{ $t("nav.interactions") }} - </div> + </h1> </div> <tab-switcher ref="tabSwitcher" diff --git a/src/components/lists/lists.vue b/src/components/lists/lists.vue @@ -2,7 +2,9 @@ <div class="Lists panel panel-default"> <div class="panel-heading"> <div class="title"> - {{ $t('lists.lists') }} + <h1 class="title"> + {{ $t('lists.lists') }} + </h1> </div> <router-link :to="{ name: 'lists-new' }" diff --git a/src/components/login_form/login_form.vue b/src/components/login_form/login_form.vue @@ -3,7 +3,7 @@ <!-- Default panel contents --> <div class="panel-heading"> - {{ $t('login.login') }} + <h1 class="title">{{ $t('login.login') }}</h1> </div> <div class="panel-body"> diff --git a/src/components/mfa_form/recovery_form.vue b/src/components/mfa_form/recovery_form.vue @@ -3,7 +3,9 @@ <!-- Default panel contents --> <div class="panel-heading"> - {{ $t('login.heading.recovery') }} + <h1 class="title"> + {{ $t('login.heading.recovery') }} + </h1> </div> <div class="panel-body"> diff --git a/src/components/mfa_form/totp_form.vue b/src/components/mfa_form/totp_form.vue @@ -3,7 +3,9 @@ <!-- Default panel contents --> <div class="panel-heading"> - {{ $t('login.heading.totp') }} + <h1 class="title"> + {{ $t('login.heading.totp') }} + </h1> </div> <div class="panel-body"> diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue @@ -50,13 +50,13 @@ @touchmove.stop="notificationsTouchMove" > <div class="panel-heading mobile-notifications-header"> - <span class="title"> + <h1 class="title"> {{ $t('notifications.notifications') }} <span v-if="unseenCountBadgeText" class="badge -notification unseen-count" >{{ unseenCountBadgeText }}</span> - </span> + </h1> <span class="spacer" /> <button v-if="notificationsAtTop" diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue @@ -14,13 +14,13 @@ v-if="!noHeading" class="notifications-heading panel-heading -sticky" > - <div class="title"> + <h1 class="title"> {{ $t('notifications.notifications') }} <span v-if="unseenCountBadgeText" class="badge -notification unseen-count" >{{ unseenCountBadgeText }}</span> - </div> + </h1> <div v-if="showScrollTop" class="rightside-button" diff --git a/src/components/password_reset/password_reset.vue b/src/components/password_reset/password_reset.vue @@ -1,7 +1,9 @@ <template> <div class="settings panel panel-default"> <div class="panel-heading"> - {{ $t('password_reset.password_reset') }} + <h1 class="title"> + {{ $t('password_reset.password_reset') }} + </h1> </div> <div class="panel-body"> <form diff --git a/src/components/post_status_modal/post_status_modal.vue b/src/components/post_status_modal/post_status_modal.vue @@ -7,7 +7,9 @@ > <div class="post-form-modal-panel panel"> <div class="panel-heading"> - {{ $t('post_status.new_status') }} + <h1 class="title"> + {{ $t('post_status.new_status') }} + </h1> </div> <PostStatusForm class="panel-body" diff --git a/src/components/registration/registration.vue b/src/components/registration/registration.vue @@ -1,7 +1,9 @@ <template> <div class="settings panel panel-default"> <div class="panel-heading"> - {{ $t('registration.registration') }} + <h1 class="title"> + {{ $t('registration.registration') }} + </h1> </div> <div v-if="!hasSignUpNotice" diff --git a/src/components/remote_user_resolver/remote_user_resolver.vue b/src/components/remote_user_resolver/remote_user_resolver.vue @@ -1,7 +1,9 @@ <template> <div class="panel panel-default"> <div class="panel-heading"> - {{ $t('remote_user_resolver.remote_user_resolver') }} + <h1 class="title"> + {{ $t('remote_user_resolver.remote_user_resolver') }} + </h1> </div> <div class="panel-body"> <p> diff --git a/src/components/search/search.vue b/src/components/search/search.vue @@ -1,9 +1,9 @@ <template> <div class="Search panel panel-default"> <div class="panel-heading"> - <div class="title"> + <h1 class="title"> {{ $t('nav.search') }} - </div> + </h1> </div> <div class="panel-body search-input-container"> <input diff --git a/src/components/settings_modal/settings_modal.vue b/src/components/settings_modal/settings_modal.vue @@ -7,9 +7,9 @@ > <div class="settings-modal-panel panel"> <div class="panel-heading"> - <span class="title"> + <h1 class="title"> {{ modalMode === 'user' ? $t('settings.settings') : $t('admin_dash.window_title') }} - </span> + </h1> <transition name="fade"> <div v-if="currentSaveStateNotice" diff --git a/src/components/settings_modal/tabs/theme_tab/theme_preview.vue b/src/components/settings_modal/tabs/theme_tab/theme_preview.vue @@ -3,12 +3,12 @@ <div class="underlay underlay-preview" /> <div class="panel dummy"> <div class="panel-heading"> - <div class="title"> + <h1 class="title"> {{ $t('settings.style.preview.header') }} <span class="badge -notification"> 99 </span> - </div> + </h1> <span class="faint"> {{ $t('settings.style.preview.header_faint') }} </span> diff --git a/src/components/shout_panel/shout_panel.vue b/src/components/shout_panel/shout_panel.vue @@ -9,14 +9,14 @@ :class="{ 'shout-heading': floating }" @click.stop.prevent="togglePanel" > - <div class="title"> + <h1 class="title"> {{ $t('shoutbox.title') }} <FAIcon v-if="floating" icon="times" class="close-icon" /> - </div> + </h1> </div> <div class="panel-body shout-window"> <div diff --git a/src/components/status_history_modal/status_history_modal.vue b/src/components/status_history_modal/status_history_modal.vue @@ -6,7 +6,9 @@ > <div class="status-history-modal-panel panel"> <div class="panel-heading"> - {{ $t('status.status_history') }} ({{ historyCount }}) + <h1 class="title"> + {{ $t('status.status_history') }} ({{ historyCount }}) + </h1> </div> <div class="panel-body"> <div diff --git a/src/components/timeline_menu/timeline_menu.vue b/src/components/timeline_menu/timeline_menu.vue @@ -29,8 +29,8 @@ </ul> </template> <template #trigger> - <span class="button-unstyled title timeline-menu-title"> - <span class="timeline-title">{{ timelineName() }}</span> + <span class="button-unstyled timeline-menu-title"> + <h1 class="title timeline-title">{{ timelineName() }}</h1> <span> <FAIcon size="sm" diff --git a/src/components/update_notification/update_notification.vue b/src/components/update_notification/update_notification.vue @@ -9,9 +9,9 @@ :class="{ '-peek': !showingMore }" > <div class="panel-heading"> - <span class="title"> + <h1 class="title"> {{ $t('update.big_update_title') }} - </span> + </h1> </div> <div class="panel-body"> <div diff --git a/src/components/user_link/user_link.vue b/src/components/user_link/user_link.vue @@ -1,12 +1,16 @@ <template> - <router-link - :title="user.screen_name_ui" - :to="userProfileLink(user)" - > - {{ at ? '@' : '' }}{{ user.screen_name_ui }}<UnicodeDomainIndicator - :user="user" - /> - </router-link> + <div class="user-profile-link"> + <router-link + :title="user.screen_name_ui" + :to="userProfileLink(user)" + > + <slot> + {{ at ? '@' : '' }}{{ user.screen_name_ui }}<UnicodeDomainIndicator + :user="user" + /> + </slot> + </router-link> + </div> </template> <script> diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue @@ -142,9 +142,9 @@ class="panel user-profile-placeholder" > <div class="panel-heading"> - <div class="title"> + <h1 class="title"> {{ $t('settings.profile_tab') }} - </div> + </h1> </div> <div> <span v-if="error">{{ error }}</span> diff --git a/src/components/user_reporting_modal/user_reporting_modal.vue b/src/components/user_reporting_modal/user_reporting_modal.vue @@ -6,7 +6,7 @@ <div class="user-reporting-panel panel"> <div class="panel-heading"> <i18n-t - tag="div" + tag="h1" keypath="user_reporting.title" class="title" > diff --git a/src/components/who_to_follow/who_to_follow.vue b/src/components/who_to_follow/who_to_follow.vue @@ -1,7 +1,9 @@ <template> <div class="panel panel-default"> <div class="panel-heading"> - {{ $t('who_to_follow.who_to_follow') }} + <h1 class="title"> + {{ $t('who_to_follow.who_to_follow') }} + </h1> </div> <div class="panel-body"> <FollowCard diff --git a/src/components/who_to_follow_panel/who_to_follow_panel.vue b/src/components/who_to_follow_panel/who_to_follow_panel.vue @@ -2,9 +2,9 @@ <div class="who-to-follow-panel"> <div class="panel panel-default base01-background"> <div class="panel-heading timeline-heading base02-background base04"> - <div class="title"> + <h1 class="title"> {{ $t('who_to_follow.who_to_follow') }} - </div> + </h1> </div> <div class="who-to-follow"> <p diff --git a/src/panel.scss b/src/panel.scss @@ -115,6 +115,8 @@ .title { font-size: 1.3em; + margin: 0; + font-weight: normal; } .alert {