git.iko.soy/unity8
on xenial help sign in
unbreak margins
2b57762Lukáš Tinkl
qml/Wizard/Pages/50-timezone.qml+6−4
compare with xenial
unifiedsplit
@@ -164,16 +164,14 @@ LocalComponents.Page {
164 columnSpacing: units.gu(2)
164 columnSpacing: units.gu(2)
165 anchors {
165 anchors {
166 fill: content
166 fill: content
167− topMargin: units.gu(4)
168 leftMargin: desktopLook ? staticMargin : 0
167 leftMargin: desktopLook ? staticMargin : 0
169 rightMargin: desktopLook ? staticMargin : 0
168 rightMargin: desktopLook ? staticMargin : 0
170 }
169 }
171
170
172 ColumnLayout {
171 ColumnLayout {
173− anchors.left: desktopLook ? undefined : parent.left
174− anchors.right: desktopLook ? undefined : parent.right
175 Layout.fillHeight: true
172 Layout.fillHeight: true
176 Layout.maximumWidth: maximumContentWidth
173 Layout.maximumWidth: maximumContentWidth
174+ spacing: units.gu(3)
177
175
178 LocalComponents.WizardTextField {
176 LocalComponents.WizardTextField {
179 id: searchField
177 id: searchField
@@ -182,6 +180,8 @@ LocalComponents.Page {
182 anchors.right: parent.right
180 anchors.right: parent.right
183 anchors.leftMargin: !desktopLook ? staticMargin : 0
181 anchors.leftMargin: !desktopLook ? staticMargin : 0
184 anchors.rightMargin: !desktopLook ? staticMargin : 0
182 anchors.rightMargin: !desktopLook ? staticMargin : 0
183+ anchors.top: parent.top
184+ anchors.topMargin: units.gu(3)
185 placeholderText: i18n.tr("Enter your city")
185 placeholderText: i18n.tr("Enter your city")
186 inputMethodHints: Qt.ImhNoPredictiveText
186 inputMethodHints: Qt.ImhNoPredictiveText
187 onTextChanged: resetViews();
187 onTextChanged: resetViews();
@@ -189,7 +189,8 @@ LocalComponents.Page {
189
189
190 Rectangle {
190 Rectangle {
191 Layout.fillWidth: true
191 Layout.fillWidth: true
192+ anchors.top: searchField.bottom
192− Layout.topMargin: units.gu(3)
193+ anchors.topMargin: units.gu(2)
193 id: divider
194 id: divider
194 height: units.dp(1)
195 height: units.dp(1)
195 color: dividerColor
196 color: dividerColor
@@ -199,6 +200,7 @@ LocalComponents.Page {
199 ListView {
200 ListView {
200 Layout.fillHeight: true
201 Layout.fillHeight: true
201 Layout.fillWidth: true
202 Layout.fillWidth: true
203+ anchors.top: divider.bottom
202 id: tzList
204 id: tzList
203 objectName: "tzList"
205 objectName: "tzList"
204 clip: true
206 clip: true