From 8083a96a14472836f5c1090d8a0a2fa2e4633ffb Mon Sep 17 00:00:00 2001 From: Renjaya Raga Zenta Date: Thu, 7 Jun 2018 23:28:32 +0700 Subject: [PATCH] Update xfce4-notifyd specific gtk3 style. Fixes #677. * Separate #XfceNotifyWindow spesific style * Move #XfceNotifyWindow code to apps/_xfce.scss --- src/gtk-3.0/scss/apps/_xfce.scss | 13 +++++++++++++ src/gtk-3.0/scss/widgets/_osd.scss | 3 +-- src/gtk-3.20/scss/apps/_xfce.scss | 17 +++++++++++++++++ src/gtk-3.20/scss/widgets/_osd.scss | 6 ++---- 4 files changed, 33 insertions(+), 6 deletions(-) diff --git a/src/gtk-3.0/scss/apps/_xfce.scss b/src/gtk-3.0/scss/apps/_xfce.scss index dc38a86..ea06560 100644 --- a/src/gtk-3.0/scss/apps/_xfce.scss +++ b/src/gtk-3.0/scss/apps/_xfce.scss @@ -23,4 +23,17 @@ .menu { -gtk-image-effect: none; } } + + #XfceNotifyWindow { + background-color: $osd_bg; + color: $osd_fg; + border-radius: $roundness; + border: 1px solid border_normal($osd_bg); + + GtkLabel { + &#summary { + font-weight: bold; + } + } + } } diff --git a/src/gtk-3.0/scss/widgets/_osd.scss b/src/gtk-3.0/scss/widgets/_osd.scss index dcb4e74..dbf1d16 100644 --- a/src/gtk-3.0/scss/widgets/_osd.scss +++ b/src/gtk-3.0/scss/widgets/_osd.scss @@ -8,8 +8,7 @@ @include exports("osd") { GtkOverlay.osd { background-color: transparent; } - .osd, - #XfceNotifyWindow { + .osd { &.background { background-color: alpha($osd_bg, .8); color: $osd_fg; diff --git a/src/gtk-3.20/scss/apps/_xfce.scss b/src/gtk-3.20/scss/apps/_xfce.scss index 4300474..4c927a0 100644 --- a/src/gtk-3.20/scss/apps/_xfce.scss +++ b/src/gtk-3.20/scss/apps/_xfce.scss @@ -27,4 +27,21 @@ text-shadow: none; } } + + #XfceNotifyWindow { + .osd { + background-color: $osd_bg; + color: $osd_fg; + border-radius: $roundness; + border: 1px solid border_normal($osd_bg); + } + + &.osd { + label { + &#summary { + font-weight: bold; + } + } + } + } } diff --git a/src/gtk-3.20/scss/widgets/_osd.scss b/src/gtk-3.20/scss/widgets/_osd.scss index 8a4d8d2..0fd38be 100644 --- a/src/gtk-3.20/scss/widgets/_osd.scss +++ b/src/gtk-3.20/scss/widgets/_osd.scss @@ -23,8 +23,7 @@ } } - button.osd, - #XfceNotifyWindow button { + button.osd { @include button($osd_bg, $osd_fg); &.image-button { @@ -73,8 +72,7 @@ } } - .osd, - #XfceNotifyWindow { + .osd { background-color: $osd_bg; color: $osd_fg;