Fixed gnome 45 issues

vinceliuice · Oct 22, 2023 · b4e7ad0 · b4e7ad0
1 parent c926f50
commit b4e7ad0
Show file tree

Hide file tree

Showing 6 changed files with 91 additions and 121 deletions.
diff --git a/src/sass/gnome-shell/common/_calendar.scss b/src/sass/gnome-shell/common/_calendar.scss
@@ -113,6 +113,7 @@
   .calendar-change-month-forward {
     padding: 0 0 !important;
     margin: ($base_padding / 2) 0 !important;
+    box-shadow: none !important;
 
     StIcon {
       icon-size: $base_icon_size;
@@ -145,13 +146,14 @@
 
     &:hover, &:focus {
       background-color: $divider;
-      box-shadow: none;
+      box-shadow: none !important;
     }
 
     &:active, &:selected {
       color: $text;
       background-color: $track;
       border-color: transparent; //avoid jumparound due to today
+      box-shadow: none !important;
     }
 
     &.calendar-day-heading {  //day of week heading
@@ -197,6 +199,7 @@
     &:hover, &:focus {
       background-color: overlay($base, hover);
       color: $text !important;
+      box-shadow: none !important;
     }
 
     &:active {
@@ -207,6 +210,7 @@
     &:selected {
       background-color: $primary;
       color: on($primary) !important;
+      box-shadow: none !important;
 
       &:hover, &:focus {
         background-color: lighten($primary, 8%);
@@ -225,9 +229,10 @@
     }
   }
 
+  .calendar-other-month,
   .calendar-other-month-day {
-    color: $text-secondary-disabled;
-    opacity: 0.5;
+    color: $text-secondary-disabled !important;
+    opacity: 1;
   }
 
   .calendar-week-number {

diff --git a/src/sass/gnome-shell/common/_popovers.scss b/src/sass/gnome-shell/common/_popovers.scss
@@ -163,8 +163,8 @@
     // "Open Windows" label
     > StLabel {
       @extend %caption_heading;
-      &:ltr {margin-right: $base_margin * 2;}
-      &:rtl {margin-left: $base_margin * 2;}
+      &:ltr { margin-right: $base_margin * 2; }
+      &:rtl { margin-left: $base_margin * 2; }
     }
   }
 }
diff --git a/src/sass/gnome-shell/widgets-42-0/_popovers.scss b/src/sass/gnome-shell/widgets-42-0/_popovers.scss
@@ -1,10 +1,10 @@
 
 .popup-menu {
   .popup-menu-item {
-    padding: $base_padding $base_padding * 2;
+    padding: $base_padding $base_padding * 1.5;
 
-    &:ltr { padding-right: $base_padding * 1.5 !important; padding-left: 0 !important; }
-    &:rtl { padding-right: 0 !important; padding-left: $base_padding * 1.5 !important; }
+    &:ltr { padding-right: $base_padding * 1.5 !important; padding-left: $base_padding !important; }
+    &:rtl { padding-right: $base_padding !important; padding-left: $base_padding * 1.5 !important; }
   }
 }
 

diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
@@ -1478,6 +1478,8 @@ searchbar > revealer > box {
   &:checked {
     @include button(checked);
     box-shadow: 0 2px 3px -1px rgba(black, 0.05);
+
+    &:focus { color: on($primary); }
   }
 
   &:disabled {
@@ -1490,7 +1492,11 @@ searchbar > revealer > box {
 
     &:focus, &:hover, &:active { color: $titlebar-text-disabled; }
 
-    &:checked { color: on($primary, disabled); }
+    &:checked {
+      color: on($primary, disabled);
+
+      &:focus { color: on($primary, disabled); }
+    }
 
     &:disabled { color: $divider; }
   }
@@ -4296,9 +4302,11 @@ window.messagedialog {
     border-spacing: 10px;
   }
 
-  .response-area > box > button {
+  .response-area button {
     @extend %button-flat;
     @extend %dialog_action_button;
+    margin: 0;
+    border-radius: 0;
 
     &.suggested {
       color: $primary;
@@ -4307,29 +4315,13 @@ window.messagedialog {
     &.destructive {
       color: $destructive;
     }
-  }
-
-  &.csd:not(.solid-csd) {
-    border-radius: $window-radius;
-
-    .response-area {
-      > box.horizontal > button {
-        margin: 0;
-
-        &:first-child {
-          margin-left: 0;
-        }
 
-        &:last-child {
-          margin-right: 0;
-        }
-      }
+    &:first-child {
+      margin-left: 0;
+    }
 
-      > box.vertical > button {
-        margin-top: 0;
-        margin-bottom: 0;
-        border-radius: 0;
-      }
+    &:last-child {
+      margin-right: 0;
     }
   }
 }
@@ -4398,6 +4390,7 @@ stacksidebar {
   separator.horizontal { @extend %hide_separators; }
 
   flap > &.sidebar,
+  .sidebar-pane &.sidebar,
   leaflet.unfolded > box > &.sidebar {
     &:dir(ltr) {
       border-right: none;

diff --git a/src/sass/gtk/_drawing-4.0.scss b/src/sass/gtk/_drawing-4.0.scss
@@ -266,7 +266,7 @@
 }
 
 
-@mixin undershoot($p, $c: $frame, $neighbor: false) {
+@mixin undershoot($p, $c: $frame, $neighbor: false, $style: 'default') {
 //
 // undershoot
 //
@@ -299,7 +299,12 @@
   }
 
   #{$_selector} undershoot.#{$p} {
-    box-shadow: inset $_border_pos $c;
+    @if $style == 'compact' {
+      box-shadow: inset $_border_pos $c;
+    } @else {
+      box-shadow: none;
+    }
+
     background: linear-gradient(to $_direction, gtkalpha($c, .75), transparent 4px);
   }
 }

diff --git a/src/sass/gtk/apps/_libadwaita.scss b/src/sass/gtk/apps/_libadwaita.scss
@@ -576,9 +576,15 @@ overlay-split-view {
   @include transition-shadows($frame);
 }
 
-// Sidebar
-.unfolded stacksidebar.sidebar { border: none; }
+toolbarview.undershoot-top scrolledwindow {
+  @include undershoot(top);
+}
+
+toolbarview.undershoot-bottom scrolledwindow {
+  @include undershoot(bottom);
+}
 
+// Sidebar
 .sidebar-pane {
   background-color: $base-alt;
   color: $text;
@@ -599,41 +605,6 @@ overlay-split-view {
     border: none;
   }
 
-  toolbarview.undershoot-top scrolledwindow {
-    @include undershoot(top);
-  }
-
-  toolbarview.undershoot-bottom scrolledwindow {
-    @include undershoot(bottom);
-  }
-
-  scrolledwindow {
-    &.undershoot-top {
-      @include undershoot(top);
-    }
-
-    &.undershoot-bottom {
-      @include undershoot(bottom)
-    }
-
-    &.undershoot-start {
-      &:dir(ltr) { @include undershoot(left); }
-      &:dir(rtl) { @include undershoot(right); }
-    }
-
-    &.undershoot-end {
-      &:dir(ltr) { @include undershoot(right); }
-      &:dir(rtl) { @include undershoot(left); }
-    }
-  }
-
-  flap,
-  leaflet,
-  navigation-view,
-  overlay-split-view {
-    @include transition-shadows($frame);
-  }
-
   banner > revealer > widget {
     background-color: gtkmix($primary, $base-alt, 30%);
     color: $text;
@@ -642,20 +613,6 @@ overlay-split-view {
       background-color: gtkmix($primary, $base-alt, 30%);
     }
   }
-
-  &:dir(ltr), &.end:dir(rtl) {
-    &, banner > revealer > widget {
-      box-shadow: none;
-      border-right: 1px solid $window-border;
-    }
-  }
-
-  &:dir(rtl), &.end:dir(ltr) {
-    &, banner > revealer > widget {
-      box-shadow: none;
-      border-left: 1px solid $window-border;
-    }
-  }
 }
 
 .content-pane {
@@ -675,50 +632,26 @@ overlay-split-view {
     transition: background-color $duration $ease-out;
   }
 
-  toolbarview.undershoot-top scrolledwindow {
-    @include undershoot(top);
-  }
-
-  toolbarview.undershoot-bottom scrolledwindow {
-    @include undershoot(bottom);
-  }
-
-  scrolledwindow {
-    &.undershoot-top {
-      @include undershoot(top);
-    }
-
-    &.undershoot-bottom {
-      @include undershoot(bottom)
-    }
-
-    &.undershoot-start {
-      &:dir(ltr) { @include undershoot(left); }
-      &:dir(rtl) { @include undershoot(right); }
-    }
+  banner > revealer > widget {
+    background-color: gtkmix($primary, $base, 30%);
+    color: $text;
 
-    &.undershoot-end {
-      &:dir(ltr) { @include undershoot(right); }
-      &:dir(rtl) { @include undershoot(left); }
+    &:backdrop {
+      background-color: gtkmix($primary, $base, 30%);
     }
   }
+}
 
+.sidebar-pane,
+.content-pane .sidebar-pane,
+.sidebar-pane .content-pane {
   flap,
   leaflet,
   navigation-view,
   overlay-split-view {
     @include transition-shadows($frame);
   }
 
-  banner > revealer > widget {
-    background-color: gtkmix($primary, $base, 30%);
-    color: $text;
-
-    &:backdrop {
-      background-color: gtkmix($primary, $base, 30%);
-    }
-  }
-
   &:dir(ltr), &.end:dir(rtl) {
     &, banner > revealer > widget {
       box-shadow: none;
@@ -739,16 +672,50 @@ overlay-split-view {
   color: inherit;
 }
 
-// Gnome >= 45.0
-.top-bar {
+.sidebar-pane, .content-pane {
   headerbar {
     &, &:backdrop {
       background-color: transparent;
       box-shadow: inset 0 1px highlight($titlebar);
     }
   }
+
+  toolbarview.undershoot-top scrolledwindow {
+    @include undershoot(top, $style: 'compact');
+  }
+
+  toolbarview.undershoot-bottom scrolledwindow {
+    @include undershoot(bottom, $style: 'compact');
+  }
+
+  scrolledwindow {
+    &.undershoot-top {
+      @include undershoot(top, $style: 'compact');
+    }
+
+    &.undershoot-bottom {
+      @include undershoot(bottom, $style: 'compact');
+    }
+
+    &.undershoot-start {
+      &:dir(ltr) { @include undershoot(left, $style: 'compact'); }
+      &:dir(rtl) { @include undershoot(right, $style: 'compact'); }
+    }
+
+    &.undershoot-end {
+      &:dir(ltr) { @include undershoot(right, $style: 'compact'); }
+      &:dir(rtl) { @include undershoot(left, $style: 'compact'); }
+    }
+  }
 }
 
-.collapse-spacing {
-  padding: 0;
+// Gnome >= 45.0
+.top-bar {
+  background: none;
+  box-shadow: none;
+  border: none;
+
+  .collapse-spacing {
+    padding: 0;
+  }
 }