Unity 8

Merge lp:~unity-team/unity8/unity8.colour_palette into lp:unity8

  1. unity8.colour_palette
  2. Merge into trunk
Proposed by Andrea Cimitan
Status: Merged
Approved by: Nicolas d'Offay
Approved revision: 101
Merged at revision: 115
Proposed branch: lp:~unity-team/unity8/unity8.colour_palette
Merge into: lp:unity8
Diff against target: 327 lines (+29/-27)
19 files modified
Components/ApplicationScreenshot.qml (+1/-1)
Components/FilterGrid.qml (+2/-2)
Components/ListItems/Header.qml (+1/-1)
Components/PageHeader.qml (+1/-1)
Components/Tile.qml (+1/-1)
Dash/Apps/RunningApplicationTile.qml (+1/-1)
Dash/DashBar.qml (+1/-1)
Dash/DashPreview.qml (+1/-1)
Dash/Music/AlbumTile.qml (+2/-2)
Dash/Video/VideoPreview.qml (+3/-3)
Notifications/Notification.qml (+4/-4)
Panel/IndicatorItem.qml (+1/-1)
Panel/Indicators/DatetimeIndicatorPage.qml (+2/-2)
Panel/Indicators/DatetimeIndicatorWidget.qml (+1/-1)
Panel/Indicators/DefaultIndicatorWidget.qml (+1/-1)
Panel/MenuContent.qml (+1/-1)
Panel/Menus/Overview/FlightModeWidget.qml (+1/-1)
Panel/Menus/Overview/OverviewGrid.qml (+2/-2)
Shell.qml (+2/-0)
To merge this branch: bzr merge lp:~unity-team/unity8/unity8.colour_palette
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Nicolas d'Offay (community) Approve
Review via email: mp+174678@code.launchpad.net

Commit message

Add support for the colour palette.

Description of the change

Starting work on colour palette support

Not theming colours outside the palette (some white, black colours and custom ones...)

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

FAILED: Continuous integration, rev:99
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~unity-team/unity8/unity8.colour_palette/+merge/174678/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/262/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1085
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/600
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/262
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/262/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/262
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1089
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1089/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/923

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/262/rebuild

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

PASSED: Continuous integration, rev:99
http://jenkins.qa.ubuntu.com/job/unity8-ci/263/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1091
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/602
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/263
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/263/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/263
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1095
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1095/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/929

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/263/rebuild

review: Approve (continuous-integration)
Revision history for this message
Nicolas d'Offay (nicolas-doffay) :
review: Approve
Revision history for this message
Nicolas d'Offay (nicolas-doffay) :
review: Needs Fixing
lp:~unity-team/unity8/unity8.colour_palette updated
101. By Andrea Cimitan

Resolve conflicts and merge trunk

Revision history for this message
Nicolas d'Offay (nicolas-doffay) wrote :

Checked colours. LGTM

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

