HC: sync dualogs with Adwaita

2 files changed, 235 insertions, 90 deletions

diff --git a/themes/HighContrast/gtk-3.0/_common.scss b/themes/HighContrast/gtk-3.0/_common.scss
index d938c5bc..058dab0b 100644
--- a/themes/HighContrast/gtk-3.0/_common.scss
+++ b/themes/HighContrast/gtk-3.0/_common.scss
@@ -1650,53 +1650,101 @@ GtkCalendar {
  * Dialogs *
  ***********/
 
-.message-dialog {
-  // no spacing in message dialogs and the likes
-  -GtkDialog-button-spacing: 0;
-}
-
-GtkMessageDialog .titlebar {
-  border-style: none;
-  box-shadow: inset 0 1px $borders_edge;
+.message-dialog .dialog-action-area .button {
+  padding: 8px;
 }
 
-.dialog-action-area.linked {
-  & .button {
-    padding: 6px;
-    border-radius: 0;
-    @include button(normal, $noedge: true);
-    @extend %middle_button;
-    &:hover {
-      @include button(hover, $noedge: true);
+.message-dialog { // Message Dialog styling
+  -GtkDialog-button-spacing: 0;
+  .titlebar {
+    border-style: none;
+    box-shadow: inset 0 1px $borders_edge;
+  }
+  &.csd { // rounded bottom border styling for csd version
+    // bigger radius for better antialiasing
+    border-bottom-left-radius: 9px;
+    border-bottom-right-radius: 9px;
+    .dialog-action-area .button {
+      padding: 12px;
+      border-radius: 0;
+      @include button(normal, $noedge: true);
       @extend %middle_button;
+      &:hover {
+        @include button(hover, $noedge: true);
+        @extend %middle_button;
+      }
+      &:active {
+        @include button(active, $noedge: true);
+        @extend %middle_button;
+      }
+      &:insensitive {
+        @include button(insensitive, $noedge: true);
+        @extend %middle_button;
+      }
+      &:backdrop {
+        @include button(backdrop, $noedge: true);
+        @extend %middle_button;
+      }
+      &:backdrop:insensitive {
+        @include button(backdrop-insensitive, $noedge: true);
+        @extend %middle_button;
+      }
+      @each $b_type, $b_color in (suggested-action, $selected_bg_color),
+                                 (destructive-action, $destructive_color) {
+        &.#{$b_type} {
+          @include button(normal, $b_color, white, $noedge: true);
+          @extend %middle_button;
+          &:hover {
+            @include button(hover, $b_color, white, $noedge: true);
+            @extend %middle_button;
+          }
+          &:active {
+            @include button(active, $b_color, white, $noedge: true);
+            @extend %middle_button;
+          }
+          &:backdrop {
+            @include button(backdrop, $b_color, white);
+            @extend %middle_button;
+            &:insensitive {
+              @include button(backdrop-insensitive);
+              @extend %middle_button;
+            }
+          }
+          &:insensitive {
+            @include button(insensitive);
+            @extend %middle_button;
+          }
+        }
+      }
+      &:first-child{ @extend %first_button; }
+      &:last-child { @extend %last_button; }
     }
-    &:active {
-      @include button(active, $noedge: true);
-      @extend %middle_button;
+    %middle_button {
+      border-right-style: none;
+      border-bottom-style: none;
     }
-    &:insensitive {
-      @include button(insensitive, $noedge: true);
-      @extend %middle_button;
+    %last_button { border-bottom-right-radius: 7px; }
+    %first_button {
+      border-left-style: none;
+      border-bottom-left-radius: 7px;
     }
+  }
+}
+
+GtkFileChooserDialog {
+  .search-bar {
+    background-color: $base_color;
+    border-color: $bg_color;
+    box-shadow: none;
     &:backdrop {
-      @include button(backdrop, $noedge: true);
-      @extend %middle_button;
-    }
-    &:backdrop:insensitive {
-      @include button(backdrop-insensitive, $noedge: true);
-      @extend %middle_button;
+      background-color: $backdrop_base_color;
+      border-color: $backdrop_bg_color;
     }
-    &:first-child{ @extend %first_button; }
   }
-  %middle_button {
-    border-style: solid none none solid;
+  .dialog-action-box {
+    border-top: 1px solid $borders_color;
+    &:backdrop { border-top-color: $backdrop_borders_color; }
   }
-  %first_button { border-style: solid none none none; }
-}
-
-GtkFileChooserDialog .dialog-action-box {
-  border-top: 1px solid $borders_color;
-  &:backdrop { border-top-color: $backdrop_borders_color; }
 }
 
 /***********
diff --git a/themes/HighContrast/gtk-3.0/gtk.css b/themes/HighContrast/gtk-3.0/gtk.css
index b923be55..f68f61ff 100644
--- a/themes/HighContrast/gtk-3.0/gtk.css
+++ b/themes/HighContrast/gtk-3.0/gtk.css
@@ -1727,61 +1727,158 @@ GtkCalendar {
 /***********
  * Dialogs *
  ***********/
+.message-dialog .dialog-action-area .button {
+  padding: 8px; }
+
 .message-dialog {
   -GtkDialog-button-spacing: 0; }
-
-GtkMessageDialog .titlebar {
-  border-style: none;
-  box-shadow: inset 0 1px white; }
-
-.dialog-action-area.linked .button {
-  padding: 6px;
-  border-radius: 0;
-  border-width: 1px;
-  border-style: solid;
-  color: black;
-  background-image: linear-gradient(to bottom, white, white 40%, #f2f2f2);
-  border-color: #7f7f7f; }
-  .dialog-action-area.linked .button:hover {
-    border-width: 1px;
-    border-style: solid;
-    color: black;
-    border-color: #7f7f7f;
-    background-image: linear-gradient(to bottom, white, white 40%, white); }
-  .dialog-action-area.linked .button:active {
-    border-width: 1px;
-    border-style: solid;
-    color: black;
-    border-color: #7f7f7f;
-    background-image: linear-gradient(to bottom, #4d4d4d);
-    color: white; }
-  .dialog-action-area.linked .button:insensitive {
-    border-width: 1px;
-    border-style: solid;
-    color: #7f7f7f;
-    border-color: #7f7f7f;
-    background-image: linear-gradient(to bottom, white);
-    text-shadow: none;
-    icon-shadow: none; }
-  .dialog-action-area.linked .button:backdrop {
-    border-width: 1px;
-    border-style: solid;
-    color: #191919;
-    border-color: #8b8b8b;
-    background-image: linear-gradient(to bottom, white);
-    text-shadow: none;
-    icon-shadow: none; }
-  .dialog-action-area.linked .button:backdrop:insensitive {
-    border-width: 1px;
-    border-style: solid;
-    color: white;
-    border-color: #8b8b8b;
-    background-image: linear-gradient(to bottom, white); }
-.dialog-action-area.linked .button, .dialog-action-area.linked .button:hover, .dialog-action-area.linked .button:active, .dialog-action-area.linked .button:insensitive, .dialog-action-area.linked .button:backdrop, .dialog-action-area.linked .button:backdrop:insensitive {
-  border-style: solid none none solid; }
-.dialog-action-area.linked .button:first-child {
-  border-style: solid none none none; }
-
+  .message-dialog .titlebar {
+    border-style: none;
+    box-shadow: inset 0 1px white; }
+  .message-dialog.csd {
+    border-bottom-left-radius: 9px;
+    border-bottom-right-radius: 9px; }
+    .message-dialog.csd .dialog-action-area .button {
+      padding: 12px;
+      border-radius: 0;
+      border-width: 1px;
+      border-style: solid;
+      color: black;
+      background-image: linear-gradient(to bottom, white, white 40%, #f2f2f2);
+      border-color: #7f7f7f; }
+      .message-dialog.csd .dialog-action-area .button:hover {
+        border-width: 1px;
+        border-style: solid;
+        color: black;
+        border-color: #7f7f7f;
+        background-image: linear-gradient(to bottom, white, white 40%, white); }
+      .message-dialog.csd .dialog-action-area .button:active {
+        border-width: 1px;
+        border-style: solid;
+        color: black;
+        border-color: #7f7f7f;
+        background-image: linear-gradient(to bottom, #4d4d4d);
+        color: white; }
+      .message-dialog.csd .dialog-action-area .button:insensitive {
+        border-width: 1px;
+        border-style: solid;
+        color: #7f7f7f;
+        border-color: #7f7f7f;
+        background-image: linear-gradient(to bottom, white);
+        text-shadow: none;
+        icon-shadow: none; }
+      .message-dialog.csd .dialog-action-area .button:backdrop {
+        border-width: 1px;
+        border-style: solid;
+        color: #191919;
+        border-color: #8b8b8b;
+        background-image: linear-gradient(to bottom, white);
+        text-shadow: none;
+        icon-shadow: none; }
+      .message-dialog.csd .dialog-action-area .button:backdrop:insensitive {
+        border-width: 1px;
+        border-style: solid;
+        color: white;
+        border-color: #8b8b8b;
+        background-image: linear-gradient(to bottom, white); }
+      .message-dialog.csd .dialog-action-area .button.suggested-action {
+        border-width: 1px;
+        border-style: solid;
+        color: white;
+        background-image: linear-gradient(to bottom, #0d0d0d, black 40%, black);
+        border-color: black; }
+        .message-dialog.csd .dialog-action-area .button.suggested-action:hover {
+          border-width: 1px;
+          border-style: solid;
+          color: white;
+          border-color: black;
+          background-image: linear-gradient(to bottom, #242424, #0a0a0a 40%, black); }
+        .message-dialog.csd .dialog-action-area .button.suggested-action:active {
+          border-width: 1px;
+          border-style: solid;
+          color: white;
+          border-color: black;
+          background-image: linear-gradient(to bottom, white);
+          color: black; }
+        .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop {
+          border-width: 1px;
+          border-style: solid;
+          color: white;
+          border-color: black;
+          background-image: linear-gradient(to bottom, black);
+          text-shadow: none;
+          icon-shadow: none; }
+          .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive {
+            border-width: 1px;
+            border-style: solid;
+            color: white;
+            border-color: #8b8b8b;
+            background-image: linear-gradient(to bottom, white); }
+        .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive {
+          border-width: 1px;
+          border-style: solid;
+          color: #7f7f7f;
+          border-color: #7f7f7f;
+          background-image: linear-gradient(to bottom, white);
+          text-shadow: none;
+          icon-shadow: none; }
+      .message-dialog.csd .dialog-action-area .button.destructive-action {
+        border-width: 1px;
+        border-style: solid;
+        color: white;
+        background-image: linear-gradient(to bottom, #f14141, #ef2929 40%, #ed1212);
+        border-color: #8e0b0b; }
+        .message-dialog.csd .dialog-action-area .button.destructive-action:hover {
+          border-width: 1px;
+          border-style: solid;
+          color: white;
+          border-color: #8e0b0b;
+          background-image: linear-gradient(to bottom, #f46b6b, #f03c3c 40%, #ef2929); }
+        .message-dialog.csd .dialog-action-area .button.destructive-action:active {
+          border-width: 1px;
+          border-style: solid;
+          color: white;
+          border-color: #8e0b0b;
+          background-image: linear-gradient(to bottom, white);
+          color: #ef2929; }
+        .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop {
+          border-width: 1px;
+          border-style: solid;
+          color: white;
+          border-color: #ef2929;
+          background-image: linear-gradient(to bottom, #ef2929);
+          text-shadow: none;
+          icon-shadow: none; }
+          .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive {
+            border-width: 1px;
+            border-style: solid;
+            color: white;
+            border-color: #8b8b8b;
+            background-image: linear-gradient(to bottom, white); }
+        .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive {
+          border-width: 1px;
+          border-style: solid;
+          color: #7f7f7f;
+          border-color: #7f7f7f;
+          background-image: linear-gradient(to bottom, white);
+          text-shadow: none;
+          icon-shadow: none; }
+    .message-dialog.csd .dialog-action-area .button, .message-dialog.csd .dialog-action-area .button:hover, .message-dialog.csd .dialog-action-area .button:active, .message-dialog.csd .dialog-action-area .button:insensitive, .message-dialog.csd .dialog-action-area .button:backdrop, .message-dialog.csd .dialog-action-area .button:backdrop:insensitive, .message-dialog.csd .dialog-action-area .button.suggested-action, .message-dialog.csd .dialog-action-area .button.suggested-action:hover, .message-dialog.csd .dialog-action-area .button.suggested-action:active, .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop, .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive, .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive, .message-dialog.csd .dialog-action-area .button.destructive-action, .message-dialog.csd .dialog-action-area .button.destructive-action:hover, .message-dialog.csd .dialog-action-area .button.destructive-action:active, .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop, .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive, .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive {
+      border-right-style: none;
+      border-bottom-style: none; }
+    .message-dialog.csd .dialog-action-area .button:last-child {
+      border-bottom-right-radius: 7px; }
+    .message-dialog.csd .dialog-action-area .button:first-child {
+      border-left-style: none;
+      border-bottom-left-radius: 7px; }
+
+GtkFileChooserDialog .search-bar {
+  background-color: white;
+  border-color: white;
+  box-shadow: none; }
+  GtkFileChooserDialog .search-bar:backdrop {
+    background-color: white;
+    border-color: white; }
 GtkFileChooserDialog .dialog-action-box {
   border-top: 1px solid #7f7f7f; }
   GtkFileChooserDialog .dialog-action-box:backdrop {