diff options
| author | Shpuld Shpuldson <shp@cock.li> | 2021-01-05 13:58:52 +0200 |
|---|---|---|
| committer | Shpuld Shpuldson <shp@cock.li> | 2021-01-05 13:58:52 +0200 |
| commit | ab2c2c66bfe96571d14cff4b8c69fe0c90d5a3c7 (patch) | |
| tree | d35c6958a49431358e131601ca31f753c804fd99 /src/components/settings_modal/tabs/theme_tab | |
| parent | 5e96260a4f855e2d93915c1b428a7209a882c8cb (diff) | |
| parent | 3e7d1fbf23b5ca1b382381b49affc481404137da (diff) | |
Merge branch 'develop' into feat/report-notification
Diffstat (limited to 'src/components/settings_modal/tabs/theme_tab')
| -rw-r--r-- | src/components/settings_modal/tabs/theme_tab/theme_tab.scss | 3 | ||||
| -rw-r--r-- | src/components/settings_modal/tabs/theme_tab/theme_tab.vue | 9 |
2 files changed, 11 insertions, 1 deletions
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 926eceff..1b7d9f31 100644 --- a/src/components/settings_modal/tabs/theme_tab/theme_tab.scss +++ b/src/components/settings_modal/tabs/theme_tab/theme_tab.scss @@ -165,7 +165,8 @@ border-color: var(--border, $fallback--border); margin: 1em 0; padding: 1em; - background: var(--body-background-image); + background-color: var(--wallpaper); + background-image: var(--body-background-image); background-size: cover; background-position: 50% 50%; 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 4ab793d6..b8add42f 100644 --- a/src/components/settings_modal/tabs/theme_tab/theme_tab.vue +++ b/src/components/settings_modal/tabs/theme_tab/theme_tab.vue @@ -617,6 +617,15 @@ /> </div> <div class="color-item"> + <h4>{{ $t('settings.style.advanced_colors.wallpaper') }}</h4> + <ColorInput + v-model="wallpaperColorLocal" + name="wallpaper" + :label="$t('settings.style.advanced_colors.wallpaper')" + :fallback="previewTheme.colors.wallpaper" + /> + </div> + <div class="color-item"> <h4>{{ $t('settings.style.advanced_colors.poll') }}</h4> <ColorInput v-model="pollColorLocal" |