git.iko.soy/unity8
on xenial help sign in
Merge lp:~unity-team/unity8/seeLessStuckBottom
abab956Michał Sawicz
qml/Dash/GenericScopeView.qml+1−1
compare with xenial
unifiedsplit
@@ -492,7 +492,7 @@ FocusScope {
492 }
492 }
493 fontSize: "small"
493 fontSize: "small"
494 font.weight: Font.Bold
494 font.weight: Font.Bold
495− color: scopeStyle ? scopeStyle.foreground : "grey"
495+ color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
496 }
496 }
497
497
498 Connections {
498 Connections {
qml/Dash/PageHeader.qml+23
@@ -335,6 +335,29 @@ Item {
335 }
335 }
336
336
337 color: scopeStyle ? scopeStyle.headerDividerColor : "#e0e0e0"
337 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"
338 }
361 }
339
362
340 Row {
363 Row {
qml/Dash/Previews/PreviewTable.qml+2−2
@@ -47,7 +47,7 @@ PreviewWidget {
47 }
47 }
48 height: visible ? implicitHeight : 0
48 height: visible ? implicitHeight : 0
49 fontSize: "large"
49 fontSize: "large"
50− color: root.scopeStyle ? root.scopeStyle.foreground : "grey"
50+ color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
51 visible: text !== ""
51 visible: text !== ""
52 opacity: .8
52 opacity: .8
53 text: widgetData["title"] || ""
53 text: widgetData["title"] || ""
@@ -70,7 +70,7 @@ PreviewWidget {
70 fontSize: "small"
70 fontSize: "small"
71 text: perRowRepeater.model[index]
71 text: perRowRepeater.model[index]
72 visible: root.expanded || rowIndex < maximumCollapsedRowCount
72 visible: root.expanded || rowIndex < maximumCollapsedRowCount
73− color: root.scopeStyle ? root.scopeStyle.foreground : "grey"
73+ color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
74 font.bold: index == 0
74 font.bold: index == 0
75 }
75 }
76 }
76 }