git.iko.soy/unity8
on xenial help sign in
remove useless aliases for builtin colors
7ddb3c7Lukáš Tinkl
qml/Notifications/Notification.qml+4−6
compare with xenial
unifiedsplit
@@ -42,8 +42,6 @@ StyledItem {
42 property int margins
42 property int margins
43 readonly property bool draggable: (type === Notification.SnapDecision && state === "contracted") || type === Notification.Interactive || type === Notification.Ephemeral
43 readonly property bool draggable: (type === Notification.SnapDecision && state === "contracted") || type === Notification.Interactive || type === Notification.Ephemeral
44 readonly property bool darkOnBright: panel.indicators.shown || type === Notification.SnapDecision
44 readonly property bool darkOnBright: panel.indicators.shown || type === Notification.SnapDecision
45− readonly property color red: UbuntuColors.red
46− readonly property color green: UbuntuColors.green
47 readonly property color sdLightGrey: "#eaeaea"
45 readonly property color sdLightGrey: "#eaeaea"
48 readonly property real contentSpacing: units.gu(2)
46 readonly property real contentSpacing: units.gu(2)
49 readonly property bool canBeClosed: type === Notification.Ephemeral
47 readonly property bool canBeClosed: type === Notification.Ephemeral
@@ -442,7 +440,7 @@ StyledItem {
442 objectName: "notify_oot_button" + index
440 objectName: "notify_oot_button" + index
443 width: oneOverTwoCase.width
441 width: oneOverTwoCase.width
444 text: oneOverTwoLoaderTop.actionLabel
442 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
446 onClicked: notification.notification.invokeAction(oneOverTwoLoaderTop.actionId)
444 onClicked: notification.notification.invokeAction(oneOverTwoLoaderTop.actionId)
447 }
445 }
448 }
446 }
@@ -470,7 +468,7 @@ StyledItem {
470 objectName: "notify_oot_button" + index
468 objectName: "notify_oot_button" + index
471 width: oneOverTwoCase.width / 2 - spacing * 2
469 width: oneOverTwoCase.width / 2 - spacing * 2
472 text: oneOverTwoLoaderBottom.actionLabel
470 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
474 onClicked: notification.notification.invokeAction(oneOverTwoLoaderBottom.actionId)
472 onClicked: notification.notification.invokeAction(oneOverTwoLoaderBottom.actionId)
475 }
473 }
476 }
474 }
@@ -533,10 +531,10 @@ StyledItem {
533 color: {
531 color: {
534 var result = theme.palette.normal.baseText;
532 var result = theme.palette.normal.baseText;
535 if (index == 0 && notification.hints["x-canonical-private-affirmative-tint"] == "true") {
533 if (index == 0 && notification.hints["x-canonical-private-affirmative-tint"] == "true") {
536− result = green;
534+ result = UbuntuColors.green;
537 }
535 }
538 if (index == 1 && notification.hints["x-canonical-private-rejection-tint"] == "true") {
536 if (index == 1 && notification.hints["x-canonical-private-rejection-tint"] == "true") {
539− result = red;
537+ result = UbuntuColors.red;
540 }
538 }
541 return result;
539 return result;
542 }
540 }