Merge lp:~macslow/ubuntu-ui-toolkit/green-darkgrey-gradient into lp:ubuntu-ui-toolkit

[Mirco Müller]

As part of the "Compact widget patterns review" from January 2014, buttons (on snap-decisions and other elements) are meant to use a green-gradient and a dark-grey gradient. This branch adds these needed gradients as symbolic gradients for easy access via the SDK.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1025
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2078/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/485/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/434/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-amd64-ci/24/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-armhf-ci/24/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/947/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/572/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2078/rebuild

review: Needs Fixing (continuous-integration)

[Tim Peeters (tpeeters)]

Can you double-check this with design? I heard last week that they want to get rid of the gradients in UbuntuColors.

Second, we don't merge directly to lp:ubuntu-ui-toolkit any more, it first needs to go to lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging, so please resubmit the MR for merging to that branch.

review: Needs Resubmitting

[Cris Dywan (kalikiana)]

I confirm we don't want gradients, in fact I'm going to have a branch transparently turning gradients into plain colors.

review: Disapprove

[Cris Dywan (kalikiana)]

See bug 1324442.

[Mirco Müller (macslow)]

Hm... ok. I'm still a bit surprised by this change in direction, because I talked with Jouni - who's with the Design-team - last week in Malta and he did not object to the new gradients.

Unmerged revisions

1025. By Mirco Müller on 2014-05-27

Added green and dark-grey gradients to allow easy access to the new color- and gradient-styles set forth by the compact widgets document from January 2014.

=== modified file 'modules/Ubuntu/Components/Colors/UbuntuColors.qml'
--- modules/Ubuntu/Components/Colors/UbuntuColors.qml	2013-07-02 00:15:07 +0000
+++ modules/Ubuntu/Components/Colors/UbuntuColors.qml	2014-05-27 07:58:10 +0000
@@ -79,4 +79,22 @@
         GradientStop { position: 0.0; color: "#888888" }
         GradientStop { position: 1.0; color: "#BBBBBB" }
     }
+    /*!
+       Ubuntu dark-grey gradient
+
+       \sa Button::gradient
+    */
+    property Gradient darkgreyGradient: Gradient {
+        GradientStop { position: 0.0; color: "#534E4B" }
+        GradientStop { position: 1.0; color: "#5D5856" }
+    }
+    /*!
+       Ubuntu green gradient
+
+       \sa Button::gradient
+    */
+    property Gradient greenGradient: Gradient {
+        GradientStop { position: 0.0; color: "#39B44A" }
+        GradientStop { position: 1.0; color: "#50BE61" }
+    }
 }