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/services/style_setter | |
| 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/services/style_setter')
| -rw-r--r-- | src/services/style_setter/style_setter.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js index 1cf7edc3..eaa495c4 100644 --- a/src/services/style_setter/style_setter.js +++ b/src/services/style_setter/style_setter.js @@ -215,6 +215,10 @@ const generateColors = (input) => { colors.alertErrorText = getTextColor(alphaBlend(colors.alertError, opacity.alert, colors.bg), colors.text) colors.alertErrorPanelText = getTextColor(alphaBlend(colors.alertError, opacity.alert, colors.panel), colors.panelText) + colors.alertWarning = col.alertWarning || Object.assign({}, colors.cOrange) + colors.alertWarningText = getTextColor(alphaBlend(colors.alertWarning, opacity.alert, colors.bg), colors.text) + colors.alertWarningPanelText = getTextColor(alphaBlend(colors.alertWarning, opacity.alert, colors.panel), colors.panelText) + colors.badgeNotification = col.badgeNotification || Object.assign({}, colors.cRed) colors.badgeNotificationText = contrastRatio(colors.badgeNotification).rgb @@ -222,6 +226,7 @@ const generateColors = (input) => { if (typeof v === 'undefined') return if (k === 'alert') { colors.alertError.a = v + colors.alertWarning.a = v return } if (k === 'faint') { |