Merge lp:~unity-team/unity8/tablePreviewWidget
commitd8e552ff82309b38754feebc85e8d2a3e0521c86
authorMichał Sawicz <michal.sawicz@canonical.com>
dateFri 15 Aug 2014, 15:08 (12 years ago)
parent0dc3bc4e9f0e56
qml/Dash/DashNavigationList.qml+1−2
@@ -31,8 +31,7 @@ Item {
3131 implicitHeight: flickable.contentHeight
3232
3333 Rectangle {
34− color: !root.scopeStyle || Qt.colorEqual(root.scopeStyle.background, "transparent") ?
35− "white" : root.scopeStyle.navigationBackground
34+ color: !root.scopeStyle || root.scopeStyle.background.a !== 1 ? "white" : root.scopeStyle.navigationBackground
3635 anchors.fill: parent
3736 }
3837
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