Merge lp:~mterry/unity8/less-ubuntucolors into lp:unity8

Proposed by Michael Terry
Status: Merged
Approved by: Michael Terry
Approved revision: 2332
Merged at revision: 2426
Proposed branch: lp:~mterry/unity8/less-ubuntucolors
Merge into: lp:unity8
Prerequisite: lp:~unity-team/unity8/uitkPageHeader
Diff against target: 211 lines (+17/-17)
15 files modified
plugins/Dash/AudioProgressBar.qml (+1/-1)
plugins/Dash/ScopeStyle.qml (+1/-1)
qml/Components/Dialogs.qml (+2/-2)
qml/Components/ModeSwitchWarningDialog.qml (+1/-1)
qml/Components/WindowControlButtons.qml (+1/-1)
qml/Dash/DashPageHeader.qml (+1/-1)
qml/Dash/Previews/PreviewActions.qml (+1/-1)
qml/Dash/Previews/PreviewPayments.qml (+1/-1)
qml/Launcher/LauncherDelegate.qml (+2/-2)
qml/Panel/Panel.qml (+1/-1)
qml/Stages/DecoratedWindow.qml (+1/-1)
qml/Stages/DesktopSpread.qml (+1/-1)
qml/Stages/DesktopSpreadDelegate.qml (+1/-1)
qml/Stages/SpreadDelegate.qml (+1/-1)
tests/plugins/Dash/tst_ScopeStyle.qml (+1/-1)
To merge this branch: bzr merge lp:~mterry/unity8/less-ubuntucolors
Reviewer Review Type Date Requested Status
Andrea Cimitan Pending
Unity8 CI Bot continuous-integration Pending
Review via email: mp+294969@code.launchpad.net

This proposal supersedes a proposal from 2016-05-16.

Commit message

Change some dash button colors from orange to green.

And switch other colors from hardcoded values to the same semantic theme value.

Description of the change

