update

vinceliuice · Oct 4, 2024 · 20e8dfe · 20e8dfe
1 parent 14254d9
commit 20e8dfe
Show file tree

Hide file tree

Showing 34 changed files with 483 additions and 226 deletions.
diff --git a/install.sh b/install.sh
@@ -751,16 +751,20 @@ clean_theme() {
     for theme in "${THEME_VARIANTS[@]}"; do
       for color in '-light' '-dark'; do
         for size in "${SIZE_VARIANTS[@]}"; do
-          clean "${dest:-$DEST_DIR}" "${_name:-$THEME_NAME}" "$round" "$theme" "$color" "$size"
+          clean "${dest:-$DEST_DIR}" "${name:-$THEME_NAME}" "$round" "$theme" "$color" "$size"
         done
       done
     done
   done
 
+  if [[ "$DEST_DIR" == "$HOME/.themes" ]]; then
+    local dest="$HOME/.local/share/themes"
+  fi
+
   for theme in "${THEME_VARIANTS[@]}"; do
     for color in "${COLOR_VARIANTS[@]}"; do
       for size in "${SIZE_VARIANTS[@]}"; do
-        uninstall "${dest:-$HOME/.local/share/themes}" "${_name:-$THEME_NAME}" "$theme" "$color" "$size"
+        uninstall "${dest}" "${name:-$THEME_NAME}" "$theme" "$color" "$size"
       done
     done
   done
@@ -770,7 +774,7 @@ uninstall_theme() {
   for theme in "${themes[@]}"; do
     for color in "${colors[@]}"; do
       for size in "${sizes[@]}"; do
-        uninstall "${dest:-$DEST_DIR}" "${_name:-$THEME_NAME}" "$theme" "$color" "$size"
+        uninstall "${dest:-$DEST_DIR}" "${name:-$THEME_NAME}" "$theme" "$color" "$size"
       done
     done
   done
@@ -780,7 +784,7 @@ install_theme() {
   for theme in "${themes[@]}"; do
     for color in "${colors[@]}"; do
       for size in "${sizes[@]}"; do
-        install "${dest:-$DEST_DIR}" "${_name:-$THEME_NAME}" "$theme" "$color" "$size" "$icon"
+        install "${dest:-$DEST_DIR}" "${name:-$THEME_NAME}" "$theme" "$color" "$size" "$icon"
       done
     done
   done
@@ -790,7 +794,7 @@ link_theme() {
   for theme in "${themes[@]}"; do
     for color in "${lcolors[@]}"; do
       for size in "${sizes[0]}"; do
-        link_libadwaita "${dest:-$DEST_DIR}" "${_name:-$THEME_NAME}" "$theme" "$color" "$size"
+        link_libadwaita "${dest:-$DEST_DIR}" "${name:-$THEME_NAME}" "$theme" "$color" "$size"
       done
     done
   done

diff --git a/src/_sass/gtk/apps/_gnome-3.22.scss b/src/_sass/gtk/apps/_gnome-3.22.scss
@@ -1686,10 +1686,14 @@ preferencesgroup, .geary-accounts-editor-pane {
   list {
     @extend %circular_list;
 
-    row.activatable { @extend %circular_row; }
+    > row.activatable {
+      @extend %circular_row;
+    }
   }
 }
 
+.geary-settings > box > box { margin: $space-size $space-size * 2; }
+
 .geary-accounts-editor-pane {
   frame:not(.geary-signature) > border,
   scrolledwindow.frame { border: none; }

diff --git a/src/_sass/gtk/apps/_nemo.scss b/src/_sass/gtk/apps/_nemo.scss
@@ -11,29 +11,32 @@
   .primary-toolbar {
     background-color: $titlebar;
     border-bottom: 1px solid $divider;
-    padding: $space-size ($space-size - 2px);
+    padding: $space-size $space-size - 2px;
 
     &:backdrop { background-color: $titlebar-backdrop; }
 
     // FIXME: workaround for wrong size allocation of Nemo
     entry {
       @extend %titlebar-entry;
+      min-height: 20px;
       margin: 0 2px;
     }
 
     button:not(.text-button):not(.suggested-action):not(.destructive-action) {
       @extend %titlebar-button;
       margin: 0 2px;
       border-radius: $corner-radius;
-      padding: ($medium-size - 26px) / 2 ($medium-size - 16px) / 2;
+      min-height: 24px;
+      min-width: 24px;
+      padding: $space-size / 2;
     }
 
     // instead of .path-bar button
     button.text-button {
       padding-left: 8px;
       padding-right: 8px;
       color: $titlebar-text-secondary;
-      margin: 0 0;
+      margin: 0;
 
       &:hover, &:active, &:checked { color: $titlebar-text; }
 

diff --git a/src/gnome-shell/sass/widgets/_panel.scss b/src/gnome-shell/sass/widgets/_panel.scss
@@ -176,15 +176,21 @@ $panel_transition_duration: 250ms; // same as the overview transition duration
     }
 
     // .panel-status-indicators-box .system-status-icon,
-    .panel-status-menu-box .system-status-icon { margin: 0 0; }
+    .panel-status-menu-box .system-status-icon { margin: 0; }
     .panel-status-menu-box StLabel { padding: 0 0 0 $container_padding / 2; }
 
-    .appindicator-trayicons-box { margin: 0 $container_padding; }
-
-    .panel-status-indicators-box,
     .panel-status-menu-box,
-    .power-status.panel-status-indicators-box { // spacing between power icon and (optional) percentage label
-      spacing: 2px;
+    .panel-status-indicators-box { // spacing between power icon and (optional) percentage label
+      spacing: $container_padding / 2;
+    }
+
+    .appindicator-trayicons-box,
+    .panel-status-indicators-box.appindicator-box {
+      margin: 0 $container_padding;
+    }
+
+    .clipboard-indicator-icon {
+      margin: 0 $container_padding;
     }
 
     // app menu icon
@@ -281,11 +287,17 @@ $panel_transition_duration: 250ms; // same as the overview transition duration
 
   Gjs_ui_panel_AggregateMenu.panel-button {
     .system-status-icon {
-      margin: 0 0 !important;
+      margin: 0 !important;
       padding: $container_padding !important;
     }
   }
 
+  Gjs_kimpanel_kde_org_indicator_KimIndicator.panel-button {
+    .panel-status-menu-box {
+      margin: 0 $container_padding;
+    }
+  }
+
   @if $panel_style == 'float' {
     Gjs_ArcMenu_ApplicationsButton.panel-button,
     Gjs_arcmenu_arcmenu_com_menuButton_ArcMenu_MenuButton.panel-button,

diff --git a/src/gnome-shell/shell-40-0/gnome-shell-Dark-compact.css b/src/gnome-shell/shell-40-0/gnome-shell-Dark-compact.css
@@ -2027,21 +2027,25 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel .panel-button .panel-status-menu-box .system-status-icon {
-  margin: 0 0;
+  margin: 0;
 }
 
 #panel .panel-button .panel-status-menu-box StLabel {
   padding: 0 0 0 2px;
 }
 
-#panel .panel-button .appindicator-trayicons-box {
+#panel .panel-button .panel-status-menu-box,
+#panel .panel-button .panel-status-indicators-box {
+  spacing: 2px;
+}
+
+#panel .panel-button .appindicator-trayicons-box,
+#panel .panel-button .panel-status-indicators-box.appindicator-box {
   margin: 0 4px;
 }
 
-#panel .panel-button .panel-status-indicators-box,
-#panel .panel-button .panel-status-menu-box,
-#panel .panel-button .power-status.panel-status-indicators-box {
-  spacing: 2px;
+#panel .panel-button .clipboard-indicator-icon {
+  margin: 0 4px;
 }
 
 #panel .panel-button .app-menu-icon {
@@ -2100,10 +2104,14 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel Gjs_ui_panel_AggregateMenu.panel-button .system-status-icon {
-  margin: 0 0 !important;
+  margin: 0 !important;
   padding: 4px !important;
 }
 
+#panel Gjs_kimpanel_kde_org_indicator_KimIndicator.panel-button .panel-status-menu-box {
+  margin: 0 4px;
+}
+
 #panel .screencast-indicator,
 #panel .remote-access-indicator {
   color: #FF6D00;

diff --git a/src/gnome-shell/shell-40-0/gnome-shell-Dark.css b/src/gnome-shell/shell-40-0/gnome-shell-Dark.css
@@ -2027,21 +2027,25 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel .panel-button .panel-status-menu-box .system-status-icon {
-  margin: 0 0;
+  margin: 0;
 }
 
 #panel .panel-button .panel-status-menu-box StLabel {
   padding: 0 0 0 3px;
 }
 
-#panel .panel-button .appindicator-trayicons-box {
+#panel .panel-button .panel-status-menu-box,
+#panel .panel-button .panel-status-indicators-box {
+  spacing: 3px;
+}
+
+#panel .panel-button .appindicator-trayicons-box,
+#panel .panel-button .panel-status-indicators-box.appindicator-box {
   margin: 0 6px;
 }
 
