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

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 :
review: Needs Fixing (continuous-integration)
1337. By Olivier Tilloy

Change text and icon color per visual design request.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
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 :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'screenshot.png'
0Binary files screenshot.png 2014-10-06 14:39:02 +0000 and screenshot.png 2016-01-26 18:12:30 +0000 differ0Binary files screenshot.png 2014-10-06 14:39:02 +0000 and screenshot.png 2016-01-26 18:12:30 +0000 differ
=== modified file 'src/app/webbrowser/AddressBar.qml'
--- src/app/webbrowser/AddressBar.qml 2015-11-03 11:56:09 +0000
+++ src/app/webbrowser/AddressBar.qml 2016-01-26 18:12:30 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright 2013-2015 Canonical Ltd.2 * Copyright 2013-2016 Canonical Ltd.
3 *3 *
4 * This file is part of webbrowser-app.4 * This file is part of webbrowser-app.
5 *5 *
@@ -43,6 +43,7 @@
43 property bool showFavicon: true43 property bool showFavicon: true
44 property bool findInPageMode: false44 property bool findInPageMode: false
45 property var findController: null45 property var findController: null
46 property color fgColor: Theme.palette.normal.baseText
4647
47 property var securityStatus: null48 property var securityStatus: null
4849
@@ -117,7 +118,7 @@
117 name: addressbar.loading ? "stop" :118 name: addressbar.loading ? "stop" :
118 reload ? "reload" :119 reload ? "reload" :
119 looksLikeAUrl ? "stock_website" : "search"120 looksLikeAUrl ? "stock_website" : "search"
120 color: UbuntuColors.darkGrey121 color: addressbar.fgColor
121122
122 MouseArea {123 MouseArea {
123 objectName: "actionButton"124 objectName: "actionButton"
@@ -142,7 +143,7 @@
142 Icon {143 Icon {
143 id: secure144 id: secure
144 name: "network-secure"145 name: "network-secure"
145 color: UbuntuColors.darkGrey146 color: addressbar.fgColor
146 height: parent.height147 height: parent.height
147 width: height148 width: height
148 visible: internal.idle && internal.secureConnection149 visible: internal.idle && internal.secureConnection
@@ -159,7 +160,7 @@
159 Icon {160 Icon {
160 id: securityAlert161 id: securityAlert
161 name: "security-alert"162 name: "security-alert"
162 color: UbuntuColors.darkGrey163 color: addressbar.fgColor
163 height: parent.height164 height: parent.height
164 width: height165 width: height
165 visible: internal.idle && internal.securityWarning166 visible: internal.idle && internal.securityWarning
@@ -201,7 +202,7 @@
201 objectName: "findInPageCounter"202 objectName: "findInPageCounter"
202 anchors.verticalCenter: parent.verticalCenter203 anchors.verticalCenter: parent.verticalCenter
203 fontSize: "x-small"204 fontSize: "x-small"
204 color: UbuntuColors.darkGrey205 color: addressbar.fgColor
205 opacity: findController && findController.count > 0 ? 1.0 : 0.6206 opacity: findController && findController.count > 0 ? 1.0 : 0.6
206 visible: findInPageMode207 visible: findInPageMode
207208
@@ -226,7 +227,7 @@
226 anchors.centerIn: parent227 anchors.centerIn: parent
227228
228 name: addressbar.bookmarked ? "starred" : "non-starred"229 name: addressbar.bookmarked ? "starred" : "non-starred"
229 color: addressbar.bookmarked ? UbuntuColors.orange : UbuntuColors.darkGrey230 color: addressbar.bookmarked ? UbuntuColors.orange : addressbar.fgColor
230 }231 }
231232
232 onClicked: addressbar.toggleBookmark()233 onClicked: addressbar.toggleBookmark()
@@ -239,7 +240,7 @@
239 }240 }
240241
241 font.pixelSize: FontUtils.sizeToPixels("small")242 font.pixelSize: FontUtils.sizeToPixels("small")
242 color: UbuntuColors.darkGrey243 color: addressbar.fgColor
243 inputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhUrlCharactersOnly244 inputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhUrlCharactersOnly
244245
245 placeholderText: findInPageMode ? i18n.tr("find in page")246 placeholderText: findInPageMode ? i18n.tr("find in page")
246247
=== modified file 'src/app/webbrowser/Chrome.qml'
--- src/app/webbrowser/Chrome.qml 2015-11-26 11:59:33 +0000
+++ src/app/webbrowser/Chrome.qml 2016-01-26 18:12:30 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright 2013-2015 Canonical Ltd.2 * Copyright 2013-2016 Canonical Ltd.
3 *3 *
4 * This file is part of webbrowser-app.4 * This file is part of webbrowser-app.
5 *5 *
@@ -45,7 +45,7 @@
45 signal requestNewTab(int index, bool makeCurrent)45 signal requestNewTab(int index, bool makeCurrent)
46 signal tabClosed(int index)46 signal tabClosed(int index)
4747
48 backgroundColor: incognito ? UbuntuColors.darkGrey : "#bcbcbc"48 backgroundColor: incognito ? UbuntuColors.darkGrey : "#ffffff"
4949
50 implicitHeight: tabsBar.height + navigationBar.height + content.anchors.topMargin50 implicitHeight: tabsBar.height + navigationBar.height + content.anchors.topMargin
5151
@@ -62,7 +62,7 @@
6262
63 Rectangle {63 Rectangle {
64 anchors.fill: navigationBar64 anchors.fill: navigationBar
65 color: (showTabsBar || !incognito) ? "#f8f8f8" : UbuntuColors.darkGrey65 color: (showTabsBar || !incognito) ? "#ffffff" : UbuntuColors.darkGrey
66 }66 }
6767
68 Loader {68 Loader {
@@ -71,6 +71,7 @@
71 sourceComponent: TabsBar {71 sourceComponent: TabsBar {
72 model: tabsModel72 model: tabsModel
73 incognito: chrome.incognito73 incognito: chrome.incognito
74 fgColor: navigationBar.fgColor
74 onSwitchToTab: chrome.switchToTab(index)75 onSwitchToTab: chrome.switchToTab(index)
75 onRequestNewTab: chrome.requestNewTab(index, makeCurrent)76 onRequestNewTab: chrome.requestNewTab(index, makeCurrent)
76 onTabClosed: chrome.tabClosed(index)77 onTabClosed: chrome.tabClosed(index)
@@ -87,7 +88,8 @@
87 NavigationBar {88 NavigationBar {
88 id: navigationBar89 id: navigationBar
8990
90 iconColor: (incognito && !showTabsBar) ? "white" : UbuntuColors.darkGrey91 fgColor: "#111111"
92 iconColor: (incognito && !showTabsBar) ? "white" : fgColor
9193
92 focus: true94 focus: true
9395
9496
=== modified file 'src/app/webbrowser/NavigationBar.qml'
--- src/app/webbrowser/NavigationBar.qml 2015-11-26 11:59:33 +0000
+++ src/app/webbrowser/NavigationBar.qml 2016-01-26 18:12:30 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright 2013-2015 Canonical Ltd.2 * Copyright 2013-2016 Canonical Ltd.
3 *3 *
4 * This file is part of webbrowser-app.4 * This file is part of webbrowser-app.
5 *5 *
@@ -37,6 +37,7 @@
37 property alias incognito: addressbar.incognito37 property alias incognito: addressbar.incognito
38 property alias showFaviconInAddressBar: addressbar.showFavicon38 property alias showFaviconInAddressBar: addressbar.showFavicon
39 readonly property alias bookmarkTogglePlaceHolder: addressbar.bookmarkTogglePlaceHolder39 readonly property alias bookmarkTogglePlaceHolder: addressbar.bookmarkTogglePlaceHolder
40 property color fgColor: Theme.palette.normal.baseText
40 property color iconColor: UbuntuColors.darkGrey41 property color iconColor: UbuntuColors.darkGrey
41 property real availableHeight42 property real availableHeight
4243
@@ -100,6 +101,8 @@
100 AddressBar {101 AddressBar {
101 id: addressbar102 id: addressbar
102103
104 fgColor: root.fgColor
105
103 focus: true106 focus: true
104107
105 findInPageMode: findInPageMode108 findInPageMode: findInPageMode
@@ -337,7 +340,7 @@
337 when: model.iconSource.toString()340 when: model.iconSource.toString()
338 value: model.iconSource341 value: model.iconSource
339 }342 }
340 color: UbuntuColors.darkGrey343 color: root.fgColor
341 }344 }
342345
343 Label {346 Label {
@@ -350,7 +353,7 @@
350 }353 }
351 text: model.text354 text: model.text
352 fontSize: "small"355 fontSize: "small"
353 color: UbuntuColors.darkGrey356 color: root.fgColor
354 elide: Text.ElideRight357 elide: Text.ElideRight
355 }358 }
356 }359 }
357360
=== modified file 'src/app/webbrowser/TabChrome.qml'
--- src/app/webbrowser/TabChrome.qml 2015-09-17 08:51:11 +0000
+++ src/app/webbrowser/TabChrome.qml 2016-01-26 18:12:30 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright 2014-2015 Canonical Ltd.2 * Copyright 2014-2016 Canonical Ltd.
3 *3 *
4 * This file is part of webbrowser-app.4 * This file is part of webbrowser-app.
5 *5 *
@@ -62,7 +62,10 @@
62 anchors.top: parent.top62 anchors.top: parent.top
63 anchors.bottom: parent.bottom63 anchors.bottom: parent.bottom
6464
65 active: true
65 hoverable: false66 hoverable: false
67 fgColor: "#111111"
68
66 onSelected: tabChrome.selected()69 onSelected: tabChrome.selected()
67 onClosed: tabChrome.closed()70 onClosed: tabChrome.closed()
68 }71 }
6972
=== modified file 'src/app/webbrowser/TabItem.qml'
--- src/app/webbrowser/TabItem.qml 2015-10-26 15:34:21 +0000
+++ src/app/webbrowser/TabItem.qml 2016-01-26 18:12:30 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright 2015 Canonical Ltd.2 * Copyright 2015-2016 Canonical Ltd.
3 *3 *
4 * This file is part of webbrowser-app.4 * This file is part of webbrowser-app.
5 *5 *
@@ -35,6 +35,8 @@
35 property real dragMax: 035 property real dragMax: 0
36 readonly property bool dragging: mouseArea.drag.active36 readonly property bool dragging: mouseArea.drag.active
3737
38 property color fgColor: Theme.palette.normal.baseText
39
38 signal selected()40 signal selected()
39 signal closed()41 signal closed()
40 signal contextMenu()42 signal contextMenu()
@@ -69,6 +71,7 @@
69 verticalAlignment: Text.AlignVCenter71 verticalAlignment: Text.AlignVCenter
70 clip: true72 clip: true
71 fontSize: "small"73 fontSize: "small"
74 color: tabItem.fgColor
72 }75 }
7376
74 Rectangle {77 Rectangle {
@@ -79,8 +82,8 @@
79 gradient: Gradient {82 gradient: Gradient {
80 GradientStop {83 GradientStop {
81 position: 0.0;84 position: 0.0;
82 color: active ? "#f8f8f8" :85 color: active ? "#ffffff" :
83 (hoverArea.containsMouse ? "#cecece" : "#dedede")86 (hoverArea.containsMouse ? "#c5c5c5" : "#d2d2d2")
84 }87 }
85 GradientStop { position: 0.33; color: "transparent" }88 GradientStop { position: 0.33; color: "transparent" }
86 }89 }
@@ -145,6 +148,7 @@
145 anchors.rightMargin: units.gu(1)148 anchors.rightMargin: units.gu(1)
146 anchors.verticalCenter: parent.verticalCenter149 anchors.verticalCenter: parent.verticalCenter
147 name: "close"150 name: "close"
151 color: tabItem.fgColor
148 }152 }
149 }153 }
150}154}
151155
=== modified file 'src/app/webbrowser/TabsBar.qml'
--- src/app/webbrowser/TabsBar.qml 2015-11-18 15:48:26 +0000
+++ src/app/webbrowser/TabsBar.qml 2016-01-26 18:12:30 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright 2015 Canonical Ltd.2 * Copyright 2015-2016 Canonical Ltd.
3 *3 *
4 * This file is part of webbrowser-app.4 * This file is part of webbrowser-app.
5 *5 *
@@ -32,6 +32,8 @@
3232
33 property bool incognito: false33 property bool incognito: false
3434
35 property color fgColor: Theme.palette.normal.baseText
36
35 signal switchToTab(int index)37 signal switchToTab(int index)
36 signal requestNewTab(int index, bool makeCurrent)38 signal requestNewTab(int index, bool makeCurrent)
37 signal tabClosed(int index)39 signal tabClosed(int index)
@@ -67,7 +69,7 @@
67 height: units.gu(2)69 height: units.gu(2)
68 anchors.centerIn: parent70 anchors.centerIn: parent
69 name: "add"71 name: "add"
70 color: incognito ? "white" : UbuntuColors.darkGrey72 color: incognito ? "white" : root.fgColor
71 }73 }
7274
73 onClicked: root.requestNewTab(root.model.count, true)75 onClicked: root.requestNewTab(root.model.count, true)
@@ -149,6 +151,7 @@
149 incognito: root.incognito151 incognito: root.incognito
150 title: model.title ? model.title : (model.url.toString() ? model.url : i18n.tr("New tab"))152 title: model.title ? model.title : (model.url.toString() ? model.url : i18n.tr("New tab"))
151 icon: model.icon153 icon: model.icon
154 fgColor: root.fgColor
152155
153 rightMargin: tabDelegate.rightMargin156 rightMargin: tabDelegate.rightMargin
154157
@@ -182,5 +185,16 @@
182 z: (root.model.currentIndex == index) ? 3 : 1 - index / root.model.count185 z: (root.model.currentIndex == index) ? 3 : 1 - index / root.model.count
183 }186 }
184 }187 }
188
189 Rectangle {
190 anchors {
191 left: parent.left
192 bottom: parent.bottom
193 }
194 width: root.width
195 height: units.dp(1)
196 color: "#cacaca"
197 z: 2
198 }
185 }199 }
186}200}
187201
=== modified file 'src/app/webbrowser/assets/bottom_edge_hint@27.png'
188Binary 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 differ202Binary 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
=== modified file 'src/app/webbrowser/assets/broken_lock@27.png'
189Binary 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 differ203Binary 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
=== modified file 'src/app/webbrowser/assets/tab-active-desktop@27.png'
190Binary 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 differ204Binary 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
=== modified file 'src/app/webbrowser/assets/tab-active@27.png'
191Binary 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 differ205Binary 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
=== modified file 'src/app/webbrowser/assets/tab-artwork.png'
192Binary 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 differ206Binary 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
=== modified file 'src/app/webbrowser/assets/tab-hover-desktop@27.png'
193Binary 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 differ207Binary 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
=== modified file 'src/app/webbrowser/assets/tab-hover@27.png'
194Binary 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 differ208Binary 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
=== modified file 'src/app/webbrowser/assets/tab-non-active-desktop@27.png'
195Binary 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 differ209Binary 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
=== modified file 'src/app/webbrowser/assets/tab-non-active@27.png'
196Binary 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 differ210Binary 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
=== modified file 'src/app/webbrowser/assets/tab-shadow-narrow@27.png'
197Binary 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 differ211Binary 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
=== modified file 'src/app/webbrowser/assets/toolbar-dropshadow.png'
198Binary 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 differ212Binary 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: