git.iko.soy/unity8
on xenial help sign in
Updated menu colors

Approved by: Lukáš Tinkl, Unity8 CI Bot

commit4347bb5f28e2c81b21003c75315566dd775ce569 authorNick Dedekind <nick.dedekind@canonical.com> dateThu 16 Feb 2017, 13:43 (10 years ago) parent079549e67cf87c
4 files changed+9−8
compare with xenial
unifiedsplit
qml/ApplicationMenus/MenuBar.qml+2−2 qml/ApplicationMenus/MenuItem.qml+5−4 qml/Panel/Panel.qml+1−1 tests/qmltests/ApplicationMenus/tst_MenuBar.qml+1−1
qml/ApplicationMenus/MenuBar.qml+2−2
@@ -208,7 +208,7 @@ Item {
208208 id: _title
209209 text: actionItem.text
210210 horizontalAlignment: Text.AlignLeft
211− color: enabled ? "white" : "#5d5d5d"
211+ color: enabled ? theme.palette.normal.backgroundText : theme.palette.disabled.backgroundText
212212 }
213213 }
214214 }
@@ -280,7 +280,7 @@ Item {
280280 width: units.gu(2)
281281 height: units.gu(2)
282282 anchors.centerIn: parent
283− color: theme.palette.normal.overlayText
283+ color: theme.palette.normal.backgroundText
284284 name: "toolkit_chevron-down_2gu"
285285 }
286286
qml/ApplicationMenus/MenuItem.qml+5−4
@@ -113,6 +113,7 @@ ActionItem {
113113 elide: Text.ElideNone
114114 wrapMode: Text.NoWrap
115115 clip: true
116+ color: enabled ? theme.palette.normal.overlayText : theme.palette.disabled.overlayText
116117 Layout.fillWidth: true
117118
118119 text: root.text ? root.text : ""
@@ -123,8 +124,8 @@ ActionItem {
123124 elide: Text.ElideNone
124125 wrapMode: Text.NoWrap
125126 clip: true
126− color: enabled ? theme.palette.normal.backgroundSecondaryText :
127− theme.palette.disabled.backgroundSecondaryText
127+ color: enabled ? theme.palette.normal.overlaySecondaryText :
128+ theme.palette.disabled.overlaySecondaryText
128129
129130 visible: menuData.shortcut != undefined && !root.hasSubmenu && QuickUtils.keyboardAttached
130131 text: menuData.shortcut ? menuData.shortcut : ""
@@ -135,8 +136,8 @@ ActionItem {
135136 id: chevronIcon
136137 width: units.gu(2)
137138 height: units.gu(2)
138− color: enabled ? theme.palette.normal.backgroundSecondaryText :
139− theme.palette.disabled.backgroundSecondaryText
139+ color: enabled ? theme.palette.normal.overlayText :
140+ theme.palette.disabled.overlayText
140141
141142 visible: root.hasSubmenu
142143 name: "toolkit_chevron-ltr_2gu"
qml/Panel/Panel.qml+1−1
@@ -285,7 +285,7 @@ Item {
285285 anchors.centerIn: parent
286286 text: actionItem.text
287287 horizontalAlignment: Text.AlignLeft
288− color: enabled ? "white" : "#5d5d5d"
288+ color: enabled ? theme.palette.normal.backgroundText : theme.palette.disabled.backgroundText
289289 }
290290 }
291291
tests/qmltests/ApplicationMenus/tst_MenuBar.qml+1−1
@@ -56,7 +56,7 @@ Item {
5656 }
5757 height: units.gu(3)
5858 width: parent.width * 2/3
59− color: "grey"
59+ color: theme.palette.normal.background
6060
6161 MenuBar {
6262 id: menuBar