Merge branch 'master' of github.com:vinceliuice/Orchis-theme

README.md

@@ -1,7 +1,7 @@
 # Orchis theme
 
 Orchis is a [Material Design](https://material.io) theme for GNOME/GTK based desktop environments.
-Based on nana-4 --  [materia-theme](https://github.com/nana-4/materia-theme)
+Based on nana-4 -- [materia-theme](https://github.com/nana-4/materia-theme)
 
 ## Requirements
 

core.sh

@@ -360,7 +360,7 @@ clean_theme() {
 
 link_theme() {
   for theme in "${themes[@]}"; do
-    for color in "${colors[2]}"; do
+    for color in "${lcolors[@]}"; do
       for size in "${sizes[0]}"; do
         link_libadwaita "${dest:-$DEST_DIR}" "${_name:-$THEME_NAME}" "$theme" "$color" "$size"
       done

install.sh

@@ -41,6 +41,7 @@ sizes=()
 othemes=()
 ocolors=()
 osizes=()
+lcolors=()
 
 while [[ "$#" -gt 0 ]]; do
   case "${1:-}" in
@@ -177,14 +178,17 @@ while [[ "$#" -gt 0 ]]; do
         case "$variant" in
           standard)
             colors+=("${COLOR_VARIANTS[0]}")
+            lcolors+=("${COLOR_VARIANTS[0]}")
             shift
             ;;
           light)
             colors+=("${COLOR_VARIANTS[1]}")
+            lcolors+=("${COLOR_VARIANTS[1]}")
             shift
             ;;
           dark)
             colors+=("${COLOR_VARIANTS[2]}")
+            lcolors+=("${COLOR_VARIANTS[2]}")
             shift
             ;;
           -*)
@@ -257,6 +261,10 @@ if [[ "${#osizes[@]}" -eq 0 ]] ; then
   osizes=("${OLD_SIZE_VARIANTS[@]}")
 fi
 
+if [[ "${#lcolors[@]}" -eq 0 ]] ; then
+  lcolors=("${COLOR_VARIANTS[1]}")
+fi
+
 clean_theme
 
 if [[ ${remove} == 'true' ]]; then

src/_sass/gtk/_common-4.0.scss

@@ -3906,6 +3906,17 @@ window {
   border-radius: $window-radius;
   box-shadow: $shadow-z16, 0 16px (24px * .6) 2px transparent, 0 6px (30px * .6) 5px transparent;
 
+  @if $variant == 'light' and $topbar == 'dark' {
+    &.background {
+      background-color: transparent;
+      background-image: linear-gradient(to bottom,
+                                        $titlebar,
+                                        $titlebar $large-size,
+                                        $background $large-size,
+                                        $background);
+    }
+  }
+
   &:backdrop {
     // the transparent shadow here is to enforce that the shadow extents don't
     // change when we go to backdrop, to prevent jumping windows.

src/_sass/gtk/apps/_gnome-4.0.scss

@@ -27,3 +27,21 @@ flowboxchild > button.card {
     padding: $container-padding * 1.5 $container-padding * 2.5;
   }
 }
+
+app-context-bar {
+  > box:not(:first-child) > button.flat {
+    border-radius: 0;
+
+    &:last-child {
+      border-radius: 0 $corner-radius $corner-radius 0;
+    }
+  }
+
+  > box:first-child > button.flat {
+    border-radius: 0;
+
+    &:first-child {
+      border-radius: $corner-radius 0 0 $corner-radius;
+    }
+  }
+}

src/gtk/4.0/gtk-Compact.css

@@ -4230,6 +4230,11 @@ window {
   box-shadow: 0 8px 6px -5px rgba(0, 0, 0, 0.2), 0 16px 14.4px 2px rgba(0, 0, 0, 0.14), 0 6px 18px 5px rgba(0, 0, 0, 0.12), 0 16px 14.4px 2px transparent, 0 6px 18px 5px transparent;
 }
 
+window.background {
+  background-color: transparent;
+  background-image: linear-gradient(to bottom, #2C2C2C, #2C2C2C 40px, #F2F2F2 40px, #F2F2F2);
+}
+
 window:backdrop {
   box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), 0 16px 14.4px 2px transparent, 0 6px 18px 5px transparent;
 }
@@ -4502,6 +4507,22 @@ flowboxchild > button.card.category-tile-iconless {
   padding: 6px 10px;
 }
 
+app-context-bar > box:not(:first-child) > button.flat {
+  border-radius: 0;
+}
+
+app-context-bar > box:not(:first-child) > button.flat:last-child {
+  border-radius: 0 10px 10px 0;
+}
+
+app-context-bar > box:first-child > button.flat {
+  border-radius: 0;
+}
+
+app-context-bar > box:first-child > button.flat:first-child {
+  border-radius: 10px 0 0 10px;
+}
+
 avatar {
   border-radius: 9999px;
   font-weight: bold;

src/gtk/4.0/gtk-Dark-Compact.css

@@ -4502,6 +4502,22 @@ flowboxchild > button.card.category-tile-iconless {
   padding: 6px 10px;
 }
 
+app-context-bar > box:not(:first-child) > button.flat {
+  border-radius: 0;
+}
+
+app-context-bar > box:not(:first-child) > button.flat:last-child {
+  border-radius: 0 10px 10px 0;
+}
+
+app-context-bar > box:first-child > button.flat {
+  border-radius: 0;
+}
+
+app-context-bar > box:first-child > button.flat:first-child {
+  border-radius: 10px 0 0 10px;
+}
+
 avatar {
   border-radius: 9999px;
   font-weight: bold;

src/gtk/4.0/gtk-Dark.css

@@ -4502,6 +4502,22 @@ flowboxchild > button.card.category-tile-iconless {
   padding: 9px 15px;
 }
 
+app-context-bar > box:not(:first-child) > button.flat {
+  border-radius: 0;
+}
+
+app-context-bar > box:not(:first-child) > button.flat:last-child {
+  border-radius: 0 12px 12px 0;
+}
+
+app-context-bar > box:first-child > button.flat {
+  border-radius: 0;
+}
+
+app-context-bar > box:first-child > button.flat:first-child {
+  border-radius: 12px 0 0 12px;
+}
+
 avatar {
   border-radius: 9999px;
   font-weight: bold;

src/gtk/4.0/gtk-Light-Compact.css

@@ -4502,6 +4502,22 @@ flowboxchild > button.card.category-tile-iconless {
   padding: 6px 10px;
 }
 
+app-context-bar > box:not(:first-child) > button.flat {
+  border-radius: 0;
+}
+
+app-context-bar > box:not(:first-child) > button.flat:last-child {
+  border-radius: 0 10px 10px 0;
+}
+
+app-context-bar > box:first-child > button.flat {
+  border-radius: 0;
+}
+
+app-context-bar > box:first-child > button.flat:first-child {
+  border-radius: 10px 0 0 10px;
+}
+
 avatar {
   border-radius: 9999px;
   font-weight: bold;

src/gtk/4.0/gtk-Light.css

@@ -4502,6 +4502,22 @@ flowboxchild > button.card.category-tile-iconless {
   padding: 9px 15px;
 }
 
+app-context-bar > box:not(:first-child) > button.flat {
+  border-radius: 0;
+}
+
+app-context-bar > box:not(:first-child) > button.flat:last-child {
+  border-radius: 0 12px 12px 0;
+}
+
+app-context-bar > box:first-child > button.flat {
+  border-radius: 0;
+}
+
+app-context-bar > box:first-child > button.flat:first-child {
+  border-radius: 12px 0 0 12px;
+}
+
 avatar {
   border-radius: 9999px;
   font-weight: bold;

src/gtk/4.0/gtk.css

@@ -4230,6 +4230,11 @@ window {
   box-shadow: 0 8px 6px -5px rgba(0, 0, 0, 0.2), 0 16px 14.4px 2px rgba(0, 0, 0, 0.14), 0 6px 18px 5px rgba(0, 0, 0, 0.12), 0 16px 14.4px 2px transparent, 0 6px 18px 5px transparent;
 }
 
+window.background {
+  background-color: transparent;
+  background-image: linear-gradient(to bottom, #2C2C2C, #2C2C2C 48px, #F2F2F2 48px, #F2F2F2);
+}
+
 window:backdrop {
   box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), 0 16px 14.4px 2px transparent, 0 6px 18px 5px transparent;
 }
@@ -4502,6 +4507,22 @@ flowboxchild > button.card.category-tile-iconless {
   padding: 9px 15px;
 }
 
+app-context-bar > box:not(:first-child) > button.flat {
+  border-radius: 0;
+}
+
+app-context-bar > box:not(:first-child) > button.flat:last-child {
+  border-radius: 0 12px 12px 0;
+}
+
+app-context-bar > box:first-child > button.flat {
+  border-radius: 0;
+}
+
+app-context-bar > box:first-child > button.flat:first-child {
+  border-radius: 12px 0 0 12px;
+}
+
 avatar {
   border-radius: 9999px;
   font-weight: bold;