git.iko.soy/unity8
on xenial help sign in
use the standard button colors
commit1822fedf46f0d7e730741bda2a79de2fcd905a9f authorLukáš Tinkl <lukas.tinkl@canonical.com> dateWed 23 Mar 2016, 22:52 (11 years ago) parent41ebd2b
2 files changed+4−5
compare with xenial
unifiedsplit
qml/Components/Dialogs.qml−3 tests/qmltests/Components/tst_Dialogs.qml+4−2
qml/Components/Dialogs.qml−3
@@ -177,7 +177,6 @@ Item {
177177 onClicked: {
178178 rebootDialog.hide();
179179 }
180− color: UbuntuColors.lightGrey
181180 }
182181 Button {
183182 text: i18n.tr("Yes")
@@ -213,14 +212,12 @@ Item {
213212 unitySessionService.reboot();
214213 powerDialog.hide();
215214 }
216− color: UbuntuColors.lightGrey
217215 }
218216 Button {
219217 text: i18n.tr("Cancel")
220218 onClicked: {
221219 powerDialog.hide();
222220 }
223− color: UbuntuColors.lightGrey
224221 }
225222 }
226223 }
tests/qmltests/Components/tst_Dialogs.qml+4−2
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014-2016 Canonical, Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU General Public License as published by
@@ -27,6 +27,8 @@ Rectangle {
2727 width: units.gu(70)
2828 height: fakeShell.longestDimension
2929
30+ Component.onCompleted: theme.name = "Ubuntu.Components.Themes.SuruDark" // use the same theme as the real shell
31+
3032 QtObject {
3133 id: fakeUnitySession
3234 signal logoutRequested
@@ -69,7 +71,7 @@ Rectangle {
6971 }
7072
7173 Rectangle {
72− color: "white"
74+ color: theme.palette.normal.background
7375 x: fakeShell.shortestDimension
7476 width: root.width - x
7577 anchors {