chore(Palette): do not define font properties twice
sue a shared impl, they are common to both light/dark palettes
This commit is contained in:
parent
4282cc10c4
commit
fa16c32316
@ -4,95 +4,7 @@ ThemePalette {
|
|||||||
|
|
||||||
name: "dark"
|
name: "dark"
|
||||||
|
|
||||||
property QtObject baseFont: FontLoader {
|
dropShadow: getColor('black', 0.08)
|
||||||
source: "../../../assets/fonts/Inter/Inter-Regular.otf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject baseFontThin: FontLoader {
|
|
||||||
source: "../../../assets/fonts/Inter/Inter-Thin.otf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject baseFontExtraLight: FontLoader {
|
|
||||||
source: "../../../assets/fonts/Inter/Inter-ExtraLight.otf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject baseFontLight: FontLoader {
|
|
||||||
source: "../../../assets/fonts/Inter/Inter-Light.otf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject baseFontMedium: FontLoader {
|
|
||||||
source: "../../../assets/fonts/Inter/Inter-Medium.otf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject baseFontBold: FontLoader {
|
|
||||||
source: "../../../assets/fonts/Inter/Inter-Bold.otf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject baseFontExtraBold: FontLoader {
|
|
||||||
source: "../../../assets/fonts/Inter/Inter-ExtraBold.otf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject baseFontBlack: FontLoader {
|
|
||||||
source: "../../../assets/fonts/Inter/Inter-Black.otf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject monoFont: FontLoader {
|
|
||||||
source: "../../../assets/fonts/InterStatus/InterStatus-Regular.otf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject monoFontThin: FontLoader {
|
|
||||||
source: "../../../assets/fonts/InterStatus/InterStatus-Thin.otf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject monoFontExtraLight: FontLoader {
|
|
||||||
source: "../../../assets/fonts/InterStatus/InterStatus-ExtraLight.otf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject monoFontLight: FontLoader {
|
|
||||||
source: "../../../assets/fonts/InterStatus/InterStatus-Light.otf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject monoFontMedium: FontLoader {
|
|
||||||
source: "../../../assets/fonts/InterStatus/InterStatus-Medium.otf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject monoFontBold: FontLoader {
|
|
||||||
source: "../../../assets/fonts/InterStatus/InterStatus-Bold.otf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject monoFontExtraBold: FontLoader {
|
|
||||||
source: "../../../assets/fonts/InterStatus/InterStatus-ExtraBold.otf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject monoFontBlack: FontLoader {
|
|
||||||
source: "../../../assets/fonts/InterStatus/InterStatus-Black.otf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject codeFont: FontLoader {
|
|
||||||
source: "../../../assets/fonts/RobotoMono/RobotoMono-Regular.ttf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject codeFontThin: FontLoader {
|
|
||||||
source: "../../../assets/fonts/RobotoMono/RobotoMono-Thin.ttf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject codeFontExtraLight: FontLoader {
|
|
||||||
source: "../../../assets/fonts/RobotoMono/RobotoMono-ExtraLight.ttf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject codeFontLight: FontLoader {
|
|
||||||
source: "../../../assets/fonts/RobotoMono/RobotoMono-Light.ttf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject codeFontMedium: FontLoader {
|
|
||||||
source: "../../../assets/fonts/RobotoMono/RobotoMono-Medium.ttf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject codeFontBold: FontLoader {
|
|
||||||
source: "../../../assets/fonts/RobotoMono/RobotoMono-Bold.ttf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property color dropShadow: getColor('black', 0.08)
|
|
||||||
|
|
||||||
baseColor1: getColor('graphite5')
|
baseColor1: getColor('graphite5')
|
||||||
baseColor2: getColor('graphite4')
|
baseColor2: getColor('graphite4')
|
||||||
|
@ -4,94 +4,6 @@ ThemePalette {
|
|||||||
|
|
||||||
name: "light"
|
name: "light"
|
||||||
|
|
||||||
property QtObject baseFont: FontLoader {
|
|
||||||
source: "../../../assets/fonts/Inter/Inter-Regular.otf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject baseFontThin: FontLoader {
|
|
||||||
source: "../../../assets/fonts/Inter/Inter-Thin.otf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject baseFontExtraLight: FontLoader {
|
|
||||||
source: "../../../assets/fonts/Inter/Inter-ExtraLight.otf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject baseFontLight: FontLoader {
|
|
||||||
source: "../../../assets/fonts/Inter/Inter-Light.otf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject baseFontMedium: FontLoader {
|
|
||||||
source: "../../../assets/fonts/Inter/Inter-Medium.otf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject baseFontBold: FontLoader {
|
|
||||||
source: "../../../assets/fonts/Inter/Inter-Bold.otf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject baseFontExtraBold: FontLoader {
|
|
||||||
source: "../../../assets/fonts/Inter/Inter-ExtraBold.otf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject baseFontBlack: FontLoader {
|
|
||||||
source: "../../../assets/fonts/Inter/Inter-Black.otf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject monoFont: FontLoader {
|
|
||||||
source: "../../../assets/fonts/InterStatus/InterStatus-Regular.otf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject monoFontThin: FontLoader {
|
|
||||||
source: "../../../assets/fonts/InterStatus/InterStatus-Thin.otf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject monoFontExtraLight: FontLoader {
|
|
||||||
source: "../../../assets/fonts/InterStatus/InterStatus-ExtraLight.otf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject monoFontLight: FontLoader {
|
|
||||||
source: "../../../assets/fonts/InterStatus/InterStatus-Light.otf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject monoFontMedium: FontLoader {
|
|
||||||
source: "../../../assets/fonts/InterStatus/InterStatus-Medium.otf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject monoFontBold: FontLoader {
|
|
||||||
source: "../../../assets/fonts/InterStatus/InterStatus-Bold.otf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject monoFontExtraBold: FontLoader {
|
|
||||||
source: "../../../assets/fonts/InterStatus/InterStatus-ExtraBold.otf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject monoFontBlack: FontLoader {
|
|
||||||
source: "../../../assets/fonts/InterStatus/InterStatus-Black.otf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject codeFont: FontLoader {
|
|
||||||
source: "../../../assets/fonts/RobotoMono/RobotoMono-Regular.ttf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject codeFontThin: FontLoader {
|
|
||||||
source: "../../../assets/fonts/RobotoMono/RobotoMono-Thin.ttf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject codeFontExtraLight: FontLoader {
|
|
||||||
source: "../../../assets/fonts/RobotoMono/RobotoMono-ExtraLight.ttf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject codeFontLight: FontLoader {
|
|
||||||
source: "../../../assets/fonts/RobotoMono/RobotoMono-Light.ttf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject codeFontMedium: FontLoader {
|
|
||||||
source: "../../../assets/fonts/RobotoMono/RobotoMono-Medium.ttf"
|
|
||||||
}
|
|
||||||
|
|
||||||
property QtObject codeFontBold: FontLoader {
|
|
||||||
source: "../../../assets/fonts/RobotoMono/RobotoMono-Bold.ttf"
|
|
||||||
}
|
|
||||||
|
|
||||||
baseColor1: getColor('grey5')
|
baseColor1: getColor('grey5')
|
||||||
baseColor2: getColor('grey4')
|
baseColor2: getColor('grey4')
|
||||||
baseColor3: getColor('grey3')
|
baseColor3: getColor('grey3')
|
||||||
|
@ -10,5 +10,3 @@ QtObject {
|
|||||||
palette = theme
|
palette = theme
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -6,30 +6,93 @@ QtObject {
|
|||||||
|
|
||||||
property string name
|
property string name
|
||||||
|
|
||||||
property FontLoader baseFont
|
property var baseFont: FontLoader {
|
||||||
property FontLoader baseFontThin
|
source: "../../../assets/fonts/Inter/Inter-Regular.otf"
|
||||||
property FontLoader baseFontExtraLight
|
}
|
||||||
property FontLoader baseFontLight
|
|
||||||
property FontLoader baseFontMedium
|
|
||||||
property FontLoader baseFontBold
|
|
||||||
property FontLoader baseFontExtraBold
|
|
||||||
property FontLoader baseFontBlack
|
|
||||||
|
|
||||||
property FontLoader monoFont
|
property var baseFontThin: FontLoader {
|
||||||
property FontLoader monoFontThin
|
source: "../../../assets/fonts/Inter/Inter-Thin.otf"
|
||||||
property FontLoader monoFontExtraLight
|
}
|
||||||
property FontLoader monoFontLight
|
|
||||||
property FontLoader monoFontMedium
|
|
||||||
property FontLoader monoFontBold
|
|
||||||
property FontLoader monoFontExtraBold
|
|
||||||
property FontLoader monoFontBlack
|
|
||||||
|
|
||||||
property FontLoader codeFont
|
property var baseFontExtraLight: FontLoader {
|
||||||
property FontLoader codeFontThin
|
source: "../../../assets/fonts/Inter/Inter-ExtraLight.otf"
|
||||||
property FontLoader codeFontExtraLight
|
}
|
||||||
property FontLoader codeFontLight
|
|
||||||
property FontLoader codeFontMedium
|
property var baseFontLight: FontLoader {
|
||||||
property FontLoader codeFontBold
|
source: "../../../assets/fonts/Inter/Inter-Light.otf"
|
||||||
|
}
|
||||||
|
|
||||||
|
property var baseFontMedium: FontLoader {
|
||||||
|
source: "../../../assets/fonts/Inter/Inter-Medium.otf"
|
||||||
|
}
|
||||||
|
|
||||||
|
property var baseFontBold: FontLoader {
|
||||||
|
source: "../../../assets/fonts/Inter/Inter-Bold.otf"
|
||||||
|
}
|
||||||
|
|
||||||
|
property var baseFontExtraBold: FontLoader {
|
||||||
|
source: "../../../assets/fonts/Inter/Inter-ExtraBold.otf"
|
||||||
|
}
|
||||||
|
|
||||||
|
property var baseFontBlack: FontLoader {
|
||||||
|
source: "../../../assets/fonts/Inter/Inter-Black.otf"
|
||||||
|
}
|
||||||
|
|
||||||
|
property var monoFont: FontLoader {
|
||||||
|
source: "../../../assets/fonts/InterStatus/InterStatus-Regular.otf"
|
||||||
|
}
|
||||||
|
|
||||||
|
property var monoFontThin: FontLoader {
|
||||||
|
source: "../../../assets/fonts/InterStatus/InterStatus-Thin.otf"
|
||||||
|
}
|
||||||
|
|
||||||
|
property var monoFontExtraLight: FontLoader {
|
||||||
|
source: "../../../assets/fonts/InterStatus/InterStatus-ExtraLight.otf"
|
||||||
|
}
|
||||||
|
|
||||||
|
property var monoFontLight: FontLoader {
|
||||||
|
source: "../../../assets/fonts/InterStatus/InterStatus-Light.otf"
|
||||||
|
}
|
||||||
|
|
||||||
|
property var monoFontMedium: FontLoader {
|
||||||
|
source: "../../../assets/fonts/InterStatus/InterStatus-Medium.otf"
|
||||||
|
}
|
||||||
|
|
||||||
|
property var monoFontBold: FontLoader {
|
||||||
|
source: "../../../assets/fonts/InterStatus/InterStatus-Bold.otf"
|
||||||
|
}
|
||||||
|
|
||||||
|
property var monoFontExtraBold: FontLoader {
|
||||||
|
source: "../../../assets/fonts/InterStatus/InterStatus-ExtraBold.otf"
|
||||||
|
}
|
||||||
|
|
||||||
|
property var monoFontBlack: FontLoader {
|
||||||
|
source: "../../../assets/fonts/InterStatus/InterStatus-Black.otf"
|
||||||
|
}
|
||||||
|
|
||||||
|
property var codeFont: FontLoader {
|
||||||
|
source: "../../../assets/fonts/RobotoMono/RobotoMono-Regular.ttf"
|
||||||
|
}
|
||||||
|
|
||||||
|
property var codeFontThin: FontLoader {
|
||||||
|
source: "../../../assets/fonts/RobotoMono/RobotoMono-Thin.ttf"
|
||||||
|
}
|
||||||
|
|
||||||
|
property var codeFontExtraLight: FontLoader {
|
||||||
|
source: "../../../assets/fonts/RobotoMono/RobotoMono-ExtraLight.ttf"
|
||||||
|
}
|
||||||
|
|
||||||
|
property var codeFontLight: FontLoader {
|
||||||
|
source: "../../../assets/fonts/RobotoMono/RobotoMono-Light.ttf"
|
||||||
|
}
|
||||||
|
|
||||||
|
property var codeFontMedium: FontLoader {
|
||||||
|
source: "../../../assets/fonts/RobotoMono/RobotoMono-Medium.ttf"
|
||||||
|
}
|
||||||
|
|
||||||
|
property var codeFontBold: FontLoader {
|
||||||
|
source: "../../../assets/fonts/RobotoMono/RobotoMono-Bold.ttf"
|
||||||
|
}
|
||||||
|
|
||||||
property color black: getColor('black')
|
property color black: getColor('black')
|
||||||
property color white: getColor('white')
|
property color white: getColor('white')
|
||||||
|
Loading…
x
Reference in New Issue
Block a user