summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2018-08-01 17:34:21 +0200
committerChristian Mollekopf <chrigi_1@fastmail.fm>2018-08-01 17:34:21 +0200
commitc9b2bf36008b2918cb61c7a08c29c2fbe38a474c (patch)
tree705c54de832c430e44689250abe1a9a65bd70e17
parentdbfd6acf3515492f30fc8985a14412cd3f1cba1e (diff)
downloadkube-c9b2bf36008b2918cb61c7a08c29c2fbe38a474c.tar.gz
kube-c9b2bf36008b2918cb61c7a08c29c2fbe38a474c.zip
Avoid direct color hardcoding
-rw-r--r--views/calendar/qml/WeekView.qml10
1 files changed, 6 insertions, 4 deletions
diff --git a/views/calendar/qml/WeekView.qml b/views/calendar/qml/WeekView.qml
index ca35d788..c8d0ab7b 100644
--- a/views/calendar/qml/WeekView.qml
+++ b/views/calendar/qml/WeekView.qml
@@ -70,7 +70,7 @@ FocusScope {
70 height: Kube.Units.gridUnit + Kube.Units.smallSpacing * 3 70 height: Kube.Units.gridUnit + Kube.Units.smallSpacing * 3
71 71
72 border.width: 1 72 border.width: 1
73 border.color: "lightgrey" 73 border.color: Kube.Colors.lightgrey
74 color: Kube.Colors.viewBackgroundColor 74 color: Kube.Colors.viewBackgroundColor
75 75
76 Kube.Label { 76 Kube.Label {
@@ -200,7 +200,7 @@ FocusScope {
200 height: root.hourHeight * 24 200 height: root.hourHeight * 24
201 201
202 border.width: 1 202 border.width: 1
203 border.color: "lightgrey" 203 border.color: Kube.Colors.lightgrey
204 color: Kube.Colors.viewBackgroundColor 204 color: Kube.Colors.viewBackgroundColor
205 205
206 Column { 206 Column {
@@ -212,7 +212,7 @@ FocusScope {
212 width: parent.width 212 width: parent.width
213 color: "transparent" 213 color: "transparent"
214 border.width:1 214 border.width:1
215 border.color: "lightgrey" 215 border.color: Kube.Colors.lightgrey
216 } 216 }
217 } 217 }
218 } 218 }
@@ -241,12 +241,14 @@ FocusScope {
241 right: parent.right 241 right: parent.right
242 rightMargin: Kube.Units.smallSpacing 242 rightMargin: Kube.Units.smallSpacing
243 } 243 }
244 radius: 2
244 width: root.dayWidth - Kube.Units.smallSpacing * 2 - Kube.Units.gridUnit * model.modelData.indention 245 width: root.dayWidth - Kube.Units.smallSpacing * 2 - Kube.Units.gridUnit * model.modelData.indention
245 height: Math.max(root.hourHeight * 0.5, root.hourHeight * model.modelData.duration) 246 height: Math.max(root.hourHeight * 0.5, root.hourHeight * model.modelData.duration)
246 y: root.hourHeight * model.modelData.starts 247 y: root.hourHeight * model.modelData.starts
247 x: Kube.Units.gridUnit * model.modelData.indention 248 x: Kube.Units.gridUnit * model.modelData.indention
248 249
249 color: model.modelData.color 250 //color: model.modelData.color
251 color: Kube.Colors.bewareOrange
250 border.width: 1 252 border.width: 1
251 border.color: Kube.Colors.viewBackgroundColor 253 border.color: Kube.Colors.viewBackgroundColor
252 254