Update upstream

themes/Default/common-dark.css

@@ -28,3 +28,7 @@ paned.vertical > separator {
   background-color: @bg-color;
 }
 
+/* Top highlight for buttons */
+button:not(.flat) {
+  box-shadow: 0 1px @extreme-selected-color inset;
+}

themes/Default/common-light.css

@@ -25,3 +25,8 @@ paned.horizontal > separator {
 paned.vertical > separator {
   background-image: url("ui/separator-handle-h.svg");
 }
+
+/* Top highlight for buttons */
+button:not(.flat) {
+  box-shadow: 0 1px @extreme-bg-color inset;
+}

themes/Default/common.css

@@ -136,7 +136,11 @@ notebook stack {
 
 notebook header {
   background-color: @bg-color;
-  border-color: @strong-border-color;
+  border-color: @edge-border-color;
+}
+
+notebook header button {
+  box-shadow: none;
 }
 
 /* Use this to make a border or padding around each tab */
@@ -220,7 +224,7 @@ toolbutton button.flat:checked:hover {
 }
 
 /* Visual indication of clicking an already
- * selected button 
+ * selected button
  */
 toolbutton button.flat:checked:active:hover {
   background-color: @hover-color;
@@ -238,8 +242,16 @@ PikaDock frame:first-child label {
   color: @fg-color;
 }
 
+/* Defining slider scale border and trough */
+scale contents trough
+{
+  border-color: @strong-border-color;
+  background-color: @ruler-color;
+}
+
 scrollbar {
   background-color: @bg-color;
+  border-color: @border-color;
 }
 
 /*
@@ -256,6 +268,11 @@ scrollbar slider {
   border: 2px solid @border-color;
 }
 
+scrolledwindow
+{
+  border-color: @edge-border-color;
+}
+
 /* Removes black border around scrolled windows */
 scrolledwindow viewport grid, scrolledwindow viewport box {
    border-radius: 1px;
@@ -323,8 +340,21 @@ button.suggested-action {
   border: 1px dotted shade(@fg-color, 0.5);
 }
 
-button:checked {
+button:not(.flat)
+{
+  border-color: @edge-border-color;
+}
+
+/* Styling for dockable dialog footer buttons */
+button.titlebutton
+{
+  border-color: transparent;
+  box-shadow: none;
+}
+
+button:checked, button.titlebutton:hover {
   background: @selected-color;
+  border-color: @edge-border-color;
 }
 
 /* Spinbuttons: there are two kinds:
@@ -345,6 +375,12 @@ spinbutton, entry {
   border-color: @strong-border-color;
 }
 
+spinbutton
+{
+  background-image: none;
+  background-color: @bg-color;
+}
+
 /* Styling for the +/- buttons */
 spinbutton button.up, spinbutton button.down {
   background-color: @bg-color;
@@ -356,6 +392,11 @@ PikaSpinScale entry progress {
   border-radius:    3px;
 }
 
+PikaSpinScale button
+{
+  border-color: @border-color;
+}
+
 /* Checkboxes */
 checkbutton, checkbutton.text-button, radiobutton, checkbutton label {
   color: @fg-color;
@@ -386,11 +427,13 @@ radio {
   background-image: none;
   background-color: @extreme-bg-color;
   border: 1px solid @stronger-border-color;
+  border-radius: 100%;
   color: @fg-color;
 }
 
 /* Removes "blurred" effect from tooltip label */
 tooltip {
+  background-image: none;
   text-shadow: 0 0;
 }
 
@@ -423,6 +466,7 @@ border {
 /* give the menu bar a color, fix for the default color being too dark */
 menubar {
   background-color: @bg-color;
+  box-shadow: 0 -1px @edge-border-color inset;
 }
 
 /* The top menu item itself: File, Edit ... */
@@ -446,6 +490,11 @@ menuitem check {
   border-color: @fg-color;
 }
 
+menuitem decoration
+{
+  box-shadow: 0 1px 2px @edge-border-color;
+}
+
 /* "Add Tab" menu in dockable dialog */
 menu {
   background-color: @bg-color;
@@ -490,17 +539,6 @@ actionbar revealer box {
   background-color: @bg-color;
 }
 
-/* Header bar */
-
-headerbar {
-  background-color: @bg-color;
-  background-image: none;
-}
-
-headerbar:backdrop * {
-  color: @disabled-fg-color;
-}
-
 /* GtkListBox widgets */
 
 list {
@@ -526,10 +564,24 @@ switch image {
   color: transparent;
 }
 
-/* XXX: should this actually go in the Compact theme instead?
+/* XXX: should the min-height actually go in the Compact theme instead?
  * I find the headerbar on GNOME default theme (Adwaita) to be kinda huge. But
  * maybe the default theme should not try and override this?
  */
 headerbar {
-  min-height: 0px
+  min-height: 0px;
+  background-color: @bg-color;
+  background-image: none;
+  border-color: @edge-border-color;
+  outline-color: @edge-border-color;
+  box-shadow: none;
+}
+
+headerbar:backdrop * {
+  color: @disabled-fg-color;
+}
+
+/* Prevent overlapping menu/header borderlines for CSD */
+headerbar button.titlebutton, headerbar > menubar {
+  box-shadow: none;
 }

themes/Default/pika-dark.css

@@ -50,6 +50,9 @@
 
 @define-color strong-border-color    rgb(40,40,40);
 @define-color stronger-border-color  rgb(75,75,75);
+/* Border color for the edge of certain widgets. This needs
+ * to be dark on light theme and very dark on dark themes */
+@define-color edge-border-color      rgb(26,26,26);
 
 /********* Colors for special cases *********/
 

themes/Default/pika.css

@@ -50,6 +50,9 @@
 
 @define-color strong-border-color    rgb(200,200,200);
 @define-color stronger-border-color  rgb(185,185,185);
+/* Border color for the edge of certain widgets. This needs
+ * to be dark on light theme and very dark on dark themes */
+@define-color edge-border-color      rgb(185,185,185);
 
 /********* Colors for special cases *********/