diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2024-06-21 21:53:00 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2024-06-21 21:53:00 +0000 |
| commit | 4c3e2979756fa374eafcd385c6fffc64d8c8ffcd (patch) | |
| tree | 71e302eb7c4901de399bef6722fe2256baaa8bdf /src/services/theme_data/theme_data_3.service.js | |
| parent | 88f95e30e1f5528bcc97a6e26bc20469e0d896d1 (diff) | |
| parent | dc37c7b28b2142227f73a36acc27a7ac77c7e59a (diff) | |
Merge branch 'tusooa/themesv3-on-safari' into 'develop'
Fix Themes v3 not working on Safari
Closes #1319
See merge request pleroma/pleroma-fe!1918
Diffstat (limited to 'src/services/theme_data/theme_data_3.service.js')
| -rw-r--r-- | src/services/theme_data/theme_data_3.service.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/services/theme_data/theme_data_3.service.js b/src/services/theme_data/theme_data_3.service.js index 15b4493e..047ba8a2 100644 --- a/src/services/theme_data/theme_data_3.service.js +++ b/src/services/theme_data/theme_data_3.service.js @@ -1,6 +1,6 @@ import { convert, brightness } from 'chromatism' import sum from 'hash-sum' -import { flattenDeep } from 'lodash' +import { flattenDeep, sortBy } from 'lodash' import { alphaBlend, getTextColor, @@ -226,7 +226,7 @@ export const init = (extraRuleset, ultimateBackgroundColor) => { combination.variant === 'normal' ? '' : combination.variant[0].toUpperCase() + combination.variant.slice(1).toLowerCase(), - ...combination.state.filter(x => x !== 'normal').toSorted().map(state => state[0].toUpperCase() + state.slice(1).toLowerCase()) + ...sortBy(combination.state.filter(x => x !== 'normal')).map(state => state[0].toUpperCase() + state.slice(1).toLowerCase()) ].join('') let inheritedTextColor = computedDirectives.textColor |