webbrowser-app

Merge lp:~mterry/webbrowser-app/less-ubuntucolors into lp:webbrowser-app

  1. less-ubuntucolors
  2. Merge into trunk
Proposed by Michael Terry
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 1458
Merged at revision: 1519
Proposed branch: lp:~mterry/webbrowser-app/less-ubuntucolors
Merge into: lp:webbrowser-app
Diff against target: 468 lines (+42/-44)
22 files modified
src/app/AlertDialog.qml (+2/-1)
src/app/AuthenticationDialog.qml (+2/-3)
src/app/BeforeUnloadDialog.qml (+2/-1)
src/app/CertificateVerificationDialog.qml (+3/-3)
src/app/ConfirmDialog.qml (+2/-1)
src/app/GeolocationPermissionRequest.qml (+2/-3)
src/app/HttpAuthenticationDialog.qml (+2/-3)
src/app/InvalidCertificateErrorSheet.qml (+2/-2)
src/app/MediaAccessDialog.qml (+1/-2)
src/app/PromptDialog.qml (+2/-3)
src/app/webbrowser/BookmarkOptions.qml (+2/-2)
src/app/webbrowser/BookmarksFoldersViewWide.qml (+2/-2)
src/app/webbrowser/DownloadDelegate.qml (+2/-2)
src/app/webbrowser/HistorySectionDelegate.qml (+2/-2)
src/app/webbrowser/HistoryViewWide.qml (+1/-1)
src/app/webbrowser/IndeterminateProgressBar.qml (+2/-2)
src/app/webbrowser/LeavePrivateModeDialog.qml (+2/-2)
src/app/webbrowser/SadTab.qml (+2/-2)
src/app/webbrowser/SettingsPage.qml (+1/-1)
src/app/webbrowser/UrlDelegate.qml (+2/-2)
src/app/webbrowser/UrlDelegateWide.qml (+2/-2)
src/app/webcontainer/SadPage.qml (+2/-2)
To merge this branch: bzr merge lp:~mterry/webbrowser-app/less-ubuntucolors
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Approve
Olivier Tilloy Approve
Review via email: mp+295412@code.launchpad.net

Commit message

Use less hard-coded colors in favor of theme colors.

- We were using some off-brand colors like "green" instead of UbuntuColors.green. Which are now fixed to the theme 'positive' color in this branch anyway.
- We were using a lot of orange in places we shouldn't (mostly for recommended buttons, some selected states, and in one place for a progress indicator).
- We were frequently specifying the color of a neutral button, but never the same way twice (coolGrey, warmGrey, lightGrey). No need, the default button color should be fine.
- And I fixed a few of the instances of UbuntuColors.darkGrey for text to appropriate theme colors.

Description of the change

There are still a lot of UbuntuColor.darkGrey instances sitting out there (which is now more properly called UbuntuColors.slate, or backgroundSecondaryText in the normal theme). And a lot of hardcoded "#xxxxxx"! But I didn't deal with all of it, since I'm not super familiar with the code base.

And I left the "this page is bookmarked" icon fill color as UbuntuColors.orange. That was a unique-enough case that I wasn't sure what would be appropriate there.

To post a comment you must log in.
Revision history for this message
Olivier Tilloy (osomon) wrote :

Those changes look good, thanks Michael for taking some time to apply them. A couple of minor comments:

The OK button in src/app/ConfirmDialog.qml should have an explicit color of theme.palette.normal.positive, for consistency. And probably src/app/AlertDialog.qml too.
Not sure what should be done with src/app/BeforeUnloadDialog.qml.

In the history and bookmarks views (wide layout), the color of the current date/folder in the left column when it doesn’t have active focus should be 'selected.backgroundText' instead of 'normal.positionText', according to https://docs.google.com/presentation/d/1Sgf536u5LgKgl41x7xeEeo-XibEEPQZ_phugEArwvec/edit?ts=5728be0d#slide=id.g12f5d7958f_0_92 (that visual design update hasn’t been implemented yet, I’ll get to it soon, but since you’re changing some colors now, I reckon it would be better to use the updated ones now).

Could you please update the dates in the copyright headers for files that were changed?

lp:~mterry/webbrowser-app/less-ubuntucolors updated
1458. By Michael Terry

Add a few more button colors and update copyright years

Revision history for this message
Michael Terry (mterry) wrote :

