Merge lp:~ssweeny/unity8/fix-seemore-color into lp:~unity-team/unity8/new-scopes

Proposed by Scott Sweeny
Status: Merged
Merged at revision: 646
Proposed branch: lp:~ssweeny/unity8/fix-seemore-color
Merge into: lp:~unity-team/unity8/new-scopes
Diff against target: 23 lines (+4/-2)
1 file modified
qml/Components/SeeMore.qml (+4/-2)
To merge this branch: bzr merge lp:~ssweeny/unity8/fix-seemore-color
Reviewer Review Type Date Requested Status
Michał Sawicz Approve
Andrea Cimitan (community) Needs Information
Review via email: mp+206561@code.launchpad.net

Commit message

temporary fix for 'See more' and 'See less' text color in previews

Description of the change

Like karni's earlier fixes this merge sets the "See more" and "See less" text you'll find in a long text element from a preview to grey so it's visible with the paper background.

To post a comment you must log in.
Revision history for this message
Andrea Cimitan (cimi) wrote :

Can we ship our own palette instead?

Revision history for this message
Andrea Cimitan (cimi) wrote :

Or I believe we just need to change the theme back to the default one. IIRC we're using SuruDark or SuruGradient

Revision history for this message
Andrea Cimitan (cimi) :
review: Needs Information
Revision history for this message
Chris Wayne (cwayne) wrote :

Now that the background closely matches that of Ambiance's, I think it would make sense to switch the theme to Ambiance

Revision history for this message
Michał Sawicz (saviq) wrote :

Merging this for now, no better short-term solution.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/Components/SeeMore.qml'
2--- qml/Components/SeeMore.qml 2014-02-05 17:35:52 +0000
3+++ qml/Components/SeeMore.qml 2014-02-14 22:27:09 +0000
4@@ -34,7 +34,8 @@
5 objectName: "seeMoreLabel"
6 text: i18n.tr("See more")
7 opacity: !more ? 0.8 : 0.4
8- color: Theme.palette.selected.backgroundText
9+ // TODO: Fix requiring Palette update
10+ color: "grey" //Theme.palette.selected.backgroundText
11 font.weight: Font.Bold
12
13 MouseArea {
14@@ -56,7 +57,8 @@
15 objectName: "seeLessLabel"
16 text: i18n.tr("See less")
17 opacity: more ? 0.8 : 0.4
18- color: Theme.palette.selected.backgroundText
19+ // TODO: Fix requiring Palette update
20+ color: "grey" //Theme.palette.selected.backgroundText
21 font.weight: Font.Bold
22
23 MouseArea {

Subscribers

People subscribed via source and target branches

to all changes: