diff options
| author | Henry Jameson <me@hjkos.com> | 2022-04-07 10:33:20 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2022-04-07 10:33:20 +0300 |
| commit | ab7490e49b275425176aec66405fd20a4e6f958d (patch) | |
| tree | b07534e2cb9867456978a2bc9477c3948d401efd /src/components | |
| parent | 6a319154d94c51f0464e0de31c6f88fbe20defea (diff) | |
| parent | d8324dd80b2beeb96b81b4bc05df12550bbda407 (diff) | |
Merge remote-tracking branch 'origin/develop' into threecolumn
* origin/develop:
Fix active popover style
Use panel text instead of text for shoutbox icon
Fix dropdown menu style inside panel header
Fix phoenix sockets in dev mode
Fix no reactivity on vuex 4 values
fix tegulu
heck
fix i18n for good??
force runtime build of i18n
fix CSP by compiling the i18n templates as well
Diffstat (limited to 'src/components')
| -rw-r--r-- | src/components/popover/popover.vue | 25 | ||||
| -rw-r--r-- | src/components/shout_panel/shout_panel.vue | 2 | ||||
| -rw-r--r-- | src/components/side_drawer/side_drawer.js | 2 |
3 files changed, 27 insertions, 2 deletions
diff --git a/src/components/popover/popover.vue b/src/components/popover/popover.vue index 8588b351..332a0398 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--lightBg; + background-color: var(--selectedMenuPopover, $fallback--lightBg); + color: $fallback--link; + color: var(--selectedMenuPopoverText, $fallback--link); + } + + &:disabled { + color: $fallback--text; + color: var(--btnDisabledText, $fallback--text); + } + + &.toggled { + color: $fallback--text; + color: var(--btnToggledText, $fallback--text); + } + } } </style> 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; } 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) }, |