Merge lp:~unity-team/unity8/seeLessStuckBottom
commit6dea7c24494d1aee9f2d9d02bade52c7f819a0ec
authorMichał Sawicz <michal.sawicz@canonical.com>
dateFri 15 Aug 2014, 15:16 (12 years ago)
parentabab956704e760
qml/Dash/DashNavigationList.qml+1−1
@@ -32,7 +32,7 @@ Item {
3232 implicitHeight: flickable.contentHeight
3333
3434 Background {
35− style: scopeStyle ? scopeStyle.navigationBackground : "color:///#f5f5f5"
35+ style: root.scopeStyle ? root.scopeStyle.navigationBackground : "color:///#f5f5f5"
3636 anchors.fill: parent
3737 }
3838
qml/Dash/PageHeader.qml+1−1
@@ -349,9 +349,9 @@ Item {
349349
350350 Rectangle {
351351 anchors {
352− top: bottomBorder.bottom
353352 left: parent.left
354353 right: parent.right
354+ bottom: bottomContainer.top
355355 }
356356 height: units.dp(1)
357357 opacity: 0.6