Ubuntu Shorts App

Merge lp:~andrewsomething/ubuntu-rssreader-app/lp1215345 into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

  1. lp1215345
  2. Merge into trunk
Proposed by Andrew Starr-Bochicchio
Status: Merged
Approved by: David Planella
Approved revision: 49
Merged at revision: 49
Proposed branch: lp:~andrewsomething/ubuntu-rssreader-app/lp1215345
Merge into: lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk
Diff against target: 78 lines (+6/-7)
6 files modified
article_items/ArticleFullImg.qml (+1/-1)
article_items/ArticleOneImgA.qml (+1/-1)
article_items/ArticleOneImgB.qml (+1/-1)
article_items/ArticleTextA.qml (+1/-2)
article_items/ArticleTextB.qml (+1/-1)
article_items/ArticleTwoImgA.qml (+1/-1)
To merge this branch: bzr merge lp:~andrewsomething/ubuntu-rssreader-app/lp1215345
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
David Planella Approve
Review via email: mp+183041@code.launchpad.net

Commit message

Headlines on the grid should have a medium font weight, not bold. Fixes bug 1215345.

Description of the change

Headlines on the grid should have a medium font weight, not bold. Fixes bug 1215345.

To post a comment you must log in.
Revision history for this message
David Planella (dpm) wrote :

Looks good to me, thanks!

I've set the description and the commit message for you to keep Jenkins happy.

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'article_items/ArticleFullImg.qml'
2--- article_items/ArticleFullImg.qml 2013-08-03 10:06:36 +0000
3+++ article_items/ArticleFullImg.qml 2013-08-29 22:06:38 +0000
4@@ -58,7 +58,7 @@
5 // color: "white"
6 fontSize: "medium"
7 textFormat: Text.StyledText
8- font.bold: true
9+ font.weight: Font.DemiBold
10 }
11
12 Label
13
14=== modified file 'article_items/ArticleOneImgA.qml'
15--- article_items/ArticleOneImgA.qml 2013-08-03 10:06:36 +0000
16+++ article_items/ArticleOneImgA.qml 2013-08-29 22:06:38 +0000
17@@ -59,7 +59,7 @@
18 fontSize: "medium"
19 textFormat: Text.PlainText
20 // horizontalAlignment: Text.AlignRight
21- font.bold: true
22+ font.weight: Font.DemiBold
23 }
24
25 Label
26
27=== modified file 'article_items/ArticleOneImgB.qml'
28--- article_items/ArticleOneImgB.qml 2013-08-03 10:06:36 +0000
29+++ article_items/ArticleOneImgB.qml 2013-08-29 22:06:38 +0000
30@@ -45,7 +45,7 @@
31 fontSize: "medium"
32 textFormat: Text.PlainText
33 // horizontalAlignment: Text.AlignRight
34- font.bold: true
35+ font.weight: Font.DemiBold
36 }
37
38 Label
39
40=== modified file 'article_items/ArticleTextA.qml'
41--- article_items/ArticleTextA.qml 2013-08-03 10:06:36 +0000
42+++ article_items/ArticleTextA.qml 2013-08-29 22:06:38 +0000
43@@ -38,8 +38,7 @@
44 wrapMode: Text.WrapAtWordBoundaryOrAnywhere
45 fontSize: "medium"
46 textFormat: Text.PlainText
47- font.bold: true
48-
49+ font.weight: Font.DemiBold
50 }
51
52 Label
53
54=== modified file 'article_items/ArticleTextB.qml'
55--- article_items/ArticleTextB.qml 2013-08-03 10:06:36 +0000
56+++ article_items/ArticleTextB.qml 2013-08-29 22:06:38 +0000
57@@ -39,7 +39,7 @@
58 wrapMode: Text.WrapAtWordBoundaryOrAnywhere
59 fontSize: "medium"
60 textFormat: Text.PlainText
61- font.bold: true
62+ font.weight: Font.DemiBold
63 horizontalAlignment: Text.AlignRight
64 }
65
66
67=== modified file 'article_items/ArticleTwoImgA.qml'
68--- article_items/ArticleTwoImgA.qml 2013-08-03 10:06:36 +0000
69+++ article_items/ArticleTwoImgA.qml 2013-08-29 22:06:38 +0000
70@@ -79,7 +79,7 @@
71 fontSize: "medium"
72 textFormat: Text.PlainText
73 // horizontalAlignment: Text.AlignRight
74- font.bold: true
75+ font.weight: Font.DemiBold
76 }
77
78 Label

Subscribers

People subscribed via source and target branches