git.iko.soy/unity8
on xenial help sign in
Wops, fix merge
f131bc3Albert Astals Cid
qml/Dash/PageHeader.qml−4
compare with xenial
unifiedsplit
@@ -250,12 +250,8 @@ Item {
250 property color dividerColor: "transparent" // Doesn't matter as we don't have PageHeadSections
250 property color dividerColor: "transparent" // Doesn't matter as we don't have PageHeadSections
251 property color panelColor: background.topColor
251 property color panelColor: background.topColor
252 panelForegroundColor: config.foregroundColor
252 panelForegroundColor: config.foregroundColor
253−<<<<<<< TREE
254− property var config: PageHeadConfiguration {
255−=======
256 config: PageHeadConfiguration {
253 config: PageHeadConfiguration {
257 title: root.title
254 title: root.title
258−>>>>>>> MERGE-SOURCE
259 foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText
255 foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText
260 backAction: Action {
256 backAction: Action {
261 iconName: backIsClose ? "close" : "back"
257 iconName: backIsClose ? "close" : "back"