Fixed solid-csd issues and header issues

src/gtk-3.0/sass/_colors.scss

@@ -47,18 +47,21 @@ $suggested_color: #db5b5b;
 $destructive_fg_color: white;
 $suggested_fg_color: white;
 $progress_color: #db5b5b;
+
 @if $color=='aliz' {
     $progress_color: #00C487;
     $success_color: #3498db;
     $destructive_color: #db5b5b;
     $suggested_color: #2eb398;
 }
+
 @if $color=='azul' {
     $progress_color: #7C4DFF;
     $success_color: #2eb398;
     $destructive_color: #db5b5b;
     $suggested_color: #4146d1;
 }
+
 $drop_target_color: #F08437;
 
 //insensitive state derived colors
@@ -85,7 +88,7 @@ $dark_sidebar_fg: $header_fg;
 $dark_sidebar_border: if($variant == 'light', $dark_sidebar_bg, darken($dark_sidebar_bg, 5%));
 
 $osd_fg_color: $dark_sidebar_fg;
-$osd_bg_color: $dark_sidebar_bg;
+$osd_bg_color: lighten($header_bg, 1%);
 
 $osd_button_bg: transparentize(lighten($osd_bg_color, 22%), 0.6);
 $osd_button_border: transparentize(darken($osd_bg_color, 12%), 0.6);

src/gtk-3.0/sass/_common.scss

@@ -35,7 +35,7 @@ $asset_suffix: if($variant=='dark', '-dark', ''); // use dark assets in dark var
   background-color: if($transparency == 'true', rgba($bg_color, 1), $bg_color); // without this headerbar transparency doesn't seem to work
 }
 
-.popup.background {
+.popup.background.csd {
   border-radius: 2px; // menus background
 }
 
@@ -1118,7 +1118,7 @@ headerbar,
     border-top-right-radius: 2px;
   }
 
-  &, & > headerbar {
+  &, & headerbar {
     box-shadow: inset 0 1px $highlight;
 
     .tiled &,
@@ -1229,7 +1229,7 @@ headerbar {
       padding: 0;
       background: none;
       border: none;
-      box-shadow: none;
+      // box-shadow: none;
     }
   }
 
@@ -2843,49 +2843,70 @@ calendar {
 
 messagedialog { // Message Dialog styling
 
-  .titlebar {
+  &.csd .titlebar {
     min-height: 20px;
-    background-color: $header_bg;
-    border-bottom: 1px solid darken($header_bg, 7%);
+    background-color: $bg_color;
+    border: none;
+    box-shadow: inset 0 1px $highlight;
   }
 
-  .dialog-action-area button { padding: 8px; min-height: 0; }
-
-  .linked:not(.vertical) > button,
-  .linked:not(.vertical) > button:hover,
-  .linked:not(.vertical) > button:active,
-  .linked:not(.vertical) > button:checked,
-  .linked:not(.vertical) > button:disabled {
-    @extend %middle_button;
-    &:first-child { @extend %first_button; }
-    &:last-child { @extend %last_button; }
-    &:only-child { @extend %single_button; }
-  }
+  .dialog-action-area.linked:not(.vertical) > button {
+    padding: 5px 10px;
+    border-radius: 0;
+    border: none;
+    border-top: 1px solid $borders_color;
 
-  &, &.csd { // rounded bottom border styling for csd version
-    &.background {
-      border-bottom-left-radius: 3px;
-      border-bottom-right-radius: 3px;
-      border: none;
+    &:active, &:checked {
+      transition: background-color 0.00001s 0.2s;
+      animation: ripple_effect 0.2s cubic-bezier(0.0, 0.0, 0.2, 1);
     }
 
-    .dialog-action-area {
-      button {
-        &:active, &:checked {
-          transition: background-color 0.00001s 0.3s;
-          animation: ripple_effect 0.3s cubic-bezier(0.0, 0.0, 0.2, 1);
-        }
+    &, &:hover, &:active, &:checked, &:disabled {
+      border-radius: 0;
+
+      &:first-child {
+        border-bottom-left-radius: 0;
+        border-top-left-radius: 0;
+      }
+
+      &:last-child {
+        border-bottom-right-radius: 0;
+        border-top-right-radius: 0;
+      }
+
+      &:only-child {
+        border-bottom-left-radius: 3px;
+        border-bottom-right-radius: 3px;
       }
     }
 
-    .dialog-action-area button:not(.suggested-action):not(.destructive-action) {
+    &:not(.suggested-action):not(.destructive-action) {
       &:hover { background-color: gtkalpha($fg_color, 0.06); }
       &:active, &:checked {
         background-color: gtkalpha($fg_color, 0.1);
         color: $fg_color;
       }
     }
   }
+
+  &.csd { // rounded bottom border styling for csd version
+    &.background {
+      border-bottom-left-radius: 3px;
+      border-bottom-right-radius: 3px;
+      border: none;
+    }
+
+    .dialog-action-area.linked:not(.vertical) > button {
+      padding: 6px 10px 8px 10px;
+
+      &, &:hover, &:active, &:checked, &:disabled {
+        @extend %middle_button;
+        &:first-child { @extend %first_button; }
+        &:last-child { @extend %last_button; }
+        &:only-child { @extend %single_button; }
+      }
+    }
+  }
 }
 
 //
@@ -3162,7 +3183,7 @@ tooltip {
   &.background {
     // background-color needs to be set this way otherwise it gets drawn twice
     // see https://bugzilla.gnome.org/show_bug.cgi?id=736155 for details.
-    background-color: lighten($osd_bg_color, 10%);
+    background-color: $osd_bg_color;
     background-clip: padding-box;
 
     label { padding: 4px; }
@@ -3390,7 +3411,7 @@ decoration {
     border-radius: 3px;
   }
   .solid-csd & {
-    border: none;
+    border: 1px solid $header_bg;
     border-radius: 0;
     margin: 0;
     background-color: $header_bg;