on xenial help sign in
Make Buttons in Notification bubble follor HIG (#336)
commitc1cdff170763387576ff2daad18913f8848c133c authorJoan CiberSheep <cibersheep@gmail.com> dateThu 5 Nov 2020, 19:35 (6 years ago) parent8ec3777
2 files changed+10−4
qml/Notifications/Notification.qml+8−3 qml/Notifications/NotificationButton.qml+2−1
qml/Notifications/Notification.qml+8−3
@@ -464,7 +464,8 @@ StyledItem {
464464 text: oneOverTwoLoaderTop.actionLabel
465465 outline: notification.hints["x-canonical-private-affirmative-tint"] !== "true"
466466 color: notification.hints["x-canonical-private-affirmative-tint"] === "true" ? theme.palette.normal.positive
467− : theme.palette.normal.foreground
467+ : theme.name == "Ubuntu.Components.Themes.SuruDark" ? "#888"
468+ : "#666"
468469 onClicked: notification.notification.invokeAction(oneOverTwoLoaderTop.actionId)
469470 }
470471 }
@@ -494,7 +495,8 @@ StyledItem {
494495 text: oneOverTwoLoaderBottom.actionLabel
495496 outline: notification.hints["x-canonical-private-rejection-tint"] !== "true"
496497 color: index == 1 && notification.hints["x-canonical-private-rejection-tint"] === "true" ? theme.palette.normal.negative
497− : theme.palette.normal.foreground
498+ : theme.name == "Ubuntu.Components.Themes.SuruDark" ? "#888"
499+ : "#666"
498500 onClicked: notification.notification.invokeAction(oneOverTwoLoaderBottom.actionId)
499501 }
500502 }
@@ -556,7 +558,10 @@ StyledItem {
556558 outline: (index == 0 && notification.hints["x-canonical-private-affirmative-tint"] !== "true") ||
557559 (index == 1 && notification.hints["x-canonical-private-rejection-tint"] !== "true")
558560 color: {
559− var result = theme.palette.normal.foreground;
561+ var result = "#666";
562+ if (theme.name == "Ubuntu.Components.Themes.SuruDark") {
563+ result = "#888"
564+ }
560565 if (index == 0 && notification.hints["x-canonical-private-affirmative-tint"] === "true") {
561566 result = theme.palette.normal.positive;
562567 }
qml/Notifications/NotificationButton.qml+2−1
@@ -38,7 +38,8 @@ Rectangle {
3838 fontSize: "medium"
3939 font.weight: Font.Light
4040 anchors.centerIn: root
41− color: outline ? theme.palette.normal.backgroundSecondaryText : "white"
41+ color: theme.name == "Ubuntu.Components.Themes.SuruDark" ? "#111"
42+ : "white"
4243 visible: text !== ""
4344 }
4445