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

Change all colors to use the new hsl(a) functions

Browse Source
This commit is contained in:
miruka
2019-07-18 01:31:51 -04:00
parent cf13315d4f
commit 271b3e3829
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/qml/Pages/EditAccount/Profile.qml
View File

@@ -59,7 +59,7 @@ HGridLayout {
Behavior on opacity { HNumberAnimation {} } Behavior on opacity { HNumberAnimation {} }
anchors.fill: parent anchors.fill: parent
color: Qt.hsla(0, 0, 0, avatar.imageUrl ? 0.7 : 1) color: Utils.hsla(0, 0, 0, avatar.imageUrl ? 0.7 : 1)
HColumnLayout { HColumnLayout {
anchors.centerIn: parent anchors.centerIn: parent
@@ -76,7 +76,7 @@ HGridLayout {
HLabel { HLabel {
text: qsTr("Upload profile picture") text: qsTr("Upload profile picture")
color: Qt.hsla(0, 0, 0.9, 1) color: Utils.hsla(0, 0, 90, 1)
font.pixelSize: theme.fontSize.big * font.pixelSize: theme.fontSize.big *
avatar.height / avatarPreferredSize avatar.height / avatarPreferredSize
wrapMode: Text.WordWrap wrapMode: Text.WordWrap

24
src/qml/Theme.qml
View File

@@ -37,14 +37,14 @@ QtObject {
property int radius: 5 property int radius: 5
property QtObject colors: QtObject { property QtObject colors: QtObject {
property color background0: Qt.hsla(0, 0, 0.9, 0.5) property color background0: Ut.hsla(0, 0, 90, 0.5)
property color background1: Qt.hsla(0, 0, 0.9, 0.6) property color background1: Ut.hsla(0, 0, 90, 0.6)
property color background2: Qt.hsla(0, 0, 0.9, 0.7) property color background2: Ut.hsla(0, 0, 90, 0.7)
property color foreground: "black" property color foreground: "black"
property color foregroundDim: Qt.hsla(0, 0, 0.2, 1) property color foregroundDim: Ut.hsl(0, 0, 20)
property color foregroundDim2: Qt.hsla(0, 0, 0.3, 1) property color foregroundDim2: Ut.hsl(0, 0, 30)
property color foregroundError: Qt.hsla(0.95, 0.64, 0.32, 1) property color foregroundError: Ut.hsl(342, 64, 32)
property color textBorder: Qt.hsla(0, 0, 0, 0.07) property color textBorder: Ut.hsla(0, 0, 0, 0.07)
property color accent: Ut.hsl(160, 62, 55) property color accent: Ut.hsl(160, 62, 55)
} }
@@ -55,9 +55,9 @@ QtObject {
property QtObject listEntry: QtObject { property QtObject listEntry: QtObject {
property color background: "transparent" property color background: "transparent"
property color hoveredBackground: Qt.hsla(0, 0, 0, 0.2) property color hoveredBackground: Ut.hsla(0, 0, 0, 0.2)
property color pressedBackground: Qt.hsla(0, 0, 0, 0.4) property color pressedBackground: Ut.hsla(0, 0, 0, 0.4)
property color checkedBackground: Qt.hsla(0, 0, 0, 0.4) property color checkedBackground: Ut.hsla(0, 0, 0, 0.4)
} }
property QtObject textField: QtObject { property QtObject textField: QtObject {
@@ -110,7 +110,7 @@ QtObject {
} }
property QtObject message: QtObject { property QtObject message: QtObject {
property color ownBackground: Qt.hsla(0.07, 0.4, 0.82, 0.7) property color ownBackground: Ut.hsla(25, 40, 82, 0.7)
property color background: colors.background2 property color background: colors.background2
property color body: colors.foreground property color body: colors.foreground
property color date: colors.foregroundDim property color date: colors.foregroundDim
@@ -159,7 +159,7 @@ QtObject {
property real saturation: 0.22 property real saturation: 0.22
property real lightness: 0.5 property real lightness: 0.5
property real alpha: 1 property real alpha: 1
property color unknown: Qt.hsla(0, 0, 0.22, 1) property color unknown: Ut.hsl(0, 0, 22)
} }
} }