- Made the OK button green in ConfirmDialog and AlertDialog.

- Looking at BeforeUnloadDialog, I thought it made sense to make "Leave" red and keep "Stay" grey. Let me know if you don't like this.

- For the history/bookmark views... at least in the current theme shipped today, selected.backgroundText is the same as normal.backgroundText: UbuntuColors.jet. Maybe that's a bug with the theme...? But I don't think positionText is so wrong. It's supposed to be "applied to navigation elements to indicate current position" (from PaletteValues.qml). And it's the color used in the toolkit's SectionsStyle.qml to indicate which header section is active. So maybe that spec is out of date? I think positionText is a relatively new palette option.

- Updated copyrights.

Revision history for this message
Olivier Tilloy (osomon) wrote :

Looks good to me, and your point about positionText makes sense to me.

review: Approve
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

PASSED: Continuous integration, rev:1458
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/579/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/950
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/167
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/950
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/855
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/855
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/855
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/852
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/852/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/852
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/852/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/852
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/852/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/852
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/852/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/852
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/852/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/852
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/852/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/852
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/852/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/852
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/852/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/852
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/852/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/579/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/app/AlertDialog.qml'
--- src/app/AlertDialog.qml 2015-08-10 15:22:00 +0000
+++ src/app/AlertDialog.qml 2016-05-23 13:25:57 +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 *
@@ -24,6 +24,7 @@
2424
25 Button {25 Button {
26 text: i18n.tr("OK")26 text: i18n.tr("OK")
27 color: theme.palette.normal.positive
27 onClicked: model.accept()28 onClicked: model.accept()
28 }29 }
29}30}
3031
=== modified file 'src/app/AuthenticationDialog.qml'
--- src/app/AuthenticationDialog.qml 2015-08-10 15:22:00 +0000
+++ src/app/AuthenticationDialog.qml 2016-05-23 13:25:57 +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,13 +45,12 @@
4545
46 Button {46 Button {
47 text: i18n.tr("OK")47 text: i18n.tr("OK")
48 color: "green"48 color: theme.palette.normal.positive
49 onClicked: accept()49 onClicked: accept()
50 }50 }
5151
52 Button {52 Button {
53 text: i18n.tr("Cancel")53 text: i18n.tr("Cancel")
54 color: UbuntuColors.coolGrey
55 onClicked: model.reject()54 onClicked: model.reject()
56 }55 }
5756
5857
=== modified file 'src/app/BeforeUnloadDialog.qml'
--- src/app/BeforeUnloadDialog.qml 2015-08-10 15:22:00 +0000
+++ src/app/BeforeUnloadDialog.qml 2016-05-23 13:25:57 +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 *
@@ -24,6 +24,7 @@
2424
25 Button {25 Button {
26 text: i18n.tr("Leave")26 text: i18n.tr("Leave")
27 color: theme.palette.normal.negative
27 onClicked: model.accept()28 onClicked: model.accept()
28 }29 }
2930
3031
=== modified file 'src/app/CertificateVerificationDialog.qml'
--- src/app/CertificateVerificationDialog.qml 2015-08-10 15:22:00 +0000
+++ src/app/CertificateVerificationDialog.qml 2016-05-23 13:25:57 +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 *
@@ -27,13 +27,13 @@
2727
28 Button {28 Button {
29 text: i18n.tr("Proceed anyway")29 text: i18n.tr("Proceed anyway")
30 color: "red"30 color: theme.palette.normal.negative
31 onClicked: model.accept()31 onClicked: model.accept()
32 }32 }
3333
34 Button {34 Button {
35 text: i18n.tr("Back to safety")35 text: i18n.tr("Back to safety")
36 color: "green"36 color: theme.palette.normal.positive
37 onClicked: model.reject()37 onClicked: model.reject()
38 }38 }
3939
4040
=== modified file 'src/app/ConfirmDialog.qml'
--- src/app/ConfirmDialog.qml 2015-08-10 15:22:00 +0000
+++ src/app/ConfirmDialog.qml 2016-05-23 13:25:57 +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 *
@@ -24,6 +24,7 @@
2424
25 Button {25 Button {
26 text: i18n.tr("OK")26 text: i18n.tr("OK")
27 color: theme.palette.normal.positive
27 onClicked: model.accept()28 onClicked: model.accept()
28 }29 }
2930
3031
=== modified file 'src/app/GeolocationPermissionRequest.qml'
--- src/app/GeolocationPermissionRequest.qml 2015-09-29 13:09:26 +0000
+++ src/app/GeolocationPermissionRequest.qml 2016-05-23 13:25:57 +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 *
@@ -31,7 +31,6 @@
31 Button {31 Button {
32 objectName: "deny"32 objectName: "deny"
33 text: i18n.tr("Deny")33 text: i18n.tr("Deny")
34 color: UbuntuColors.warmGrey
35 onClicked: {34 onClicked: {
36 request.deny()35 request.deny()
37 PopupUtils.close(dialog)36 PopupUtils.close(dialog)
@@ -41,7 +40,7 @@
41 Button {40 Button {
42 objectName: "allow"41 objectName: "allow"
43 text: i18n.tr("Allow")42 text: i18n.tr("Allow")
44 color: UbuntuColors.orange43 color: theme.palette.normal.positive
45 onClicked: {44 onClicked: {
46 request.allow()45 request.allow()
47 PopupUtils.close(dialog)46 PopupUtils.close(dialog)
4847
=== modified file 'src/app/HttpAuthenticationDialog.qml'
--- src/app/HttpAuthenticationDialog.qml 2015-08-12 16:11:24 +0000
+++ src/app/HttpAuthenticationDialog.qml 2016-05-23 13:25:57 +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 *
@@ -57,7 +57,7 @@
57 Button {57 Button {
58 objectName: "allow"58 objectName: "allow"
59 text: i18n.tr("OK")59 text: i18n.tr("OK")
60 color: UbuntuColors.green60 color: theme.palette.normal.positive
61 onClicked: {61 onClicked: {
62 request.allow(usernameInput.text, passwordInput.text)62 request.allow(usernameInput.text, passwordInput.text)
63 PopupUtils.close(dialog)63 PopupUtils.close(dialog)
@@ -67,7 +67,6 @@
67 Button {67 Button {
68 objectName: "deny"68 objectName: "deny"
69 text: i18n.tr("Cancel")69 text: i18n.tr("Cancel")
70 color: UbuntuColors.coolGrey
71 onClicked: {70 onClicked: {
72 request.deny()71 request.deny()
73 PopupUtils.close(dialog)72 PopupUtils.close(dialog)
7473
=== modified file 'src/app/InvalidCertificateErrorSheet.qml'
--- src/app/InvalidCertificateErrorSheet.qml 2015-08-10 15:22:00 +0000
+++ src/app/InvalidCertificateErrorSheet.qml 2016-05-23 13:25:57 +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 *
@@ -175,7 +175,7 @@
175 certificateError.deny()175 certificateError.deny()
176 denied()176 denied()
177 }177 }
178 color: UbuntuColors.orange178 color: theme.palette.normal.positive
179 }179 }
180 }180 }
181 }181 }
182182
=== modified file 'src/app/MediaAccessDialog.qml'
--- src/app/MediaAccessDialog.qml 2016-04-08 17:05:47 +0000
+++ src/app/MediaAccessDialog.qml 2016-05-23 13:25:57 +0000
@@ -70,7 +70,7 @@
70 Button {70 Button {
71 objectName: "mediaAccessDialog.allowButton"71 objectName: "mediaAccessDialog.allowButton"
72 text: i18n.tr("Yes")72 text: i18n.tr("Yes")
73 color: UbuntuColors.green73 color: theme.palette.normal.positive
74 width: units.gu(10)74 width: units.gu(10)
75 onClicked: {75 onClicked: {
76 request.allow()76 request.allow()
@@ -81,7 +81,6 @@
81 Button {81 Button {
82 objectName: "mediaAccessDialog.denyButton"82 objectName: "mediaAccessDialog.denyButton"
83 text: i18n.tr("No")83 text: i18n.tr("No")
84 color: UbuntuColors.lightGrey
85 width: units.gu(10)84 width: units.gu(10)
86 onClicked: {85 onClicked: {
87 request.deny()86 request.deny()
8887
=== modified file 'src/app/PromptDialog.qml'
--- src/app/PromptDialog.qml 2015-08-10 15:22:00 +0000
+++ src/app/PromptDialog.qml 2016-05-23 13:25:57 +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 *
@@ -30,13 +30,12 @@
3030
31 Button {31 Button {
32 text: i18n.tr("OK")32 text: i18n.tr("OK")
33 color: "green"33 color: theme.palette.normal.positive
34 onClicked: model.accept(input.text)34 onClicked: model.accept(input.text)
35 }35 }
3636
37 Button {37 Button {
38 text: i18n.tr("Cancel")38 text: i18n.tr("Cancel")
39 color: UbuntuColors.coolGrey
40 onClicked: model.reject()39 onClicked: model.reject()
41 }40 }
4241
4342
=== modified file 'src/app/webbrowser/BookmarkOptions.qml'
--- src/app/webbrowser/BookmarkOptions.qml 2016-02-17 18:27:31 +0000
+++ src/app/webbrowser/BookmarkOptions.qml 2016-05-23 13:25:57 +0000
@@ -99,7 +99,7 @@
99 objectName: "bookmarkOptions.okButton"99 objectName: "bookmarkOptions.okButton"
100 anchors.right: parent.right100 anchors.right: parent.right
101 text: i18n.tr("OK")101 text: i18n.tr("OK")
102 color: UbuntuColors.green102 color: theme.palette.normal.positive
103 onClicked: bookmarkOptions.destroy()103 onClicked: bookmarkOptions.destroy()
104 }104 }
105 }105 }
@@ -152,7 +152,7 @@
152 }152 }
153 text: i18n.tr("Save")153 text: i18n.tr("Save")
154 enabled: folderTextField.text154 enabled: folderTextField.text
155 color: UbuntuColors.green155 color: theme.palette.normal.positive
156 // Button took focus on press what makes the keyboard be156 // Button took focus on press what makes the keyboard be
157 // dismissed and that could make the Button moves between the157 // dismissed and that could make the Button moves between the
158 // press and the release. Button onClicked is not triggered158 // press and the release. Button onClicked is not triggered
159159
=== modified file 'src/app/webbrowser/BookmarksFoldersViewWide.qml'
--- src/app/webbrowser/BookmarksFoldersViewWide.qml 2016-04-15 11:27:13 +0000
+++ src/app/webbrowser/BookmarksFoldersViewWide.qml 2016-05-23 13:25:57 +0000
@@ -90,7 +90,7 @@
90 readonly property bool isAllBookmarksFolder: folder.length === 090 readonly property bool isAllBookmarksFolder: folder.length === 0
91 readonly property bool isCurrentDropTarget: dropArea.containsDrag && dropArea.drag.source.folder !== folder91 readonly property bool isCurrentDropTarget: dropArea.containsDrag && dropArea.drag.source.folder !== folder
9292
93 color: isCurrentDropTarget ? "green" : "transparent"93 color: isCurrentDropTarget ? theme.palette.normal.positive : "transparent"
9494
95 Label {95 Label {
96 anchors {96 anchors {
@@ -103,7 +103,7 @@
103103
104 fontSize: "small"104 fontSize: "small"
105 text: isAllBookmarksFolder ? i18n.tr("All Bookmarks") : folderItem.name105 text: isAllBookmarksFolder ? i18n.tr("All Bookmarks") : folderItem.name
106 color: (isActiveFolder && !folders.activeFocus) ? UbuntuColors.orange : UbuntuColors.darkGrey106 color: (isActiveFolder && !folders.activeFocus) ? theme.palette.normal.positionText : theme.palette.normal.backgroundSecondaryText
107 }107 }
108108
109 onClicked: folders.currentIndex = index109 onClicked: folders.currentIndex = index
110110
=== modified file 'src/app/webbrowser/DownloadDelegate.qml'
--- src/app/webbrowser/DownloadDelegate.qml 2016-02-01 12:06:20 +0000
+++ src/app/webbrowser/DownloadDelegate.qml 2016-05-23 13:25:57 +0000
@@ -145,7 +145,7 @@
145 height: width145 height: width
146 anchors.verticalCenter: parent.verticalCenter146 anchors.verticalCenter: parent.verticalCenter
147 name: "dialog-warning-symbolic"147 name: "dialog-warning-symbolic"
148 color: UbuntuColors.red148 color: theme.palette.normal.negative
149 }149 }
150150
151 Label {151 Label {
@@ -154,7 +154,7 @@
154 anchors.leftMargin: units.gu(1)154 anchors.leftMargin: units.gu(1)
155 anchors.verticalCenter: errorIcon.verticalCenter155 anchors.verticalCenter: errorIcon.verticalCenter
156 fontSize: "x-small"156 fontSize: "x-small"
157 color: UbuntuColors.red157 color: theme.palette.normal.negative
158 text: errorMessage !== "" ? errorMessage 158 text: errorMessage !== "" ? errorMessage
159 : (incomplete && download === undefined) ? i18n.tr("Download failed") 159 : (incomplete && download === undefined) ? i18n.tr("Download failed")
160 : ""160 : ""
161161
=== modified file 'src/app/webbrowser/HistorySectionDelegate.qml'
--- src/app/webbrowser/HistorySectionDelegate.qml 2015-08-11 14:56:25 +0000
+++ src/app/webbrowser/HistorySectionDelegate.qml 2016-05-23 13:25:57 +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 *
@@ -52,7 +52,7 @@
52 }52 }
5353
54 fontSize: "small"54 fontSize: "small"
55 color: UbuntuColors.darkGrey55 color: theme.palette.normal.backgroundSecondaryText
56 }56 }
5757
58 ListItem.ThinDivider {58 ListItem.ThinDivider {
5959
=== modified file 'src/app/webbrowser/HistoryViewWide.qml'
--- src/app/webbrowser/HistoryViewWide.qml 2016-05-05 11:11:01 +0000
+++ src/app/webbrowser/HistoryViewWide.qml 2016-05-23 13:25:57 +0000
@@ -254,7 +254,7 @@
254 }254 }
255255
256 fontSize: "small"256 fontSize: "small"
257 color: (!lastVisitDateListView.activeFocus && lastVisitDateDelegate.ListView.isCurrentItem) ? UbuntuColors.orange : UbuntuColors.darkGrey257 color: (!lastVisitDateListView.activeFocus && lastVisitDateDelegate.ListView.isCurrentItem) ? theme.palette.normal.positionText : theme.palette.normal.backgroundSecondaryText
258 }258 }
259259
260 onClicked: ListView.view.currentIndex = index260 onClicked: ListView.view.currentIndex = index
261261
=== modified file 'src/app/webbrowser/IndeterminateProgressBar.qml'
--- src/app/webbrowser/IndeterminateProgressBar.qml 2015-10-01 11:33:36 +0000
+++ src/app/webbrowser/IndeterminateProgressBar.qml 2016-05-23 13:25:57 +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,7 +35,7 @@
35 anchors.left: parent.left35 anchors.left: parent.left
36 anchors.leftMargin: 036 anchors.leftMargin: 0
37 anchors.top: parent.top37 anchors.top: parent.top
38 color: UbuntuColors.orange38 color: theme.palette.normal.activity
39 width: indeterminateProgress ? parent.width / 6 : (progress / 100) * parent.width39 width: indeterminateProgress ? parent.width / 6 : (progress / 100) * parent.width
4040
41 SequentialAnimation {41 SequentialAnimation {
4242
=== modified file 'src/app/webbrowser/LeavePrivateModeDialog.qml'
--- src/app/webbrowser/LeavePrivateModeDialog.qml 2015-08-10 15:22:00 +0000
+++ src/app/webbrowser/LeavePrivateModeDialog.qml 2016-05-23 13:25:57 +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 *
@@ -37,7 +37,7 @@
37 objectName: "leavePrivateModeDialog.okButton"37 objectName: "leavePrivateModeDialog.okButton"
38 anchors { left: parent.left; right: parent.right }38 anchors { left: parent.left; right: parent.right }
39 text: i18n.tr("OK")39 text: i18n.tr("OK")
40 color: UbuntuColors.green40 color: theme.palette.normal.positive
41 onClicked: okButtonClicked()41 onClicked: okButtonClicked()
42 }42 }
43}43}
4444
=== modified file 'src/app/webbrowser/SadTab.qml'
--- src/app/webbrowser/SadTab.qml 2015-09-29 19:31:47 +0000
+++ src/app/webbrowser/SadTab.qml 2016-05-23 13:25:57 +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 *
@@ -84,7 +84,7 @@
84 Button {84 Button {
85 objectName: "reloadButton"85 objectName: "reloadButton"
86 text: i18n.tr("Reload")86 text: i18n.tr("Reload")
87 color: UbuntuColors.green87 color: theme.palette.normal.positive
88 onClicked: webview.reload()88 onClicked: webview.reload()
89 }89 }
90 }90 }
9191
=== modified file 'src/app/webbrowser/SettingsPage.qml'
--- src/app/webbrowser/SettingsPage.qml 2016-05-04 10:30:57 +0000
+++ src/app/webbrowser/SettingsPage.qml 2016-05-23 13:25:57 +0000
@@ -263,7 +263,7 @@
263 objectName: "privacyConfirmDialog.confirmButton"263 objectName: "privacyConfirmDialog.confirmButton"
264 width: (parent.width - parent.spacing) / 2264 width: (parent.width - parent.spacing) / 2
265 text: i18n.tr("Clear")265 text: i18n.tr("Clear")
266 color: UbuntuColors.green266 color: theme.palette.normal.positive
267 onClicked: {267 onClicked: {
268 confirmed()268 confirmed()
269 PopupUtils.close(privacyConfirmDialog)269 PopupUtils.close(privacyConfirmDialog)
270270
=== modified file 'src/app/webbrowser/UrlDelegate.qml'
--- src/app/webbrowser/UrlDelegate.qml 2016-03-01 11:22:35 +0000
+++ src/app/webbrowser/UrlDelegate.qml 2016-05-23 13:25:57 +0000
@@ -68,7 +68,7 @@
68 right: parent.right68 right: parent.right
69 }69 }
70 fontSize: "x-small"70 fontSize: "x-small"
71 color: UbuntuColors.darkGrey71 color: theme.palette.normal.backgroundSecondaryText
72 wrapMode: Text.Wrap72 wrapMode: Text.Wrap
73 elide: Text.ElideRight73 elide: Text.ElideRight
74 maximumLineCount: 174 maximumLineCount: 1
@@ -81,7 +81,7 @@
81 right: parent.right81 right: parent.right
82 }82 }
83 fontSize: "xx-small"83 fontSize: "xx-small"
84 color: UbuntuColors.darkGrey84 color: theme.palette.normal.backgroundTertiaryText
85 wrapMode: Text.Wrap85 wrapMode: Text.Wrap
86 elide: Text.ElideRight86 elide: Text.ElideRight
87 maximumLineCount: 187 maximumLineCount: 1
8888
=== modified file 'src/app/webbrowser/UrlDelegateWide.qml'
--- src/app/webbrowser/UrlDelegateWide.qml 2016-01-28 16:48:27 +0000
+++ src/app/webbrowser/UrlDelegateWide.qml 2016-05-23 13:25:57 +0000
@@ -54,7 +54,7 @@
54 id: title54 id: title
5555
56 fontSize: "x-small"56 fontSize: "x-small"
57 color: UbuntuColors.darkGrey57 color: theme.palette.normal.backgroundSecondaryText
58 wrapMode: Text.Wrap58 wrapMode: Text.Wrap
59 elide: Text.ElideRight59 elide: Text.ElideRight
60 maximumLineCount: 160 maximumLineCount: 1
@@ -64,7 +64,7 @@
64 id: url64 id: url
6565
66 fontSize: "xx-small"66 fontSize: "xx-small"
67 color: UbuntuColors.darkGrey67 color: theme.palette.normal.backgroundTertiaryText
68 wrapMode: Text.Wrap68 wrapMode: Text.Wrap
69 elide: Text.ElideRight69 elide: Text.ElideRight
70 maximumLineCount: 170 maximumLineCount: 1
7171
=== modified file 'src/app/webcontainer/SadPage.qml'
--- src/app/webcontainer/SadPage.qml 2015-09-29 20:14:51 +0000
+++ src/app/webcontainer/SadPage.qml 2016-05-23 13:25:57 +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 *
@@ -49,7 +49,7 @@
49 anchors.horizontalCenter: parent.horizontalCenter49 anchors.horizontalCenter: parent.horizontalCenter
50 objectName: "reloadButton"50 objectName: "reloadButton"
51 text: i18n.tr("Reload")51 text: i18n.tr("Reload")
52 color: UbuntuColors.green52 color: theme.palette.normal.positive
53 onClicked: webview.reload()53 onClicked: webview.reload()
54 }54 }
55 }55 }

Subscribers

People subscribed via source and target branches

to status/vote changes: