Compare commits
No commits in common. "fe5edb7db94c13358204e874e6ba52e30cc02e88" and "33a239b89b930a62879d70f83911904f0d422124" have entirely different histories.
fe5edb7db9
...
33a239b89b
6 changed files with 31 additions and 48 deletions
|
@ -762,6 +762,12 @@ option {
|
||||||
margin-left: 0.7em;
|
margin-left: 0.7em;
|
||||||
margin-top: -1em;
|
margin-top: -1em;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&.-neutral {
|
||||||
|
background-color: var(--badgeNeutral);
|
||||||
|
color: white;
|
||||||
|
color: var(--badgeNeutralText, white);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.alert {
|
.alert {
|
||||||
|
|
|
@ -2,7 +2,6 @@ export default {
|
||||||
name: 'ButtonUnstyled',
|
name: 'ButtonUnstyled',
|
||||||
selector: '.button-unstyled',
|
selector: '.button-unstyled',
|
||||||
notEditable: true,
|
notEditable: true,
|
||||||
transparent: true,
|
|
||||||
states: {
|
states: {
|
||||||
toggled: '.toggled',
|
toggled: '.toggled',
|
||||||
disabled: ':disabled',
|
disabled: ':disabled',
|
||||||
|
|
|
@ -2,7 +2,6 @@ export default {
|
||||||
name: 'RichContent',
|
name: 'RichContent',
|
||||||
selector: '.RichContent',
|
selector: '.RichContent',
|
||||||
notEditable: true,
|
notEditable: true,
|
||||||
transparent: true,
|
|
||||||
validInnerComponents: [
|
validInnerComponents: [
|
||||||
'Text',
|
'Text',
|
||||||
'FunText',
|
'FunText',
|
||||||
|
|
|
@ -2,6 +2,27 @@ export default {
|
||||||
name: 'Root',
|
name: 'Root',
|
||||||
selector: ':root',
|
selector: ':root',
|
||||||
notEditable: true,
|
notEditable: true,
|
||||||
|
validInnerComponents: [
|
||||||
|
// These are purely for --parent--text et such to work
|
||||||
|
'Text',
|
||||||
|
'Link',
|
||||||
|
'Border',
|
||||||
|
|
||||||
|
'Underlay',
|
||||||
|
'Modals',
|
||||||
|
'Popover',
|
||||||
|
'TopBar',
|
||||||
|
'Scrollbar',
|
||||||
|
'ScrollbarElement',
|
||||||
|
'MobileDrawer',
|
||||||
|
'Alert',
|
||||||
|
'Button' // mobile post button
|
||||||
|
],
|
||||||
|
validInnerComponentsLite: [
|
||||||
|
'Underlay',
|
||||||
|
'Scrollbar',
|
||||||
|
'ScrollbarElement'
|
||||||
|
],
|
||||||
defaultRules: [
|
defaultRules: [
|
||||||
{
|
{
|
||||||
directives: {
|
directives: {
|
||||||
|
|
2
src/services/theme_data/pleromafe.t3.js
Normal file
2
src/services/theme_data/pleromafe.t3.js
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
export const sampleRules = [
|
||||||
|
]
|
|
@ -32,7 +32,6 @@ const components = {
|
||||||
Link: null,
|
Link: null,
|
||||||
Icon: null,
|
Icon: null,
|
||||||
Border: null,
|
Border: null,
|
||||||
PanelHeader: null,
|
|
||||||
Panel: null,
|
Panel: null,
|
||||||
Chat: null,
|
Chat: null,
|
||||||
ChatMessage: null
|
ChatMessage: null
|
||||||
|
@ -152,25 +151,6 @@ componentsContext.keys().forEach(key => {
|
||||||
}
|
}
|
||||||
components[component.name] = component
|
components[component.name] = component
|
||||||
})
|
})
|
||||||
Object.keys(components).forEach(key => {
|
|
||||||
if (key === 'Root') return
|
|
||||||
components.Root.validInnerComponents = components.Root.validInnerComponents || []
|
|
||||||
components.Root.validInnerComponents.push(key)
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
Object.keys(components).forEach(key => {
|
|
||||||
const component = components[key]
|
|
||||||
const { validInnerComponents = [] } = component
|
|
||||||
validInnerComponents.forEach(inner => {
|
|
||||||
const child = components[inner]
|
|
||||||
component.possibleChildren = component.possibleChildren || []
|
|
||||||
component.possibleChildren.push(child)
|
|
||||||
child.possibleParents = child.possibleParents || []
|
|
||||||
child.possibleParents.push(component)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
const engineChecksum = sum(components)
|
const engineChecksum = sum(components)
|
||||||
|
|
||||||
|
@ -264,21 +244,7 @@ export const init = ({
|
||||||
}
|
}
|
||||||
|
|
||||||
const virtualComponents = new Set(Object.values(components).filter(c => c.virtual).map(c => c.name))
|
const virtualComponents = new Set(Object.values(components).filter(c => c.virtual).map(c => c.name))
|
||||||
const transparentComponents = new Set(Object.values(components).filter(c => c.transparent).map(c => c.name))
|
|
||||||
const nonEditableComponents = new Set(Object.values(components).filter(c => c.notEditable).map(c => c.name))
|
const nonEditableComponents = new Set(Object.values(components).filter(c => c.notEditable).map(c => c.name))
|
||||||
const extraCompileComponents = new Set([])
|
|
||||||
|
|
||||||
Object.values(components).forEach(component => {
|
|
||||||
const relevantRules = ruleset.filter(r => r.component === component.name)
|
|
||||||
const backgrounds = relevantRules.map(r => r.directives.background).filter(x => x)
|
|
||||||
const opacities = relevantRules.map(r => r.directives.opacity).filter(x => x)
|
|
||||||
if (
|
|
||||||
backgrounds.some(x => x.match(/--parent/)) ||
|
|
||||||
opacities.some(x => x != null && x < 1))
|
|
||||||
{
|
|
||||||
extraCompileComponents.add(component.name)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
const processCombination = (combination) => {
|
const processCombination = (combination) => {
|
||||||
try {
|
try {
|
||||||
|
@ -507,21 +473,11 @@ export const init = ({
|
||||||
let validInnerComponents
|
let validInnerComponents
|
||||||
if (editMode) {
|
if (editMode) {
|
||||||
const temp = (component.validInnerComponentsLite || component.validInnerComponents || [])
|
const temp = (component.validInnerComponentsLite || component.validInnerComponents || [])
|
||||||
validInnerComponents = temp
|
validInnerComponents = temp.filter(c => virtualComponents.has(c) && !nonEditableComponents.has(c))
|
||||||
.filter(c => virtualComponents.has(c) && !nonEditableComponents.has(c))
|
|
||||||
} else if (liteMode) {
|
} else if (liteMode) {
|
||||||
validInnerComponents = (component.validInnerComponentsLite || component.validInnerComponents || [])
|
validInnerComponents = (component.validInnerComponentsLite || component.validInnerComponents || [])
|
||||||
} else if (component.name === 'Root') {
|
|
||||||
validInnerComponents = component.validInnerComponents || []
|
|
||||||
} else {
|
} else {
|
||||||
validInnerComponents = component
|
validInnerComponents = component.validInnerComponents || []
|
||||||
.validInnerComponents
|
|
||||||
?.filter(
|
|
||||||
c => virtualComponents.has(c)
|
|
||||||
|| transparentComponents.has(c)
|
|
||||||
|| extraCompileComponents.has(c)
|
|
||||||
)
|
|
||||||
|| []
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Normalizing states and variants to always include "normal"
|
// Normalizing states and variants to always include "normal"
|
||||||
|
|
Loading…
Add table
Reference in a new issue