webbrowser-app

Merge lp:~osomon/webbrowser-app/tab-assets-more-contrast into lp:webbrowser-app

  1. tab-assets-more-contrast
  2. Merge into trunk
Proposed by Olivier Tilloy
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 1340
Merged at revision: 1337
Proposed branch: lp:~osomon/webbrowser-app/tab-assets-more-contrast
Merge into: lp:webbrowser-app
Diff against target: 313 lines (+47/-20)
6 files modified
src/app/webbrowser/AddressBar.qml (+8/-7)
src/app/webbrowser/Chrome.qml (+6/-4)
src/app/webbrowser/NavigationBar.qml (+6/-3)
src/app/webbrowser/TabChrome.qml (+4/-1)
src/app/webbrowser/TabItem.qml (+7/-3)
src/app/webbrowser/TabsBar.qml (+16/-2)
To merge this branch: bzr merge lp:~osomon/webbrowser-app/tab-assets-more-contrast
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+283925@code.launchpad.net

Commit message

Update tab visuals to higher-contrast assets.

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

FAILED: Continuous integration, rev:1336
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2577/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6200
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1330
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1330
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1330/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1330
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4781
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6211
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6211/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27044

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2577/rebuild

review: Needs Fixing (continuous-integration)
lp:~osomon/webbrowser-app/tab-assets-more-contrast updated
1337. By Olivier Tilloy

Change text and icon color per visual design request.

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

FAILED: Continuous integration, rev:1337
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2578/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6207
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1331
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1331
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1331/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1331
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4785
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6218
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6218/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27053

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2578/rebuild

review: Needs Fixing (continuous-integration)
lp:~osomon/webbrowser-app/tab-assets-more-contrast updated
1338. By Olivier Tilloy

Make icons and text in chrome darker, per visual design request.

1339. By Olivier Tilloy

Update the appearance of tabs in narrow mode too.

1340. By Olivier Tilloy

Merge PNG optimization branch.

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

FAILED: Continuous integration, rev:1339
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2580/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6210
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1333
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1333
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1333/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1333
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4788
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6221
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6221/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27059

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2580/rebuild

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

FAILED: Continuous integration, rev:1340
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2581/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6211
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1334
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1334
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1334/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1334
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4789
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6222
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6222/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27062

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2581/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'screenshot.png'
2Binary files screenshot.png 2014-10-06 14:39:02 +0000 and screenshot.png 2016-01-26 18:12:30 +0000 differ
3=== modified file 'src/app/webbrowser/AddressBar.qml'
4--- src/app/webbrowser/AddressBar.qml 2015-11-03 11:56:09 +0000
5+++ src/app/webbrowser/AddressBar.qml 2016-01-26 18:12:30 +0000
6@@ -1,5 +1,5 @@
7 /*
8- * Copyright 2013-2015 Canonical Ltd.
9+ * Copyright 2013-2016 Canonical Ltd.
10 *
11 * This file is part of webbrowser-app.
12 *
13@@ -43,6 +43,7 @@
14 property bool showFavicon: true
15 property bool findInPageMode: false
16 property var findController: null
17+ property color fgColor: Theme.palette.normal.baseText
18
19 property var securityStatus: null
20
21@@ -117,7 +118,7 @@
22 name: addressbar.loading ? "stop" :
23 reload ? "reload" :
24 looksLikeAUrl ? "stock_website" : "search"
25- color: UbuntuColors.darkGrey
26+ color: addressbar.fgColor
27
28 MouseArea {
29 objectName: "actionButton"
30@@ -142,7 +143,7 @@
31 Icon {
32 id: secure
33 name: "network-secure"
34- color: UbuntuColors.darkGrey
35+ color: addressbar.fgColor
36 height: parent.height
37 width: height
38 visible: internal.idle && internal.secureConnection
39@@ -159,7 +160,7 @@
40 Icon {
41 id: securityAlert
42 name: "security-alert"
43- color: UbuntuColors.darkGrey
44+ color: addressbar.fgColor
45 height: parent.height
46 width: height
47 visible: internal.idle && internal.securityWarning
48@@ -201,7 +202,7 @@
49 objectName: "findInPageCounter"
50 anchors.verticalCenter: parent.verticalCenter
51 fontSize: "x-small"
52- color: UbuntuColors.darkGrey
53+ color: addressbar.fgColor
54 opacity: findController && findController.count > 0 ? 1.0 : 0.6
55 visible: findInPageMode
56
57@@ -226,7 +227,7 @@
58 anchors.centerIn: parent
59
60 name: addressbar.bookmarked ? "starred" : "non-starred"
61- color: addressbar.bookmarked ? UbuntuColors.orange : UbuntuColors.darkGrey
62+ color: addressbar.bookmarked ? UbuntuColors.orange : addressbar.fgColor
63 }
64
65 onClicked: addressbar.toggleBookmark()
66@@ -239,7 +240,7 @@
67 }
68
69 font.pixelSize: FontUtils.sizeToPixels("small")
70- color: UbuntuColors.darkGrey
71+ color: addressbar.fgColor
72 inputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhUrlCharactersOnly
73
74 placeholderText: findInPageMode ? i18n.tr("find in page")
75
76=== modified file 'src/app/webbrowser/Chrome.qml'
77--- src/app/webbrowser/Chrome.qml 2015-11-26 11:59:33 +0000
78+++ src/app/webbrowser/Chrome.qml 2016-01-26 18:12:30 +0000
79@@ -1,5 +1,5 @@
80 /*
81- * Copyright 2013-2015 Canonical Ltd.
82+ * Copyright 2013-2016 Canonical Ltd.
83 *
84 * This file is part of webbrowser-app.
85 *
86@@ -45,7 +45,7 @@
87 signal requestNewTab(int index, bool makeCurrent)
88 signal tabClosed(int index)
89
90- backgroundColor: incognito ? UbuntuColors.darkGrey : "#bcbcbc"
91+ backgroundColor: incognito ? UbuntuColors.darkGrey : "#ffffff"
92
93 implicitHeight: tabsBar.height + navigationBar.height + content.anchors.topMargin
94
95@@ -62,7 +62,7 @@
96
97 Rectangle {
98 anchors.fill: navigationBar
99- color: (showTabsBar || !incognito) ? "#f8f8f8" : UbuntuColors.darkGrey
100+ color: (showTabsBar || !incognito) ? "#ffffff" : UbuntuColors.darkGrey
101 }
102
103 Loader {
104@@ -71,6 +71,7 @@
105 sourceComponent: TabsBar {
106 model: tabsModel
107 incognito: chrome.incognito
108+ fgColor: navigationBar.fgColor
109 onSwitchToTab: chrome.switchToTab(index)
110 onRequestNewTab: chrome.requestNewTab(index, makeCurrent)
111 onTabClosed: chrome.tabClosed(index)
112@@ -87,7 +88,8 @@
113 NavigationBar {
114 id: navigationBar
115
116- iconColor: (incognito && !showTabsBar) ? "white" : UbuntuColors.darkGrey
117+ fgColor: "#111111"
118+ iconColor: (incognito && !showTabsBar) ? "white" : fgColor
119
120 focus: true
121
122
123=== modified file 'src/app/webbrowser/NavigationBar.qml'
124--- src/app/webbrowser/NavigationBar.qml 2015-11-26 11:59:33 +0000
125+++ src/app/webbrowser/NavigationBar.qml 2016-01-26 18:12:30 +0000
126@@ -1,5 +1,5 @@
127 /*
128- * Copyright 2013-2015 Canonical Ltd.
129+ * Copyright 2013-2016 Canonical Ltd.
130 *
131 * This file is part of webbrowser-app.
132 *
133@@ -37,6 +37,7 @@
134 property alias incognito: addressbar.incognito
135 property alias showFaviconInAddressBar: addressbar.showFavicon
136 readonly property alias bookmarkTogglePlaceHolder: addressbar.bookmarkTogglePlaceHolder
137+ property color fgColor: Theme.palette.normal.baseText
138 property color iconColor: UbuntuColors.darkGrey
139 property real availableHeight
140
141@@ -100,6 +101,8 @@
142 AddressBar {
143 id: addressbar
144
145+ fgColor: root.fgColor
146+
147 focus: true
148
149 findInPageMode: findInPageMode
150@@ -337,7 +340,7 @@
151 when: model.iconSource.toString()
152 value: model.iconSource
153 }
154- color: UbuntuColors.darkGrey
155+ color: root.fgColor
156 }
157
158 Label {
159@@ -350,7 +353,7 @@
160 }
161 text: model.text
162 fontSize: "small"
163- color: UbuntuColors.darkGrey
164+ color: root.fgColor
165 elide: Text.ElideRight
166 }
167 }
168
169=== modified file 'src/app/webbrowser/TabChrome.qml'
170--- src/app/webbrowser/TabChrome.qml 2015-09-17 08:51:11 +0000
171+++ src/app/webbrowser/TabChrome.qml 2016-01-26 18:12:30 +0000
172@@ -1,5 +1,5 @@
173 /*
174- * Copyright 2014-2015 Canonical Ltd.
175+ * Copyright 2014-2016 Canonical Ltd.
176 *
177 * This file is part of webbrowser-app.
178 *
179@@ -62,7 +62,10 @@
180 anchors.top: parent.top
181 anchors.bottom: parent.bottom
182
183+ active: true
184 hoverable: false
185+ fgColor: "#111111"
186+
187 onSelected: tabChrome.selected()
188 onClosed: tabChrome.closed()
189 }
190
191=== modified file 'src/app/webbrowser/TabItem.qml'
192--- src/app/webbrowser/TabItem.qml 2015-10-26 15:34:21 +0000
193+++ src/app/webbrowser/TabItem.qml 2016-01-26 18:12:30 +0000
194@@ -1,5 +1,5 @@
195 /*
196- * Copyright 2015 Canonical Ltd.
197+ * Copyright 2015-2016 Canonical Ltd.
198 *
199 * This file is part of webbrowser-app.
200 *
201@@ -35,6 +35,8 @@
202 property real dragMax: 0
203 readonly property bool dragging: mouseArea.drag.active
204
205+ property color fgColor: Theme.palette.normal.baseText
206+
207 signal selected()
208 signal closed()
209 signal contextMenu()
210@@ -69,6 +71,7 @@
211 verticalAlignment: Text.AlignVCenter
212 clip: true
213 fontSize: "small"
214+ color: tabItem.fgColor
215 }
216
217 Rectangle {
218@@ -79,8 +82,8 @@
219 gradient: Gradient {
220 GradientStop {
221 position: 0.0;
222- color: active ? "#f8f8f8" :
223- (hoverArea.containsMouse ? "#cecece" : "#dedede")
224+ color: active ? "#ffffff" :
225+ (hoverArea.containsMouse ? "#c5c5c5" : "#d2d2d2")
226 }
227 GradientStop { position: 0.33; color: "transparent" }
228 }
229@@ -145,6 +148,7 @@
230 anchors.rightMargin: units.gu(1)
231 anchors.verticalCenter: parent.verticalCenter
232 name: "close"
233+ color: tabItem.fgColor
234 }
235 }
236 }
237
238=== modified file 'src/app/webbrowser/TabsBar.qml'
239--- src/app/webbrowser/TabsBar.qml 2015-11-18 15:48:26 +0000
240+++ src/app/webbrowser/TabsBar.qml 2016-01-26 18:12:30 +0000
241@@ -1,5 +1,5 @@
242 /*
243- * Copyright 2015 Canonical Ltd.
244+ * Copyright 2015-2016 Canonical Ltd.
245 *
246 * This file is part of webbrowser-app.
247 *
248@@ -32,6 +32,8 @@
249
250 property bool incognito: false
251
252+ property color fgColor: Theme.palette.normal.baseText
253+
254 signal switchToTab(int index)
255 signal requestNewTab(int index, bool makeCurrent)
256 signal tabClosed(int index)
257@@ -67,7 +69,7 @@
258 height: units.gu(2)
259 anchors.centerIn: parent
260 name: "add"
261- color: incognito ? "white" : UbuntuColors.darkGrey
262+ color: incognito ? "white" : root.fgColor
263 }
264
265 onClicked: root.requestNewTab(root.model.count, true)
266@@ -149,6 +151,7 @@
267 incognito: root.incognito
268 title: model.title ? model.title : (model.url.toString() ? model.url : i18n.tr("New tab"))
269 icon: model.icon
270+ fgColor: root.fgColor
271
272 rightMargin: tabDelegate.rightMargin
273
274@@ -182,5 +185,16 @@
275 z: (root.model.currentIndex == index) ? 3 : 1 - index / root.model.count
276 }
277 }
278+
279+ Rectangle {
280+ anchors {
281+ left: parent.left
282+ bottom: parent.bottom
283+ }
284+ width: root.width
285+ height: units.dp(1)
286+ color: "#cacaca"
287+ z: 2
288+ }
289 }
290 }
291
292=== modified file 'src/app/webbrowser/assets/bottom_edge_hint@27.png'
293Binary files src/app/webbrowser/assets/bottom_edge_hint@27.png 2015-04-27 15:33:27 +0000 and src/app/webbrowser/assets/bottom_edge_hint@27.png 2016-01-26 18:12:30 +0000 differ
294=== modified file 'src/app/webbrowser/assets/broken_lock@27.png'
295Binary files src/app/webbrowser/assets/broken_lock@27.png 2015-01-20 17:46:40 +0000 and src/app/webbrowser/assets/broken_lock@27.png 2016-01-26 18:12:30 +0000 differ
296=== modified file 'src/app/webbrowser/assets/tab-active-desktop@27.png'
297Binary files src/app/webbrowser/assets/tab-active-desktop@27.png 2015-09-17 09:15:51 +0000 and src/app/webbrowser/assets/tab-active-desktop@27.png 2016-01-26 18:12:30 +0000 differ
298=== modified file 'src/app/webbrowser/assets/tab-active@27.png'
299Binary files src/app/webbrowser/assets/tab-active@27.png 2015-09-04 12:07:38 +0000 and src/app/webbrowser/assets/tab-active@27.png 2016-01-26 18:12:30 +0000 differ
300=== modified file 'src/app/webbrowser/assets/tab-artwork.png'
301Binary files src/app/webbrowser/assets/tab-artwork.png 2014-08-20 16:04:01 +0000 and src/app/webbrowser/assets/tab-artwork.png 2016-01-26 18:12:30 +0000 differ
302=== modified file 'src/app/webbrowser/assets/tab-hover-desktop@27.png'
303Binary files src/app/webbrowser/assets/tab-hover-desktop@27.png 2015-09-17 09:15:51 +0000 and src/app/webbrowser/assets/tab-hover-desktop@27.png 2016-01-26 18:12:30 +0000 differ
304=== modified file 'src/app/webbrowser/assets/tab-hover@27.png'
305Binary files src/app/webbrowser/assets/tab-hover@27.png 2015-09-17 09:15:51 +0000 and src/app/webbrowser/assets/tab-hover@27.png 2016-01-26 18:12:30 +0000 differ
306=== modified file 'src/app/webbrowser/assets/tab-non-active-desktop@27.png'
307Binary files src/app/webbrowser/assets/tab-non-active-desktop@27.png 2015-09-17 09:15:51 +0000 and src/app/webbrowser/assets/tab-non-active-desktop@27.png 2016-01-26 18:12:30 +0000 differ
308=== modified file 'src/app/webbrowser/assets/tab-non-active@27.png'
309Binary files src/app/webbrowser/assets/tab-non-active@27.png 2015-09-17 09:15:51 +0000 and src/app/webbrowser/assets/tab-non-active@27.png 2016-01-26 18:12:30 +0000 differ
310=== modified file 'src/app/webbrowser/assets/tab-shadow-narrow@27.png'
311Binary files src/app/webbrowser/assets/tab-shadow-narrow@27.png 2015-09-03 14:46:18 +0000 and src/app/webbrowser/assets/tab-shadow-narrow@27.png 2016-01-26 18:12:30 +0000 differ
312=== modified file 'src/app/webbrowser/assets/toolbar-dropshadow.png'
313Binary files src/app/webbrowser/assets/toolbar-dropshadow.png 2014-07-30 10:24:51 +0000 and src/app/webbrowser/assets/toolbar-dropshadow.png 2016-01-26 18:12:30 +0000 differ

Subscribers

People subscribed via source and target branches

to status/vote changes: