Merge lp://qastaging/~mterry/webbrowser-app/less-ubuntucolors into lp://qastaging/webbrowser-app
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Olivier Tilloy | ||||
| Approved revision: | 1458 | ||||
| Merged at revision: | 1519 | ||||
| Proposed branch: | lp://qastaging/~mterry/webbrowser-app/less-ubuntucolors | ||||
| Merge into: | lp://qastaging/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://qastaging/~mterry/webbrowser-app/less-ubuntucolors | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| system-apps-ci-bot | continuous-integration | Approve | |
| Olivier Tilloy | Approve | ||
|
Review via email:
|
|||
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.
Description of the change
There are still a lot of UbuntuColor.
And I left the "this page is bookmarked" icon fill color as UbuntuColors.
| Olivier Tilloy (osomon) wrote | # |
| Michael Terry (mterry) wrote | # |
| system-apps-ci-bot (system-apps-ci-bot) 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/
Not sure what should be done with src/app/
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.
Could you please update the dates in the copyright headers for files that were changed?