Merge remote-tracking branch 'upstream/master'

README.md

@@ -25,7 +25,7 @@ You'll also need the ```glib-compile-schemas``` and  ```gdk-pixbuf-pixdata``` co
 |Distro|Commands|
 |:----:|:----:|
 |![arch][arch]  ![antergos][antergos]|`sudo pacman -S glib2 gdk-pixbuf2`|
-|![opensuse][opensuse]|`sudo zipper install glib2-devel gdk-pixbuf-devel`|
+|![opensuse][opensuse]|`sudo zypper install glib2-devel gdk-pixbuf-devel`|
 |![fedora][fedora]|`sudo dnf install glib2-devel gdk-pixbuf2-devel`|
 |![debian][debian]  ![ubuntu][ubuntu]|`sudo apt-get install ruby-sass libglib2.0-dev libgdk-pixbuf2.0-dev libxml2-utils`|
 

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;
+            }
+        }
+    }
 }

src/gtk-3.0/scss/widgets/_osd.scss

@@ -8,8 +8,7 @@
 @include exports("osd") {
     GtkOverlay.osd { background-color: transparent; }
 
-    .osd,
+    .osd {
-    #XfceNotifyWindow {
         &.background {
             background-color: alpha($osd_bg, .8);
             color: $osd_fg;

src/gtk-3.20/scss/apps/_xfce.scss

@@ -27,4 +27,65 @@
             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;
+                }
+            }
+        }
+    }
+
+    #whiskermenu-window {
+		* {
+			border-color: border_normal($dark_bg_color);
+			outline: none;
+        }
+
+        background-color: $dark_bg_color;
+        color: $dark_fg_color;
+
+        entry {
+			background-color: shade($dark_bg_color, 1.2);
+			color: $dark_fg_color;
+        }
+
+        button {
+            font-weight: bold;
+            padding: 6px 12px;
+			margin: 3px 0px;
+			border: none;
+			@include linear_gradient($dark_bg_color);
+			color: $dark_fg_color;
+
+			&:focus, &:hover {
+			    background-color: $selected_bg_color;
+                color: $selected_fg_color;
+			}
+
+			&:checked {
+                background-color: shade($selected_bg_color, .9);
+                color: $selected_fg_color;
+			}
+        }
+
+        treeview {
+            background-color: shade($dark_bg_color, 1.2);
+			color: $dark_fg_color;
+
+			&:selected, &:hover {
+                background-color: $selected_bg_color;
+                color: $selected_fg_color;
+			}
+        }
+    }
 }

src/gtk-3.20/scss/widgets/_osd.scss

@@ -23,8 +23,7 @@
         }
     }
 
-    button.osd,
+    button.osd {
-    #XfceNotifyWindow button {
         @include button($osd_bg, $osd_fg);
 
         &.image-button {
@@ -73,8 +72,7 @@
         }
     }
 
-    .osd,
+    .osd {
-    #XfceNotifyWindow {
         background-color: $osd_bg;
         color: $osd_fg;
 

src/openbox-3/themerc

@@ -59,6 +59,9 @@ window.active.button.hover.bg: flat solid
 window.active.button.hover.bg.color: #444444
 window.active.button.hover.image.color: #f06860
 
+window.active.button.toggled.image.color: #eeeeee
+window.active.button.toggled.hover.image.color: #f06860
+
 
 # Inactive window
 window.inactive.border.color: #393939
@@ -93,6 +96,9 @@ window.inactive.button.hover.bg: flat solid
 window.inactive.button.hover.bg.color: #444444
 window.inactive.button.hover.image.color: #f06860
 
+window.inactive.button.toggled.image.color: #888888
+window.inactive.button.toggled.hover.image.color: #f06860
+
 
 # OSD
 osd.border.width: 1