git.iko.soy/unity8
on xenial help sign in
hardcode colors in labels like we do everywhere
commitd3205bf1ffdc3ab605ff750f8f3d151cea07190c authorAlbert Astals <albert.astals@canonical.com> dateTue 17 Jun 2014, 15:32 (12 years ago) parent05af436
2 files changed+5−1
compare with xenial
unifiedsplit
qml/Dash/DashDepartments.qml+1 qml/Dash/DashDepartmentsList.qml+4−1
qml/Dash/DashDepartments.qml+1
@@ -77,6 +77,7 @@ AbstractButton {
7777 anchors.margins: units.gu(2)
7878 verticalAlignment: Text.AlignVCenter
7979 text: root.currentDepartment ? root.currentDepartment.label : ""
80+ color: "gray" // TODO remove once we're a separate app
8081 }
8182
8283 Image {
qml/Dash/DashDepartmentsList.qml+4−1
@@ -81,6 +81,7 @@ Item {
8181 anchors.verticalCenter: parent.verticalCenter
8282 anchors.left: backImage.right
8383 text: department ? department.parentLabel : ""
84+ color: "gray" // TODO remove once we're a separate app
8485 }
8586
8687 Rectangle {
@@ -110,6 +111,7 @@ Item {
110111 anchors.leftMargin: units.gu(2)
111112 text: department ? (department.allLabel != "" ? department.allLabel : department.label) : ""
112113 font.bold: true
114+ color: "gray" // TODO remove once we're a separate app
113115 }
114116
115117 Rectangle {
@@ -119,7 +121,7 @@ Item {
119121 anchors.leftMargin: units.gu(2)
120122 anchors.rightMargin: units.gu(2)
121123 width: parent.width
122− color: "grey"
124+ color: "gray"
123125 opacity: 0.2
124126 height: units.dp(1)
125127 }
@@ -143,6 +145,7 @@ Item {
143145 anchors.left: parent.left
144146 anchors.leftMargin: units.gu(2)
145147 text: label
148+ color: "gray" // TODO remove once we're a separate app
146149 }
147150
148151 Image {