Unity 8

Merge lp:~cimi/unity8/selected-to-normal-backgroundText into lp:unity8

  1. selected-to-normal-backgroundText
  2. Merge into trunk
Proposed by Andrea Cimitan
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 2148
Merged at revision: 2219
Proposed branch: lp:~cimi/unity8/selected-to-normal-backgroundText
Merge into: lp:unity8
Prerequisite: lp:~nick-dedekind/unity8/indicator-color-fixes
Diff against target: 65 lines (+6/-6)
3 files modified
qml/Notifications/Notification.qml (+3/-3)
qml/Stages/Splash.qml (+2/-2)
qml/Wizard/StackButton.qml (+1/-1)
To merge this branch: bzr merge lp:~cimi/unity8/selected-to-normal-backgroundText
Reviewer Review Type Date Requested Status
Albert Astals Cid (community) Approve
Unity8 CI Bot continuous-integration Needs Fixing
Review via email: mp+287452@code.launchpad.net

Commit message

replace selected.backgroundText with normal.backgroundText in Splash, Notifications, Wizard

Description of the change

We used selected.backgroundText in the past for white text on dark backgrounds. It recently changed to blue, and we realised we should have used normal.backgroundText with some proper fixes in the theme instead. The branch updates some colors that were still using selected palette to normal

 * Are there any related MPs required for this MP to build/function as expected? Please list.
from the prerequisite https://code.launchpad.net/~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20/+merge/283385
 * Did you perform an exploratory manual test run of your code change and any related functionality?
y
 * Did you make sure that your branch does not contain spurious tags?
y
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
n/a
 * If you changed the UI, has there been a design review?
n/a

To post a comment you must log in.
Revision history for this message
Andrea Cimitan (cimi) wrote :

 * Are there any related MPs required for this MP to build/function as expected? Please list.
from the prerequisite https://code.launchpad.net/~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20/+merge/283385
 * Did you perform an exploratory manual test run of your code change and any related functionality?
y
 * Did you make sure that your branch does not contain spurious tags?
y
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
n/a
 * If you changed the UI, has there been a design review?
n/a

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2147
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/517/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/681/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/704
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/722
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/722
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/718
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/718/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/718/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/718
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/718/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/718
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/718/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/718
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/718/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/718/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/517/rebuild

review: Needs Fixing (continuous-integration)
lp:~cimi/unity8/selected-to-normal-backgroundText updated
2148. By Andrea Cimitan

merged

Revision history for this message
Albert Astals Cid (aacid) wrote :

Code looks good, waiting on silo to be available to do testing.

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2148
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/534/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/700/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/723
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/741
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/741
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/737
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/737/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/737/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/737
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/737/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/737/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/737
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/737/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/737/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/534/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

silo testing looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/Notifications/Notification.qml'
2--- qml/Notifications/Notification.qml 2015-11-06 15:52:24 +0000
3+++ qml/Notifications/Notification.qml 2016-02-29 14:27:16 +0000
4@@ -281,7 +281,7 @@
5 }
6 visible: type !== Notification.Confirmation
7 fontSize: "medium"
8- color: darkOnBright ? sdFontColor : theme.palette.selected.backgroundText
9+ color: darkOnBright ? sdFontColor : theme.palette.normal.backgroundText
10 elide: Text.ElideRight
11 textFormat: Text.PlainText
12 }
13@@ -296,7 +296,7 @@
14 }
15 visible: body != "" && type !== Notification.Confirmation
16 fontSize: "small"
17- color: darkOnBright ? sdFontColor : theme.palette.selected.backgroundText
18+ color: darkOnBright ? sdFontColor : theme.palette.normal.backgroundText
19 wrapMode: Text.WordWrap
20 maximumLineCount: type == Notification.SnapDecision ? 12 : 2
21 elide: Text.ElideRight
22@@ -337,7 +337,7 @@
23 anchors.horizontalCenter: parent.horizontalCenter
24 visible: type === Notification.Confirmation && body !== ""
25 fontSize: "medium"
26- color: darkOnBright ? sdFontColor : theme.palette.selected.backgroundText
27+ color: darkOnBright ? sdFontColor : theme.palette.normal.backgroundText
28 wrapMode: Text.WordWrap
29 maximumLineCount: 1
30 elide: Text.ElideRight
31
32=== modified file 'qml/Stages/Splash.qml'
33--- qml/Stages/Splash.qml 2016-01-20 08:51:48 +0000
34+++ qml/Stages/Splash.qml 2016-02-29 14:27:16 +0000
35@@ -88,7 +88,7 @@
36 panelForegroundColor: config.foregroundColor
37 config: PageHeadConfiguration {
38 id: headerConfig
39- foregroundColor: styledItem.fakeTheme.palette.selected.backgroundText
40+ foregroundColor: styledItem.fakeTheme.palette.normal.backgroundText
41 }
42
43 property var contents: null
44@@ -134,7 +134,7 @@
45 anchors.topMargin: units.gu(2)
46 fontSize: "large"
47
48- color: styledItem.fakeTheme.palette.selected.backgroundText
49+ color: styledItem.fakeTheme.palette.normal.backgroundText
50 visible: d.showIcon
51 }
52
53
54=== modified file 'qml/Wizard/StackButton.qml'
55--- qml/Wizard/StackButton.qml 2015-07-15 15:07:19 +0000
56+++ qml/Wizard/StackButton.qml 2016-02-29 14:27:16 +0000
57@@ -32,7 +32,7 @@
58 anchors.verticalCenter: parent.verticalCenter
59 anchors.left: parent.left
60 anchors.right: parent.right
61- color: enabled ? theme.palette.selected.backgroundText : Qt.darker(theme.palette.selected.backgroundText, 1.5)
62+ color: enabled ? theme.palette.normal.backgroundText : Qt.darker(theme.palette.normal.backgroundText, 1.5)
63 text: {
64 if (backArrow) {
65 // Translators: This is the arrow for "Back" buttons

Subscribers

People subscribed via source and target branches