Merge branch 'hj/2.7.1-fixes' into shigusegubu-themes3
This commit is contained in:
commit
f8b0af62b2
57 changed files with 82 additions and 59 deletions
|
|
@ -351,6 +351,7 @@ export const convertTheme2To3 = (data) => {
|
|||
newRules.push({ ...rule, parent: { component: 'Notification' } })
|
||||
}
|
||||
if (key === 'buttonPressed') {
|
||||
console.log(key)
|
||||
newRules.push({ ...rule, state: ['toggled'] })
|
||||
newRules.push({ ...rule, state: ['toggled', 'focus'] })
|
||||
newRules.push({ ...rule, state: ['pressed', 'focus'] })
|
||||
|
|
@ -418,7 +419,6 @@ export const convertTheme2To3 = (data) => {
|
|||
case 'Border':
|
||||
newRule.parent = rule
|
||||
newRule.directives.textColor = data.colors[key]
|
||||
newRule.directives.textAuto = 'no-auto'
|
||||
variantArray = parts.slice(0, -1)
|
||||
break
|
||||
default:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue