Merge master into photon-style

black7375 · Nov 19, 2023 · ee97b7e · ee97b7e
2 parents 12dbad0 + c24a7b5
commit ee97b7e
Show file tree

Hide file tree

Showing 177 changed files with 20,512 additions and 945 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -43,13 +43,13 @@ jobs:
             name: "Lepton-Proton-Style"
             branch: "proton-style"
           - mode: "ESR"
-            name: "Lepton"
+            name: "ESR-Lepton"
             branch: "master"
           - mode: "ESR"
-            name: "Lepton-Photon-Style"
+            name: "ESR-Lepton-Photon-Style"
             branch: "photon-style"
           - mode: "ESR"
-            name: "Lepton-Proton-Style"
+            name: "ESR-Lepton-Proton-Style"
             branch: "proton-style"
     steps:
       - uses: actions/checkout@v3
@@ -99,17 +99,8 @@ jobs:
           zip -rv ${{ matrix.name }}.zip chrome CREDITS LICENSE user.js install.sh install.ps1
 
       - uses: softprops/action-gh-release@v1 # actions/create-release, actions/upload-release-asset is deprecated
-        if: matrix.mode == 'STANDARD'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           files: |
             ${{ matrix.name }}.zip
-
-      - uses: softprops/action-gh-release@v1
-        if: matrix.mode == 'ESR'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          files: |
-            ESR-${{ matrix.name }}.zip
diff --git a/CREDITS b/CREDITS
@@ -22,6 +22,9 @@ N: Yunsup Sim
 E: [email protected]
 W: https://ethansup.net
 
+N: ZapSNH
+W: https://github.com/zapSNH
+
 ----------
     Sponsors
 
@@ -72,6 +75,9 @@ W: https://github.com/andmagdo
 N: anzz1
 W: https://github.com/anzz1
 
+N: Artur Pragacz
+W: https://github.com/arturpragacz
+
 N: Backseat-Driver
 W: https://www.reddit.com/user/Backseat-Driver/
 
@@ -140,9 +146,16 @@ N: Roel
 E: [email protected]
 W: https://github.com/Nyubis
 
+N: Ryosuke Asano
+E: [email protected]
+W: https://github.com/surapunoyousei
+
 N: roland-rollo
 W: https://github.com/roland-rollo
 
+N: Roy Orbitson
+W: https://github.com/Roy-Orbison
+
 N: ryenyuku
 E: [email protected]
 W: https://github.com/ryenyuku

diff --git a/__tests__/accent_color.test.scss b/__tests__/accent_color.test.scss
@@ -1,7 +1,10 @@
 @use "true" as *;
 @use "../src/utils/accent_color" as *;
+@use "../src/utils/mode";
 
 @include test-module("Accent Color Option [mix]") {
+  @include mode.ESR;
+
   @include test("simple") {
     @include assert {
       @include output {

diff --git a/__tests__/mode.test.scss b/__tests__/mode.test.scss
@@ -27,6 +27,36 @@
       }
     }
   }
+
+  @include test("support pref") {
+    @include mode.SUPPORT_PREF;
+
+    @include assert {
+      @include output {
+        @if mode.isMediaPref() {
+          @include example;
+        }
+      }
+      @include expect {
+        // IGNORE
+      }
+    }
+  }
+
+  @include test("media pref") {
+    @include mode.MEDIA_PREF;
+
+    @include assert {
+      @include output {
+        @if mode.isMediaPref() {
+          @include example;
+        }
+      }
+      @include expect {
+        // IGNORE
+      }
+    }
+  }
 }
 
 @include test-module("STANDARD Mode [mix]") {
@@ -54,4 +84,34 @@
       }
     }
   }
+
+  @include test("support pref") {
+    @include mode.SUPPORT_PREF;
+
+    @include assert {
+      @include output {
+        @if mode.isMediaPref() {
+          @include example;
+        }
+      }
+      @include expect {
+        // IGNORE
+      }
+    }
+  }
+
+  @include test("media pref") {
+    @include mode.MEDIA_PREF;
+
+    @include assert {
+      @include output {
+        @if mode.isMediaPref() {
+          @include example;
+        }
+      }
+      @include expect {
+        @include example;
+      }
+    }
+  }
 }
diff --git a/__tests__/native_menu.test.scss b/__tests__/native_menu.test.scss
@@ -137,6 +137,7 @@
 
 @include test-module("Native Menu Option - Standard [mix]") {
   @include mode.STANDARD;
+  @include mode.SUPPORT_PREF;
 
   @include test("simple") {
     @include assert {
@@ -252,3 +253,122 @@
     }
   }
 }
+
+@include test-module("Native Menu Option - MediaPref [mix]") {
+  @include mode.STANDARD;
+  @include mode.MEDIA_PREF;
+
+  @include test("simple") {
+    @include assert {
+      @include output {
+        @include native_menu.NativeToolkitMenu {
+          @include example;
+        }
+
+        @include native_menu.NativeMenuPopup {
+          @include example;
+        }
+      }
+      @include expect {
+        @media (-moz-bool-pref: '"widget.macos.native-context-menus"'), (-moz-bool-pref: '"widget.gtk.native-context-menus"') {
+          @include example;
+        }
+
+        menupopup:is(#historyMenuPopup, #bookmarksMenuPopup),
+        menupopup:not([placespopup="true"]) {
+          @include example;
+        }
+      }
+    }
+  }
+  @include test("native menu - with windows media") {
+    @include assert {
+      @include output {
+        @include native_menu.NativeMenu(true) {
+          @include example;
+        }
+
+        @include native_menu.NonNativeMenu(true) {
+          @include example;
+        }
+
+        @include native_menu.WinNativeMenu(true) {
+          @include example;
+        }
+
+        @include native_menu.WinNonNativeMenu(true) {
+          @include example;
+        }
+      }
+      @include expect {
+        @media (not (-moz-bool-pref: '"userChrome.theme.non_native_menu"')) {
+          @media (-moz-gtk-csd-available) {
+            @include example;
+          }
+        }
+
+        // Only Windows
+        @media (-moz-platform: windows) {
+          @include example;
+        }
+        @media (-moz-bool-pref: '"userChrome.theme.non_native_menu"') {
+          @media (-moz-gtk-csd-available) {
+            @include example;
+          }
+        }
+
+        // IGNORE
+
+        // Only Windows
+        @media (-moz-platform: windows) {
+          @include example;
+        }
+      }
+    }
+  }
+  @include test("native menu - without windows media") {
+    @include assert {
+      @include output {
+        @include native_menu.NativeMenu {
+          @include example;
+        }
+
+        @include native_menu.NonNativeMenu {
+          @include example;
+        }
+
+        @include native_menu.WinNativeMenu {
+          @include example;
+        }
+
+        @include native_menu.WinNonNativeMenu {
+          @include example;
+        }
+      }
+      @include expect {
+        @media (not (-moz-bool-pref: '"userChrome.theme.non_native_menu"')) {
+          @media (-moz-gtk-csd-available) {
+            @include example;
+          }
+        }
+
+        // AS Windows
+        @media (-moz-platform: windows) {
+          @include example;
+        }
+        @media (-moz-bool-pref: '"userChrome.theme.non_native_menu"') {
+          @media (-moz-gtk-csd-available) {
+            @include example;
+          }
+        }
+
+        // IGNORE
+
+        // AS Windows
+        @media (-moz-platform: windows) {
+          @include example;
+        }
+      }
+    }
+  }
+}