From 7b99d98c553f40ec4d633d0d4fdf65f275c80e77 Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Tue, 24 Nov 2020 12:32:42 +0200 Subject: Replace all use of + href='#' with proper buttons --- src/components/desktop_nav/desktop_nav.scss | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/components/desktop_nav/desktop_nav.scss') diff --git a/src/components/desktop_nav/desktop_nav.scss b/src/components/desktop_nav/desktop_nav.scss index 028692a9..7ec0caf7 100644 --- a/src/components/desktop_nav/desktop_nav.scss +++ b/src/components/desktop_nav/desktop_nav.scss @@ -80,12 +80,14 @@ .nav-icon { margin-left: 0.2em; width: 2em; + height: 100%; text-align: center; - } + cursor: pointer; - a, a svg { - color: $fallback--link; - color: var(--topBarLink, $fallback--link); + .svg-inline--fa { + color: $fallback--link; + color: var(--topBarLink, $fallback--link); + } } .sitename { -- cgit v1.2.3-70-g09d2 From 38c32c7f7aea23a798d0dc267082050d15009134 Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Tue, 24 Nov 2020 15:22:01 +0200 Subject: renames and removals of cursor: pointer --- src/components/desktop_nav/desktop_nav.scss | 1 - src/components/extra_buttons/extra_buttons.vue | 1 - src/components/react_button/react_button.vue | 5 ++--- 3 files changed, 2 insertions(+), 5 deletions(-) (limited to 'src/components/desktop_nav/desktop_nav.scss') diff --git a/src/components/desktop_nav/desktop_nav.scss b/src/components/desktop_nav/desktop_nav.scss index 7ec0caf7..ed567d33 100644 --- a/src/components/desktop_nav/desktop_nav.scss +++ b/src/components/desktop_nav/desktop_nav.scss @@ -82,7 +82,6 @@ width: 2em; height: 100%; text-align: center; - cursor: pointer; .svg-inline--fa { color: $fallback--link; diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue index 1578267c..b84229c2 100644 --- a/src/components/extra_buttons/extra_buttons.vue +++ b/src/components/extra_buttons/extra_buttons.vue @@ -115,7 +115,6 @@ @import '../../_variables.scss'; .ExtraButtons { - cursor: pointer; position: static; padding: 10px; margin: -10px; diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue index 2e3cedd1..9f437535 100644 --- a/src/components/react_button/react_button.vue +++ b/src/components/react_button/react_button.vue @@ -39,7 +39,7 @@ Date: Thu, 26 Nov 2020 17:05:38 +0200 Subject: fix nav bar button active style --- src/components/desktop_nav/desktop_nav.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/components/desktop_nav/desktop_nav.scss') diff --git a/src/components/desktop_nav/desktop_nav.scss b/src/components/desktop_nav/desktop_nav.scss index ed567d33..8fd8e620 100644 --- a/src/components/desktop_nav/desktop_nav.scss +++ b/src/components/desktop_nav/desktop_nav.scss @@ -21,7 +21,7 @@ grid-template-areas: "logo sitename actions"; } - button { + .button-default { &, svg { color: $fallback--text; color: var(--btnTopBarText, $fallback--text); -- cgit v1.2.3-70-g09d2 From c1977567677385bef3f27ba0f8d20e13e07cd9e9 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Wed, 16 Dec 2020 18:25:07 +0200 Subject: Basic no-wallpaper support --- src/App.js | 17 ++++++++++------- src/App.scss | 4 +++- src/App.vue | 3 +-- src/components/desktop_nav/desktop_nav.scss | 4 ++++ src/components/settings_modal/tabs/general_tab.js | 4 ++++ src/components/settings_modal/tabs/general_tab.vue | 5 +++++ .../settings_modal/tabs/theme_tab/theme_tab.scss | 3 ++- src/i18n/en.json | 1 + src/modules/config.js | 1 + src/services/theme_data/pleromafe.js | 4 ++++ static/themes/redmond-xx-se.json | 1 + static/themes/redmond-xx.json | 1 + static/themes/redmond-xxi.json | 1 + 13 files changed, 38 insertions(+), 11 deletions(-) (limited to 'src/components/desktop_nav/desktop_nav.scss') diff --git a/src/App.js b/src/App.js index 52700319..c79184ab 100644 --- a/src/App.js +++ b/src/App.js @@ -54,13 +54,16 @@ export default { return this.currentUser.background_image || this.$store.state.instance.background }, bgStyle () { - return { - 'background-image': `url(${this.background})` - } - }, - bgAppStyle () { - return { - '--body-background-image': `url(${this.background})` + if ( + this.currentUser.background_image || + ( + this.$store.state.instance.background && + !this.$store.getters.mergedConfig.hideInstanceWallpaper + ) + ) { + return { + '--body-background-image': `url(${this.background})` + } } }, chat () { return this.$store.state.chat.channel.state === 'joined' }, diff --git a/src/App.scss b/src/App.scss index cdc3209c..394d6434 100644 --- a/src/App.scss +++ b/src/App.scss @@ -14,7 +14,9 @@ right: -20px; background-size: cover; background-repeat: no-repeat; - background-position: 0 50%; + background-color: var(--wallpaper); + background-image: var(--body-background-image); + background-position: 50% 50px; } i[class^='icon-'] { diff --git a/src/App.vue b/src/App.vue index b4eb0524..1a166778 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,12 +1,11 @@