Ubuntu Calendar App

Merge lp:~pkunal-parmar/ubuntu-calendar-app/RemoveUbuntuShape into lp:ubuntu-calendar-app

  1. RemoveUbuntuShape
  2. Merge into trunk
Proposed by Kunal Parmar
Status: Merged
Approved by: Mihir Soni
Approved revision: 291
Merged at revision: 292
Proposed branch: lp:~pkunal-parmar/ubuntu-calendar-app/RemoveUbuntuShape
Merge into: lp:ubuntu-calendar-app
Diff against target: 52 lines (+17/-24)
1 file modified
NewEvent.qml (+17/-24)
To merge this branch: bzr merge lp:~pkunal-parmar/ubuntu-calendar-app/RemoveUbuntuShape
Reviewer Review Type Date Requested Status
Mihir Soni Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+221069@code.launchpad.net

Commit message

Removing ubuntu shape from Description field, as per design team's suggestion

Description of the change

Removing ubuntu shape from Description field, as per design team's suggestion

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:291
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/496/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2847
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2847/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/386
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/386/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/330
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/54

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/496/rebuild

review: Approve (continuous-integration)
Revision history for this message
Mihir Soni (mihirsoni) wrote :

Looks good to me.
Thanks Kunal

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NewEvent.qml'
2--- NewEvent.qml 2014-05-23 07:21:51 +0000
3+++ NewEvent.qml 2014-05-27 11:43:26 +0000
4@@ -394,31 +394,24 @@
5 objectName: "newEventName"
6 }
7
8- UbuntuShape{
9- width:parent.width
10- height: descriptionColumn.height
11-
12- Column{
13- id: descriptionColumn
14+ Column{
15+ id: descriptionColumn
16+ width: parent.width
17+ spacing: units.gu(1)
18+
19+ Label {
20+ text: i18n.tr("Description")
21+ anchors.margins: units.gu(0.5)
22+ anchors.left: parent.left
23+ }
24+
25+ TextArea{
26+ id: messageEdit
27 width: parent.width
28- anchors.top: parent.top
29- anchors.topMargin: units.gu(0.5)
30- spacing: units.gu(1)
31-
32- Label {
33- text: i18n.tr("Description")
34- anchors.margins: units.gu(0.5)
35- anchors.left: parent.left
36- }
37-
38- TextArea{
39- id: messageEdit
40- width: parent.width
41- color: focus ? "#2C001E" : "#5D5D5D"
42- // default style
43- font {
44- pixelSize: focus ? FontUtils.sizeToPixels("large") : FontUtils.sizeToPixels("medium")
45- }
46+ color: focus ? "#2C001E" : "#5D5D5D"
47+ // default style
48+ font {
49+ pixelSize: focus ? FontUtils.sizeToPixels("large") : FontUtils.sizeToPixels("medium")
50 }
51 }
52 }

Subscribers

People subscribed via source and target branches

to status/vote changes: