Merge lp:~zsombi/ubuntu-ui-toolkit/thindivider-margins into lp:ubuntu-ui-toolkit/staging

Proposed by Zsombor Egri
Status: Merged
Approved by: Zsombor Egri
Approved revision: 1306
Merged at revision: 1308
Proposed branch: lp:~zsombi/ubuntu-ui-toolkit/thindivider-margins
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 86 lines (+51/-9)
3 files modified
modules/Ubuntu/Components/ListItems/Empty.qml (+1/-5)
modules/Ubuntu/Components/ListItems/ThinDivider.qml (+4/-4)
tests/resources/listitems/Dividers.qml (+46/-0)
To merge this branch: bzr merge lp:~zsombi/ubuntu-ui-toolkit/thindivider-margins
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Tim Peeters Approve
Review via email: mp+239320@code.launchpad.net

Commit message

ThinDivider margins rolled back to edge-to-edge. Divider colors adjusted with design.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Tim Peeters (tpeeters) wrote :

thank you

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
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 'modules/Ubuntu/Components/ListItems/Empty.qml'
2--- modules/Ubuntu/Components/ListItems/Empty.qml 2014-10-02 13:03:22 +0000
3+++ modules/Ubuntu/Components/ListItems/Empty.qml 2014-10-24 15:04:57 +0000
4@@ -307,11 +307,7 @@
5
6 ThinDivider {
7 id: bottomDividerLine
8- anchors {
9- bottom: parent.bottom
10- leftMargin: units.gu(2)
11- rightMargin: units.gu(2)
12- }
13+ anchors.bottom: parent.bottom
14 visible: showDivider && !priv.removed
15 }
16
17
18=== modified file 'modules/Ubuntu/Components/ListItems/ThinDivider.qml'
19--- modules/Ubuntu/Components/ListItems/ThinDivider.qml 2014-09-09 04:59:23 +0000
20+++ modules/Ubuntu/Components/ListItems/ThinDivider.qml 2014-10-24 15:04:57 +0000
21@@ -57,9 +57,9 @@
22 property bool __lightBackground: ColorUtils.luminance(Theme.palette.normal.background) > 0.85
23 // use a gradient of 4 steps instead of instantiating two Rectangles for performance reasons
24 gradient: Gradient {
25- GradientStop { position: 0.0; color: __lightBackground ? "#26000000" : "#26FFFFFF" }
26- GradientStop { position: 0.49; color: __lightBackground ? "#26000000" : "#26FFFFFF" }
27- GradientStop { position: 0.5; color: __lightBackground ? "#14FFFFFF" : "#14000000" }
28- GradientStop { position: 1.0; color: __lightBackground ? "#14FFFFFF" : "#14000000" }
29+ GradientStop { position: 0.0; color: __lightBackground ? Qt.rgba(0, 0, 0, 0.1) : Qt.rgba(0, 0, 0, 0.4) }
30+ GradientStop { position: 0.49; color: __lightBackground ? Qt.rgba(0, 0, 0, 0.1) : Qt.rgba(0, 0, 0, 0.4) }
31+ GradientStop { position: 0.5; color: __lightBackground ? Qt.rgba(1, 1, 1, 0.4) : Qt.rgba(1, 1, 1, 0.1) }
32+ GradientStop { position: 1.0; color: __lightBackground ? Qt.rgba(1, 1, 1, 0.4) : Qt.rgba(1, 1, 1, 0.1) }
33 }
34 }
35
36=== added directory 'tests/resources/listitems'
37=== added file 'tests/resources/listitems/Dividers.qml'
38--- tests/resources/listitems/Dividers.qml 1970-01-01 00:00:00 +0000
39+++ tests/resources/listitems/Dividers.qml 2014-10-24 15:04:57 +0000
40@@ -0,0 +1,46 @@
41+/*
42+ * Copyright 2014 Canonical Ltd.
43+ *
44+ * This program is free software; you can redistribute it and/or modify
45+ * it under the terms of the GNU Lesser General Public License as published by
46+ * the Free Software Foundation; version 3.
47+ *
48+ * This program is distributed in the hope that it will be useful,
49+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
50+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
51+ * GNU Lesser General Public License for more details.
52+ *
53+ * You should have received a copy of the GNU Lesser General Public License
54+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
55+ */
56+
57+import QtQuick 2.0
58+import Ubuntu.Components 0.1
59+import Ubuntu.Components.ListItems 0.1
60+import Ubuntu.Components.Popups 0.1
61+
62+MainView {
63+ width: units.gu(50)
64+ height: units.gu(100)
65+
66+ Component.onCompleted: Theme.name = "Ubuntu.Components.Themes.SuruDark"
67+
68+ Column {
69+ width: parent.width
70+ Repeater {
71+ model: 5
72+ Subtitled {
73+ text: "Caption text"
74+ subText: "Subtitle"
75+ }
76+ }
77+ ThinDivider {}
78+ Repeater {
79+ model: 5
80+ Subtitled {
81+ text: "Caption text"
82+ subText: "Subtitle"
83+ }
84+ }
85+ }
86+}

Subscribers

People subscribed via source and target branches