FAILED: Continuous integration, rev:100
http://jenkins.qa.ubuntu.com/job/unity8-ci/295/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1195/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/649
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/295
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/295/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/295/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1199/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/295/rebuild

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 'Components/ApplicationScreenshot.qml'
2--- Components/ApplicationScreenshot.qml 2013-06-05 22:03:08 +0000
3+++ Components/ApplicationScreenshot.qml 2013-07-17 11:05:31 +0000
4@@ -46,7 +46,7 @@
5 Rectangle {
6 id: background
7 anchors.fill: parent
8- color: "white"
9+ color: "white" // FIXME should use normal background color of Suru theme
10 visible: applicationScreenshot.withBackground
11 }
12
13
14=== modified file 'Components/FilterGrid.qml'
15--- Components/FilterGrid.qml 2013-06-27 14:13:11 +0000
16+++ Components/FilterGrid.qml 2013-07-17 11:05:31 +0000
17@@ -99,7 +99,7 @@
18
19 UbuntuShape {
20 anchors.fill: parent
21- color: "#33ffffff"
22+ color: "#33ffffff" // FIXME no palette
23 radius: "small"
24 }
25
26@@ -123,7 +123,7 @@
27 }
28 text: (filter) ? "+ View all (" + model.count + ")" : "- Show fewer"
29 fontSize: "small"
30- color: "#f3f3e7"
31+ color: Theme.palette.selected.backgroundText
32 opacity: 0.6
33 style: Text.Raised
34 styleColor: "black"
35
36=== modified file 'Components/ListItems/Header.qml'
37--- Components/ListItems/Header.qml 2013-06-27 09:50:24 +0000
38+++ Components/ListItems/Header.qml 2013-07-17 11:05:31 +0000
39@@ -45,7 +45,7 @@
40 verticalCenter: parent.verticalCenter
41 }
42
43- color: "#f3f3e7" //at 60%
44+ color: Theme.palette.selected.backgroundText //at 60%
45 opacity: 0.6
46 font.family: "Ubuntu"
47 fontSize: "medium"
48
49=== modified file 'Components/PageHeader.qml'
50--- Components/PageHeader.qml 2013-07-04 08:05:46 +0000
51+++ Components/PageHeader.qml 2013-07-17 11:05:31 +0000
52@@ -90,7 +90,7 @@
53 verticalCenter: parent.verticalCenter
54 }
55
56- color: "#f3f3e7"
57+ color: Theme.palette.selected.backgroundText
58 opacity: 0.8
59 font.family: "Ubuntu"
60 font.weight: Font.Light
61
62=== modified file 'Components/Tile.qml'
63--- Components/Tile.qml 2013-06-27 14:13:11 +0000
64+++ Components/Tile.qml 2013-07-17 11:05:31 +0000
65@@ -75,7 +75,7 @@
66 rightMargin: units.gu(1)
67 }
68
69- color: "#f3f3e7"
70+ color: Theme.palette.selected.backgroundText
71 opacity: 0.9
72 style: Text.Raised
73 styleColor: "black"
74
75=== modified file 'Dash/Apps/RunningApplicationTile.qml'
76--- Dash/Apps/RunningApplicationTile.qml 2013-06-28 12:35:41 +0000
77+++ Dash/Apps/RunningApplicationTile.qml 2013-07-17 11:05:31 +0000
78@@ -113,7 +113,7 @@
79 }
80 text: (application) ? application.name : ""
81
82- color: "#f3f3e7"
83+ color: Theme.palette.selected.backgroundText
84 opacity: 0.9
85 style: Text.Raised
86 styleColor: "black"
87
88=== modified file 'Dash/DashBar.qml'
89--- Dash/DashBar.qml 2013-06-19 17:43:05 +0000
90+++ Dash/DashBar.qml 2013-07-17 11:05:31 +0000
91@@ -117,7 +117,7 @@
92
93 Rectangle {
94 id: highlightLine
95- color: "#dd4814"
96+ color: Theme.palette.selected.foreground
97 height: parent.height
98 anchors.bottom: parent.bottom
99 z: 1
100
101=== modified file 'Dash/DashPreview.qml'
102--- Dash/DashPreview.qml 2013-06-05 22:03:08 +0000
103+++ Dash/DashPreview.qml 2013-07-17 11:05:31 +0000
104@@ -92,7 +92,7 @@
105 elide: Text.ElideRight
106 fontSize: "x-large"
107 font.weight: Font.Light
108- color: "#f3f3e7"
109+ color: Theme.palette.selected.backgroundText
110 opacity: 0.9
111 text: root.title
112 style: Text.Raised
113
114=== modified file 'Dash/Music/AlbumTile.qml'
115--- Dash/Music/AlbumTile.qml 2013-06-27 14:13:11 +0000
116+++ Dash/Music/AlbumTile.qml 2013-07-17 11:05:31 +0000
117@@ -69,7 +69,7 @@
118 rightMargin: units.gu(1)
119 }
120
121- color: "#f3f3e7"
122+ color: Theme.palette.selected.backgroundText
123 opacity: 0.9
124 style: Text.Raised
125 styleColor: "black"
126@@ -97,7 +97,7 @@
127 rightMargin: units.gu(1)
128 }
129
130- color: "#f3f3e7"
131+ color: Theme.palette.selected.backgroundText
132 opacity: 0.9
133 style: Text.Raised
134 styleColor: "black"
135
136=== modified file 'Dash/Video/VideoPreview.qml'
137--- Dash/Video/VideoPreview.qml 2013-06-08 13:44:29 +0000
138+++ Dash/Video/VideoPreview.qml 2013-07-17 11:05:31 +0000
139@@ -48,7 +48,7 @@
140 property int buttonWidth: Math.min(units.gu(22), (width - spacing) / 2)
141 Button {
142 width: parent.buttonWidth
143- color: "#dd4814"
144+ color: Theme.palette.selected.foreground
145 text: nfo.ready && nfo.video.buyPrice != "" ? "Buy for " + nfo.video.buyPrice : ""
146 visible: text != ""
147 iconSource: "graphics/icon_button_amazon.png"
148@@ -56,7 +56,7 @@
149 }
150 Button {
151 width: parent.buttonWidth
152- color: "#dd4814"
153+ color: Theme.palette.selected.foreground
154 text: nfo.ready && nfo.video.buyPrice != "" ? "Rent for " + nfo.video.rentPrice : ""
155 visible: text != ""
156 iconSource: "graphics/icon_button_u1.png"
157@@ -73,7 +73,7 @@
158
159 Label {
160 text: nfo.ready ? nfo.video.plot : ""
161- color: "#f3f3e7"
162+ color: Theme.palette.selected.backgroundText
163 opacity: .6
164 fontSize: "medium"
165 width: parent.width
166
167=== modified file 'Notifications/Notification.qml'
168--- Notifications/Notification.qml 2013-06-28 16:03:09 +0000
169+++ Notifications/Notification.qml 2013-07-17 11:05:31 +0000
170@@ -117,7 +117,7 @@
171 }
172 fontSize: "medium"
173 font.bold: true
174- color: "#f3f3e7"
175+ color: Theme.palette.selected.backgroundText
176 elide: Text.ElideRight
177 }
178
179@@ -131,7 +131,7 @@
180 }
181 visible: body != ""
182 fontSize: "small"
183- color: "#f3f3e7"
184+ color: Theme.palette.selected.backgroundText
185 opacity: 0.6
186 wrapMode: Text.WordWrap
187 maximumLineCount: 10
188@@ -194,7 +194,7 @@
189 top: parent.top
190 bottom: parent.bottom
191 }
192- color: "#d85317"
193+ color: "#d85317" // FIXME ??
194 visible: width > 0
195 onClicked: notification.notification.invokeAction(actionRepeater.itemAt(0).actionId)
196 }
197@@ -241,7 +241,7 @@
198
199 text: loader.actionLabel
200 height: units.gu(4)
201- color: "#cdcdcb"
202+ color: "#cdcdcb" // FIXME ?? which color?
203 onClicked: notification.notification.invokeAction(loader.actionId)
204 }
205 }
206
207=== modified file 'Panel/IndicatorItem.qml'
208--- Panel/IndicatorItem.qml 2013-06-27 09:09:25 +0000
209+++ Panel/IndicatorItem.qml 2013-07-17 11:05:31 +0000
210@@ -47,7 +47,7 @@
211 }
212
213 Rectangle {
214- color: "#dd4814"
215+ color: Theme.palette.selected.foreground
216 objectName: "highlight"
217 height: units.dp(2)
218 width: parent.width
219
220=== modified file 'Panel/Indicators/DatetimeIndicatorPage.qml'
221--- Panel/Indicators/DatetimeIndicatorPage.qml 2013-06-17 09:57:52 +0000
222+++ Panel/Indicators/DatetimeIndicatorPage.qml 2013-07-17 11:05:31 +0000
223@@ -54,7 +54,7 @@
224 }
225
226 text: ""
227- color: "#f3f3e7"
228+ color: Theme.palette.selected.backgroundText
229 font.weight: Font.Light
230 font.pixelSize: units.gu(6)
231 }
232@@ -69,7 +69,7 @@
233 bottomMargin: units.gu(1.5)
234 }
235 text: ""
236- color: "#f3f3e7"
237+ color: Theme.palette.selected.backgroundText
238 fontSize: "small"
239 }
240 }
241
242=== modified file 'Panel/Indicators/DatetimeIndicatorWidget.qml'
243--- Panel/Indicators/DatetimeIndicatorWidget.qml 2013-06-17 09:57:52 +0000
244+++ Panel/Indicators/DatetimeIndicatorWidget.qml 2013-07-17 11:05:31 +0000
245@@ -31,7 +31,7 @@
246 Label {
247 id: timeLabel
248 objectName: "timeLabel"
249- color: "#f3f3e7"
250+ color: Theme.palette.selected.backgroundText
251 opacity: 0.8
252 font.family: "Ubuntu"
253 fontSize: "medium"
254
255=== modified file 'Panel/Indicators/DefaultIndicatorWidget.qml'
256--- Panel/Indicators/DefaultIndicatorWidget.qml 2013-06-27 14:12:57 +0000
257+++ Panel/Indicators/DefaultIndicatorWidget.qml 2013-07-17 11:05:31 +0000
258@@ -52,7 +52,7 @@
259 Label {
260 id: itemLabel
261 objectName: "itemLabel"
262- color: "#f3f3e7"
263+ color: Theme.palette.selected.backgroundText
264 opacity: 0.8
265 font.family: "Ubuntu"
266 fontSize: "medium"
267
268=== modified file 'Panel/MenuContent.qml'
269--- Panel/MenuContent.qml 2013-07-03 16:33:58 +0000
270+++ Panel/MenuContent.qml 2013-07-17 11:05:31 +0000
271@@ -29,7 +29,7 @@
272 property bool __shown: false
273 property bool __contentActive: false
274 property alias currentIndex : menus.currentIndex
275- property color backgroundColor: "#221e1c"
276+ property color backgroundColor: "#221e1c" // FIXME not in palette yet
277 property int contentReleaseInterval: 20000
278
279 width: units.gu(40)
280
281=== modified file 'Panel/Menus/Overview/FlightModeWidget.qml'
282--- Panel/Menus/Overview/FlightModeWidget.qml 2013-06-05 22:03:08 +0000
283+++ Panel/Menus/Overview/FlightModeWidget.qml 2013-07-17 11:05:31 +0000
284@@ -40,7 +40,7 @@
285 verticalCenter: parent.verticalCenter
286 }
287 text: i18n.tr("Flight mode")
288- color: "#f3f3e7"
289+ color: Theme.palette.selected.backgroundText
290 style: Text.Raised
291 styleColor: "black"
292 opacity: 0.6;
293
294=== modified file 'Panel/Menus/Overview/OverviewGrid.qml'
295--- Panel/Menus/Overview/OverviewGrid.qml 2013-06-26 15:38:03 +0000
296+++ Panel/Menus/Overview/OverviewGrid.qml 2013-07-17 11:05:31 +0000
297@@ -29,7 +29,7 @@
298 UbuntuShape {
299 id: gridBackground
300 anchors.fill: grid
301- color: "#282421"
302+ color: "#282421" // FIXME missing palette
303 radius: "medium"
304 }
305
306@@ -80,7 +80,7 @@
307
308 Label {
309 text: title
310- color: "#f3f3e7"
311+ color: Theme.palette.selected.backgroundText
312 fontSize: "small"
313 anchors {
314 left: parent.left
315
316=== modified file 'Shell.qml'
317--- Shell.qml 2013-07-15 15:36:07 +0000
318+++ Shell.qml 2013-07-17 11:05:31 +0000
319@@ -62,6 +62,8 @@
320 property var applicationManager: ApplicationManagerWrapper {}
321
322 Component.onCompleted: {
323+ Theme.name = "Ubuntu.Components.Themes.SuruGradient"
324+
325 applicationManager.sideStageEnabled = Qt.binding(function() { return sideStage.enabled })
326
327 // FIXME: if application focused before shell starts, shell draws on top of it only.

Subscribers

People subscribed via source and target branches