git.iko.soy/unity8
on xenial help sign in
hardcode colors in labels like we do everywhere
d3205bfAlbert Astals
qml/Dash/DashDepartments.qml+1
compare with xenial
unifiedsplit
@@ -77,6 +77,7 @@ AbstractButton {
77 anchors.margins: units.gu(2)
77 anchors.margins: units.gu(2)
78 verticalAlignment: Text.AlignVCenter
78 verticalAlignment: Text.AlignVCenter
79 text: root.currentDepartment ? root.currentDepartment.label : ""
79 text: root.currentDepartment ? root.currentDepartment.label : ""
80+ color: "gray" // TODO remove once we're a separate app
80 }
81 }
81
82
82 Image {
83 Image {
qml/Dash/DashDepartmentsList.qml+4−1
@@ -81,6 +81,7 @@ Item {
81 anchors.verticalCenter: parent.verticalCenter
81 anchors.verticalCenter: parent.verticalCenter
82 anchors.left: backImage.right
82 anchors.left: backImage.right
83 text: department ? department.parentLabel : ""
83 text: department ? department.parentLabel : ""
84+ color: "gray" // TODO remove once we're a separate app
84 }
85 }
85
86
86 Rectangle {
87 Rectangle {
@@ -110,6 +111,7 @@ Item {
110 anchors.leftMargin: units.gu(2)
111 anchors.leftMargin: units.gu(2)
111 text: department ? (department.allLabel != "" ? department.allLabel : department.label) : ""
112 text: department ? (department.allLabel != "" ? department.allLabel : department.label) : ""
112 font.bold: true
113 font.bold: true
114+ color: "gray" // TODO remove once we're a separate app
113 }
115 }
114
116
115 Rectangle {
117 Rectangle {
@@ -119,7 +121,7 @@ Item {
119 anchors.leftMargin: units.gu(2)
121 anchors.leftMargin: units.gu(2)
120 anchors.rightMargin: units.gu(2)
122 anchors.rightMargin: units.gu(2)
121 width: parent.width
123 width: parent.width
122− color: "grey"
124+ color: "gray"
123 opacity: 0.2
125 opacity: 0.2
124 height: units.dp(1)
126 height: units.dp(1)
125 }
127 }
@@ -143,6 +145,7 @@ Item {
143 anchors.left: parent.left
145 anchors.left: parent.left
144 anchors.leftMargin: units.gu(2)
146 anchors.leftMargin: units.gu(2)
145 text: label
147 text: label
148+ color: "gray" // TODO remove once we're a separate app
146 }
149 }
147
150
148 Image {
151 Image {