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

Fix accent and input colors

Browse Source
This commit is contained in:
miruka 2019-08-27 22:44:41 -04:00
parent 9b83b91d9d
commit 77dbc3a502
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/qml/Base/HButtonBackground.qml
View File

@ -2,6 +2,7 @@ import QtQuick 2.12
import QtQuick.Controls 2.12 import QtQuick.Controls 2.12
HRectangle { HRectangle {
color: buttonTheme.background
opacity: loading ? theme.loadingElementsOpacity : opacity: loading ? theme.loadingElementsOpacity :
enabled ? 1 : theme.disabledElementsOpacity enabled ? 1 : theme.disabledElementsOpacity

12
src/themes/Default.qpl
View File

@ -48,13 +48,13 @@ colors:
color strongBackground: hsluv(hue, saturation, intensity * 6, opacity) color strongBackground: hsluv(hue, saturation, intensity * 6, opacity)
color inputBackground: color inputBackground:
hsluv(hue, saturation, intensity * 2, Math.min(0.6, opacity)) hsluv(hue, saturation, intensity * 2, Math.max(0.6, opacity))
color accentBackground: color accentBackground:
hsluv(hue, saturation * 1.25, intensity * 42, Math.min(0.6, opacity)) hsluv(hue, saturation * 1.25, intensity * 42, Math.max(0.6, opacity))
color strongAccentBackground: color strongAccentBackground:
hsluv(hue, saturation * 2, intensity * 52, Math.min(0.6, opacity)) hsluv(hue, saturation * 2, intensity * 52, Math.max(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)
@ -63,7 +63,7 @@ colors:
color dimmerText: hsluv(0, 0, intensity * 30) color dimmerText: hsluv(0, 0, intensity * 30)
color errorText: hsluv(0, saturation * 2.25, 50) color errorText: hsluv(0, saturation * 2.25, 50)
color accentText: hsluv(hue - 80, saturation * 2.25, 60) color accentText: hsluv(hue, saturation * 2.25, 60)
color link: accentText color link: accentText
color code: hsluv(hue + 5, saturation * 1.5, intensity * 60) color code: hsluv(hue + 5, saturation * 1.5, intensity * 60)
@ -114,7 +114,7 @@ controls:
color checkedOverlay: controls.button.hoveredOverlay color checkedOverlay: controls.button.hoveredOverlay
checkBox: checkBox:
color checkIconColor: colors.strongAccentBackground color checkIconColor: colors.accentBackground
color boxBackground: controls.button.background color boxBackground: controls.button.background
color boxBorder: hsluv(0, 0, 50, 0.3) color boxBorder: hsluv(0, 0, 50, 0.3)
@ -132,7 +132,7 @@ controls:
int borderWidth: 1 int borderWidth: 1
color border: "transparent" color border: "transparent"
color focusedBorder: colors.strongAccentBackground color focusedBorder: colors.accentBackground
color errorBorder: colors.errorText color errorBorder: colors.errorText
color text: colors.text color text: colors.text