git.iko.soy/unity8
on xenial help sign in
reverted color fixes
6df3185Nick Dedekind
qml/ApplicationMenus/MenuBar.qml+2−3
compare with xenial
unifiedsplit
@@ -18,7 +18,6 @@ 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
22import GlobalShortcut 1.0
21import GlobalShortcut 1.0
23
22
24Item {
23Item {
@@ -195,7 +194,7 @@ Item {
195 id: _title
194 id: _title
196 text: actionItem.text
195 text: actionItem.text
197 horizontalAlignment: Text.AlignLeft
196 horizontalAlignment: Text.AlignLeft
198− color: enabled ? theme.palette.normal.overlayText : theme.palette.disabled.overlayText
197+ color: enabled ? "white" : "#5d5d5d"
199 }
198 }
200 }
199 }
201 }
200 }
@@ -339,7 +338,7 @@ Item {
339 x: d.currentItem ? row.x + d.currentItem.x - units.gu(1) : 0
338 x: d.currentItem ? row.x + d.currentItem.x - units.gu(1) : 0
340 width: d.currentItem ? d.currentItem.width + units.gu(2) : 0
339 width: d.currentItem ? d.currentItem.width + units.gu(2) : 0
341 height: units.dp(4)
340 height: units.dp(4)
342− color: theme.palette.normal.activity
341+ color: UbuntuColors.orange
343 visible: d.currentItem
342 visible: d.currentItem
344 }
343 }
345
344
qml/ApplicationMenus/MenuPopup.qml+1−1
@@ -320,7 +320,7 @@ UbuntuShape {
320 Rectangle {
320 Rectangle {
321 color: "transparent"
321 color: "transparent"
322 border.width: units.dp(1)
322 border.width: units.dp(1)
323− border.color: theme.palette.normal.activity
323+ border.color: UbuntuColors.orange
324 z: 1
324 z: 1
325
325
326 width: listView.width
326 width: listView.width