Ubuntu UI Toolkit

Merge lp:~tpeeters/ubuntu-ui-toolkit/darkSelectorStyle into lp:ubuntu-ui-toolkit/staging

  1. darkSelectorStyle
  2. Merge into staging
Proposed by Tim Peeters
Status: Merged
Approved by: Zsombor Egri
Approved revision: 1328
Merged at revision: 1327
Proposed branch: lp:~tpeeters/ubuntu-ui-toolkit/darkSelectorStyle
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 59 lines (+0/-50)
2 files modified
modules/Ubuntu/Components/Themes/SuruDark/ListItemOptionSelectorStyle.qml (+0/-23)
modules/Ubuntu/Components/Themes/SuruGradient/ListItemOptionSelectorStyle.qml (+0/-27)
To merge this branch: bzr merge lp:~tpeeters/ubuntu-ui-toolkit/darkSelectorStyle
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Zsombor Egri Approve
Review via email: mp+241938@code.launchpad.net

Commit message

Fix the ItemSelector style for SuruDark and SuruGradient themes.

Description of the change

Fix the ItemSelector style for SuruDark and SuruGradient themes.

To post a comment you must log in.
lp:~tpeeters/ubuntu-ui-toolkit/darkSelectorStyle updated
1328. By Tim Peeters

remove ListItemOptionSelectorStyle from SuruDark and SuruGradient themes. It must be fixed in Ambience

Revision history for this message
Zsombor Egri (zsombi) wrote :

Good, ready to go.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1327
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1223/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6554/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/1056
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/1055
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/1055/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/1055
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/6129/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7806
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7806/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15885

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

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'modules/Ubuntu/Components/Themes/SuruDark/ListItemOptionSelectorStyle.qml'
2--- modules/Ubuntu/Components/Themes/SuruDark/ListItemOptionSelectorStyle.qml 2013-09-04 13:19:53 +0000
3+++ modules/Ubuntu/Components/Themes/SuruDark/ListItemOptionSelectorStyle.qml 1970-01-01 00:00:00 +0000
4@@ -1,23 +0,0 @@
5-/*
6- * Copyright 2013 Canonical Ltd.
7- *
8- * This program is free software; you can redistribute it and/or modify
9- * it under the terms of the GNU Lesser General Public License as published by
10- * the Free Software Foundation; version 3.
11- *
12- * This program is distributed in the hope that it will be useful,
13- * but WITHOUT ANY WARRANTY; without even the implied warranty of
14- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15- * GNU Lesser General Public License for more details.
16- *
17- * You should have received a copy of the GNU Lesser General Public License
18- * along with this program. If not, see <http://www.gnu.org/licenses/>.
19- *
20- */
21-
22-import QtQuick 2.0
23-import Ubuntu.Components.Themes.Ambiance 0.1
24-
25-OptionSelectorStyle {
26- id: suruDarkStyle
27-}
28
29=== removed file 'modules/Ubuntu/Components/Themes/SuruGradient/ListItemOptionSelectorStyle.qml'
30--- modules/Ubuntu/Components/Themes/SuruGradient/ListItemOptionSelectorStyle.qml 2014-08-26 14:12:52 +0000
31+++ modules/Ubuntu/Components/Themes/SuruGradient/ListItemOptionSelectorStyle.qml 1970-01-01 00:00:00 +0000
32@@ -1,27 +0,0 @@
33-/*
34- * Copyright 2013 Canonical Ltd.
35- *
36- * This program is free software; you can redistribute it and/or modify
37- * it under the terms of the GNU Lesser General Public License as published by
38- * the Free Software Foundation; version 3.
39- *
40- * This program is distributed in the hope that it will be useful,
41- * but WITHOUT ANY WARRANTY; without even the implied warranty of
42- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
43- * GNU Lesser General Public License for more details.
44- *
45- * You should have received a copy of the GNU Lesser General Public License
46- * along with this program. If not, see <http://www.gnu.org/licenses/>.
47- *
48- */
49-
50-import QtQuick 2.0
51-import Ubuntu.Components.Themes.Ambiance 0.1
52-
53-OptionSelectorStyle {
54- id: suruGradientStyle
55-
56- chevron: "artwork/chevron_down.png"
57- tick: "artwork/tick.png"
58- colourComponent: false
59-}

Subscribers

People subscribed via source and target branches