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

[Kunal Parmar]

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

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

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

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)

[Mihir Soni (mihirsoni)]

Looks good to me.
Thanks Kunal

review: Approve

=== modified file 'NewEvent.qml'
--- NewEvent.qml	2014-05-23 07:21:51 +0000
+++ NewEvent.qml	2014-05-27 11:43:26 +0000
@@ -394,31 +394,24 @@
                 objectName: "newEventName"
             }
 
-            UbuntuShape{
-                width:parent.width
-                height: descriptionColumn.height
-
-                Column{
-                    id: descriptionColumn
+            Column{
+                id: descriptionColumn
+                width: parent.width
+                spacing: units.gu(1)
+
+                Label {
+                    text: i18n.tr("Description")
+                    anchors.margins: units.gu(0.5)
+                    anchors.left: parent.left
+                }
+
+                TextArea{
+                    id: messageEdit
                     width: parent.width
-                    anchors.top: parent.top
-                    anchors.topMargin: units.gu(0.5)
-                    spacing: units.gu(1)
-
-                    Label {
-                        text: i18n.tr("Description")
-                        anchors.margins: units.gu(0.5)
-                        anchors.left: parent.left
-                    }
-
-                    TextArea{
-                        id: messageEdit
-                        width: parent.width
-                        color: focus ? "#2C001E" : "#5D5D5D"
-                        // default style
-                        font {
-                            pixelSize: focus ? FontUtils.sizeToPixels("large") : FontUtils.sizeToPixels("medium")
-                        }
+                    color: focus ? "#2C001E" : "#5D5D5D"
+                    // default style
+                    font {
+                        pixelSize: focus ? FontUtils.sizeToPixels("large") : FontUtils.sizeToPixels("medium")
                     }
                 }
             }