Ubuntu UI Toolkit

Merge lp:~fboucault/ubuntu-ui-toolkit/better_visual_feedback into lp:ubuntu-ui-toolkit/staging

  1. better_visual_feedback
  2. Merge into staging
Proposed by Florian Boucault
Status: Merged
Approved by: Zoltan Balogh
Approved revision: 1186
Merged at revision: 1194
Proposed branch: lp:~fboucault/ubuntu-ui-toolkit/better_visual_feedback
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 135 lines (+45/-9)
4 files modified
modules/Ubuntu/Components/ListItems/Empty.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/PageHeadButton.qml (+6/-0)
modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml (+37/-3)
modules/Ubuntu/Components/Themes/Ambiance/Palette.qml (+1/-5)
To merge this branch: bzr merge lp:~fboucault/ubuntu-ui-toolkit/better_visual_feedback
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Tim Peeters Approve
Cris Dywan Approve
Victor Thompson (community) Approve
Review via email: mp+230121@code.launchpad.net

Commit message

Visual feedback upon press for Header.
Better visual feedback upon press for List Items.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1184
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/759/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3255/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2548/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/591/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/591/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/591/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4500/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2819/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/759/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Victor Thompson (vthompson) wrote :

LGTM. Fixes the issue seen in the overflow tab drawer for the Music app, Clock app, and others using a darker theme in the header.

review: Approve
Revision history for this message
Cris Dywan (kalikiana) wrote :

Looks fine to me (sorry about the delay, I apparently didn't hit "Save Comment" :-P)

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/338/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3354/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2624/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-autolanding/282/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/282/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-autolanding/282/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4600/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2899/console

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/350/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3442/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2704/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-autolanding/294/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/294/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-autolanding/294/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4689/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2981/console

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1185
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/802/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3457/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2717/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/634/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/634/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/634/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4704/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2994/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/802/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Tim Peeters (tpeeters) wrote :

I'm not sure why this failed :s

********* Start testing of components *********
Config: Using QtTest library 5.3.0, Qt 5.3.0
PASS : components::PageHeadSectionsAPI::initTestCase()
PASS : components::PageHeadSectionsAPI::test_number_of_sections()

** (process:20548): CRITICAL **: Unable to get session bus: Cannot spawn a message bus without a machine-id: Unable to load /var/lib/dbus/machine-id or /etc/machine-id: Failed to open file '/var/lib/dbus/machine-id': No such file or directory
PASS : components::PageHeadSectionsAPI::test_selected_section()
PASS : components::PageHeadSectionsAPI::test_warn_when_too_many_sections()
PASS : components::PageHeadSectionsAPI::cleanupTestCase()
QWARN : components::UnknownTestFunc() file:///tmp/buildd/ubuntu-ui-toolkit-1.1.1181+14.10.20140806bzr1185pkg0utopic4704+autopilot0/modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml:81: ReferenceError: bottomDividerLine is not defined
QWARN : components::UnknownTestFunc() file:///tmp/buildd/ubuntu-ui-toolkit-1.1.1181+14.10.20140806bzr1185pkg0utopic4704+autopilot0/modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml:81: ReferenceError: bottomDividerLine is not defined
QWARN : components::UnknownTestFunc() file:///tmp/buildd/ubuntu-ui-toolkit-1.1.1181+14.10.20140806bzr1185pkg0utopic4704+autopilot0/modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml:81: ReferenceError: bottomDividerLine is not defined
QWARN : components::UnknownTestFunc() file:///tmp/buildd/ubuntu-ui-toolkit-1.1.1181+14.10.20140806bzr1185pkg0utopic4704+autopilot0/modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml:81: ReferenceError: bottomDividerLine is not defined
Totals: 5 passed, 0 failed, 0 skipped
********* Finished testing of components *********
Error: 4 warnings in tst_header_sections.qml
tst_header_sections.qml exited with 666

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1186
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/805/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3474
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2731
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/637
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/637
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/637/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/637
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3375
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4721
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4721/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11395
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2205
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3008
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3008/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/805/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/359/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3520/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2768
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-autolanding/303
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/303
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/303/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-autolanding/303
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3417/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4767
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4767/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11444
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2240
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3047
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3047/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)
Revision history for this message
Tim Peeters (tpeeters) wrote :

looks good

weird jenkins failure, happroving again...

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/362/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3536
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2782
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-autolanding/306
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/306
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/306/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-autolanding/306
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3432
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4783
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4783/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11465
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2254
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3061
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3061/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1186
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/836/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3756
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2891
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/668
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/668
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/668/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/668
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3626
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5003
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5003/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11725
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2348
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3175
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3175/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/836/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/368/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3779
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2907
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-autolanding/312
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/312
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-autolanding/312/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-autolanding/312
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3646
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5026
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5026/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11748
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2361
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3191
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3191/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'modules/Ubuntu/Components/ListItems/Empty.qml'
2--- modules/Ubuntu/Components/ListItems/Empty.qml 2014-07-30 14:51:01 +0000
3+++ modules/Ubuntu/Components/ListItems/Empty.qml 2014-08-13 13:49:46 +0000
4@@ -302,7 +302,7 @@
5 top: parent.top
6 }
7 height: emptyListItem.height - bottomDividerLine.height
8- color: Qt.rgba(0, 0, 0, 0.05)
9+ color: Theme.palette.selected.background
10 }
11
12 ThinDivider {
13
14=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/PageHeadButton.qml'
15--- modules/Ubuntu/Components/Themes/Ambiance/PageHeadButton.qml 2014-07-31 14:38:10 +0000
16+++ modules/Ubuntu/Components/Themes/Ambiance/PageHeadButton.qml 2014-08-13 13:49:46 +0000
17@@ -28,6 +28,12 @@
18
19 property alias color: icon.color
20
21+ Rectangle {
22+ visible: button.pressed
23+ anchors.fill: parent
24+ color: Theme.palette.selected.background
25+ }
26+
27 Icon {
28 id: icon
29 anchors {
30
31=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml'
32--- modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml 2014-08-04 16:21:55 +0000
33+++ modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml 2014-08-13 13:49:46 +0000
34@@ -71,6 +71,17 @@
35 property bool selected: index === separator.sections.selectedIndex
36 onClicked: separator.sections.selectedIndex = index;
37
38+ Rectangle {
39+ visible: parent.pressed
40+ anchors {
41+ left: parent.left
42+ right: parent.right
43+ top: parent.top
44+ }
45+ height: parent.height - bottomDividerLine.height
46+ color: Theme.palette.selected.background
47+ }
48+
49 Label {
50 id: label
51 text: modelData
52@@ -84,6 +95,7 @@
53
54 // vertical divider line
55 Rectangle {
56+ id: bottomDividerLine
57 anchors {
58 verticalCenter: parent.verticalCenter
59 right: parent.right
60@@ -186,6 +198,17 @@
61 implicitHeight: units.gu(6) + bottomDividerLine.height
62 width: parent ? parent.width : units.gu(31)
63
64+ Rectangle {
65+ visible: parent.pressed
66+ anchors {
67+ left: parent.left
68+ right: parent.right
69+ top: parent.top
70+ }
71+ height: parent.height - bottomDividerLine.height
72+ color: Theme.palette.selected.background
73+ }
74+
75 Label {
76 anchors {
77 verticalCenter: parent.verticalCenter
78@@ -196,7 +219,7 @@
79 fontSize: "medium"
80 elide: Text.ElideRight
81 text: tab.title // FIXME: only "title" doesn't work with i18n.tr(). Why not?
82- color: '#5d5d5d'
83+ color: Theme.palette.selected.backgroundText
84 }
85
86 ListItem.ThinDivider {
87@@ -359,10 +382,21 @@
88 implicitHeight: units.gu(6) + bottomDividerLine.height
89 width: parent ? parent.width : units.gu(31)
90
91+ Rectangle {
92+ visible: parent.pressed
93+ anchors {
94+ left: parent.left
95+ right: parent.right
96+ top: parent.top
97+ }
98+ height: parent.height - bottomDividerLine.height
99+ color: Theme.palette.selected.background
100+ }
101+
102 Icon {
103 id: actionIcon
104 name: action.iconName
105- color: '#5d5d5d'
106+ color: Theme.palette.selected.backgroundText
107 anchors {
108 verticalCenter: parent.verticalCenter
109 verticalCenterOffset: units.dp(-1)
110@@ -383,7 +417,7 @@
111 fontSize: "small"
112 elide: Text.ElideRight
113 text: action.text
114- color: '#5d5d5d'
115+ color: Theme.palette.selected.backgroundText
116 }
117
118 ListItem.ThinDivider {
119
120=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/Palette.qml'
121--- modules/Ubuntu/Components/Themes/Ambiance/Palette.qml 2014-07-25 11:27:58 +0000
122+++ modules/Ubuntu/Components/Themes/Ambiance/Palette.qml 2014-08-13 13:49:46 +0000
123@@ -32,11 +32,7 @@
124 fieldText: UbuntuColors.darkGrey
125 }
126 selected: PaletteValues {
127- /* FIXME: 'background' does not come from design
128- it is used solely in the list items for the selection highlight
129- that will go away with the new design.
130- */
131- background: "#B2E6E6E6"
132+ background: Qt.rgba(0, 0, 0, 0.05)
133 backgroundText: UbuntuColors.darkGrey
134 selection: Qt.rgba(UbuntuColors.blue.r, UbuntuColors.blue.g, UbuntuColors.blue.b, 0.2)
135 foreground: UbuntuColors.orange

Subscribers

People subscribed via source and target branches