logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://hacktivis.me/git/pleroma-fe.git
commit: f4544f0742508713a9cef2db08c6fa844345d9e0
parent 292895913892ac5eb7e1e8855775e97a7ea1eb18
Author: Henry Jameson <me@hjkos.com>
Date:   Tue, 23 Jul 2024 21:35:29 +0300

elaboration and spacing

Diffstat:

Msrc/components/settings_modal/helpers/unit_setting.vue1+
Msrc/components/settings_modal/tabs/appearance_tab.vue86++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
Msrc/components/settings_modal/tabs/theme_tab/theme_tab.scss5+++++
Msrc/components/settings_modal/tabs/theme_tab/theme_tab.vue2+-
Msrc/i18n/en.json3++-
5 files changed, 57 insertions(+), 40 deletions(-)

diff --git a/src/components/settings_modal/helpers/unit_setting.vue b/src/components/settings_modal/helpers/unit_setting.vue @@ -9,6 +9,7 @@ > <slot /> </label> + {{ ' ' }} <input :id="path" class="input number-input" diff --git a/src/components/settings_modal/tabs/appearance_tab.vue b/src/components/settings_modal/tabs/appearance_tab.vue @@ -1,5 +1,5 @@ <template> - <div :label="$t('settings.general')"> + <div class="appearance-tab" :label="$t('settings.general')"> <div class="setting-item"> <h2>{{ $t('settings.theme') }}</h2> <ul @@ -34,6 +34,9 @@ </button> </ul> </div> + <div class="alert neutral theme-notice"> + {{ $t("settings.style.appearance_tab_note") }} + </div> <div class="setting-item"> <h2>{{ $t('settings.scale_and_layout') }}</h2> <ul class="setting-list"> @@ -254,49 +257,56 @@ <script src="./appearance_tab.js"></script> <style lang="scss"> -.column-settings { - display: flex; - justify-content: space-evenly; - flex-wrap: wrap; -} +.appearance-tab { + .theme-notice { + padding: 0.5em; + margin: 1em; + } -.column-settings .size-label { - display: block; - margin-bottom: 0.5em; - margin-top: 0.5em; -} + .column-settings { + display: flex; + justify-content: space-evenly; + flex-wrap: wrap; + } -.theme-list { - list-style: none; - display: flex; - flex-wrap: wrap; - margin: -0.5em 0; - height: 25em; - overflow-x: hidden; - overflow-y: auto; - scrollbar-gutter: stable; - border-radius: var(--roundness); - border: 1px solid var(--border); - padding: 0; + .column-settings .size-label { + display: block; + margin-bottom: 0.5em; + margin-top: 0.5em; + } - .theme-preview { - font-size: 1rem; // fix for firefox - width: 19rem; + .theme-list { + list-style: none; display: flex; - flex-direction: column; - align-items: center; - margin: 0.5em; + flex-wrap: wrap; + margin: -0.5em 0; + height: 25em; + overflow-x: hidden; + overflow-y: auto; + scrollbar-gutter: stable; + border-radius: var(--roundness); + border: 1px solid var(--border); + padding: 0; - &.placeholder { - opacity: 0.2; - } + .theme-preview { + font-size: 1rem; // fix for firefox + width: 19rem; + display: flex; + flex-direction: column; + align-items: center; + margin: 0.5em; + + &.placeholder { + opacity: 0.2; + } - .preview-container { - pointer-events: none; - zoom: 0.5; - border: none; - border-radius: var(--roundness); - text-align: left; + .preview-container { + pointer-events: none; + zoom: 0.5; + border: none; + border-radius: var(--roundness); + text-align: left; + } } } } diff --git a/src/components/settings_modal/tabs/theme_tab/theme_tab.scss b/src/components/settings_modal/tabs/theme_tab/theme_tab.scss @@ -1,4 +1,9 @@ .theme-tab { + .deprecation-warning { + padding: 0.5em; + margin: 2em; + } + padding-bottom: 2em; .preset-switcher { diff --git a/src/components/settings_modal/tabs/theme_tab/theme_tab.vue b/src/components/settings_modal/tabs/theme_tab/theme_tab.vue @@ -1,6 +1,6 @@ <template> <div class="theme-tab"> - <div class="alert warning"> + <div class="alert warning deprecation-warning"> {{ $t("settings.style.themes2_outdated") }} </div> <div class="presets-container"> diff --git a/src/i18n/en.json b/src/i18n/en.json @@ -741,7 +741,8 @@ "more_settings": "More settings", "style": { "custom_theme_used": "(Custom theme)", - "themes2_outdated": "Editor for Themes V2 is no longer supported and presented here for sake of legacy.", + "themes2_outdated": "Editor for Themes V2 is being phased out and will eventually be replaced with a new one that takes advantage of new Themes V3 engine. It should still work but experience might be degraded and inconsistent.", + "appearance_tab_note": "Changes on this tab do not affect the theme used", "update_preview": "Update preview", "themes3": { "define": "Override",