Change some dash button colors from orange to green.
And switch other colors from hardcoded values to the same semantic theme value. Fixes: #1581047
commit742698d53587d0af6c2bdc4604c4695712b7cd29
authorMichael Terry <michael.terry@canonical.com>
dateFri 27 May 2016, 13:52 (10 years ago)
parentb38e0ce12dff53
plugins/Dash/AudioProgressBar.qml+1−1
@@ -49,6 +49,6 @@ Item {
4949 rightMargin: maxWidth - (maxWidth * root.progress)
5050 }
5151 height: units.dp(2)
52− backgroundColor: UbuntuColors.orange
52+ backgroundColor: theme.palette.normal.activity
5353 }
5454}
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"] : UbuntuColors.orange
73+ readonly property color previewButtonColor: "preview-button-color" in style ? style["preview-button-color"] : theme.palette.normal.positive
7474
7575 //! @cond
7676 property var d: QtObject {
qml/Components/Dialogs.qml+2−2
@@ -185,7 +185,7 @@ Item {
185185 unitySessionService.reboot();
186186 rebootDialog.hide();
187187 }
188− color: UbuntuColors.red
188+ color: theme.palette.normal.negative
189189 }
190190 }
191191 }
@@ -203,7 +203,7 @@ Item {
203203 powerDialog.hide();
204204 root.powerOffClicked();
205205 }
206− color: UbuntuColors.red
206+ color: theme.palette.normal.negative
207207 }
208208 Button {
209209 text: i18n.ctr("Button: Restart the system", "Restart")
qml/Components/ModeSwitchWarningDialog.qml+1−1
@@ -86,7 +86,7 @@ ShellDialog {
8686 Button {
8787 objectName: "forceCloseButton"
8888 text: i18n.tr("Close all")
89− color: UbuntuColors.red
89+ color: theme.palette.normal.negative
9090 onClicked: {
9191 root.forceClose();
9292 }
qml/Components/WindowControlButtons.qml+1−1
@@ -43,7 +43,7 @@ Row {
4343 width: units.gu(2)
4444 height: units.gu(2)
4545 radius: height / 2
46− color: UbuntuColors.red
46+ color: theme.palette.normal.negative
4747 visible: parent.containsMouse
4848 }
4949 Icon {
qml/Dash/DashPageHeader.qml+1−1
@@ -269,7 +269,7 @@ Item {
269269 anchors.fill: parent
270270 anchors.margins: units.gu(2)
271271 name: "filters"
272− color: root.activeFiltersCount > 0 ? UbuntuColors.orange : header.__styleInstance.foregroundColor
272+ color: root.activeFiltersCount > 0 ? theme.palette.normal.positive : header.__styleInstance.foregroundColor
273273 }
274274
275275 onClicked: {
qml/Dash/Previews/PreviewActions.qml+1−1
@@ -66,7 +66,7 @@ PreviewWidget {
6666 visible: root.actions && root.actions.length > 0
6767 onTriggeredAction: root.triggered(root.widgetId, actionData.id, actionData)
6868 width: (root.width - units.gu(1)) / 2
69− color: root.scopeStyle ? root.scopeStyle.previewButtonColor : UbuntuColors.orange
69+ color: root.scopeStyle ? root.scopeStyle.previewButtonColor : theme.palette.normal.positive
7070 }
7171 }
7272}
qml/Dash/Previews/PreviewPayments.qml+1−1
@@ -35,7 +35,7 @@ PreviewWidget {
3535 id: paymentButton
3636 objectName: "paymentButton"
3737
38− color: UbuntuColors.orange
38+ color: theme.palette.normal.positive
3939 text: paymentClient.formattedPrice
4040 onClicked: {
4141 paymentClient.start();
qml/Launcher/LauncherDelegate.qml+2−2
@@ -164,7 +164,7 @@ Item {
164164 }
165165 width: Math.min(root.itemWidth, Math.max(units.gu(2), countLabel.implicitWidth + units.gu(1)))
166166 height: units.gu(2)
167− backgroundColor: UbuntuColors.green
167+ backgroundColor: theme.palette.normal.positive
168168 visible: root.countVisible
169169 aspect: UbuntuShape.Flat
170170
@@ -207,7 +207,7 @@ Item {
207207 top: parent.top
208208 bottom: parent.bottom
209209 }
210− backgroundColor: UbuntuColors.blue
210+ backgroundColor: theme.palette.normal.activity
211211 borderSource: "none"
212212 width: progressOverlay.width
213213 }
qml/Panel/Panel.qml+1−1
@@ -80,7 +80,7 @@ Item {
8080
8181 Rectangle {
8282 id: indicatorAreaBackground
83− color: callHint.visible ? UbuntuColors.green : theme.palette.normal.background
83+ color: callHint.visible ? theme.palette.normal.positive : theme.palette.normal.background
8484 anchors {
8585 top: parent.top
8686 left: parent.left
qml/Stages/DecoratedWindow.qml+1−1
@@ -62,7 +62,7 @@ FocusScope {
6262 Rectangle {
6363 anchors { left: selectionHighlight.left; right: selectionHighlight.right; bottom: selectionHighlight.bottom; }
6464 height: units.dp(2)
65− color: UbuntuColors.orange
65+ color: theme.palette.normal.focus
6666 visible: highlightShown
6767 }
6868
qml/Stages/DesktopSpread.qml+1−1
@@ -494,7 +494,7 @@ FocusScope {
494494 // Rectangle {
495495 // anchors { left: parent.left; right: parent.right; bottom: parent.bottom }
496496 // height: units.dp(2)
497− // color: UbuntuColors.orange
497+ // color: theme.palette.normal.focus
498498 // visible: index == 0 // TODO: should be active workspace index
499499 // }
500500 }
qml/Stages/DesktopSpreadDelegate.qml+1−1
@@ -83,7 +83,7 @@ Item {
8383 Rectangle {
8484 anchors { left: selectionHighlight.left; right: selectionHighlight.right; bottom: selectionHighlight.bottom; }
8585 height: units.dp(2)
86− color: UbuntuColors.orange
86+ color: theme.palette.normal.focus
8787 visible: root.highlightShown
8888 antialiasing: true
8989 }
qml/Stages/SpreadDelegate.qml+1−1
@@ -286,7 +286,7 @@ FocusScope {
286286 Rectangle {
287287 anchors { left: selectionHighlight.left; right: selectionHighlight.right; bottom: selectionHighlight.bottom; }
288288 height: units.dp(2)
289− color: UbuntuColors.orange
289+ color: theme.palette.normal.focus
290290 visible: root.highlightShown
291291 antialiasing: true
292292 }
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: UbuntuColors.orange },
177+ { tag: "default", index: 0, previewButtonColor: theme.palette.normal.positive },
178178 { tag: "red", index: 1, previewButtonColor: "red" },
179179 ];
180180 }