Merge lp:~saviq/unity8/preview-customizations
commita20a64952bcb583369d5feb2cc136b266d4c8164
authorMichał Sawicz <michal.sawicz@canonical.com>
dateFri 15 Aug 2014, 14:43 (12 years ago)
parent9db610f4e12dee
qml/Dash/DashNavigationList.qml+2−1
@@ -31,7 +31,8 @@ Item {
3131 implicitHeight: flickable.contentHeight
3232
3333 Rectangle {
34− color: !root.scopeStyle || Qt.colorEqual(root.scopeStyle.background, "transparent") ? "white" : root.scopeStyle.background
34+ color: !root.scopeStyle || Qt.colorEqual(root.scopeStyle.background, "transparent") ?
35+ "white" : root.scopeStyle.navigationBackground
3536 anchors.fill: parent
3637 }
3738
qml/Dash/PageHeader.qml+23
@@ -335,6 +335,29 @@ Item {
335335 }
336336
337337 color: scopeStyle ? scopeStyle.headerDividerColor : "#e0e0e0"
338+
339+ Rectangle {
340+ anchors {
341+ top: parent.top
342+ left: parent.left
343+ right: parent.right
344+ }
345+ height: units.dp(1)
346+ color: Qt.darker(parent.color, 1.1)
347+ }
348+ }
349+
350+ Rectangle {
351+ anchors {
352+ top: bottomBorder.bottom
353+ left: parent.left
354+ right: parent.right
355+ }
356+ height: units.dp(1)
357+ opacity: 0.6
358+ color: scopeStyle ?
359+ Qt.lighter(Qt.rgba(scopeStyle.background.r, scopeStyle.background.g, scopeStyle.background.b, 1.0), 1.2) :
360+ "#CCFFFFFF"
338361 }
339362
340363 Row {