[gtk+/gtk-3-14] Adwaita: backport osd style changes from 3.15



commit 7acbd5fd24fc3017133e846b065118eb0a2596b6
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Tue Nov 4 13:00:36 2014 +0100

    Adwaita: backport osd style changes from 3.15

 gtk/resources/theme/Adwaita/_colors.scss           |    8 +-
 gtk/resources/theme/Adwaita/_common.scss           |  155 ++++++--
 gtk/resources/theme/Adwaita/_drawing.scss          |   88 ++++-
 gtk/resources/theme/Adwaita/gtk-contained-dark.css |  410 ++++++++++++++------
 gtk/resources/theme/Adwaita/gtk-contained.css      |  410 ++++++++++++++------
 5 files changed, 756 insertions(+), 315 deletions(-)
---
diff --git a/gtk/resources/theme/Adwaita/_colors.scss b/gtk/resources/theme/Adwaita/_colors.scss
index f57f00f..e2482ce 100644
--- a/gtk/resources/theme/Adwaita/_colors.scss
+++ b/gtk/resources/theme/Adwaita/_colors.scss
@@ -25,11 +25,13 @@ $success_color: if($variant =='light', #73d216, darken(#73d216,10%));
 $destructive_color: if($variant =='light', #ef2929, darken(#ef2929,10%));
 
 $osd_fg_color: #eeeeec;
-$osd_bg_color: #2e3436;
+$osd_text_color: white;
+$osd_bg_color: transparentize(#202526, 0.3);
+$osd_insensitive_bg_color: transparentize(mix($osd_fg_color, opacify($osd_bg_color, 1), 10%), 0.5);
+$osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 50%);
 $osd_borders_color: transparentize(black, 0.3);
-$osd_outer_borders_color: transparentize(white, 0.9);
 
-$tooltip_borders_color: $osd_outer_borders_color;
+$tooltip_borders_color: transparentize(white, 0.9);
 
 //insensitive state derived colors
 $insensitive_fg_color: mix($fg_color, $bg_color, 50%);
diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 6b33c51..809285f 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -185,7 +185,11 @@ GtkFlowBox .grid-child {
 
 %osd, .osd {
   color: $osd_fg_color;
+  border: none;
+  background-color: $osd_bg_color;
+  background-clip: padding-box;
   outline-color: transparentize($osd_fg_color, 0.7);
+  box-shadow: none;
   text-shadow: 0 1px black;
   icon-shadow: 0 1px black;
   &:backdrop { text-shadow: none; }
@@ -220,31 +224,41 @@ GtkFlowBox .grid-child {
 .entry {
   border: 1px solid;
   padding: 5px 8px 6px;
+
   &.image { // icons inside the entry
     &.left { padding-left: 0; }
     &.right { padding-right: 0; }
   }
+
   border-radius: 3px;
   transition: all 200ms ease-out;
   @include entry(normal);
+
   &.flat, &.flat:focus {
     padding: 2px;
     @include entry(normal, $edge:none);
     border: none;
     border-radius: 0;
   }
+
   &:focus { @include entry(focus); }
+
   &:insensitive { @include entry(insensitive); }
+
   &:backdrop { @include entry(backdrop); }
+
   &:backdrop:insensitive { @include entry(backdrop-insensitive); }
+
   &:selected, &:backdrop:selected {
     background-color: $selected_bg_color;
     color: $selected_fg_color;
   }
+
   &:selected,
   &:selected:focus {
     @extend %selected_items;
   }
+
   &.progressbar {
     margin: 1px;
     border-radius: 0;
@@ -256,6 +270,7 @@ GtkFlowBox .grid-child {
     box-shadow: none;
     &:backdrop { background-color: transparent; }
   }
+
   .linked & { //FIXME: use same buttons linking logic and template
     &:first-child {
       border-top-right-radius: 0;
@@ -269,6 +284,7 @@ GtkFlowBox .grid-child {
       &:dir(rtl) { border-left-style: solid; }
     }
   }
+
   &.error {
     color: $error_color;
     border-color: $error_color;
@@ -281,6 +297,7 @@ GtkFlowBox .grid-child {
       &:selected:backdrop { color: $backdrop_base_color; }
     }
   }
+
   &.warning {
     color: $warning_color;
     border-color: $warning_color;
@@ -293,12 +310,20 @@ GtkFlowBox .grid-child {
       &:selected:backdrop { color: $backdrop_base_color; }
     }
   }
+
   &.image { // entry icons colors
     color: mix($fg_color,$base_color,80%);
     &:hover { color: $fg_color; }
     &:active { color: $selected_bg_color; }
     &:backdrop { color: mix($backdrop_fg_color,$backdrop_base_color,80%); }
   }
+
+  .osd & {
+    @include entry(osd);
+    &:focus { @include entry(osd-focus); }
+    &:backdrop { @include entry(osd-backdrop); }
+    &:insensitive { @include entry(osd-insensitive); }
+  }
 }
 
 /***********
@@ -367,37 +392,33 @@ $_dot_color: if($variant=='light', $selected_bg_color,
   &.osd {
     &.image-button { padding: 13px; }
     color: $osd_fg_color;
-    border-radius: 6px;
-    outline-color: transparentize($osd_fg_color, 0.8);
+    border-radius: 5px;
+    outline-color: transparentize($osd_fg_color, 0.7);
     @include button(osd);
-    border-color: $osd_outer_borders_color;
+    border: none;
     box-shadow: none;
     &:hover {
       @include button(osd-hover);
-      border-color: $osd_outer_borders_color;
+      border: none;
       box-shadow: none;
     }
     &:active, &:checked {
       @include button(osd-active);
-      border-color: $osd_outer_borders_color;
+      border: none;
       box-shadow: none
     }
     &:insensitive, &:backdrop:insensitive {
       @include button(osd-insensitive);
-      border-color: $osd_outer_borders_color;
-      // FIXME: if this state actually exists we should probably make the button
-      //        disappear
+      border: none;
     }
     &:backdrop {
       @include button(osd-backdrop);
-      border-color: $osd_outer_borders_color;
+      border: none;
     }
   }
+
   //overlay / OSD style
   .osd & {
-    // FIXME: for some reason I can't figure out the bookmark button in gnome
-    //        documents gets borders radius 0, when they get backdrop and
-    //        another state
     @include button(osd);
     // there's a problem with sass which prevents it to extend the linked
     // placeholder as expected, it should just be "@extend %linked;", the
@@ -440,8 +461,33 @@ $_dot_color: if($variant=='light', $selected_bg_color,
       @include button(osd-backdrop);
       @extend %linked;
     }
-  }
 
+    &.flat {
+      @include button(undecorated);
+      box-shadow: none; //FIXME respect no edge on the button mixin
+      text-shadow: 0 1px black;
+      icon-shadow: 0 1px black;
+      &:hover {
+        @include button(osd-hover);
+        background-clip: padding-box;
+        border-color: transparent;
+        box-shadow: none;
+      }
+      &:insensitive {
+        @include button(osd-insensitive);
+        background-image: none;
+        border-color: transparent;
+        box-shadow: none;
+      }
+      &:backdrop { @include button(undecorated); }
+      &:active, &:checked {
+        @include button(osd-active);
+        background-clip: padding-box;
+        border-color: transparent;
+        box-shadow: none;
+      }
+    }
+  }
   // Suggested and Destructive Action buttons
   @each $b_type, $b_color in (suggested-action, $selected_bg_color),
                               (destructive-action, $destructive_color) {
@@ -778,6 +824,44 @@ GtkColorButton.button {
       &:dir(rtl) { border-style: none solid none none; }
     }
   }
+
+  .osd & {
+    .button {
+      @include button(undecorated);
+      color: $osd_fg_color;
+      border-style: none none none solid;
+      border-color: transparentize($osd_borders_color, 0.3);
+      border-radius: 0;
+      box-shadow: none;
+      icon-shadow: 0 1px black;
+      &:dir(rtl) { border-style: none solid none none; }
+      &:hover {
+        @include button(undecorated);
+        color: $osd_fg_color;
+        border-color: transparentize(opacify($osd_borders_color, 1), 0.5);
+        background-color: transparentize($osd_fg_color, 0.9);
+        icon-shadow: 0 1px black;
+        box-shadow: none;
+      }
+      &:backdrop {
+        @include button(undecorated);
+        color: $osd_fg_color;
+        border-color: transparentize(opacify($osd_borders_color, 1), 0.5);
+        icon-shadow: none;
+        box-shadow: none;
+      }
+      &:insensitive {
+        @include button(undecorated);
+        color: $osd_insensitive_fg_color;
+        border-color: transparentize(opacify($osd_borders_color, 1), 0.5);
+        icon-shadow: none;
+        box-shadow: none;
+      }
+      &:last-child { border-radius: 0 3px 3px 0; }
+      &:dir(rtl):first-child { border-radius: 3px 0 0 3px; }
+    }
+  }
+
   &.vertical, &.vertical:dir(rtl) {
     .button {
       padding-top: 8px;    //  Same vertical padding as image-buttons
@@ -922,10 +1006,9 @@ GtkComboBox {
   background-color: $bg_color;
   .osd &, &.osd {
     padding: 13px;
-    border: $osd_outer_borders_color;
-    border-radius: 6px;
-    background-color: transparentize($osd_bg_color, 0.3);
-    background-clip: padding-box;
+    border: none;
+    border-radius: 5px;
+    background-color: $osd_bg_color;
   }
 }
 
@@ -1363,21 +1446,7 @@ column-header.button.dnd { // for treeview-like derive widgets
     text-shadow: none;
     transition: none;
   }
-  &.osd { // Also used for touch cut'n'paste overlays
-          // FIXME Doesn't work
-    background-image: none;
-    background-color: $osd_bg_color;
-    border: 1px solid $borders_color;
-    color: $osd_fg_color;
-    .button {
-      color: white;
-      text-shadow: none;
-      @include button(osd);
-      &:hover { @include button(osd-hover); };
-      &:active { @include button(osd-active); };
-      &:insensitive { @include button(osd-insensitive); };
-    }
-  }
+  &.osd { @extend %osd; }
 }
 
 //touch selection handlebars for the Popover.osd above
@@ -2358,20 +2427,17 @@ GtkScrolledWindow {
 .app-notification.frame {
   @extend %osd;
   padding: 10px;
-  border-width: 0 1px 1px;
-  border-style: solid;
-  border-color: $osd_outer_borders_color;
+  border: none;
   border-radius: 0 0 6px 6px;
-  background-color: transparentize($osd_bg_color, 0.3);
+  background-color: $osd_bg_color;
   background-image: linear-gradient(to bottom, transparentize(black, 0.8),
                                                transparent 2px);
   background-clip: padding-box;
   &:backdrop { background-image: none; }
+
   .button {
-    border: 1px solid;
-    color: $osd_fg_color;
-    outline-color: transparentize($osd_fg_color, 0.8);
     @include button(osd);
+
     &.flat {
       @extend %undecorated_button;
       icon-shadow: 0 1px black;
@@ -2380,13 +2446,20 @@ GtkScrolledWindow {
       &:insensitive,
       &:backdrop:insensitive { @extend %undecorated_button; }
     }
+
     &:hover { @include button(osd-hover); }
-    &:active, &:checked, &:backdrop:active, &:backdrop:checked {
+    &:active,
+    &:checked,
+    &:backdrop:active,
+    &:backdrop:checked {
       @include button(osd-active);
     }
-    &:insensitive, &:backdrop:insensitive {
+
+    &:insensitive,
+    &:backdrop:insensitive {
       @include button(osd-insensitive);
     }
+
     &:backdrop { @include button(osd-backdrop); }
   }
 }
diff --git a/gtk/resources/theme/Adwaita/_drawing.scss b/gtk/resources/theme/Adwaita/_drawing.scss
index 937192f..f9e9bfc 100644
--- a/gtk/resources/theme/Adwaita/_drawing.scss
+++ b/gtk/resources/theme/Adwaita/_drawing.scss
@@ -33,7 +33,7 @@
 //        use the default one
 //
 // possible $t values:
-// normal, focus, insensitive, backdrop, backdrop-insensitive;
+// normal, focus, insensitive, backdrop, backdrop-insensitive, osd, osd-focus, osd-insensitive, osd-backdrop.
 //
   background-color: transparent;
   background-image: entry_gradient($base_color);
@@ -59,6 +59,7 @@
                       $_entry_edge);
     // the second transparent shadow is needed for the transition to work
   }
+
   @if $t==focus {
     @include _shadows($_inner_shadows,
                       inset 0 0 0 1px $_focus_glow_color,
@@ -70,25 +71,67 @@
                        darken($fc,35%));
     }
   }
+
   @if $t==insensitive {
     color: $insensitive_fg_color;
     border-color: $borders_color;
     background-image: linear-gradient(to bottom, $insensitive_bg_color);
     @include _shadows($_blank_inner_shadows, $_entry_edge);
-
   }
+
   @if $t==backdrop {
     color: $backdrop_text_color;
     border-color: $backdrop_borders_color;
     background-image: linear-gradient(to bottom, $backdrop_base_color);
     @include _shadows($_blank_inner_shadows, $_blank_edge);
   }
+
   @if $t==backdrop-insensitive {
     color: $backdrop_insensitive_color;
     border-color: $backdrop_borders_color;
     background-image: linear-gradient(to bottom, $insensitive_bg_color);
     @include _shadows($_blank_inner_shadows, $_blank_edge);
   }
+
+  @if $t==osd {
+    color: $osd_text_color;
+    border-color: $osd_borders_color;
+    background-image: linear-gradient(to bottom, transparentize(opacify($osd_borders_color, 1), 0.5));
+    background-clip: padding-box;
+    box-shadow: none;
+    text-shadow: 0 1px black;
+    icon-shadow: 0 1px black;
+  }
+
+  @if $t==osd-focus {
+    color: $osd_text_color;
+    border-color: $selected_bg_color;
+    background-image: linear-gradient(to bottom, transparentize(opacify($osd_borders_color, 1), 0.5));
+    background-clip: padding-box;
+    box-shadow: inset 0 0 0 1px transparentize($fc, 0.6);
+    text-shadow: 0 1px black;
+    icon-shadow: 0 1px black;
+  }
+
+  @if $t==osd-insensitive {
+    color: $osd_insensitive_fg_color;
+    border-color: $osd_borders_color;
+    background-image: linear-gradient(to bottom, $osd_insensitive_bg_color);
+    background-clip: padding-box;
+    box-shadow: none;
+    text-shadow: none;
+    icon-shadow: none;
+  }
+
+  @if $t==osd-backdrop {
+    color: $osd_text_color;
+    border-color: $osd_borders_color;
+    background-image: linear-gradient(to bottom, transparentize(opacify($osd_borders_color, 1), 0.5));
+    background-clip: padding-box;
+    box-shadow: none;
+    text-shadow: none;
+    icon-shadow: none;
+  }
 }
 
 // buttons
@@ -210,6 +253,7 @@
                       inset 0 2px 1px -2px transparentize(black,0.4),
                       $_button_edge);
   }
+
   @else if $t==insensitive {
   //
   // insensitive button
@@ -227,6 +271,7 @@
     @include _shadows(inset 0 1px transparentize(white,1), $_button_edge);
     > GtkLabel { color: inherit; }
   }
+
   @else if $t==insensitive-active {
   //
   // insensitive pushed button
@@ -262,7 +307,7 @@
 
   @else if $t==backdrop-active {
   //
-  // backdrop pushed button FIXME no colors here!
+  // backdrop pushed button
   //
     $_bg: if($c!=$bg_color, darken($c,10%), $backdrop_dark_fill);
     $_bc: if($variant=='light',$_bg,_border_color($c));
@@ -316,35 +361,35 @@
   // normal osd button
   //
     $_bg: if($c!=$bg_color, transparentize($c, 0.5),
-                            transparentize($osd_bg_color, 0.3));
+                            $osd_bg_color);
 
     color: $osd_fg_color;
-    outline-color: transparentize($osd_fg_color, 0.8);
-    background-color: transparent;
-    background-clip: padding-box;
-    background-image: linear-gradient(to bottom, $_bg);
     border-color: $osd_borders_color;
-    box-shadow: inset 0 -1px transparentize(black, 0.7),
-                inset 0 1px transparentize(white, 0.9);
+    background-image: linear-gradient(to bottom, $_bg);
+    background-clip: padding-box;
+    box-shadow: inset 0 1px transparentize(white, 0.9);
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
+    outline-color: transparentize($osd_fg_color, 0.7);
   }
+
   @else if $t==osd-hover {
   //
   // active osd button
   //
     $_bg: if($c!=$bg_color, transparentize($c, 0.3),
-                            transparentize(lighten($osd_bg_color, 12%), 0.3));
+                            lighten($osd_bg_color, 12%));
 
     color: white;
     border-color: $osd_borders_color;
     background-image: linear-gradient(to bottom, $_bg);
-    box-shadow: inset 0 -1px transparentize(black, 0.7),
-                inset 0 1px transparentize(white, 0.9);
+    background-clip: padding-box;
+    box-shadow: inset 0 1px transparentize(white, 0.9);
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
-
+    outline-color: transparentize($osd_fg_color, 0.7);
   }
+
   @else if $t==osd-active {
   //
   // active osd button
@@ -354,37 +399,42 @@
     color: white;
     border-color: $osd_borders_color;
     background-image: linear-gradient(to bottom, $_bg);
+    background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
     icon-shadow: none;
+    outline-color: transparentize($osd_fg_color, 0.7);
   }
+
   @else if $t==osd-insensitive {
   //
   // insensitive osd button
   //
-    $_bg: transparentize(mix($insensitive_fg_color,$osd_bg_color,20%),0.3);
-
-    color: $insensitive_fg_color;
+    color: $osd_insensitive_fg_color;
     border-color: $osd_borders_color;
-    background-image: linear-gradient(to bottom, $_bg);
+    background-image: linear-gradient(to bottom, $osd_insensitive_bg_color);
+    background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
     icon-shadow: none;
   }
+
   @else if $t==osd-backdrop {
   //
   // backdrop osd button
   //
     $_bg: if($c!=$bg_color, transparentize($c, 0.5),
-                            transparentize($osd_bg_color, 0.3));
+                            $osd_bg_color);
 
     color: $osd_fg_color;
+    border-color: $osd_borders_color;
     background-image: linear-gradient(to bottom, $_bg);
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
     icon-shadow: none;
   }
+
   @else if $t==undecorated {
   //
   // reset
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css 
b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 648ed3f..f01fda3 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -119,13 +119,17 @@ GtkFlowBox .grid-child {
   GtkFlowBox .grid-child:selected {
     outline-offset: -2px; }
 
-.app-notification,
+.popover.osd, .app-notification,
 .app-notification.frame, .osd {
   color: #eeeeec;
+  border: none;
+  background-color: rgba(32, 37, 38, 0.7);
+  background-clip: padding-box;
   outline-color: rgba(238, 238, 236, 0.3);
+  box-shadow: none;
   text-shadow: 0 1px black;
   icon-shadow: 0 1px black; }
-  .app-notification:backdrop, .osd:backdrop {
+  .popover.osd:backdrop, .app-notification:backdrop, .osd:backdrop {
     text-shadow: none; }
 
 /*********************
@@ -258,6 +262,46 @@ GtkFlowBox .grid-child {
       color: #215d9c; }
     .entry.image:backdrop {
       color: #7e8080; }
+  .osd .entry {
+    background-color: transparent;
+    background-image: linear-gradient(to bottom, #212121, #292929 90%);
+    color: white;
+    border-color: rgba(0, 0, 0, 0.7);
+    background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
+    background-clip: padding-box;
+    box-shadow: none;
+    text-shadow: 0 1px black;
+    icon-shadow: 0 1px black; }
+    .osd .entry:focus {
+      background-color: transparent;
+      background-image: linear-gradient(to bottom, #212121, #292929 90%);
+      color: white;
+      border-color: #215d9c;
+      background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
+      background-clip: padding-box;
+      box-shadow: inset 0 0 0 1px rgba(33, 93, 156, 0.4);
+      text-shadow: 0 1px black;
+      icon-shadow: 0 1px black; }
+    .osd .entry:backdrop {
+      background-color: transparent;
+      background-image: linear-gradient(to bottom, #212121, #292929 90%);
+      color: white;
+      border-color: rgba(0, 0, 0, 0.7);
+      background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
+      background-clip: padding-box;
+      box-shadow: none;
+      text-shadow: none;
+      icon-shadow: none; }
+    .osd .entry:insensitive {
+      background-color: transparent;
+      background-image: linear-gradient(to bottom, #212121, #292929 90%);
+      color: #878989;
+      border-color: rgba(0, 0, 0, 0.7);
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+      background-clip: padding-box;
+      box-shadow: none;
+      text-shadow: none;
+      icon-shadow: none; }
 
 /***********
  * Buttons *
@@ -400,18 +444,17 @@ GtkCalendar.header .button.titlebutton {
   .titlebar .osd.button.titlebutton,
   GtkCalendar.header .osd.button.titlebutton {
     color: #eeeeec;
-    border-radius: 6px;
-    outline-color: rgba(238, 238, 236, 0.2);
+    border-radius: 5px;
+    outline-color: rgba(238, 238, 236, 0.3);
     color: #eeeeec;
-    outline-color: rgba(238, 238, 236, 0.2);
-    background-color: transparent;
-    background-clip: padding-box;
-    background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
     border-color: rgba(0, 0, 0, 0.7);
-    box-shadow: inset 0 -1px rgba(0, 0, 0, 0.3), inset 0 1px rgba(255, 255, 255, 0.1);
+    background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
+    background-clip: padding-box;
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
-    border-color: rgba(255, 255, 255, 0.1);
+    outline-color: rgba(238, 238, 236, 0.3);
+    border: none;
     box-shadow: none; }
     .button.osd.image-button, .header-bar .osd.titlebutton.button,
     .titlebar .osd.titlebutton.button,
@@ -420,51 +463,56 @@ GtkCalendar.header .button.titlebutton {
     .button.osd:hover {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(74, 84, 87, 0.7));
-      box-shadow: inset 0 -1px rgba(0, 0, 0, 0.3), inset 0 1px rgba(255, 255, 255, 0.1);
+      background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.7));
+      background-clip: padding-box;
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black;
-      border-color: rgba(255, 255, 255, 0.1);
+      outline-color: rgba(238, 238, 236, 0.3);
+      border: none;
       box-shadow: none; }
     .button.osd:active, .button.osd:checked {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
+      background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none;
-      border-color: rgba(255, 255, 255, 0.1);
+      outline-color: rgba(238, 238, 236, 0.3);
+      border: none;
       box-shadow: none; }
     .button.osd:insensitive, .button.osd:backdrop:insensitive {
-      color: #939695;
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(66, 71, 73, 0.7));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+      background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none;
-      border-color: rgba(255, 255, 255, 0.1); }
+      border: none; }
     .button.osd:backdrop {
       color: #eeeeec;
-      background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
+      border-color: rgba(0, 0, 0, 0.7);
+      background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none;
-      border-color: rgba(255, 255, 255, 0.1); }
+      border: none; }
   .osd .button, .osd .header-bar .button.titlebutton, .header-bar .osd .button.titlebutton,
   .osd .titlebar .button.titlebutton,
   .titlebar .osd .button.titlebutton,
   .osd GtkCalendar.header .button.titlebutton,
   GtkCalendar.header .osd .button.titlebutton {
     color: #eeeeec;
-    outline-color: rgba(238, 238, 236, 0.2);
-    background-color: transparent;
-    background-clip: padding-box;
-    background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
     border-color: rgba(0, 0, 0, 0.7);
-    box-shadow: inset 0 -1px rgba(0, 0, 0, 0.3), inset 0 1px rgba(255, 255, 255, 0.1);
+    background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
+    background-clip: padding-box;
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
+    outline-color: rgba(238, 238, 236, 0.3);
     border-radius: 0;
     border-left-style: none; }
     .osd .button:dir(rtl) {
@@ -484,31 +532,113 @@ GtkCalendar.header .button.titlebutton {
     .osd .button:hover {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(74, 84, 87, 0.7));
-      box-shadow: inset 0 -1px rgba(0, 0, 0, 0.3), inset 0 1px rgba(255, 255, 255, 0.1);
+      background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.7));
+      background-clip: padding-box;
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
-      icon-shadow: 0 1px black; }
+      icon-shadow: 0 1px black;
+      outline-color: rgba(238, 238, 236, 0.3); }
     .osd .button:active, .osd .button:checked, .osd .button:backdrop:active, .osd .button:backdrop:checked {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
+      background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
-      icon-shadow: none; }
+      icon-shadow: none;
+      outline-color: rgba(238, 238, 236, 0.3); }
     .osd .button:insensitive, .osd .button:backdrop:insensitive {
-      color: #939695;
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(66, 71, 73, 0.7));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+      background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none; }
     .osd .button:backdrop {
       color: #eeeeec;
-      background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
+      border-color: rgba(0, 0, 0, 0.7);
+      background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none; }
+    .osd .button.flat, .osd .header-bar .titlebutton.button, .header-bar .osd .titlebutton.button,
+    .osd .titlebar .titlebutton.button,
+    .titlebar .osd .titlebutton.button,
+    .osd GtkCalendar.header .titlebutton.button,
+    GtkCalendar.header .osd .titlebutton.button {
+      border-color: transparent;
+      background-color: transparent;
+      background-image: none;
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
+      text-shadow: none;
+      icon-shadow: none;
+      box-shadow: none;
+      text-shadow: 0 1px black;
+      icon-shadow: 0 1px black; }
+      .osd .button.flat:hover, .osd .header-bar .titlebutton.button:hover, .header-bar .osd 
.titlebutton.button:hover,
+      .osd .titlebar .titlebutton.button:hover,
+      .titlebar .osd .titlebutton.button:hover,
+      .osd GtkCalendar.header .titlebutton.button:hover,
+      GtkCalendar.header .osd .titlebutton.button:hover {
+        color: white;
+        border-color: rgba(0, 0, 0, 0.7);
+        background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.7));
+        background-clip: padding-box;
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
+        text-shadow: 0 1px black;
+        icon-shadow: 0 1px black;
+        outline-color: rgba(238, 238, 236, 0.3);
+        background-clip: padding-box;
+        border-color: transparent;
+        box-shadow: none; }
+      .osd .button.flat:insensitive, .osd .header-bar .titlebutton.button:insensitive, .header-bar .osd 
.titlebutton.button:insensitive,
+      .osd .titlebar .titlebutton.button:insensitive,
+      .titlebar .osd .titlebutton.button:insensitive,
+      .osd GtkCalendar.header .titlebutton.button:insensitive,
+      GtkCalendar.header .osd .titlebutton.button:insensitive {
+        color: #878989;
+        border-color: rgba(0, 0, 0, 0.7);
+        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+        background-clip: padding-box;
+        box-shadow: none;
+        text-shadow: none;
+        icon-shadow: none;
+        background-image: none;
+        border-color: transparent;
+        box-shadow: none; }
+      .osd .button.flat:backdrop, .osd .header-bar .titlebutton.button:backdrop, .header-bar .osd 
.titlebutton.button:backdrop,
+      .osd .titlebar .titlebutton.button:backdrop,
+      .titlebar .osd .titlebutton.button:backdrop,
+      .osd GtkCalendar.header .titlebutton.button:backdrop,
+      GtkCalendar.header .osd .titlebutton.button:backdrop {
+        border-color: transparent;
+        background-color: transparent;
+        background-image: none;
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
+        text-shadow: none;
+        icon-shadow: none; }
+      .osd .button.flat:active, .osd .header-bar .titlebutton.button:active, .header-bar .osd 
.titlebutton.button:active,
+      .osd .titlebar .titlebutton.button:active,
+      .titlebar .osd .titlebutton.button:active,
+      .osd GtkCalendar.header .titlebutton.button:active,
+      GtkCalendar.header .osd .titlebutton.button:active, .osd .button.flat:checked, .osd .header-bar 
.titlebutton.button:checked, .header-bar .osd .titlebutton.button:checked,
+      .osd .titlebar .titlebutton.button:checked,
+      .titlebar .osd .titlebutton.button:checked,
+      .osd GtkCalendar.header .titlebutton.button:checked,
+      GtkCalendar.header .osd .titlebutton.button:checked {
+        color: white;
+        border-color: rgba(0, 0, 0, 0.7);
+        background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
+        background-clip: padding-box;
+        box-shadow: none;
+        text-shadow: none;
+        icon-shadow: none;
+        outline-color: rgba(238, 238, 236, 0.3);
+        background-clip: padding-box;
+        border-color: transparent;
+        box-shadow: none; }
   .button.suggested-action, .header-bar .suggested-action.button.titlebutton,
   .titlebar .suggested-action.button.titlebutton,
   GtkCalendar.header .suggested-action.button.titlebutton {
@@ -623,37 +753,42 @@ GtkCalendar.header .button.titlebutton {
           color: inherit; }
     .osd .button.suggested-action {
       color: #eeeeec;
-      outline-color: rgba(238, 238, 236, 0.2);
-      background-color: transparent;
-      background-clip: padding-box;
-      background-image: linear-gradient(to bottom, rgba(33, 93, 156, 0.5));
       border-color: rgba(0, 0, 0, 0.7);
-      box-shadow: inset 0 -1px rgba(0, 0, 0, 0.3), inset 0 1px rgba(255, 255, 255, 0.1);
+      background-image: linear-gradient(to bottom, rgba(33, 93, 156, 0.5));
+      background-clip: padding-box;
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
-      icon-shadow: 0 1px black; }
+      icon-shadow: 0 1px black;
+      outline-color: rgba(238, 238, 236, 0.3); }
       .osd .button.suggested-action:hover {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(33, 93, 156, 0.7));
-        box-shadow: inset 0 -1px rgba(0, 0, 0, 0.3), inset 0 1px rgba(255, 255, 255, 0.1);
+        background-clip: padding-box;
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
         text-shadow: 0 1px black;
-        icon-shadow: 0 1px black; }
+        icon-shadow: 0 1px black;
+        outline-color: rgba(238, 238, 236, 0.3); }
       .osd .button.suggested-action:active, .osd .button.suggested-action:checked, .osd 
.button.suggested-action:backdrop:active, .osd .button.suggested-action:backdrop:checked {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, #215d9c);
+        background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
-        icon-shadow: none; }
+        icon-shadow: none;
+        outline-color: rgba(238, 238, 236, 0.3); }
       .osd .button.suggested-action:insensitive, .osd .button.suggested-action:backdrop:insensitive {
-        color: #939695;
+        color: #878989;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(66, 71, 73, 0.7));
+        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+        background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none; }
       .osd .button.suggested-action:backdrop {
         color: #eeeeec;
+        border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(33, 93, 156, 0.5));
         background-clip: padding-box;
         box-shadow: none;
@@ -773,37 +908,42 @@ GtkCalendar.header .button.titlebutton {
           color: inherit; }
     .osd .button.destructive-action {
       color: #eeeeec;
-      outline-color: rgba(238, 238, 236, 0.2);
-      background-color: transparent;
-      background-clip: padding-box;
-      background-image: linear-gradient(to bottom, rgba(213, 16, 16, 0.5));
       border-color: rgba(0, 0, 0, 0.7);
-      box-shadow: inset 0 -1px rgba(0, 0, 0, 0.3), inset 0 1px rgba(255, 255, 255, 0.1);
+      background-image: linear-gradient(to bottom, rgba(213, 16, 16, 0.5));
+      background-clip: padding-box;
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
-      icon-shadow: 0 1px black; }
+      icon-shadow: 0 1px black;
+      outline-color: rgba(238, 238, 236, 0.3); }
       .osd .button.destructive-action:hover {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(213, 16, 16, 0.7));
-        box-shadow: inset 0 -1px rgba(0, 0, 0, 0.3), inset 0 1px rgba(255, 255, 255, 0.1);
+        background-clip: padding-box;
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
         text-shadow: 0 1px black;
-        icon-shadow: 0 1px black; }
+        icon-shadow: 0 1px black;
+        outline-color: rgba(238, 238, 236, 0.3); }
       .osd .button.destructive-action:active, .osd .button.destructive-action:checked, .osd 
.button.destructive-action:backdrop:active, .osd .button.destructive-action:backdrop:checked {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, #d51010);
+        background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
-        icon-shadow: none; }
+        icon-shadow: none;
+        outline-color: rgba(238, 238, 236, 0.3); }
       .osd .button.destructive-action:insensitive, .osd .button.destructive-action:backdrop:insensitive {
-        color: #939695;
+        color: #878989;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(66, 71, 73, 0.7));
+        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+        background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none; }
       .osd .button.destructive-action:backdrop {
         color: #eeeeec;
+        border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(213, 16, 16, 0.5));
         background-clip: padding-box;
         box-shadow: none;
@@ -1269,6 +1409,59 @@ GtkCalendar.header .button.titlebutton:visited {
       border-style: none none none solid; }
       .spinbutton .button:backdrop:insensitive:dir(rtl) {
         border-style: none solid none none; }
+  .osd .spinbutton .button {
+    border-color: transparent;
+    background-color: transparent;
+    background-image: none;
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
+    text-shadow: none;
+    icon-shadow: none;
+    color: #eeeeec;
+    border-style: none none none solid;
+    border-color: rgba(0, 0, 0, 0.4);
+    border-radius: 0;
+    box-shadow: none;
+    icon-shadow: 0 1px black; }
+    .osd .spinbutton .button:dir(rtl) {
+      border-style: none solid none none; }
+    .osd .spinbutton .button:hover {
+      border-color: transparent;
+      background-color: transparent;
+      background-image: none;
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
+      text-shadow: none;
+      icon-shadow: none;
+      color: #eeeeec;
+      border-color: rgba(0, 0, 0, 0.5);
+      background-color: rgba(238, 238, 236, 0.1);
+      icon-shadow: 0 1px black;
+      box-shadow: none; }
+    .osd .spinbutton .button:backdrop {
+      border-color: transparent;
+      background-color: transparent;
+      background-image: none;
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
+      text-shadow: none;
+      icon-shadow: none;
+      color: #eeeeec;
+      border-color: rgba(0, 0, 0, 0.5);
+      icon-shadow: none;
+      box-shadow: none; }
+    .osd .spinbutton .button:insensitive {
+      border-color: transparent;
+      background-color: transparent;
+      background-image: none;
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
+      text-shadow: none;
+      icon-shadow: none;
+      color: #878989;
+      border-color: rgba(0, 0, 0, 0.5);
+      icon-shadow: none;
+      box-shadow: none; }
+    .osd .spinbutton .button:last-child {
+      border-radius: 0 3px 3px 0; }
+    .osd .spinbutton .button:dir(rtl):first-child {
+      border-radius: 3px 0 0 3px; }
   .spinbutton.vertical .button, .spinbutton.vertical:dir(rtl) .button {
     padding-top: 8px;
     padding-bottom: 8px; }
@@ -1412,10 +1605,9 @@ GtkComboBox {
   background-color: #393f3f; }
   .osd .toolbar, .osd .inline-toolbar, .osd .search-bar, .osd .location-bar, .toolbar.osd, 
.osd.inline-toolbar, .osd.search-bar, .osd.location-bar {
     padding: 13px;
-    border: rgba(255, 255, 255, 0.1);
-    border-radius: 6px;
-    background-color: rgba(46, 52, 54, 0.7);
-    background-clip: padding-box; }
+    border: none;
+    border-radius: 5px;
+    background-color: rgba(32, 37, 38, 0.7); }
 
 .inline-toolbar {
   border-width: 0 1px 1px;
@@ -1989,44 +2181,6 @@ GtkCalendar.header column-header .button.titlebutton, column-header .button:hove
   GtkCalendar.header .popover .titlebutton.button:hover {
     text-shadow: none;
     transition: none; }
-  .popover.osd {
-    background-image: none;
-    background-color: #2e3436;
-    border: 1px solid #1c1f1f;
-    color: #eeeeec; }
-    .popover.osd .button {
-      color: white;
-      text-shadow: none;
-      color: #eeeeec;
-      outline-color: rgba(238, 238, 236, 0.2);
-      background-color: transparent;
-      background-clip: padding-box;
-      background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
-      border-color: rgba(0, 0, 0, 0.7);
-      box-shadow: inset 0 -1px rgba(0, 0, 0, 0.3), inset 0 1px rgba(255, 255, 255, 0.1);
-      text-shadow: 0 1px black;
-      icon-shadow: 0 1px black; }
-      .popover.osd .button:hover {
-        color: white;
-        border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(74, 84, 87, 0.7));
-        box-shadow: inset 0 -1px rgba(0, 0, 0, 0.3), inset 0 1px rgba(255, 255, 255, 0.1);
-        text-shadow: 0 1px black;
-        icon-shadow: 0 1px black; }
-      .popover.osd .button:active {
-        color: white;
-        border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
-        box-shadow: none;
-        text-shadow: none;
-        icon-shadow: none; }
-      .popover.osd .button:insensitive {
-        color: #939695;
-        border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(66, 71, 73, 0.7));
-        box-shadow: none;
-        text-shadow: none;
-        icon-shadow: none; }
 
 .entry.cursor-handle,
 .cursor-handle {
@@ -2912,38 +3066,42 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     .scale.scale-has-marks-above.scale-has-marks-below.slider, .osd
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider {
       color: #eeeeec;
-      outline-color: rgba(238, 238, 236, 0.2);
-      background-color: transparent;
-      background-clip: padding-box;
-      background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
       border-color: rgba(0, 0, 0, 0.7);
-      box-shadow: inset 0 -1px rgba(0, 0, 0, 0.3), inset 0 1px rgba(255, 255, 255, 0.1);
+      background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
+      background-clip: padding-box;
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black;
-      background-color: #2e3436; }
+      outline-color: rgba(238, 238, 236, 0.3);
+      background-color: rgba(32, 37, 38, 0.7); }
       .osd .scale.slider:hover, .osd
       .scale.scale-has-marks-above.scale-has-marks-below.slider:hover, .osd
       .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:hover {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(74, 84, 87, 0.7));
-        box-shadow: inset 0 -1px rgba(0, 0, 0, 0.3), inset 0 1px rgba(255, 255, 255, 0.1);
+        background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.7));
+        background-clip: padding-box;
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
         text-shadow: 0 1px black;
-        icon-shadow: 0 1px black; }
+        icon-shadow: 0 1px black;
+        outline-color: rgba(238, 238, 236, 0.3); }
       .osd .scale.slider:active, .osd
       .scale.scale-has-marks-above.scale-has-marks-below.slider:active, .osd
       .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:active {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
+        background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
-        icon-shadow: none; }
+        icon-shadow: none;
+        outline-color: rgba(238, 238, 236, 0.3); }
       .osd .scale.slider:backdrop, .osd
       .scale.scale-has-marks-above.scale-has-marks-below.slider:backdrop, .osd
       .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:backdrop {
         color: #eeeeec;
-        background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
+        border-color: rgba(0, 0, 0, 0.7);
+        background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -3565,11 +3723,9 @@ GtkCalendar.header .list-row.button.titlebutton {
 .app-notification,
 .app-notification.frame {
   padding: 10px;
-  border-width: 0 1px 1px;
-  border-style: solid;
-  border-color: rgba(255, 255, 255, 0.1);
+  border: none;
   border-radius: 0 0 6px 6px;
-  background-color: rgba(46, 52, 54, 0.7);
+  background-color: rgba(32, 37, 38, 0.7);
   background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2), transparent 2px);
   background-clip: padding-box; }
   .app-notification:backdrop,
@@ -3581,18 +3737,14 @@ GtkCalendar.header .list-row.button.titlebutton {
   .app-notification GtkCalendar.header .button.titlebutton,
   GtkCalendar.header .app-notification .button.titlebutton,
   .app-notification.frame .button {
-    border: 1px solid;
-    color: #eeeeec;
-    outline-color: rgba(238, 238, 236, 0.2);
     color: #eeeeec;
-    outline-color: rgba(238, 238, 236, 0.2);
-    background-color: transparent;
-    background-clip: padding-box;
-    background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
     border-color: rgba(0, 0, 0, 0.7);
-    box-shadow: inset 0 -1px rgba(0, 0, 0, 0.3), inset 0 1px rgba(255, 255, 255, 0.1);
+    background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
+    background-clip: padding-box;
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
-    icon-shadow: 0 1px black; }
+    icon-shadow: 0 1px black;
+    outline-color: rgba(238, 238, 236, 0.3); }
     .app-notification .button.flat, .app-notification .header-bar .titlebutton.button, .header-bar 
.app-notification .titlebutton.button,
     .app-notification .titlebar .titlebutton.button,
     .titlebar .app-notification .titlebutton.button,
@@ -3611,10 +3763,12 @@ GtkCalendar.header .list-row.button.titlebutton {
     .app-notification.frame .button:hover {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(74, 84, 87, 0.7));
-      box-shadow: inset 0 -1px rgba(0, 0, 0, 0.3), inset 0 1px rgba(255, 255, 255, 0.1);
+      background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.7));
+      background-clip: padding-box;
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
-      icon-shadow: 0 1px black; }
+      icon-shadow: 0 1px black;
+      outline-color: rgba(238, 238, 236, 0.3); }
     .app-notification .button:active, .app-notification .button:checked, .app-notification 
.button:backdrop:active, .app-notification .button:backdrop:checked,
     .app-notification.frame .button:active,
     .app-notification.frame .button:checked,
@@ -3623,22 +3777,26 @@ GtkCalendar.header .list-row.button.titlebutton {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
+      background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
-      icon-shadow: none; }
+      icon-shadow: none;
+      outline-color: rgba(238, 238, 236, 0.3); }
     .app-notification .button:insensitive, .app-notification .button:backdrop:insensitive,
     .app-notification.frame .button:insensitive,
     .app-notification.frame .button:backdrop:insensitive {
-      color: #939695;
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(66, 71, 73, 0.7));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+      background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none; }
     .app-notification .button:backdrop,
     .app-notification.frame .button:backdrop {
       color: #eeeeec;
-      background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
+      border-color: rgba(0, 0, 0, 0.7);
+      background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index db76312..a3dce33 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -119,13 +119,17 @@ GtkFlowBox .grid-child {
   GtkFlowBox .grid-child:selected {
     outline-offset: -2px; }
 
-.app-notification,
+.popover.osd, .app-notification,
 .app-notification.frame, .osd {
   color: #eeeeec;
+  border: none;
+  background-color: rgba(32, 37, 38, 0.7);
+  background-clip: padding-box;
   outline-color: rgba(238, 238, 236, 0.3);
+  box-shadow: none;
   text-shadow: 0 1px black;
   icon-shadow: 0 1px black; }
-  .app-notification:backdrop, .osd:backdrop {
+  .popover.osd:backdrop, .app-notification:backdrop, .osd:backdrop {
     text-shadow: none; }
 
 /*********************
@@ -250,6 +254,46 @@ GtkFlowBox .grid-child {
       color: #4a90d9; }
     .entry.image:backdrop {
       color: #a3a5a6; }
+  .osd .entry {
+    background-color: transparent;
+    background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
+    color: white;
+    border-color: rgba(0, 0, 0, 0.7);
+    background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
+    background-clip: padding-box;
+    box-shadow: none;
+    text-shadow: 0 1px black;
+    icon-shadow: 0 1px black; }
+    .osd .entry:focus {
+      background-color: transparent;
+      background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
+      color: white;
+      border-color: #4a90d9;
+      background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
+      background-clip: padding-box;
+      box-shadow: inset 0 0 0 1px rgba(74, 144, 217, 0.4);
+      text-shadow: 0 1px black;
+      icon-shadow: 0 1px black; }
+    .osd .entry:backdrop {
+      background-color: transparent;
+      background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
+      color: white;
+      border-color: rgba(0, 0, 0, 0.7);
+      background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5));
+      background-clip: padding-box;
+      box-shadow: none;
+      text-shadow: none;
+      icon-shadow: none; }
+    .osd .entry:insensitive {
+      background-color: transparent;
+      background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
+      color: #878989;
+      border-color: rgba(0, 0, 0, 0.7);
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+      background-clip: padding-box;
+      box-shadow: none;
+      text-shadow: none;
+      icon-shadow: none; }
 
 /***********
  * Buttons *
@@ -392,18 +436,17 @@ GtkCalendar.header .button.titlebutton {
   .titlebar .osd.button.titlebutton,
   GtkCalendar.header .osd.button.titlebutton {
     color: #eeeeec;
-    border-radius: 6px;
-    outline-color: rgba(238, 238, 236, 0.2);
+    border-radius: 5px;
+    outline-color: rgba(238, 238, 236, 0.3);
     color: #eeeeec;
-    outline-color: rgba(238, 238, 236, 0.2);
-    background-color: transparent;
-    background-clip: padding-box;
-    background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
     border-color: rgba(0, 0, 0, 0.7);
-    box-shadow: inset 0 -1px rgba(0, 0, 0, 0.3), inset 0 1px rgba(255, 255, 255, 0.1);
+    background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
+    background-clip: padding-box;
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
-    border-color: rgba(255, 255, 255, 0.1);
+    outline-color: rgba(238, 238, 236, 0.3);
+    border: none;
     box-shadow: none; }
     .button.osd.image-button, .header-bar .osd.titlebutton.button,
     .titlebar .osd.titlebutton.button,
@@ -412,51 +455,56 @@ GtkCalendar.header .button.titlebutton {
     .button.osd:hover {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(74, 84, 87, 0.7));
-      box-shadow: inset 0 -1px rgba(0, 0, 0, 0.3), inset 0 1px rgba(255, 255, 255, 0.1);
+      background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.7));
+      background-clip: padding-box;
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black;
-      border-color: rgba(255, 255, 255, 0.1);
+      outline-color: rgba(238, 238, 236, 0.3);
+      border: none;
       box-shadow: none; }
     .button.osd:active, .button.osd:checked {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
+      background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none;
-      border-color: rgba(255, 255, 255, 0.1);
+      outline-color: rgba(238, 238, 236, 0.3);
+      border: none;
       box-shadow: none; }
     .button.osd:insensitive, .button.osd:backdrop:insensitive {
-      color: #8d9091;
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(65, 70, 72, 0.7));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+      background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none;
-      border-color: rgba(255, 255, 255, 0.1); }
+      border: none; }
     .button.osd:backdrop {
       color: #eeeeec;
-      background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
+      border-color: rgba(0, 0, 0, 0.7);
+      background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none;
-      border-color: rgba(255, 255, 255, 0.1); }
+      border: none; }
   .osd .button, .osd .header-bar .button.titlebutton, .header-bar .osd .button.titlebutton,
   .osd .titlebar .button.titlebutton,
   .titlebar .osd .button.titlebutton,
   .osd GtkCalendar.header .button.titlebutton,
   GtkCalendar.header .osd .button.titlebutton {
     color: #eeeeec;
-    outline-color: rgba(238, 238, 236, 0.2);
-    background-color: transparent;
-    background-clip: padding-box;
-    background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
     border-color: rgba(0, 0, 0, 0.7);
-    box-shadow: inset 0 -1px rgba(0, 0, 0, 0.3), inset 0 1px rgba(255, 255, 255, 0.1);
+    background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
+    background-clip: padding-box;
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
+    outline-color: rgba(238, 238, 236, 0.3);
     border-radius: 0;
     border-left-style: none; }
     .osd .button:dir(rtl) {
@@ -476,31 +524,113 @@ GtkCalendar.header .button.titlebutton {
     .osd .button:hover {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(74, 84, 87, 0.7));
-      box-shadow: inset 0 -1px rgba(0, 0, 0, 0.3), inset 0 1px rgba(255, 255, 255, 0.1);
+      background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.7));
+      background-clip: padding-box;
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
-      icon-shadow: 0 1px black; }
+      icon-shadow: 0 1px black;
+      outline-color: rgba(238, 238, 236, 0.3); }
     .osd .button:active, .osd .button:checked, .osd .button:backdrop:active, .osd .button:backdrop:checked {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
+      background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
-      icon-shadow: none; }
+      icon-shadow: none;
+      outline-color: rgba(238, 238, 236, 0.3); }
     .osd .button:insensitive, .osd .button:backdrop:insensitive {
-      color: #8d9091;
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(65, 70, 72, 0.7));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+      background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none; }
     .osd .button:backdrop {
       color: #eeeeec;
-      background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
+      border-color: rgba(0, 0, 0, 0.7);
+      background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none; }
+    .osd .button.flat, .osd .header-bar .titlebutton.button, .header-bar .osd .titlebutton.button,
+    .osd .titlebar .titlebutton.button,
+    .titlebar .osd .titlebutton.button,
+    .osd GtkCalendar.header .titlebutton.button,
+    GtkCalendar.header .osd .titlebutton.button {
+      border-color: transparent;
+      background-color: transparent;
+      background-image: none;
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
+      text-shadow: none;
+      icon-shadow: none;
+      box-shadow: none;
+      text-shadow: 0 1px black;
+      icon-shadow: 0 1px black; }
+      .osd .button.flat:hover, .osd .header-bar .titlebutton.button:hover, .header-bar .osd 
.titlebutton.button:hover,
+      .osd .titlebar .titlebutton.button:hover,
+      .titlebar .osd .titlebutton.button:hover,
+      .osd GtkCalendar.header .titlebutton.button:hover,
+      GtkCalendar.header .osd .titlebutton.button:hover {
+        color: white;
+        border-color: rgba(0, 0, 0, 0.7);
+        background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.7));
+        background-clip: padding-box;
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
+        text-shadow: 0 1px black;
+        icon-shadow: 0 1px black;
+        outline-color: rgba(238, 238, 236, 0.3);
+        background-clip: padding-box;
+        border-color: transparent;
+        box-shadow: none; }
+      .osd .button.flat:insensitive, .osd .header-bar .titlebutton.button:insensitive, .header-bar .osd 
.titlebutton.button:insensitive,
+      .osd .titlebar .titlebutton.button:insensitive,
+      .titlebar .osd .titlebutton.button:insensitive,
+      .osd GtkCalendar.header .titlebutton.button:insensitive,
+      GtkCalendar.header .osd .titlebutton.button:insensitive {
+        color: #878989;
+        border-color: rgba(0, 0, 0, 0.7);
+        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+        background-clip: padding-box;
+        box-shadow: none;
+        text-shadow: none;
+        icon-shadow: none;
+        background-image: none;
+        border-color: transparent;
+        box-shadow: none; }
+      .osd .button.flat:backdrop, .osd .header-bar .titlebutton.button:backdrop, .header-bar .osd 
.titlebutton.button:backdrop,
+      .osd .titlebar .titlebutton.button:backdrop,
+      .titlebar .osd .titlebutton.button:backdrop,
+      .osd GtkCalendar.header .titlebutton.button:backdrop,
+      GtkCalendar.header .osd .titlebutton.button:backdrop {
+        border-color: transparent;
+        background-color: transparent;
+        background-image: none;
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
+        text-shadow: none;
+        icon-shadow: none; }
+      .osd .button.flat:active, .osd .header-bar .titlebutton.button:active, .header-bar .osd 
.titlebutton.button:active,
+      .osd .titlebar .titlebutton.button:active,
+      .titlebar .osd .titlebutton.button:active,
+      .osd GtkCalendar.header .titlebutton.button:active,
+      GtkCalendar.header .osd .titlebutton.button:active, .osd .button.flat:checked, .osd .header-bar 
.titlebutton.button:checked, .header-bar .osd .titlebutton.button:checked,
+      .osd .titlebar .titlebutton.button:checked,
+      .titlebar .osd .titlebutton.button:checked,
+      .osd GtkCalendar.header .titlebutton.button:checked,
+      GtkCalendar.header .osd .titlebutton.button:checked {
+        color: white;
+        border-color: rgba(0, 0, 0, 0.7);
+        background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
+        background-clip: padding-box;
+        box-shadow: none;
+        text-shadow: none;
+        icon-shadow: none;
+        outline-color: rgba(238, 238, 236, 0.3);
+        background-clip: padding-box;
+        border-color: transparent;
+        box-shadow: none; }
   .button.suggested-action, .header-bar .suggested-action.button.titlebutton,
   .titlebar .suggested-action.button.titlebutton,
   GtkCalendar.header .suggested-action.button.titlebutton {
@@ -615,37 +745,42 @@ GtkCalendar.header .button.titlebutton {
           color: inherit; }
     .osd .button.suggested-action {
       color: #eeeeec;
-      outline-color: rgba(238, 238, 236, 0.2);
-      background-color: transparent;
-      background-clip: padding-box;
-      background-image: linear-gradient(to bottom, rgba(74, 144, 217, 0.5));
       border-color: rgba(0, 0, 0, 0.7);
-      box-shadow: inset 0 -1px rgba(0, 0, 0, 0.3), inset 0 1px rgba(255, 255, 255, 0.1);
+      background-image: linear-gradient(to bottom, rgba(74, 144, 217, 0.5));
+      background-clip: padding-box;
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
-      icon-shadow: 0 1px black; }
+      icon-shadow: 0 1px black;
+      outline-color: rgba(238, 238, 236, 0.3); }
       .osd .button.suggested-action:hover {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(74, 144, 217, 0.7));
-        box-shadow: inset 0 -1px rgba(0, 0, 0, 0.3), inset 0 1px rgba(255, 255, 255, 0.1);
+        background-clip: padding-box;
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
         text-shadow: 0 1px black;
-        icon-shadow: 0 1px black; }
+        icon-shadow: 0 1px black;
+        outline-color: rgba(238, 238, 236, 0.3); }
       .osd .button.suggested-action:active, .osd .button.suggested-action:checked, .osd 
.button.suggested-action:backdrop:active, .osd .button.suggested-action:backdrop:checked {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, #4a90d9);
+        background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
-        icon-shadow: none; }
+        icon-shadow: none;
+        outline-color: rgba(238, 238, 236, 0.3); }
       .osd .button.suggested-action:insensitive, .osd .button.suggested-action:backdrop:insensitive {
-        color: #8d9091;
+        color: #878989;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(65, 70, 72, 0.7));
+        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+        background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none; }
       .osd .button.suggested-action:backdrop {
         color: #eeeeec;
+        border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(74, 144, 217, 0.5));
         background-clip: padding-box;
         box-shadow: none;
@@ -765,37 +900,42 @@ GtkCalendar.header .button.titlebutton {
           color: inherit; }
     .osd .button.destructive-action {
       color: #eeeeec;
-      outline-color: rgba(238, 238, 236, 0.2);
-      background-color: transparent;
-      background-clip: padding-box;
-      background-image: linear-gradient(to bottom, rgba(239, 41, 41, 0.5));
       border-color: rgba(0, 0, 0, 0.7);
-      box-shadow: inset 0 -1px rgba(0, 0, 0, 0.3), inset 0 1px rgba(255, 255, 255, 0.1);
+      background-image: linear-gradient(to bottom, rgba(239, 41, 41, 0.5));
+      background-clip: padding-box;
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
-      icon-shadow: 0 1px black; }
+      icon-shadow: 0 1px black;
+      outline-color: rgba(238, 238, 236, 0.3); }
       .osd .button.destructive-action:hover {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(239, 41, 41, 0.7));
-        box-shadow: inset 0 -1px rgba(0, 0, 0, 0.3), inset 0 1px rgba(255, 255, 255, 0.1);
+        background-clip: padding-box;
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
         text-shadow: 0 1px black;
-        icon-shadow: 0 1px black; }
+        icon-shadow: 0 1px black;
+        outline-color: rgba(238, 238, 236, 0.3); }
       .osd .button.destructive-action:active, .osd .button.destructive-action:checked, .osd 
.button.destructive-action:backdrop:active, .osd .button.destructive-action:backdrop:checked {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, #ef2929);
+        background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
-        icon-shadow: none; }
+        icon-shadow: none;
+        outline-color: rgba(238, 238, 236, 0.3); }
       .osd .button.destructive-action:insensitive, .osd .button.destructive-action:backdrop:insensitive {
-        color: #8d9091;
+        color: #878989;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(65, 70, 72, 0.7));
+        background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+        background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none; }
       .osd .button.destructive-action:backdrop {
         color: #eeeeec;
+        border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(239, 41, 41, 0.5));
         background-clip: padding-box;
         box-shadow: none;
@@ -1261,6 +1401,59 @@ GtkCalendar.header .button.titlebutton:visited {
       border-style: none none none solid; }
       .spinbutton .button:backdrop:insensitive:dir(rtl) {
         border-style: none solid none none; }
+  .osd .spinbutton .button {
+    border-color: transparent;
+    background-color: transparent;
+    background-image: none;
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
+    text-shadow: none;
+    icon-shadow: none;
+    color: #eeeeec;
+    border-style: none none none solid;
+    border-color: rgba(0, 0, 0, 0.4);
+    border-radius: 0;
+    box-shadow: none;
+    icon-shadow: 0 1px black; }
+    .osd .spinbutton .button:dir(rtl) {
+      border-style: none solid none none; }
+    .osd .spinbutton .button:hover {
+      border-color: transparent;
+      background-color: transparent;
+      background-image: none;
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
+      text-shadow: none;
+      icon-shadow: none;
+      color: #eeeeec;
+      border-color: rgba(0, 0, 0, 0.5);
+      background-color: rgba(238, 238, 236, 0.1);
+      icon-shadow: 0 1px black;
+      box-shadow: none; }
+    .osd .spinbutton .button:backdrop {
+      border-color: transparent;
+      background-color: transparent;
+      background-image: none;
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
+      text-shadow: none;
+      icon-shadow: none;
+      color: #eeeeec;
+      border-color: rgba(0, 0, 0, 0.5);
+      icon-shadow: none;
+      box-shadow: none; }
+    .osd .spinbutton .button:insensitive {
+      border-color: transparent;
+      background-color: transparent;
+      background-image: none;
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
+      text-shadow: none;
+      icon-shadow: none;
+      color: #878989;
+      border-color: rgba(0, 0, 0, 0.5);
+      icon-shadow: none;
+      box-shadow: none; }
+    .osd .spinbutton .button:last-child {
+      border-radius: 0 3px 3px 0; }
+    .osd .spinbutton .button:dir(rtl):first-child {
+      border-radius: 3px 0 0 3px; }
   .spinbutton.vertical .button, .spinbutton.vertical:dir(rtl) .button {
     padding-top: 8px;
     padding-bottom: 8px; }
@@ -1404,10 +1597,9 @@ GtkComboBox {
   background-color: #ededed; }
   .osd .toolbar, .osd .inline-toolbar, .osd .search-bar, .osd .location-bar, .toolbar.osd, 
.osd.inline-toolbar, .osd.search-bar, .osd.location-bar {
     padding: 13px;
-    border: rgba(255, 255, 255, 0.1);
-    border-radius: 6px;
-    background-color: rgba(46, 52, 54, 0.7);
-    background-clip: padding-box; }
+    border: none;
+    border-radius: 5px;
+    background-color: rgba(32, 37, 38, 0.7); }
 
 .inline-toolbar {
   border-width: 0 1px 1px;
@@ -1986,44 +2178,6 @@ GtkCalendar.header column-header .button.titlebutton, column-header .button:hove
   GtkCalendar.header .popover .titlebutton.button:hover {
     text-shadow: none;
     transition: none; }
-  .popover.osd {
-    background-image: none;
-    background-color: #2e3436;
-    border: 1px solid #a1a1a1;
-    color: #eeeeec; }
-    .popover.osd .button {
-      color: white;
-      text-shadow: none;
-      color: #eeeeec;
-      outline-color: rgba(238, 238, 236, 0.2);
-      background-color: transparent;
-      background-clip: padding-box;
-      background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
-      border-color: rgba(0, 0, 0, 0.7);
-      box-shadow: inset 0 -1px rgba(0, 0, 0, 0.3), inset 0 1px rgba(255, 255, 255, 0.1);
-      text-shadow: 0 1px black;
-      icon-shadow: 0 1px black; }
-      .popover.osd .button:hover {
-        color: white;
-        border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(74, 84, 87, 0.7));
-        box-shadow: inset 0 -1px rgba(0, 0, 0, 0.3), inset 0 1px rgba(255, 255, 255, 0.1);
-        text-shadow: 0 1px black;
-        icon-shadow: 0 1px black; }
-      .popover.osd .button:active {
-        color: white;
-        border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
-        box-shadow: none;
-        text-shadow: none;
-        icon-shadow: none; }
-      .popover.osd .button:insensitive {
-        color: #8d9091;
-        border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(65, 70, 72, 0.7));
-        box-shadow: none;
-        text-shadow: none;
-        icon-shadow: none; }
 
 .entry.cursor-handle,
 .cursor-handle {
@@ -3065,38 +3219,42 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     .scale.scale-has-marks-above.scale-has-marks-below.slider, .osd
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider {
       color: #eeeeec;
-      outline-color: rgba(238, 238, 236, 0.2);
-      background-color: transparent;
-      background-clip: padding-box;
-      background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
       border-color: rgba(0, 0, 0, 0.7);
-      box-shadow: inset 0 -1px rgba(0, 0, 0, 0.3), inset 0 1px rgba(255, 255, 255, 0.1);
+      background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
+      background-clip: padding-box;
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black;
-      background-color: #2e3436; }
+      outline-color: rgba(238, 238, 236, 0.3);
+      background-color: rgba(32, 37, 38, 0.7); }
       .osd .scale.slider:hover, .osd
       .scale.scale-has-marks-above.scale-has-marks-below.slider:hover, .osd
       .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:hover {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(74, 84, 87, 0.7));
-        box-shadow: inset 0 -1px rgba(0, 0, 0, 0.3), inset 0 1px rgba(255, 255, 255, 0.1);
+        background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.7));
+        background-clip: padding-box;
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
         text-shadow: 0 1px black;
-        icon-shadow: 0 1px black; }
+        icon-shadow: 0 1px black;
+        outline-color: rgba(238, 238, 236, 0.3); }
       .osd .scale.slider:active, .osd
       .scale.scale-has-marks-above.scale-has-marks-below.slider:active, .osd
       .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:active {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
+        background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
-        icon-shadow: none; }
+        icon-shadow: none;
+        outline-color: rgba(238, 238, 236, 0.3); }
       .osd .scale.slider:backdrop, .osd
       .scale.scale-has-marks-above.scale-has-marks-below.slider:backdrop, .osd
       .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:backdrop {
         color: #eeeeec;
-        background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
+        border-color: rgba(0, 0, 0, 0.7);
+        background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
@@ -3726,11 +3884,9 @@ GtkCalendar.header .list-row.button.titlebutton {
 .app-notification,
 .app-notification.frame {
   padding: 10px;
-  border-width: 0 1px 1px;
-  border-style: solid;
-  border-color: rgba(255, 255, 255, 0.1);
+  border: none;
   border-radius: 0 0 6px 6px;
-  background-color: rgba(46, 52, 54, 0.7);
+  background-color: rgba(32, 37, 38, 0.7);
   background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2), transparent 2px);
   background-clip: padding-box; }
   .app-notification:backdrop,
@@ -3742,18 +3898,14 @@ GtkCalendar.header .list-row.button.titlebutton {
   .app-notification GtkCalendar.header .button.titlebutton,
   GtkCalendar.header .app-notification .button.titlebutton,
   .app-notification.frame .button {
-    border: 1px solid;
-    color: #eeeeec;
-    outline-color: rgba(238, 238, 236, 0.2);
     color: #eeeeec;
-    outline-color: rgba(238, 238, 236, 0.2);
-    background-color: transparent;
-    background-clip: padding-box;
-    background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
     border-color: rgba(0, 0, 0, 0.7);
-    box-shadow: inset 0 -1px rgba(0, 0, 0, 0.3), inset 0 1px rgba(255, 255, 255, 0.1);
+    background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
+    background-clip: padding-box;
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
-    icon-shadow: 0 1px black; }
+    icon-shadow: 0 1px black;
+    outline-color: rgba(238, 238, 236, 0.3); }
     .app-notification .button.flat, .app-notification .header-bar .titlebutton.button, .header-bar 
.app-notification .titlebutton.button,
     .app-notification .titlebar .titlebutton.button,
     .titlebar .app-notification .titlebutton.button,
@@ -3772,10 +3924,12 @@ GtkCalendar.header .list-row.button.titlebutton {
     .app-notification.frame .button:hover {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(74, 84, 87, 0.7));
-      box-shadow: inset 0 -1px rgba(0, 0, 0, 0.3), inset 0 1px rgba(255, 255, 255, 0.1);
+      background-image: linear-gradient(to bottom, rgba(60, 69, 71, 0.7));
+      background-clip: padding-box;
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
-      icon-shadow: 0 1px black; }
+      icon-shadow: 0 1px black;
+      outline-color: rgba(238, 238, 236, 0.3); }
     .app-notification .button:active, .app-notification .button:checked, .app-notification 
.button:backdrop:active, .app-notification .button:backdrop:checked,
     .app-notification.frame .button:active,
     .app-notification.frame .button:checked,
@@ -3784,22 +3938,26 @@ GtkCalendar.header .list-row.button.titlebutton {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.7));
+      background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
-      icon-shadow: none; }
+      icon-shadow: none;
+      outline-color: rgba(238, 238, 236, 0.3); }
     .app-notification .button:insensitive, .app-notification .button:backdrop:insensitive,
     .app-notification.frame .button:insensitive,
     .app-notification.frame .button:backdrop:insensitive {
-      color: #8d9091;
+      color: #878989;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(65, 70, 72, 0.7));
+      background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5));
+      background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none; }
     .app-notification .button:backdrop,
     .app-notification.frame .button:backdrop {
       color: #eeeeec;
-      background-image: linear-gradient(to bottom, rgba(46, 52, 54, 0.7));
+      border-color: rgba(0, 0, 0, 0.7);
+      background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.7));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]