Zergling_man/moment
Zergling_man/moment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust/fix header, fields and buttons colors

Browse Source
This commit is contained in:
miruka 2019-07-24 16:21:34 -04:00
parent 29107ca7f2
commit 72eff47012
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/qml/Base/HBusyIndicator.qml
View File

@ -8,8 +8,8 @@ BusyIndicator {
contentItem: Item { contentItem: Item {
Rectangle { Rectangle {
id: rect id: circle
width: indicator.height width: height
height: indicator.height height: indicator.height
radius: height / 2 radius: height / 2
@ -27,7 +27,7 @@ BusyIndicator {
XAnimator on x { XAnimator on x {
from: 0 from: 0
to: indicator.width - rect.width to: indicator.width - circle.width
duration: colorAnimation.duration / 2 duration: colorAnimation.duration / 2
onStopped: {[from, to] = [to, from]; start()} onStopped: {[from, to] = [to, from]; start()}
} }

3
src/qml/Base/HUIButton.qml
View File

@ -50,10 +50,9 @@ HBaseButton {
font.pixelSize: fontSize font.pixelSize: fontSize
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
color: enabled ? color: button.enabled ?
theme.controls.button.text : theme.controls.button.text :
theme.controls.button.disabledText theme.controls.button.disabledText
Behavior on color { HNumberAnimation {} }
Layout.fillWidth: true Layout.fillWidth: true
} }

14
src/themes/Default.qpl
View File

@ -46,7 +46,9 @@ colors:
color weakBackground: hsluv(hue, saturation, intensity * 12, opacity) color weakBackground: hsluv(hue, saturation, intensity * 12, opacity)
color mediumBackground: hsluv(hue, saturation, intensity * 9, opacity) color mediumBackground: hsluv(hue, saturation, intensity * 9, opacity)
color strongBackground: hsluv(hue, saturation, intensity * 6, 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 brightText: hsluv(0, 0, intensity * 100)
color text: hsluv(0, 0, intensity * 80) color text: hsluv(0, 0, intensity * 80)
@ -72,11 +74,11 @@ controls:
int radius: theme.radius int radius: theme.radius
header: header:
color background: colors.mediumBackground color background: colors.strongBackground
button: button:
color background: colors.fullBackground color background: colors.inputBackground
color text: colors.text color text: colors.text
color disabledText: colors.dimmerText color disabledText: colors.dimmerText
interactiveRectangle: interactiveRectangle:
@ -91,7 +93,7 @@ controls:
real checkedOpacity: 0.2 real checkedOpacity: 0.2
textField: textField:
color background: colors.fullBackground color background: colors.inputBackground
color focusedBackground: background color focusedBackground: background
int borderWidth: 1 int borderWidth: 1
@ -102,7 +104,7 @@ controls:
color focusedText: colors.text color focusedText: colors.text
textArea: textArea:
color background: colors.fullBackground color background: colors.inputBackground
color text: colors.text color text: colors.text
avatar: avatar: