hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix firefox redmond themes / fixed topbar and panel headers not having

Browse source 
proper theme2 inputs/alerts colors
This commit is contained in:
Henry Jameson 2024-06-22 00:45:46 +03:00
parent f9e407de63
commit aae508f5a1
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/services/theme_data/theme2_to_theme3.js
View file

@ -138,7 +138,7 @@ export const convertTheme2To3 = (data) => {
Object.keys(data.opacity || {}).forEach(key => { Object.keys(data.opacity || {}).forEach(key => {
if (!opacityKeys.has(key) || data.opacity[key] === undefined) return null if (!opacityKeys.has(key) || data.opacity[key] === undefined) return null
const originalOpacity = data.opacity[key] const originalOpacity = data.opacity[key]
const rule = {} const rule = { source: '2to3' }
switch (key) { switch (key) {
case 'alert': case 'alert':
@ -213,7 +213,7 @@ export const convertTheme2To3 = (data) => {
Object.keys(data.radii || {}).forEach(key => { Object.keys(data.radii || {}).forEach(key => {
if (!radiiKeys.has(key) || data.radii[key] === undefined) return null if (!radiiKeys.has(key) || data.radii[key] === undefined) return null
const originalRadius = data.radii[key] const originalRadius = data.radii[key]
const rule = {} const rule = { source: '2to3' }
switch (key) { switch (key) {
case 'btn': case 'btn':
@ -266,7 +266,7 @@ export const convertTheme2To3 = (data) => {
Object.keys(data.fonts || {}).forEach(key => { Object.keys(data.fonts || {}).forEach(key => {
if (!fontsKeys.has(key)) return if (!fontsKeys.has(key)) return
const originalFont = data.fonts[key].family const originalFont = data.fonts[key].family
const rule = {} const rule = { source: '2to3' }
switch (key) { switch (key) {
case 'interface': case 'interface':
@ -300,7 +300,7 @@ export const convertTheme2To3 = (data) => {
Object.keys(data.shadows || {}).forEach(key => { Object.keys(data.shadows || {}).forEach(key => {
if (!shadowsKeys.has(key)) return if (!shadowsKeys.has(key)) return
const originalShadow = data.shadows[key] const originalShadow = data.shadows[key]
const rule = {} const rule = { source: '2to3' }
switch (key) { switch (key) {
case 'panel': case 'panel':
@ -369,7 +369,7 @@ export const convertTheme2To3 = (data) => {
const extendedRules = Object.entries(extendedBaseKeys).map(([prefix, keys]) => { const extendedRules = Object.entries(extendedBaseKeys).map(([prefix, keys]) => {
if (nonComponentPrefixes.has(prefix)) return null if (nonComponentPrefixes.has(prefix)) return null
const rule = {} const rule = { source: '2to3' }
if (prefix === 'alertPopup') { if (prefix === 'alertPopup') {
rule.component = 'Alert' rule.component = 'Alert'
rule.parent = { component: 'Popover' } rule.parent = { component: 'Popover' }
@ -402,7 +402,7 @@ export const convertTheme2To3 = (data) => {
const leftoverKey = key.replace(prefix, '') const leftoverKey = key.replace(prefix, '')
const parts = (leftoverKey || 'Bg').match(/[A-Z][a-z]*/g) const parts = (leftoverKey || 'Bg').match(/[A-Z][a-z]*/g)
const last = parts.slice(-1)[0] const last = parts.slice(-1)[0]
let newRule = { directives: {} } let newRule = { source: '2to3', directives: {} }
let variantArray = [] let variantArray = []
switch (last) { switch (last) {
@ -462,12 +462,12 @@ export const convertTheme2To3 = (data) => {
if (prefix === 'popover' && variantArray[0] === 'Post') { if (prefix === 'popover' && variantArray[0] === 'Post') {
newRule.component = 'Post' newRule.component = 'Post'
newRule.parent = { component: 'Popover' } newRule.parent = { source: '2to3hack', component: 'Popover' }
variantArray = variantArray.filter(x => x !== 'Post') variantArray = variantArray.filter(x => x !== 'Post')
} }
if (prefix === 'selectedMenu' && variantArray[0] === 'Popover') { if (prefix === 'selectedMenu' && variantArray[0] === 'Popover') {
newRule.parent = { component: 'Popover' } newRule.parent = { source: '2to3hack', component: 'Popover' }
variantArray = variantArray.filter(x => x !== 'Popover') variantArray = variantArray.filter(x => x !== 'Popover')
} }
@ -477,12 +477,12 @@ export const convertTheme2To3 = (data) => {
case 'alert': { case 'alert': {
const hasPanel = variantArray.find(x => x === 'Panel') const hasPanel = variantArray.find(x => x === 'Panel')
if (hasPanel) { if (hasPanel) {
newRule.parent = { component: 'PanelHeader' } newRule.parent = { source: '2to3hack', component: 'PanelHeader', parent: newRule.parent }
variantArray = variantArray.filter(x => x !== 'Panel') variantArray = variantArray.filter(x => x !== 'Panel')
} }
const hasTop = variantArray.find(x => x === 'Top') // TopBar const hasTop = variantArray.find(x => x === 'Top') // TopBar
if (hasTop) { if (hasTop) {
newRule.parent = { component: 'TopBar' } newRule.parent = { source: '2to3hack', component: 'TopBar', parent: newRule.parent }
variantArray = variantArray.filter(x => x !== 'Top' && x !== 'Bar') variantArray = variantArray.filter(x => x !== 'Top' && x !== 'Bar')
} }
break break

2
src/services/theme_data/theme_data_3.service.js
View file

@ -156,7 +156,7 @@ export const init = (extraRuleset, ultimateBackgroundColor, debug) => {
const rulesetUnsorted = [ const rulesetUnsorted = [
...Object.values(components) ...Object.values(components)
.map(c => (c.defaultRules || []).map(r => ({ component: c.name, ...r }))) .map(c => (c.defaultRules || []).map(r => ({ component: c.name, ...r, source: 'Built-in' })))
.reduce((acc, arr) => [...acc, ...arr], []), .reduce((acc, arr) => [...acc, ...arr], []),
...extraRuleset ...extraRuleset
].map(rule => { ].map(rule => {