Merge pull request #54515 from nextcloud/fix/theming-parsing

fix(theming): correctly parse CSS colors for user primary color picker
feat/provide-server-version-capability
Ferdinand Thiessen 2 months ago committed by GitHub
commit 9fd80b2aa2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 14
      apps/theming/src/components/UserPrimaryColor.vue
  2. 4
      dist/theming-personal-theming.js
  3. 2
      dist/theming-personal-theming.js.map

@ -76,13 +76,23 @@ export default defineComponent({
methods: {
t,
numberToHex(numeric: string) {
const parsed = Number.parseInt(numeric)
return parsed.toString(16).padStart(2, '0')
},
/**
* Global styles are reloaded so we might need to update the current value
*/
reload() {
const trigger = this.$refs.trigger as HTMLButtonElement
const newColor = window.getComputedStyle(trigger).backgroundColor
if (newColor.toLowerCase() !== this.primaryColor) {
let newColor = window.getComputedStyle(trigger).backgroundColor
// sometimes the browser returns the color in the "rgb(255, 132, 234)" format
const rgbMatch = newColor.replaceAll(/\s/g, '').match(/^rgba?\((\d+),(\d+),(\d+)/)
if (rgbMatch) {
newColor = `#${this.numberToHex(rgbMatch[1])}${this.numberToHex(rgbMatch[2])}${this.numberToHex(rgbMatch[3])}`
}
if (newColor.toLowerCase() !== this.primaryColor.toLowerCase()) {
this.primaryColor = newColor
}
},

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save