Fixed issues

vinceliuice · Mar 8, 2022 · 3da08b5 · 3da08b5
1 parent d0a8c9d
commit 3da08b5
Show file tree

Hide file tree

Showing 10 changed files with 87 additions and 395 deletions.
diff --git a/src/assets/gnome-shell/make-assets.sh b/src/assets/gnome-shell/make-assets.sh
@@ -124,10 +124,12 @@ for theme in '' '-purple' '-pink' '-red' '-orange' '-yellow' '-green' '-teal' '-
     fi
 
     if [[ "$type" != '' ]]; then
+      rm -rf "theme${theme}${type}"
       cp -rf "theme" "theme${theme}${type}"
       sed -i "s/#3c84f7/${theme_color_dark}/g" "theme${theme}${type}"/*.svg
       sed -i "s/#5b9bf8/${theme_color_light}/g" "theme${theme}${type}"/*.svg
     elif [[ "$theme" != '' ]]; then
+      rm -rf "theme${theme}"
       cp -rf "theme" "theme${theme}"
       sed -i "s/#3c84f7/${theme_color_dark}/g" "theme${theme}"/*.svg
       sed -i "s/#5b9bf8/${theme_color_light}/g" "theme${theme}"/*.svg

diff --git a/src/main/gtk-3.0/gtk-dark.css b/src/main/gtk-3.0/gtk-dark.css
diff --git a/src/main/gtk-3.0/gtk-light.css b/src/main/gtk-3.0/gtk-light.css
diff --git a/src/main/gtk-3.0/gtk.css b/src/main/gtk-3.0/gtk.css
diff --git a/src/main/gtk-4.0/gtk-dark.css b/src/main/gtk-4.0/gtk-dark.css
@@ -28,6 +28,7 @@ treeview.expander:disabled {
 }
 
 iconview, .view {
+  background-color: #2C2C2C;
   color: #FFFFFF;
 }
 
@@ -636,6 +637,11 @@ button.text-button.image-button image:not(:only-child) {
   box-shadow: inset 0 0 0 9999px alpha(currentColor, 0.08);
 }
 
+.linked:not(.vertical) > menubutton > button {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
 button.osd {
   padding: 12px 16px;
 }
@@ -2549,6 +2555,7 @@ radio {
   margin: 3px;
   padding: 0;
   border-radius: 9999px;
+  border: none;
   color: transparent;
   background-color: rgba(255, 255, 255, 0.12);
   transition: all 75ms cubic-bezier(0, 0, 0.2, 1), box-shadow 150ms cubic-bezier(0, 0, 0.2, 1);
@@ -3854,14 +3861,15 @@ separator.sidebar.selection-mode, .selection-mode separator.sidebar {
  * Navigation Sidebar *
  **********************/
 .navigation-sidebar {
-  padding: 6px;
+  padding: 3px 0;
   border-right: none;
 }
 
 .navigation-sidebar > row {
   min-height: 24px;
   padding: 6px;
   border-radius: 6px;
+  margin: 3px 6px;
 }
 
 .navigation-sidebar > row:hover, .navigation-sidebar > row:focus-visible:focus-within {

diff --git a/src/main/gtk-4.0/gtk-light.css b/src/main/gtk-4.0/gtk-light.css
@@ -28,6 +28,7 @@ treeview.expander:disabled {
 }
 
 iconview, .view {
+  background-color: #FFFFFF;
   color: rgba(0, 0, 0, 0.87);
 }
 
@@ -636,6 +637,11 @@ button.text-button.image-button image:not(:only-child) {
   box-shadow: inset 0 0 0 9999px alpha(currentColor, 0.08);
 }
 
+.linked:not(.vertical) > menubutton > button {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
 button.osd {
   padding: 12px 16px;
 }
@@ -2557,6 +2563,7 @@ radio {
   margin: 3px;
   padding: 0;
   border-radius: 9999px;
+  border: none;
   color: transparent;
   background-color: rgba(0, 0, 0, 0.12);
   transition: all 75ms cubic-bezier(0, 0, 0.2, 1), box-shadow 150ms cubic-bezier(0, 0, 0.2, 1);
@@ -3862,14 +3869,15 @@ separator.sidebar.selection-mode, .selection-mode separator.sidebar {
  * Navigation Sidebar *
  **********************/
 .navigation-sidebar {
-  padding: 6px;
+  padding: 3px 0;
   border-right: none;
 }
 
 .navigation-sidebar > row {
   min-height: 24px;
   padding: 6px;
   border-radius: 6px;
+  margin: 3px 6px;
 }
 
 .navigation-sidebar > row:hover, .navigation-sidebar > row:focus-visible:focus-within {

diff --git a/src/main/gtk-4.0/gtk.css b/src/main/gtk-4.0/gtk.css
@@ -28,6 +28,7 @@ treeview.expander:disabled {
 }
 
 iconview, .view {
+  background-color: #FFFFFF;
   color: rgba(0, 0, 0, 0.87);
 }
 
@@ -636,6 +637,11 @@ button.text-button.image-button image:not(:only-child) {
   box-shadow: inset 0 0 0 9999px alpha(currentColor, 0.08);
 }
 
+.linked:not(.vertical) > menubutton > button {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
 button.osd {
   padding: 12px 16px;
 }
@@ -2566,6 +2572,7 @@ radio {
   margin: 3px;
   padding: 0;
   border-radius: 9999px;
+  border: none;
   color: transparent;
   background-color: rgba(0, 0, 0, 0.12);
   transition: all 75ms cubic-bezier(0, 0, 0.2, 1), box-shadow 150ms cubic-bezier(0, 0, 0.2, 1);
@@ -3871,14 +3878,15 @@ separator.sidebar.selection-mode, .selection-mode separator.sidebar {
  * Navigation Sidebar *
  **********************/
 .navigation-sidebar {
-  padding: 6px;
+  padding: 3px 0;
   border-right: none;
 }
 
 .navigation-sidebar > row {
   min-height: 24px;
   padding: 6px;
   border-radius: 6px;
+  margin: 3px 6px;
 }
 
 .navigation-sidebar > row:hover, .navigation-sidebar > row:focus-visible:focus-within {

diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
@@ -3890,7 +3890,9 @@ button.titlebutton:not(.suggested-action):not(.destructive-action) {
     @extend %firefox_window_button;
   }
 
-  .background.csd.maximized headerbar.titlebar.default-decoration &.maximize {
+  .background.csd.maximized headerbar.titlebar.default-decoration &.maximize,
+  .background.csd.fullscreen headerbar.titlebar.default-decoration &.maximize,
+  .background.csd.tiled headerbar.titlebar.default-decoration &.maximize {
     &:hover, &:active {
       background-image: url("assets/scalable/unmaximize.svg");
     }

diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
@@ -27,7 +27,7 @@ radio:disabled,
 treeview.expander:disabled { -gtk-icon-filter: opacity(0.5); }
 
 %view, .view {
-  // background-color: $base;
+  background-color: $base;
   color: $text;
 
   // &:selected:hover { box-shadow: inset 0 0 0 9999px rgba($primary, 0.08); }
@@ -546,6 +546,11 @@ button {
     &:focus { box-shadow: inset 0 0 0 9999px $overlay-focus; }
   }
 
+  .linked:not(.vertical) > menubutton > & {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+  }
+
   // big standalone buttons like in Documents pager
   &.osd {
     padding: ($large-size - 24px) / 2 ($large-size - 16px) / 2;
@@ -2454,6 +2459,7 @@ radio {
   margin: $space-size / 2;
   padding: 0;
   border-radius: $circular-radius;
+  border: none;
   color: transparent;
   background-color: $divider;
   transition: $transition,
@@ -3529,13 +3535,14 @@ separator.sidebar {
  **********************/
 
 .navigation-sidebar {
-  padding: $space-size; //only vertical padding. horizontal row size would clip
+  padding: $space-size / 2 0; //only vertical padding. horizontal row size would clip
   border-right: none;
 
   > row {
     min-height: $small-size;
     padding: $space-size;
     border-radius: $corner-radius;
+    margin: $space-size / 2 $space-size;
 
     &:hover,
     &:focus-visible:focus-within {

diff --git a/src/sass/gtk/apps/_gnome-3.0.scss b/src/sass/gtk/apps/_gnome-3.0.scss
@@ -381,32 +381,30 @@ window.org-gnome-gedit {
 }
 
 .gedit-search-slider {
-  margin: 4px 4px 8px;
+  margin: 0 6px 10px;
+  padding: $space-size;
+  background-color: $surface;
+  border-radius: 0 0 $menu-radius $menu-radius;
 
-  .linked:not(.vertical) > entry {
-    border-radius: $corner-radius;
-    @extend %entry_raised;
+  @if $rimless == 'true' {
+    box-shadow: $shadow-z5;
+  } @else {
+    box-shadow: $shadow-z5, 0 0 0 1px $window-border;
+  }
 
+  .linked:not(.vertical) > entry {
     .gedit-search-entry-occurrences-tag {
       all: unset;
       color: $text-secondary;
     }
 
-    $buttons_width: $small-size * 2 + $space-size * 3;
-
     &:dir(ltr) {
-      margin-right: -$buttons_width;
-      padding-right: $buttons_width;
-
       .gedit-search-entry-occurrences-tag { margin-left: $space-size; }
 
       image.right { margin-right: 0; }
     }
 
     &:dir(rtl) {
-      margin-left: -$buttons_width;
-      padding-left: $buttons_width;
-
       .gedit-search-entry-occurrences-tag { margin-right: $space-size; }
 
       image.left { margin-left: 0; }
@@ -422,20 +420,6 @@ window.org-gnome-gedit {
       &:disabled { color: on($error, secondary-disabled); }
     }
   }
-
-  .linked > button {
-    border: solid $space-size transparent;
-    border-radius: $circular-radius;
-
-    @extend %button-flat-simple;
-    @extend %small-button;
-
-    &:last-child:dir(ltr),
-    &:not(:first-child):dir(rtl) { margin-left: -$space-size / 2; }
-
-    &:first-child:dir(rtl),
-    &:not(:last-child):dir(ltr) { margin-right: -$space-size / 2; }
-  }
 }
 
 frame.gedit-map-frame > border {