Merge remote-tracking branch 'upstream/master'

HACKING.md

@@ -72,7 +72,7 @@ Here's an example to change the _accent color_:
 ### With script
 
 To easily change the color scheme, you can use the `change_color.sh` script (or
-just use the [oomox](https://github.com/actionless/oomox) app).
+just use the [oomox](https://github.com/themix-project/oomox) app).
 
 > Originally, `change_color.sh` and `scripts/*.sh` were implemented for oomox,
 but you can also run it on the command line without the app.

change_color.sh

@@ -224,12 +224,13 @@ done
       #-e 's/%HDR_BTN_FG%/'"$HDR_BTN_FG"'/g' \
       #-e 's/%WM_BORDER_FOCUS%/'"$WM_BORDER_FOCUS"'/g' \
       #-e 's/%WM_BORDER_UNFOCUS%/'"$WM_BORDER_UNFOCUS"'/g' \
-      #-e 's/%ROUNDNESS%/'"$ROUNDNESS"'/g' \
       #-e 's/%SPACING%/'"$SPACING"'/g' \
       #-e 's/%INACTIVE_FG%/'"$INACTIVE_FG"'/g' \
       #-e 's/%INACTIVE_TXT_FG%/'"$INACTIVE_TXT_FG"'/g' \
       #-e 's/%INACTIVE_MENU_FG%/'"$INACTIVE_MENU_FG"'/g' \
 
+sed -i -e 's/^$material_radius: .px/$material_radius: '"$ROUNDNESS"'px/g' ./src/_sass/gtk/_variables.scss
+
 if [[ "${DEBUG:-}" ]]; then
   echo "You can debug TEMP DIR: $tempdir, press [Enter] when finished"; read -r
 fi
@@ -258,7 +259,6 @@ for FILEPATH in "${PATHLIST[@]}"; do
     -e 's/%HDR_BTN_FG%/#'"$HDR_BTN_FG"'/g' \
     -e 's/%WM_BORDER_FOCUS%/#'"$WM_BORDER_FOCUS"'/g' \
     -e 's/%WM_BORDER_UNFOCUS%/#'"$WM_BORDER_UNFOCUS"'/g' \
-    -e 's/%ROUNDNESS%/'"$ROUNDNESS"'/g' \
     -e 's/%SPACING%/'"$SPACING"'/g' \
     -e 's/%INACTIVE_FG%/#'"$INACTIVE_FG"'/g' \
     -e 's/%INACTIVE_TXT_FG%/#'"$INACTIVE_TXT_FG"'/g' \

install.sh

@@ -11,7 +11,7 @@ COLOR_VARIANTS=('' '-dark' '-light')
 SIZE_VARIANTS=('' '-compact')
 
 GTK_VERSIONS=('3.18' '3.20' '3.22')
-GS_VERSIONS=('3.18' '3.24' '3.26' '3.28')
+GS_VERSIONS=('3.18' '3.24' '3.26' '3.28' '3.30')
 LATEST_GS_VERSION="${GS_VERSIONS[-1]}"
 
 # Set a proper gnome-shell theme version

parse-sass.sh

@@ -12,7 +12,7 @@ _COLOR_VARIANTS=('' '-dark' '-light')
 _SIZE_VARIANTS=('' '-compact')
 
 GTK_VERSIONS=('3.18' '3.20' '3.22')
-GS_VERSIONS=('3.18' '3.24' '3.26' '3.28')
+GS_VERSIONS=('3.18' '3.24' '3.26' '3.28' '3.30')
 
 if [[ ! -z "${COLOR_VARIANTS:-}" ]]; then
   IFS=', ' read -r -a _COLOR_VARIANTS <<< "${COLOR_VARIANTS:-}"

src/_sass/gnome-shell/_common-3.18.scss

@@ -1229,7 +1229,7 @@ StScrollBar {
   .aggregate-menu {
     min-width: 280px;
     .popup-menu-icon { padding: 0 4px; }
-    .popup-sub-menu .popup-menu-item :first-child {
+    .popup-sub-menu .popup-menu-item > :first-child {
       &:ltr { /* 8px spacing + 2*4px padding */
               padding-left: 16px; margin-left: em(16px); }
       &:rtl { /* 8px spacing + 2*4px padding */

src/_sass/gnome-shell/_common-3.24.scss

@@ -1244,7 +1244,7 @@ StScrollBar {
   .aggregate-menu {
     min-width: 280px;
     .popup-menu-icon { padding: 0 4px; }
-    .popup-sub-menu .popup-menu-item :first-child {
+    .popup-sub-menu .popup-menu-item > :first-child {
       &:ltr { /* 8px spacing + 2*4px padding */
               padding-left: 16px; margin-left: em(16px); }
       &:rtl { /* 8px spacing + 2*4px padding */

src/_sass/gnome-shell/_common-3.26.scss

@@ -1274,7 +1274,7 @@ StScrollBar {
   .aggregate-menu {
     min-width: 280px;
     .popup-menu-icon { padding: 0 4px; }
-    .popup-sub-menu .popup-menu-item :first-child {
+    .popup-sub-menu .popup-menu-item > :first-child {
       &:ltr { /* 8px spacing + 2*4px padding */
               padding-left: 16px; margin-left: em(16px); }
       &:rtl { /* 8px spacing + 2*4px padding */

src/_sass/gnome-shell/_common-3.28.scss

@@ -1274,7 +1274,7 @@ StScrollBar {
   .aggregate-menu {
     min-width: 280px;
     .popup-menu-icon { padding: 0 4px; }
-    .popup-sub-menu .popup-menu-item :first-child {
+    .popup-sub-menu .popup-menu-item > :first-child {
       &:ltr { /* 8px spacing + 2*4px padding */
               padding-left: 16px; margin-left: em(16px); }
       &:rtl { /* 8px spacing + 2*4px padding */