Merge lp:~nicolas-doffay/unity8/infographics-font-fix into lp:unity8

Proposed by Nicolas d'Offay
Status: Merged
Approved by: Pete Woods
Approved revision: 441
Merged at revision: 450
Proposed branch: lp:~nicolas-doffay/unity8/infographics-font-fix
Merge into: lp:unity8
Diff against target: 26 lines (+1/-3)
1 file modified
Greeter/Infographics.qml (+1/-3)
To merge this branch: bzr merge lp:~nicolas-doffay/unity8/infographics-font-fix
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Pete Woods (community) Approve
Review via email: mp+190725@code.launchpad.net

Commit message

Changed Infographics to use Ubuntu font.

To post a comment you must log in.
Revision history for this message
Pete Woods (pete-woods) wrote :

Ooh, that looks better! :)

Revision history for this message
Pete Woods (pete-woods) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:441
http://jenkins.qa.ubuntu.com/job/unity8-ci/1372/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4954
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2859
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2238
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/395
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1372
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1372/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1371
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1129
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/829
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/829/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2861
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2861/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2377
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2417

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1372/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Greeter/Infographics.qml'
--- Greeter/Infographics.qml 2013-09-30 19:39:14 +0000
+++ Greeter/Infographics.qml 2013-10-11 16:31:19 +0000
@@ -405,7 +405,7 @@
405 }405 }
406 }406 }
407407
408 Text {408 Label {
409 id: notification409 id: notification
410 objectName: "label"410 objectName: "label"
411411
@@ -419,13 +419,11 @@
419 anchors.centerIn: parent419 anchors.centerIn: parent
420420
421 text: infographic.model.label421 text: infographic.model.label
422 font.pixelSize: notification.height / 12
423422
424 wrapMode: Text.WordWrap423 wrapMode: Text.WordWrap
425 horizontalAlignment: Text.AlignHCenter424 horizontalAlignment: Text.AlignHCenter
426 verticalAlignment: Text.AlignVCenter425 verticalAlignment: Text.AlignVCenter
427 color: "white"426 color: "white"
428 font.weight: Font.Light
429427
430 PropertyAnimation {428 PropertyAnimation {
431 id: increaseOpacity429 id: increaseOpacity

Subscribers

People subscribed via source and target branches