Fixed geary issues

vinceliuice · Dec 4, 2019 · 566dcb1 · 566dcb1
1 parent 63afa71
commit 566dcb1
Show file tree

Hide file tree

Showing 18 changed files with 202 additions and 1,164 deletions.
diff --git a/src/gtk-3.0/gtk-compact-dark-alt.css b/src/gtk-3.0/gtk-compact-dark-alt.css
diff --git a/src/gtk-3.0/gtk-compact-dark-solid-alt.css b/src/gtk-3.0/gtk-compact-dark-solid-alt.css
diff --git a/src/gtk-3.0/gtk-compact-dark-solid.css b/src/gtk-3.0/gtk-compact-dark-solid.css
diff --git a/src/gtk-3.0/gtk-compact-dark.css b/src/gtk-3.0/gtk-compact-dark.css
diff --git a/src/gtk-3.0/gtk-compact-light-alt.css b/src/gtk-3.0/gtk-compact-light-alt.css
diff --git a/src/gtk-3.0/gtk-compact-light-solid-alt.css b/src/gtk-3.0/gtk-compact-light-solid-alt.css
diff --git a/src/gtk-3.0/gtk-compact-light-solid.css b/src/gtk-3.0/gtk-compact-light-solid.css
diff --git a/src/gtk-3.0/gtk-compact-light.css b/src/gtk-3.0/gtk-compact-light.css
diff --git a/src/gtk-3.0/gtk-dark-alt.css b/src/gtk-3.0/gtk-dark-alt.css
diff --git a/src/gtk-3.0/gtk-dark-solid-alt.css b/src/gtk-3.0/gtk-dark-solid-alt.css
diff --git a/src/gtk-3.0/gtk-dark-solid.css b/src/gtk-3.0/gtk-dark-solid.css
diff --git a/src/gtk-3.0/gtk-dark.css b/src/gtk-3.0/gtk-dark.css
diff --git a/src/gtk-3.0/gtk-light-alt.css b/src/gtk-3.0/gtk-light-alt.css
diff --git a/src/gtk-3.0/gtk-light-solid-alt.css b/src/gtk-3.0/gtk-light-solid-alt.css
diff --git a/src/gtk-3.0/gtk-light-solid.css b/src/gtk-3.0/gtk-light-solid.css
diff --git a/src/gtk-3.0/gtk-light.css b/src/gtk-3.0/gtk-light.css
diff --git a/src/gtk-3.0/sass/_applications.scss b/src/gtk-3.0/sass/_applications.scss
@@ -1956,14 +1956,16 @@ window#ValaPanel.background {
     min-width: 22px;
   }
 
-  > box.linked.raised.horizontal > button.image-button {
-    &, &:hover, &:active, &:checked, &:disabled {
-      @extend %linked_header;
-    }
+  > box.linked.raised.horizontal > button {
+    &, &.image-button, &.popup.toggle {
+      &, &:hover, &:active, &:checked, &:disabled {
+        @extend %linked_header;
+      }
 
-    &:last-child {
-      border-radius: 0 $bt_radius $bt_radius 0;
-      border-left: none;
+      &:last-child {
+        border-radius: 0 $bt_radius $bt_radius 0;
+        border-left: none;
+      }
     }
   }
 }
@@ -2655,30 +2657,6 @@ headerbar.titlebar {
     + button.flat.image-button.toggle { margin-right: if($variant=='light', -6px, -5px); }
   }
 
-  .linked.raised {
-    > button.toggle {
-      @extend %outline_dashed;
-      @include button(header-normal);
-      &:hover { @include button(header-hover); }
-      &:active { @include button(header-active); }
-      &:checked { @include button(header-checked); }
-      &:disabled { color: transparentize($header_fg, 0.4); }
-      &:backdrop { opacity: 0.7; background-image: none; box-shadow: none; }
-      &, &:hover, &:active, &:checked, &:disabled {
-        @extend %linked;
-        border-left: 1px solid $header_button_border;
-      }
-    }
-
-    // fixed ugly border color
-    > button.toggle:not(:last-child) {
-      &:active { @if $variant=='light' { box-shadow: 1px 0 $header_button_active_bg; }}
-      &:checked { @if $variant=='light' { box-shadow: 1px 0 $header_button_checked_bg; }}
-    }
-
-    @include pathbar_linking_rules($button_rules: 'header');
-  }
-
   > grid.linked.horizontal.format-bar {
     background-image: image($header_bg); // Hide Code header format-bar
   }

diff --git a/src/gtk-3.0/sass/_common.scss b/src/gtk-3.0/sass/_common.scss
@@ -1606,7 +1606,7 @@ window.background > box.vertical > headerbar:not(.titlebar) { // reset headerbar
     }
   }
 
-  .linked.raised:not(.vertical):not(.path-bar) > button.image-button {
+  .linked.raised:not(.vertical):not(.path-bar) > button:not(.popup.toggle) {
     @extend %outline_dashed;
 
     &, &:hover, &:active, &:checked, &:disabled {