git.iko.soy/unity8
on xenial help sign in
Merge lp:~unity-team/unity8/tablePreviewWidget
07ea17dMichał Sawicz
qml/Dash/PageHeader.qml+1
compare with xenial
unifiedsplit
@@ -368,6 +368,7 @@ Item {
368
368
369 // FIXME this doesn't work with solid scope backgrounds due to z-ordering
369 // FIXME this doesn't work with solid scope backgrounds due to z-ordering
370 Rectangle {
370 Rectangle {
371+ visible: bottomBorder.visible
371 anchors {
372 anchors {
372 top: bottomContainer.top
373 top: bottomContainer.top
373 left: parent.left
374 left: parent.left
tests/qmltests/Dash/tst_GenericScopeView.qml+3−3
@@ -20,7 +20,7 @@ import Unity 0.2
20import ".."
20import ".."
21import "../../../qml/Dash"
21import "../../../qml/Dash"
22import "../../../qml/Components"
22import "../../../qml/Components"
23−import Ubuntu.Components 0.1
23+import Ubuntu.Components 1.1
24import Unity.Test 0.1 as UT
24import Unity.Test 0.1 as UT
25
25
26Item {
26Item {
@@ -337,9 +337,9 @@ Item {
337
337
338 function test_header_style_data() {
338 function test_header_style_data() {
339 return [
339 return [
340− { tag: "Default", index: 0, foreground: Theme.palette.normal.baseText, background: "color:///#f5f5f5", logo: "" },
340+ { tag: "Default", index: 0, foreground: UbuntuColors.darkGrey, background: "color:///#f5f5f5", logo: "" },
341 { tag: "Foreground", index: 1, foreground: "yellow", background: "color:///#f5f5f5", logo: "" },
341 { tag: "Foreground", index: 1, foreground: "yellow", background: "color:///#f5f5f5", logo: "" },
342− { tag: "Logo+Background", index: 2, foreground: Theme.palette.normal.baseText, background: "gradient:///lightgrey/grey",
342+ { tag: "Logo+Background", index: 2, foreground: UbuntuColors.darkGrey, background: "gradient:///lightgrey/grey",
343 logo: Qt.resolvedUrl("../Dash/tst_PageHeader/logo-ubuntu-orange.svg") },
343 logo: Qt.resolvedUrl("../Dash/tst_PageHeader/logo-ubuntu-orange.svg") },
344 ];
344 ];
345 }
345 }