From 5ffcddd3b9b4b6600e4e51066b9410d7e852df11 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Wed, 27 May 2020 03:32:57 +0300 Subject: fixes. sorry for bad commit message i'm tired --- src/components/settings_modal/settings_modal.js | 3 +++ .../settings_modal/settings_modal_content.js | 3 --- .../settings_modal/settings_modal_content.vue | 2 +- .../settings_modal/tabs/theme_tab/theme_tab.scss | 19 ++++++++++------ .../settings_modal/tabs/theme_tab/theme_tab.vue | 26 ++++++++++++---------- 5 files changed, 30 insertions(+), 23 deletions(-) (limited to 'src/components/settings_modal') diff --git a/src/components/settings_modal/settings_modal.js b/src/components/settings_modal/settings_modal.js index 32ef38d6..caa7c48c 100644 --- a/src/components/settings_modal/settings_modal.js +++ b/src/components/settings_modal/settings_modal.js @@ -24,6 +24,9 @@ const SettingsModal = { } }, computed: { + currentSaveStateNotice () { + return this.$store.state.interface.settings.currentSaveStateNotice + }, modalActivated () { return this.$store.state.interface.settingsModalState !== 'hidden' }, diff --git a/src/components/settings_modal/settings_modal_content.js b/src/components/settings_modal/settings_modal_content.js index b27fbd28..48101a90 100644 --- a/src/components/settings_modal/settings_modal_content.js +++ b/src/components/settings_modal/settings_modal_content.js @@ -25,9 +25,6 @@ const SettingsModalContent = { ThemeTab }, computed: { - currentSaveStateNotice () { - return this.$store.state.interface.settings.currentSaveStateNotice - }, isLoggedIn () { return !!this.$store.state.users.currentUser } diff --git a/src/components/settings_modal/settings_modal_content.vue b/src/components/settings_modal/settings_modal_content.vue index 8b83e48c..283b4ef8 100644 --- a/src/components/settings_modal/settings_modal_content.vue +++ b/src/components/settings_modal/settings_modal_content.vue @@ -40,7 +40,7 @@
diff --git a/src/components/settings_modal/tabs/theme_tab/theme_tab.scss b/src/components/settings_modal/tabs/theme_tab/theme_tab.scss index e0b1a2df..926eceff 100644 --- a/src/components/settings_modal/tabs/theme_tab/theme_tab.scss +++ b/src/components/settings_modal/tabs/theme_tab/theme_tab.scss @@ -95,20 +95,25 @@ align-items: baseline; width: 100%; min-height: 30px; - - .btn { - min-width: 1px; - flex: 0 auto; - padding: 0 1em; - } + margin-bottom: 1em; p { flex: 1; margin: 0; margin-right: .5em; } + } - margin-bottom: 1em; + .tab-header-buttons { + display: flex; + flex-direction: column; + + .btn { + min-width: 1px; + flex: 0 auto; + padding: 0 1em; + margin-bottom: .5em; + } } .shadow-selector { diff --git a/src/components/settings_modal/tabs/theme_tab/theme_tab.vue b/src/components/settings_modal/tabs/theme_tab/theme_tab.vue index 33098498..fcfad23b 100644 --- a/src/components/settings_modal/tabs/theme_tab/theme_tab.vue +++ b/src/components/settings_modal/tabs/theme_tab/theme_tab.vue @@ -126,18 +126,20 @@ >

{{ $t('settings.theme_help') }}

- - +
+ + +

{{ $t('settings.theme_help_v2_1') }}

{{ $t('settings.style.common_colors.main') }}

-- cgit v1.2.3-70-g09d2