-#panel .panel-button .panel-status-indicators-box,
-#panel .panel-button .panel-status-menu-box,
-#panel .panel-button .power-status.panel-status-indicators-box {
-  spacing: 2px;
+#panel .panel-button .clipboard-indicator-icon {
+  margin: 0 6px;
 }
 
 #panel .panel-button .app-menu-icon {
@@ -2100,10 +2104,14 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel Gjs_ui_panel_AggregateMenu.panel-button .system-status-icon {
-  margin: 0 0 !important;
+  margin: 0 !important;
   padding: 6px !important;
 }
 
+#panel Gjs_kimpanel_kde_org_indicator_KimIndicator.panel-button .panel-status-menu-box {
+  margin: 0 6px;
+}
+
 #panel .screencast-indicator,
 #panel .remote-access-indicator {
   color: #FF6D00;

diff --git a/src/gnome-shell/shell-40-0/gnome-shell-Light-compact.css b/src/gnome-shell/shell-40-0/gnome-shell-Light-compact.css
@@ -2027,21 +2027,25 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel .panel-button .panel-status-menu-box .system-status-icon {
-  margin: 0 0;
+  margin: 0;
 }
 
 #panel .panel-button .panel-status-menu-box StLabel {
   padding: 0 0 0 2px;
 }
 
