darkkirb/akkoma-fe
1
0
Fork 0
forked from mirrors/akkoma-fe
Code Pull requests Activity

theme tab: don't crash out on non-colours (#41)

Browse source 
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/41
This commit is contained in:
floatingghost 2022-07-17 13:13:51 +00:00
parent a256931596
commit 2977edc04d
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/color_input/color_input.scss
View file

@ -28,7 +28,7 @@
flex: 0 0 2em; flex: 0 0 2em;
min-width: 2em; min-width: 2em;
align-self: center; align-self: center;
height: 100%; height: 2em;
} }
} }
.computedIndicator, .computedIndicator,

6
src/components/settings_modal/tabs/theme_tab/theme_tab.js
View file

@ -51,8 +51,11 @@ const v1OnlyNames = [
'cOrange' 'cOrange'
].map(_ => _ + 'ColorLocal') ].map(_ => _ + 'ColorLocal')
// if color doesn't match regex, it's not a color
const isColor = (color) => /^#[0-9a-f]{6}$/i.test(color)
const colorConvert = (color) => { const colorConvert = (color) => {
if (color.startsWith('--') || color === 'transparent') { if (color.startsWith('--') || color === 'transparent' || !isColor(color)) {
return color return color
} else { } else {
return hex2rgb(color) return hex2rgb(color)
@ -246,6 +249,7 @@ export default {
const colors = this.previewTheme.colors const colors = this.previewTheme.colors
const opacity = this.previewTheme.opacity const opacity = this.previewTheme.opacity
if (!colors.bg) return {} if (!colors.bg) return {}
if (!isColor(colors.bg)) return {}
const hints = (ratio) => ({ const hints = (ratio) => ({
text: ratio.toPrecision(3) + ':1', text: ratio.toPrecision(3) + ':1',
// AA level, AAA level // AA level, AAA level