git.iko.soy/unity8
on xenial help sign in
color fixes
c1fc94eNick Dedekind
qml/ApplicationMenus/MenuBar.qml+3−2
compare with xenial
unifiedsplit
@@ -18,6 +18,7 @@ import QtQuick 2.4
18import QtQuick.Layouts 1.1
18import QtQuick.Layouts 1.1
19import Utils 0.1
19import Utils 0.1
20import Ubuntu.Components 1.3
20import Ubuntu.Components 1.3
21+import Ubuntu.Components.Themes 1.3
21import GlobalShortcut 1.0
22import GlobalShortcut 1.0
22
23
23Item {
24Item {
@@ -176,7 +177,7 @@ Item {
176 id: _title
177 id: _title
177 text: actionItem.text
178 text: actionItem.text
178 horizontalAlignment: Text.AlignLeft
179 horizontalAlignment: Text.AlignLeft
179− color: enabled ? "white" : "#5d5d5d"
180+ color: enabled ? theme.palette.normal.overlayText : theme.palette.disabled.overlayText
180 }
181 }
181 }
182 }
182 }
183 }
@@ -223,7 +224,7 @@ Item {
223 x: d.currentItem ? row.x + d.currentItem.x - units.gu(1) : 0
224 x: d.currentItem ? row.x + d.currentItem.x - units.gu(1) : 0
224 width: d.currentItem ? d.currentItem.width + units.gu(2) : 0
225 width: d.currentItem ? d.currentItem.width + units.gu(2) : 0
225 height: units.dp(4)
226 height: units.dp(4)
226− color: UbuntuColors.orange
227+ color: theme.palette.normal.activity
227 visible: d.currentItem
228 visible: d.currentItem
228 }
229 }
229 }
230 }
qml/ApplicationMenus/MenuPopup.qml+1−1
@@ -309,7 +309,7 @@ UbuntuShape {
309 Rectangle {
309 Rectangle {
310 color: "transparent"
310 color: "transparent"
311 border.width: units.dp(1)
311 border.width: units.dp(1)
312− border.color: UbuntuColors.orange
312+ border.color: theme.palette.normal.activity
313 z: 1
313 z: 1
314
314
315 width: listView.width
315 width: listView.width