git.iko.soy/unity8
on xenial help sign in
Merge lp:~unity-team/unity8/tablePreviewWidget
commit07ea17d1f243f1b382929c79360832b48d384653 authorMichał Sawicz <michal.sawicz@canonical.com> dateSat 16 Aug 2014, 17:19 (12 years ago) parentc336164a009eff
2 files changed+4−3
compare with xenial
unifiedsplit
qml/Dash/PageHeader.qml+1 tests/qmltests/Dash/tst_GenericScopeView.qml+3−3
qml/Dash/PageHeader.qml+1
@@ -368,6 +368,7 @@ Item {
368368
369369 // FIXME this doesn't work with solid scope backgrounds due to z-ordering
370370 Rectangle {
371+ visible: bottomBorder.visible
371372 anchors {
372373 top: bottomContainer.top
373374 left: parent.left
tests/qmltests/Dash/tst_GenericScopeView.qml+3−3
@@ -20,7 +20,7 @@ import Unity 0.2
2020import ".."
2121import "../../../qml/Dash"
2222import "../../../qml/Components"
23−import Ubuntu.Components 0.1
23+import Ubuntu.Components 1.1
2424import Unity.Test 0.1 as UT
2525
2626Item {
@@ -337,9 +337,9 @@ Item {
337337
338338 function test_header_style_data() {
339339 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: "" },
341341 { 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",
343343 logo: Qt.resolvedUrl("../Dash/tst_PageHeader/logo-ubuntu-orange.svg") },
344344 ];
345345 }