-#panel .panel-button .appindicator-trayicons-box {
+#panel .panel-button .panel-status-menu-box,
+#panel .panel-button .panel-status-indicators-box {
+  spacing: 2px;
+}
+
+#panel .panel-button .appindicator-trayicons-box,
+#panel .panel-button .panel-status-indicators-box.appindicator-box {
   margin: 0 4px;
 }
 
-#panel .panel-button .panel-status-indicators-box,
-#panel .panel-button .panel-status-menu-box,
-#panel .panel-button .power-status.panel-status-indicators-box {
-  spacing: 2px;
+#panel .panel-button .clipboard-indicator-icon {
+  margin: 0 4px;
 }
 
 #panel .panel-button .app-menu-icon {
@@ -2100,10 +2104,14 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel Gjs_ui_panel_AggregateMenu.panel-button .system-status-icon {
-  margin: 0 0 !important;
+  margin: 0 !important;
   padding: 4px !important;
 }
 
+#panel Gjs_kimpanel_kde_org_indicator_KimIndicator.panel-button .panel-status-menu-box {
+  margin: 0 4px;
+}
+
 #panel .screencast-indicator,
 #panel .remote-access-indicator {
   color: #FF6D00;

diff --git a/src/gnome-shell/shell-40-0/gnome-shell-Light.css b/src/gnome-shell/shell-40-0/gnome-shell-Light.css
@@ -2027,21 +2027,25 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel .panel-button .panel-status-menu-box .system-status-icon {
-  margin: 0 0;
+  margin: 0;
 }
 
 #panel .panel-button .panel-status-menu-box StLabel {
   padding: 0 0 0 3px;
 }
 
-#panel .panel-button .appindicator-trayicons-box {
+#panel .panel-button .panel-status-menu-box,
+#panel .panel-button .panel-status-indicators-box {
+  spacing: 3px;
+}
+
+#panel .panel-button .appindicator-trayicons-box,
+#panel .panel-button .panel-status-indicators-box.appindicator-box {
   margin: 0 6px;
 }
 
-#panel .panel-button .panel-status-indicators-box,
-#panel .panel-button .panel-status-menu-box,
-#panel .panel-button .power-status.panel-status-indicators-box {
-  spacing: 2px;
+#panel .panel-button .clipboard-indicator-icon {
+  margin: 0 6px;
 }
 
 #panel .panel-button .app-menu-icon {
@@ -2100,10 +2104,14 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel Gjs_ui_panel_AggregateMenu.panel-button .system-status-icon {
-  margin: 0 0 !important;
+  margin: 0 !important;
   padding: 6px !important;
 }
 
+#panel Gjs_kimpanel_kde_org_indicator_KimIndicator.panel-button .panel-status-menu-box {
+  margin: 0 6px;
+}
+
 #panel .screencast-indicator,
 #panel .remote-access-indicator {
   color: #FF6D00;

diff --git a/src/gnome-shell/shell-40-0/gnome-shell-compact.css b/src/gnome-shell/shell-40-0/gnome-shell-compact.css
@@ -2027,21 +2027,25 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel .panel-button .panel-status-menu-box .system-status-icon {
-  margin: 0 0;
+  margin: 0;
 }
 
 #panel .panel-button .panel-status-menu-box StLabel {
   padding: 0 0 0 2px;
 }
 
-#panel .panel-button .appindicator-trayicons-box {
+#panel .panel-button .panel-status-menu-box,
+#panel .panel-button .panel-status-indicators-box {
+  spacing: 2px;
+}
+
+#panel .panel-button .appindicator-trayicons-box,
+#panel .panel-button .panel-status-indicators-box.appindicator-box {
   margin: 0 4px;
 }
 
-#panel .panel-button .panel-status-indicators-box,
-#panel .panel-button .panel-status-menu-box,
-#panel .panel-button .power-status.panel-status-indicators-box {
-  spacing: 2px;
+#panel .panel-button .clipboard-indicator-icon {
+  margin: 0 4px;
 }
 
 #panel .panel-button .app-menu-icon {
@@ -2100,10 +2104,14 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel Gjs_ui_panel_AggregateMenu.panel-button .system-status-icon {
-  margin: 0 0 !important;
+  margin: 0 !important;
   padding: 4px !important;
 }
 
+#panel Gjs_kimpanel_kde_org_indicator_KimIndicator.panel-button .panel-status-menu-box {
+  margin: 0 4px;
+}
+
 #panel .screencast-indicator,
 #panel .remote-access-indicator {
   color: #FF6D00;