Move from Theme colour to direct UbuntuColors.orange for activity indicator and preview buttons
commit12b1f0b97a655930ae8c1e960f1a57c04059e3bf
authorMichał Sawicz <michal.sawicz@canonical.com>
dateThu 20 Nov 2014, 12:44 (12 years ago)
parent3bff641
plugins/Dash/ScopeStyle.qml+1−1
@@ -70,7 +70,7 @@ QtObject {
7070 readonly property url navigationBackground: "navigation-background" in d.headerStyle ? d.headerStyle["navigation-background"] : "color:///#f5f5f5"
7171
7272 /// Color of the primary preview button
73− readonly property color previewButtonColor: "preview-button-color" in style ? style["preview-button-color"] : Theme.palette.selected.foreground
73+ readonly property color previewButtonColor: "preview-button-color" in style ? style["preview-button-color"] : UbuntuColors.orange
7474
7575 //! @cond
7676 property var d: QtObject {
qml/Dash/Dash.qml+1−1
@@ -309,7 +309,7 @@ Showable {
309309 id: orange
310310 anchors { top: parent.top; bottom: parent.bottom }
311311 width: parent.width / 4
312− color: Theme.palette.selected.foreground
312+ color: UbuntuColors.orange
313313
314314 SequentialAnimation {
315315 running: indicator.visible
qml/Dash/Previews/PreviewActions.qml+2−1
@@ -15,6 +15,7 @@
1515 */
1616
1717import QtQuick 2.1
18+import Ubuntu.Components 1.1
1819
1920/*! This preview widget shows either one button, two buttons or one button
2021 * and a combo button depending on the number of items in widgetData["actions"].
@@ -64,7 +65,7 @@ PreviewWidget {
6465 visible: row.actions && row.actions.length > 0
6566 onTriggeredAction: root.triggered(root.widgetId, actionData.id, actionData)
6667 width: (root.width - units.gu(1)) / 2
67− color: root.scopeStyle ? root.scopeStyle.previewButtonColor : Theme.palette.selected.foreground
68+ color: root.scopeStyle ? root.scopeStyle.previewButtonColor : UbuntuColors.orange
6869 }
6970 }
7071}
qml/Dash/Previews/PreviewPayments.qml+1−1
@@ -35,7 +35,7 @@ PreviewWidget {
3535 id: paymentButton
3636 objectName: "paymentButton"
3737
38− color: Theme.palette.selected.foreground
38+ color: UbuntuColors.orange
3939 text: paymentClient.formattedPrice
4040 onClicked: {
4141 paymentClient.start();
tests/plugins/Dash/tst_ScopeStyle.qml+1−1
@@ -174,7 +174,7 @@ Rectangle {
174174
175175 function test_previewButtonColor_data() {
176176 return [
177− { tag: "default", index: 0, previewButtonColor: Theme.palette.selected.foreground },
177+ { tag: "default", index: 0, previewButtonColor: UbuntuColors.orange },
178178 { tag: "red", index: 1, previewButtonColor: "red" },
179179 ];
180180 }