diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-11-08 22:01:42 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-11-08 22:01:42 +0000 |
| commit | 2b68134ab01266913b89b79ea6c3e9575278ecb2 (patch) | |
| tree | 69a410f34429c52c7cdd335e1bdfeba795ba8f6c /src/components/style_switcher/style_switcher.vue | |
| parent | 5679dcdd18750a1fc9ac1d4eeea3fd3b642a2151 (diff) | |
| parent | a3501d58d8703379d5f60e1bb53dfb0dbb1022b2 (diff) | |
Merge branch 'emoji-optimizations' into 'develop'
Emoji fixes, optimizations and improvements
Closes #690, #686, #682, #674, and #678
See merge request pleroma/pleroma-fe!969
Diffstat (limited to 'src/components/style_switcher/style_switcher.vue')
| -rw-r--r-- | src/components/style_switcher/style_switcher.vue | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/components/style_switcher/style_switcher.vue b/src/components/style_switcher/style_switcher.vue index 944debab..ad032041 100644 --- a/src/components/style_switcher/style_switcher.vue +++ b/src/components/style_switcher/style_switcher.vue @@ -201,6 +201,13 @@ :fallback="previewTheme.colors.alertError" /> <ContrastRatio :contrast="previewContrast.alertError" /> + <ColorInput + v-model="alertWarningColorLocal" + name="alertWarning" + :label="$t('settings.style.advanced_colors.alert_warning')" + :fallback="previewTheme.colors.alertWarning" + /> + <ContrastRatio :contrast="previewContrast.alertWarning" /> </div> <div class="color-item"> <h4>{{ $t('settings.style.advanced_colors.badge') }}</h4> |