Adjust/fix header, fields and buttons colors
This commit is contained in:
parent
29107ca7f2
commit
72eff47012
|
@ -8,8 +8,8 @@ BusyIndicator {
|
|||
|
||||
contentItem: Item {
|
||||
Rectangle {
|
||||
id: rect
|
||||
width: indicator.height
|
||||
id: circle
|
||||
width: height
|
||||
height: indicator.height
|
||||
radius: height / 2
|
||||
|
||||
|
@ -27,7 +27,7 @@ BusyIndicator {
|
|||
|
||||
XAnimator on x {
|
||||
from: 0
|
||||
to: indicator.width - rect.width
|
||||
to: indicator.width - circle.width
|
||||
duration: colorAnimation.duration / 2
|
||||
onStopped: {[from, to] = [to, from]; start()}
|
||||
}
|
||||
|
|
|
@ -50,10 +50,9 @@ HBaseButton {
|
|||
font.pixelSize: fontSize
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
color: enabled ?
|
||||
color: button.enabled ?
|
||||
theme.controls.button.text :
|
||||
theme.controls.button.disabledText
|
||||
Behavior on color { HNumberAnimation {} }
|
||||
|
||||
Layout.fillWidth: true
|
||||
}
|
||||
|
|
|
@ -46,7 +46,9 @@ colors:
|
|||
color weakBackground: hsluv(hue, saturation, intensity * 12, opacity)
|
||||
color mediumBackground: hsluv(hue, saturation, intensity * 9, opacity)
|
||||
color strongBackground: hsluv(hue, saturation, intensity * 6, opacity)
|
||||
color fullBackground: hsluv(hue, saturation, intensity * 2, opacity)
|
||||
|
||||
color inputBackground:
|
||||
hsluv(hue, saturation, intensity * 2, Math.min(0.6, opacity))
|
||||
|
||||
color brightText: hsluv(0, 0, intensity * 100)
|
||||
color text: hsluv(0, 0, intensity * 80)
|
||||
|
@ -72,10 +74,10 @@ controls:
|
|||
int radius: theme.radius
|
||||
|
||||
header:
|
||||
color background: colors.mediumBackground
|
||||
color background: colors.strongBackground
|
||||
|
||||
button:
|
||||
color background: colors.fullBackground
|
||||
color background: colors.inputBackground
|
||||
color text: colors.text
|
||||
color disabledText: colors.dimmerText
|
||||
|
||||
|
@ -91,7 +93,7 @@ controls:
|
|||
real checkedOpacity: 0.2
|
||||
|
||||
textField:
|
||||
color background: colors.fullBackground
|
||||
color background: colors.inputBackground
|
||||
color focusedBackground: background
|
||||
|
||||
int borderWidth: 1
|
||||
|
@ -102,7 +104,7 @@ controls:
|
|||
color focusedText: colors.text
|
||||
|
||||
textArea:
|
||||
color background: colors.fullBackground
|
||||
color background: colors.inputBackground
|
||||
color text: colors.text
|
||||
|
||||
avatar:
|
||||
|
|
Loading…
Reference in New Issue
Block a user