Merge lp:~nikwen/ubuntu-terminal-app/improve-list-item-design into lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot

Proposed by Niklas Wenzel
Status: Merged
Approved by: Niklas Wenzel
Approved revision: 163
Merged at revision: 163
Proposed branch: lp:~nikwen/ubuntu-terminal-app/improve-list-item-design
Merge into: lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot
Diff against target: 53 lines (+11/-6)
2 files modified
src/app/qml/ColorSchemePage.qml (+1/-1)
src/app/qml/SettingsPage.qml (+10/-5)
To merge this branch: bzr merge lp:~nikwen/ubuntu-terminal-app/improve-list-item-design
Reviewer Review Type Date Requested Status
Stefano Verzegnassi Approve
Jenkins Bot continuous-integration Approve
Ubuntu Terminal Developers Pending
Review via email: mp+285274@code.launchpad.net

Commit message

Tweak the design of the ListItems in the settings

Description of the change

Tweak the design of the ListItems in the settings

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Stefano Verzegnassi (verzegnassi-stefano) wrote :

Looks good to me. Thanks!

review: Approve
Revision history for this message
Niklas Wenzel (nikwen) wrote :

Thanks for the review, Stefano. :)

Shall we pull the top-level approve trigger?

Revision history for this message
Stefano Verzegnassi (verzegnassi-stefano) wrote :

Yes, +1!

Revision history for this message
Niklas Wenzel (nikwen) wrote :

Then let's do it. :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/app/qml/ColorSchemePage.qml'
--- src/app/qml/ColorSchemePage.qml 2016-01-22 18:29:56 +0000
+++ src/app/qml/ColorSchemePage.qml 2016-02-06 17:00:20 +0000
@@ -32,7 +32,7 @@
32 model: settings.profilesList32 model: settings.profilesList
33 delegate: ListItem {33 delegate: ListItem {
34 ListItemLayout {34 ListItemLayout {
35 anchors.fill: parent35 anchors.verticalCenter: parent.verticalCenter
36 title.text: modelData36 title.text: modelData
3737
38 Icon {38 Icon {
3939
=== modified file 'src/app/qml/SettingsPage.qml'
--- src/app/qml/SettingsPage.qml 2016-01-22 18:37:29 +0000
+++ src/app/qml/SettingsPage.qml 2016-02-06 17:00:20 +0000
@@ -34,16 +34,16 @@
34 Column {34 Column {
35 id: mainColumn35 id: mainColumn
36 anchors { left: parent.left; right: parent.right }36 anchors { left: parent.left; right: parent.right }
37 spacing: units.gu(1)
3837
39 ListItem {38 ListItem {
40 ListItemLayout {39 ListItemLayout {
41 anchors.fill: parent40 anchors.verticalCenter: parent.verticalCenter
42 title.text: i18n.tr("Layouts")41 title.text: i18n.tr("Layouts")
4342
44 Icon {43 Icon {
45 SlotsLayout.position: SlotsLayout.Trailing44 SlotsLayout.position: SlotsLayout.Trailing
46 width: units.gu(2); height: width45 width: units.gu(2)
46 height: width
47 name: "go-next"47 name: "go-next"
48 }48 }
49 }49 }
@@ -84,10 +84,15 @@
84 }84 }
8585
86 ListItem {86 ListItem {
87 height: units.gu(12)87 height: units.gu(13)
8888
89 Label {89 Label {
90 anchors { left: parent.left; margins: units.gu(2) }90 anchors {
91 top: parent.top
92 left: parent.left
93 right: parent.right
94 margins: units.gu(2)
95 }
91 text: i18n.tr("Font Size:")96 text: i18n.tr("Font Size:")
92 }97 }
9398

Subscribers

People subscribed via source and target branches