diff options
| author | Tarteka <info@tarteka.net> | 2019-10-30 22:17:19 +0100 |
|---|---|---|
| committer | Tarteka <info@tarteka.net> | 2019-10-30 22:17:19 +0100 |
| commit | fe4845a7c1ca9d6fa51132a0ef9bc5103facae66 (patch) | |
| tree | 92aceb88e58d149a5446e5a9d7bca6084cb6fa99 /src/components/notification/notification.js | |
| parent | a178346f1e0fbe2246532bbfeba5fd1cc0c1cb2d (diff) | |
| parent | 74f5f168d639e9e21e294ac45dd6091694a041cc (diff) | |
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into develop
Diffstat (limited to 'src/components/notification/notification.js')
| -rw-r--r-- | src/components/notification/notification.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/notification/notification.js b/src/components/notification/notification.js index 8e817f3b..7d46eb5a 100644 --- a/src/components/notification/notification.js +++ b/src/components/notification/notification.js @@ -39,7 +39,7 @@ const Notification = { return highlightClass(this.notification.from_profile) }, userStyle () { - const highlight = this.$store.state.config.highlight + const highlight = this.$store.getters.mergedConfig.highlight const user = this.notification.from_profile return highlightStyle(highlight[user.screen_name]) }, |