Ubuntu UI Toolkit

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/darkBackgroundText into lp:ubuntu-ui-toolkit/staging

  1. darkBackgroundText
  2. Merge into staging
Proposed by Christian Dywan on 2015-05-30
Status: Merged
Approved by: Christian Dywan on 2015-06-11
Approved revision: 1524
Merged at revision: 1532
Proposed branch: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/darkBackgroundText
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 40 lines (+6/-2)
3 files modified
examples/ubuntu-ui-toolkit-gallery/Dialog.qml (+4/-0)
modules/Ubuntu/Components/Themes/SuruDark/1.2/Palette.qml (+1/-1)
modules/Ubuntu/Components/Themes/SuruDark/1.3/Palette.qml (+1/-1)
To merge this branch: bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/darkBackgroundText
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2015-06-11
Zsombor Egri (community) 2015-05-30 Approve on 2015-06-10
Olivia Caro de Diego 2015-06-01 Pending
Review via email: mp+260647@code.launchpad.net

Commit Message

Update normal.backgroundText in SuruDark to #5D5D5D

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1523
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1817/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3022
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/545/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/547
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/547/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/544
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2571
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3020
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3020/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20852

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1817/rebuild

review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1524
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1840/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3054
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/568
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/570
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/570/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/567
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2590
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3052
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3052/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20901

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1840/rebuild

review: Needs Fixing (continuous-integration)
Zsombor Egri (zsombi) wrote :

Looks good, hopefully design also finds it so. We can change it later if they don't :)

review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'examples/ubuntu-ui-toolkit-gallery/Dialog.qml'
2--- examples/ubuntu-ui-toolkit-gallery/Dialog.qml 2015-04-29 08:55:31 +0000
3+++ examples/ubuntu-ui-toolkit-gallery/Dialog.qml 2015-06-02 16:21:12 +0000
4@@ -43,6 +43,10 @@
5 title: "Sample Dialog"
6 text: "Descriptive text goes here"
7
8+ TextField {
9+ placeholderText: "Type like your lifes depends on it"
10+ }
11+
12 Row {
13 id: row
14 width: parent.width
15
16=== modified file 'modules/Ubuntu/Components/Themes/SuruDark/1.2/Palette.qml'
17--- modules/Ubuntu/Components/Themes/SuruDark/1.2/Palette.qml 2015-04-24 14:48:00 +0000
18+++ modules/Ubuntu/Components/Themes/SuruDark/1.2/Palette.qml 2015-06-02 16:21:12 +0000
19@@ -21,7 +21,7 @@
20 Palette {
21 normal: PaletteValues {
22 background: "#221E1C"
23- backgroundText: "#33F3F3E7"
24+ backgroundText: "#5D5D5D78"
25 base: "#19000000"
26 baseText: "#FFFFFF"
27 foreground: "#888888"
28
29=== modified file 'modules/Ubuntu/Components/Themes/SuruDark/1.3/Palette.qml'
30--- modules/Ubuntu/Components/Themes/SuruDark/1.3/Palette.qml 2015-04-24 14:34:39 +0000
31+++ modules/Ubuntu/Components/Themes/SuruDark/1.3/Palette.qml 2015-06-02 16:21:12 +0000
32@@ -22,7 +22,7 @@
33 Palette {
34 normal {
35 background: "#221E1C"
36- backgroundText: "#33F3F3E7"
37+ backgroundText: "#5D5D5D78"
38 base: "#19000000"
39 baseText: "#FFFFFF"
40 foreground: "#888888"

Subscribers

People subscribed via source and target branches