UbuntuColors should be avoided when possible. Instead we should use semantic color names from the theme. These are future-proof and potentially locale-proof (for locales where green and red mean different things -- which I heard was a thing, but can't find anything on it in a quick search).

Half this branch simply replaces some color names with the correct theme color. So no visual change there. But it also changes some colors:

plugins/Dash/AudioProgressBar.qml: progress bar color from orange to "activity" (blue)
plugins/Dash/ScopeStyle.qml: preview button color from orange to "positive" (green)
qml/Dash/DashPageHeader.qml: active filter color from orange to "positive" (green)
qml/Dash/Previews/PreviewActions.qml: button color from orange to "positive" (green)
qml/Dash/Previews/PreviewPayments.qml: purchase button color from orange to "positive" (green)

I didn't change any uses of the various "grey" colors (slate, jet, charcoal, etc). That seemed a bit more fiddly and less user visible. But they should in theory be fixed down the road.

 * Are there any related MPs required for this MP to build/function as expected? Please list.
 Just the pre-req (lp:~cimi/unity8/uitkPageHeader)

 * Did you perform an exploratory manual test run of your code change and any related functionality?
 Not yet.. will do in a bit

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
 NA

 * If you changed the UI, has there been a design review?
 No... Do we need one for just using the correct theme colors? The only border case I'd see is the purchase button -- maybe that's supposed to be branding-colored?

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2396
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1203/
Executed test runs:
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/740
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/740
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1612
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1567
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1567
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1560
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1560/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1560
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1560/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1560
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1560/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1560
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1560/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1560
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1560/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1560
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1560/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Andrea Cimitan (cimi) wrote : Posted in a previous version of this proposal

Please rebase on https://code.launchpad.net/~cimi/unity8/uitkPageHeader/+merge/293608 since it will conflict in DashPageHeader.qml

review: Needs Fixing
Revision history for this message
Michael Terry (mterry) wrote : Posted in a previous version of this proposal

Done, rebased on uitkPageHeader. Thanks for the pointer.

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

PASSED: Continuous integration, rev:2397
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1223/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/760
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/760
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1640
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1593
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1593
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1586
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1586/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1586
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1586/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1586
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1586/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1586
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1586/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1586
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1586/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1586
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1586/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Andrea Cimitan (cimi) wrote : Posted in a previous version of this proposal

 * Did you perform an exploratory manual test run of the code change and any related functionality?
y
 * Did CI run pass? If not, please explain why.
y

thank you, we'll see for the purchase button

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'plugins/Dash/AudioProgressBar.qml'
--- plugins/Dash/AudioProgressBar.qml 2016-01-18 22:56:16 +0000
+++ plugins/Dash/AudioProgressBar.qml 2016-05-17 20:47:52 +0000
@@ -49,6 +49,6 @@
49 rightMargin: maxWidth - (maxWidth * root.progress)49 rightMargin: maxWidth - (maxWidth * root.progress)
50 }50 }
51 height: units.dp(2)51 height: units.dp(2)
52 backgroundColor: UbuntuColors.orange52 backgroundColor: theme.palette.normal.activity
53 }53 }
54}54}
5555
=== modified file 'plugins/Dash/ScopeStyle.qml'
--- plugins/Dash/ScopeStyle.qml 2016-03-29 03:47:39 +0000
+++ plugins/Dash/ScopeStyle.qml 2016-05-17 20:47:52 +0000
@@ -70,7 +70,7 @@
70 readonly property url navigationBackground: "navigation-background" in d.headerStyle ? d.headerStyle["navigation-background"] : "color:///#f5f5f5"70 readonly property url navigationBackground: "navigation-background" in d.headerStyle ? d.headerStyle["navigation-background"] : "color:///#f5f5f5"
7171
72 /// Color of the primary preview button72 /// Color of the primary preview button
73 readonly property color previewButtonColor: "preview-button-color" in style ? style["preview-button-color"] : UbuntuColors.orange73 readonly property color previewButtonColor: "preview-button-color" in style ? style["preview-button-color"] : theme.palette.normal.positive
7474
75 //! @cond75 //! @cond
76 property var d: QtObject {76 property var d: QtObject {
7777
=== modified file 'qml/Components/Dialogs.qml'
--- qml/Components/Dialogs.qml 2016-04-27 15:01:10 +0000
+++ qml/Components/Dialogs.qml 2016-05-17 20:47:52 +0000
@@ -185,7 +185,7 @@
185 unitySessionService.reboot();185 unitySessionService.reboot();
186 rebootDialog.hide();186 rebootDialog.hide();
187 }187 }
188 color: UbuntuColors.red188 color: theme.palette.normal.negative
189 }189 }
190 }190 }
191 }191 }
@@ -203,7 +203,7 @@
203 powerDialog.hide();203 powerDialog.hide();
204 root.powerOffClicked();204 root.powerOffClicked();
205 }205 }
206 color: UbuntuColors.red206 color: theme.palette.normal.negative
207 }207 }
208 Button {208 Button {
209 text: i18n.ctr("Button: Restart the system", "Restart")209 text: i18n.ctr("Button: Restart the system", "Restart")
210210
=== modified file 'qml/Components/ModeSwitchWarningDialog.qml'
--- qml/Components/ModeSwitchWarningDialog.qml 2016-03-08 13:57:52 +0000
+++ qml/Components/ModeSwitchWarningDialog.qml 2016-05-17 20:47:52 +0000
@@ -86,7 +86,7 @@
86 Button {86 Button {
87 objectName: "forceCloseButton"87 objectName: "forceCloseButton"
88 text: i18n.tr("Close all")88 text: i18n.tr("Close all")
89 color: UbuntuColors.red89 color: theme.palette.normal.negative
90 onClicked: {90 onClicked: {
91 root.forceClose();91 root.forceClose();
92 }92 }
9393
=== modified file 'qml/Components/WindowControlButtons.qml'
--- qml/Components/WindowControlButtons.qml 2016-04-27 14:57:19 +0000
+++ qml/Components/WindowControlButtons.qml 2016-05-17 20:47:52 +0000
@@ -43,7 +43,7 @@
43 width: units.gu(2)43 width: units.gu(2)
44 height: units.gu(2)44 height: units.gu(2)
45 radius: height / 245 radius: height / 2
46 color: UbuntuColors.red46 color: theme.palette.normal.negative
47 visible: parent.containsMouse47 visible: parent.containsMouse
48 }48 }
49 Icon {49 Icon {
5050
=== modified file 'qml/Dash/DashPageHeader.qml'
--- qml/Dash/DashPageHeader.qml 2016-05-17 20:47:52 +0000
+++ qml/Dash/DashPageHeader.qml 2016-05-17 20:47:52 +0000
@@ -269,7 +269,7 @@
269 anchors.fill: parent269 anchors.fill: parent
270 anchors.margins: units.gu(2)270 anchors.margins: units.gu(2)
271 name: "filters"271 name: "filters"
272 color: root.activeFiltersCount > 0 ? UbuntuColors.orange : header.__styleInstance.foregroundColor272 color: root.activeFiltersCount > 0 ? theme.palette.normal.positive : header.__styleInstance.foregroundColor
273 }273 }
274274
275 onClicked: {275 onClicked: {
276276
=== modified file 'qml/Dash/Previews/PreviewActions.qml'
--- qml/Dash/Previews/PreviewActions.qml 2016-04-01 13:20:27 +0000
+++ qml/Dash/Previews/PreviewActions.qml 2016-05-17 20:47:52 +0000
@@ -66,7 +66,7 @@
66 visible: root.actions && root.actions.length > 066 visible: root.actions && root.actions.length > 0
67 onTriggeredAction: root.triggered(root.widgetId, actionData.id, actionData)67 onTriggeredAction: root.triggered(root.widgetId, actionData.id, actionData)
68 width: (root.width - units.gu(1)) / 268 width: (root.width - units.gu(1)) / 2
69 color: root.scopeStyle ? root.scopeStyle.previewButtonColor : UbuntuColors.orange69 color: root.scopeStyle ? root.scopeStyle.previewButtonColor : theme.palette.normal.positive
70 }70 }
71 }71 }
72}72}
7373
=== modified file 'qml/Dash/Previews/PreviewPayments.qml'
--- qml/Dash/Previews/PreviewPayments.qml 2016-02-16 20:00:47 +0000
+++ qml/Dash/Previews/PreviewPayments.qml 2016-05-17 20:47:52 +0000
@@ -35,7 +35,7 @@
35 id: paymentButton35 id: paymentButton
36 objectName: "paymentButton"36 objectName: "paymentButton"
3737
38 color: UbuntuColors.orange38 color: theme.palette.normal.positive
39 text: paymentClient.formattedPrice39 text: paymentClient.formattedPrice
40 onClicked: {40 onClicked: {
41 paymentClient.start();41 paymentClient.start();
4242
=== modified file 'qml/Launcher/LauncherDelegate.qml'
--- qml/Launcher/LauncherDelegate.qml 2016-03-29 13:51:56 +0000
+++ qml/Launcher/LauncherDelegate.qml 2016-05-17 20:47:52 +0000
@@ -164,7 +164,7 @@
164 }164 }
165 width: Math.min(root.itemWidth, Math.max(units.gu(2), countLabel.implicitWidth + units.gu(1)))165 width: Math.min(root.itemWidth, Math.max(units.gu(2), countLabel.implicitWidth + units.gu(1)))
166 height: units.gu(2)166 height: units.gu(2)
167 backgroundColor: UbuntuColors.green167 backgroundColor: theme.palette.normal.positive
168 visible: root.countVisible168 visible: root.countVisible
169 aspect: UbuntuShape.Flat169 aspect: UbuntuShape.Flat
170170
@@ -207,7 +207,7 @@
207 top: parent.top207 top: parent.top
208 bottom: parent.bottom208 bottom: parent.bottom
209 }209 }
210 backgroundColor: UbuntuColors.blue210 backgroundColor: theme.palette.normal.activity
211 borderSource: "none"211 borderSource: "none"
212 width: progressOverlay.width212 width: progressOverlay.width
213 }213 }
214214
=== modified file 'qml/Panel/Panel.qml'
--- qml/Panel/Panel.qml 2016-04-27 15:01:10 +0000
+++ qml/Panel/Panel.qml 2016-05-17 20:47:52 +0000
@@ -89,7 +89,7 @@
8989
90 Rectangle {90 Rectangle {
91 id: indicatorAreaBackground91 id: indicatorAreaBackground
92 color: callHint.visible ? UbuntuColors.green : theme.palette.normal.background92 color: callHint.visible ? theme.palette.normal.positive : theme.palette.normal.background
93 anchors {93 anchors {
94 top: parent.top94 top: parent.top
95 left: parent.left95 left: parent.left
9696
=== modified file 'qml/Stages/DecoratedWindow.qml'
--- qml/Stages/DecoratedWindow.qml 2016-04-27 15:01:10 +0000
+++ qml/Stages/DecoratedWindow.qml 2016-05-17 20:47:52 +0000
@@ -62,7 +62,7 @@
62 Rectangle {62 Rectangle {
63 anchors { left: selectionHighlight.left; right: selectionHighlight.right; bottom: selectionHighlight.bottom; }63 anchors { left: selectionHighlight.left; right: selectionHighlight.right; bottom: selectionHighlight.bottom; }
64 height: units.dp(2)64 height: units.dp(2)
65 color: UbuntuColors.orange65 color: theme.palette.normal.focus
66 visible: highlightShown66 visible: highlightShown
67 }67 }
6868
6969
=== modified file 'qml/Stages/DesktopSpread.qml'
--- qml/Stages/DesktopSpread.qml 2016-04-27 11:55:12 +0000
+++ qml/Stages/DesktopSpread.qml 2016-05-17 20:47:52 +0000
@@ -494,7 +494,7 @@
494 // Rectangle {494 // Rectangle {
495 // anchors { left: parent.left; right: parent.right; bottom: parent.bottom }495 // anchors { left: parent.left; right: parent.right; bottom: parent.bottom }
496 // height: units.dp(2)496 // height: units.dp(2)
497 // color: UbuntuColors.orange497 // color: theme.palette.normal.focus
498 // visible: index == 0 // TODO: should be active workspace index498 // visible: index == 0 // TODO: should be active workspace index
499 // }499 // }
500 }500 }
501501
=== modified file 'qml/Stages/DesktopSpreadDelegate.qml'
--- qml/Stages/DesktopSpreadDelegate.qml 2016-04-04 13:37:49 +0000
+++ qml/Stages/DesktopSpreadDelegate.qml 2016-05-17 20:47:52 +0000
@@ -83,7 +83,7 @@
83 Rectangle {83 Rectangle {
84 anchors { left: selectionHighlight.left; right: selectionHighlight.right; bottom: selectionHighlight.bottom; }84 anchors { left: selectionHighlight.left; right: selectionHighlight.right; bottom: selectionHighlight.bottom; }
85 height: units.dp(2)85 height: units.dp(2)
86 color: UbuntuColors.orange86 color: theme.palette.normal.focus
87 visible: root.highlightShown87 visible: root.highlightShown
88 antialiasing: true88 antialiasing: true
89 }89 }
9090
=== modified file 'qml/Stages/SpreadDelegate.qml'
--- qml/Stages/SpreadDelegate.qml 2016-04-27 15:01:10 +0000
+++ qml/Stages/SpreadDelegate.qml 2016-05-17 20:47:52 +0000
@@ -286,7 +286,7 @@
286 Rectangle {286 Rectangle {
287 anchors { left: selectionHighlight.left; right: selectionHighlight.right; bottom: selectionHighlight.bottom; }287 anchors { left: selectionHighlight.left; right: selectionHighlight.right; bottom: selectionHighlight.bottom; }
288 height: units.dp(2)288 height: units.dp(2)
289 color: UbuntuColors.orange289 color: theme.palette.normal.focus
290 visible: root.highlightShown290 visible: root.highlightShown
291 antialiasing: true291 antialiasing: true
292 }292 }
293293
=== modified file 'tests/plugins/Dash/tst_ScopeStyle.qml'
--- tests/plugins/Dash/tst_ScopeStyle.qml 2016-03-29 03:47:39 +0000
+++ tests/plugins/Dash/tst_ScopeStyle.qml 2016-05-17 20:47:52 +0000
@@ -174,7 +174,7 @@
174174
175 function test_previewButtonColor_data() {175 function test_previewButtonColor_data() {
176 return [176 return [
177 { tag: "default", index: 0, previewButtonColor: UbuntuColors.orange },177 { tag: "default", index: 0, previewButtonColor: theme.palette.normal.positive },
178 { tag: "red", index: 1, previewButtonColor: "red" },178 { tag: "red", index: 1, previewButtonColor: "red" },
179 ];179 ];
180 }180 }

Subscribers

People subscribed via source and target branches