git.iko.soy/unity8
on xenial help sign in
use the standard button colors
1822fedLukáš Tinkl
qml/Components/Dialogs.qml−3
compare with xenial
unifiedsplit
@@ -177,7 +177,6 @@ Item {
177 onClicked: {
177 onClicked: {
178 rebootDialog.hide();
178 rebootDialog.hide();
179 }
179 }
180− color: UbuntuColors.lightGrey
181 }
180 }
182 Button {
181 Button {
183 text: i18n.tr("Yes")
182 text: i18n.tr("Yes")
@@ -213,14 +212,12 @@ Item {
213 unitySessionService.reboot();
212 unitySessionService.reboot();
214 powerDialog.hide();
213 powerDialog.hide();
215 }
214 }
216− color: UbuntuColors.lightGrey
217 }
215 }
218 Button {
216 Button {
219 text: i18n.tr("Cancel")
217 text: i18n.tr("Cancel")
220 onClicked: {
218 onClicked: {
221 powerDialog.hide();
219 powerDialog.hide();
222 }
220 }
223− color: UbuntuColors.lightGrey
224 }
221 }
225 }
222 }
226 }
223 }
tests/qmltests/Components/tst_Dialogs.qml+4−2
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014-2016 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -27,6 +27,8 @@ Rectangle {
27 width: units.gu(70)
27 width: units.gu(70)
28 height: fakeShell.longestDimension
28 height: fakeShell.longestDimension
29
29
30+ Component.onCompleted: theme.name = "Ubuntu.Components.Themes.SuruDark" // use the same theme as the real shell
31+
30 QtObject {
32 QtObject {
31 id: fakeUnitySession
33 id: fakeUnitySession
32 signal logoutRequested
34 signal logoutRequested
@@ -69,7 +71,7 @@ Rectangle {
69 }
71 }
70
72
71 Rectangle {
73 Rectangle {
72− color: "white"
74+ color: theme.palette.normal.background
73 x: fakeShell.shortestDimension
75 x: fakeShell.shortestDimension
74 width: root.width - x
76 width: root.width - x
75 anchors {
77 anchors {