← Back to branch summary

~ci-train-bot/unity8/unity8-ubuntu-zesty-2129

« back to all changes in this revision

Viewing changes to qml/ApplicationMenus/MenuItem.qml

  • Committer: Bileto Bot
  • Author(s): Nick Dedekind
  • Date: 2017-02-16 13:43:00 UTC
  • mfrom: (2768.12.3 unity8.menu.color.fixes)
  • Revision ID: ci-train-bot@canonical.com-20170216134300-ik1h9p12iwk3487l
Updated menu colors

Approved by: Lukáš Tinkl, Unity8 CI Bot

Show diffs side-by-side

added added

removed removed

Lines of Context:
qml/ApplicationMenus/MenuItem.qml
113
113
                elide: Text.ElideNone
114
114
                wrapMode: Text.NoWrap
115
115
                clip: true
 
116
                color: enabled ? theme.palette.normal.overlayText : theme.palette.disabled.overlayText
116
117
                Layout.fillWidth: true
117
118
 
118
119
                text: root.text ? root.text : ""
123
124
                elide: Text.ElideNone
124
125
                wrapMode: Text.NoWrap
125
126
                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
128
129
 
129
130
                visible: menuData.shortcut != undefined && !root.hasSubmenu && QuickUtils.keyboardAttached
130
131
                text: menuData.shortcut ? menuData.shortcut : ""
135
136
            id: chevronIcon
136
137
            width: units.gu(2)
137
138
            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
140
141
 
141
142
            visible: root.hasSubmenu
142
143
            name: "toolkit_chevron-ltr_2gu"