on xenial help sign in
remove useless aliases for builtin colors
commit7ddb3c704c092727b68f0c42e4e71936e6b0e64a authorLukáš Tinkl <lukas.tinkl@canonical.com> dateMon 14 Mar 2016, 16:29 (11 years ago) parenta32e7e1
1 file changed+4−6
qml/Notifications/Notification.qml+4−6
qml/Notifications/Notification.qml+4−6
@@ -42,8 +42,6 @@ StyledItem {
4242 property int margins
4343 readonly property bool draggable: (type === Notification.SnapDecision && state === "contracted") || type === Notification.Interactive || type === Notification.Ephemeral
4444 readonly property bool darkOnBright: panel.indicators.shown || type === Notification.SnapDecision
45− readonly property color red: UbuntuColors.red
46− readonly property color green: UbuntuColors.green
4745 readonly property color sdLightGrey: "#eaeaea"
4846 readonly property real contentSpacing: units.gu(2)
4947 readonly property bool canBeClosed: type === Notification.Ephemeral
@@ -442,7 +440,7 @@ StyledItem {
442440 objectName: "notify_oot_button" + index
443441 width: oneOverTwoCase.width
444442 text: oneOverTwoLoaderTop.actionLabel
445− color: notification.hints["x-canonical-private-affirmative-tint"] == "true" ? green : theme.palette.normal.baseText
443+ color: notification.hints["x-canonical-private-affirmative-tint"] == "true" ? UbuntuColors.green : theme.palette.normal.baseText
446444 onClicked: notification.notification.invokeAction(oneOverTwoLoaderTop.actionId)
447445 }
448446 }
@@ -470,7 +468,7 @@ StyledItem {
470468 objectName: "notify_oot_button" + index
471469 width: oneOverTwoCase.width / 2 - spacing * 2
472470 text: oneOverTwoLoaderBottom.actionLabel
473− color: index == 1 && notification.hints["x-canonical-private-rejection-tint"] == "true" ? red : theme.palette.normal.baseText
471+ color: index == 1 && notification.hints["x-canonical-private-rejection-tint"] == "true" ? UbuntuColors.red : theme.palette.normal.baseText
474472 onClicked: notification.notification.invokeAction(oneOverTwoLoaderBottom.actionId)
475473 }
476474 }
@@ -533,10 +531,10 @@ StyledItem {
533531 color: {
534532 var result = theme.palette.normal.baseText;
535533 if (index == 0 && notification.hints["x-canonical-private-affirmative-tint"] == "true") {
536− result = green;
534+ result = UbuntuColors.green;
537535 }
538536 if (index == 1 && notification.hints["x-canonical-private-rejection-tint"] == "true") {
539− result = red;
537+ result = UbuntuColors.red;
540538 }
541539 return result;
542540 }