From 4ddb6189dc09e03aba5e3da1d2dd2e06e7020b24 Mon Sep 17 00:00:00 2001 From: Tusooa Zhu Date: Wed, 6 Apr 2022 17:06:41 -0400 Subject: Fix no reactivity on vuex 4 values --- src/components/side_drawer/side_drawer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/components') diff --git a/src/components/side_drawer/side_drawer.js b/src/components/side_drawer/side_drawer.js index 89719df3..bad1806b 100644 --- a/src/components/side_drawer/side_drawer.js +++ b/src/components/side_drawer/side_drawer.js @@ -49,7 +49,7 @@ const SideDrawer = { currentUser () { return this.$store.state.users.currentUser }, - shout () { return this.$store.state.shout.channel.state === 'joined' }, + shout () { return this.$store.state.shout.joined }, unseenNotifications () { return unseenNotificationsFromStore(this.$store) }, -- cgit v1.2.3-70-g09d2 From 041c72b07c7d0559bd5b97c49503e69707aa08b2 Mon Sep 17 00:00:00 2001 From: Tusooa Zhu Date: Wed, 6 Apr 2022 20:04:36 -0400 Subject: Fix dropdown menu style inside panel header --- src/components/popover/popover.vue | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'src/components') diff --git a/src/components/popover/popover.vue b/src/components/popover/popover.vue index 8588b351..1502c30c 100644 --- a/src/components/popover/popover.vue +++ b/src/components/popover/popover.vue @@ -149,5 +149,30 @@ } } + + .button-default.dropdown-item { + &, + i[class*=icon-] { + color: $fallback--text; + color: var(--btnText, $fallback--text); + } + + &:active { + background-color: $fallback--fg; + background-color: var(--btnPressed, $fallback--fg); + color: $fallback--text; + color: var(--btnPressedText, $fallback--text); + } + + &:disabled { + color: $fallback--text; + color: var(--btnDisabledText, $fallback--text); + } + + &.toggled { + color: $fallback--text; + color: var(--btnToggledText, $fallback--text); + } + } } -- cgit v1.2.3-70-g09d2 From 6de87e8b658a203a471af0210b6677d22aef9ebb Mon Sep 17 00:00:00 2001 From: Tusooa Zhu Date: Wed, 6 Apr 2022 20:26:37 -0400 Subject: Use panel text instead of text for shoutbox icon --- src/components/shout_panel/shout_panel.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/components') diff --git a/src/components/shout_panel/shout_panel.vue b/src/components/shout_panel/shout_panel.vue index c88797d1..f3e9ff96 100644 --- a/src/components/shout_panel/shout_panel.vue +++ b/src/components/shout_panel/shout_panel.vue @@ -98,7 +98,7 @@ .icon { color: $fallback--text; - color: var(--text, $fallback--text); + color: var(--panelText, $fallback--text); margin-right: 0.5em; } -- cgit v1.2.3-70-g09d2 From fce9c5eeb2092a3c66609afbed81f933b6bec069 Mon Sep 17 00:00:00 2001 From: Tusooa Zhu Date: Wed, 6 Apr 2022 22:50:01 -0400 Subject: Fix active popover style --- src/components/popover/popover.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/components') diff --git a/src/components/popover/popover.vue b/src/components/popover/popover.vue index 1502c30c..332a0398 100644 --- a/src/components/popover/popover.vue +++ b/src/components/popover/popover.vue @@ -158,10 +158,10 @@ } &:active { - background-color: $fallback--fg; - background-color: var(--btnPressed, $fallback--fg); - color: $fallback--text; - color: var(--btnPressedText, $fallback--text); + background-color: $fallback--lightBg; + background-color: var(--selectedMenuPopover, $fallback--lightBg); + color: $fallback--link; + color: var(--selectedMenuPopoverText, $fallback--link); } &:disabled { -- cgit v1.2.3-70-g09d2