Merge pull request #755 from black7375/dev

Ver 8.0.0 Feedback Thread
black7375 · Aug 23, 2023 · a7ee0c8 · a7ee0c8
2 parents bf37686 + 5756c71
commit a7ee0c8
Show file tree

Hide file tree

Showing 56 changed files with 20,814 additions and 1,361 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -32,6 +32,7 @@ jobs:
     needs: sync-branches
     strategy:
       matrix:
+        mode: ["STANDARD", "ESR"]
         include:
           - name: "Lepton"
             branch: "master"
@@ -55,6 +56,20 @@ jobs:
 
           echo -e "[Info]\nVer=${TAGVER}\nBranch=${BRANCH}" > LEPTON
 
+      - name: Processing for STANDARD
+        if: matrix.mode == 'STANDARD'
+        run: |
+          rm css/leptonChromeESR.css
+          rm css/leptonContentESR.css
+
+      - name: Processing for ESR
+        if: matrix.mode == 'ESR'
+        run: |
+          sed -i "s/\.css/ESR\.css/g" userChrome.css
+          sed -i "s/\.css/ESR\.css/g" userContent.css
+          rm css/leptonChrome.css
+          rm css/leptonContent.css
+
       - name: Release Structure
         run: |
           # Remove unnecessary files
@@ -73,9 +88,17 @@ 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: startsWith(github.ref, 'refs/tags/')
+        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: |
+            ${{ matrix.name }}-ESR.zip
diff --git a/CREDITS b/CREDITS
@@ -156,6 +156,11 @@ W: https://github.com/thunderstone135
 ----------
     Reference Projects & Resources
 
+N: BEST-WALLPAPER.NET
+W: https://best-wallpaper.net/
+C: Copyright (c) 2011-2022 best-wallpaper.net
+L: Unspecified License
+
 N: Compact Mode Firefox Css
 W: https://github.com/Godiesc/compactmodefirefoxcss
 C: Copyright (c) 2021 Godiesc
@@ -186,6 +191,11 @@ W: https://github.com/MrOtherGuy/firefox-csshacks
 C: Copyright (c) 2018 MrOtherGuy
 L: MPL 2.0
 
+N: Firefox Custom CSS
+W: https://github.com/hakan-demirli/Firefox_Custom_CSS
+C: Copyright (c) 2022 hakan-demirli
+L: MIT
+
 N: Fluent UI System Icons
 W: https://github.com/microsoft/fluentui-system-icons
 C: Copyright (c) 2020 Microsoft Corporation

diff --git a/__tests__/color_scheme.test.scss b/__tests__/color_scheme.test.scss
@@ -1,8 +1,11 @@
 @use "true" as *;
 @use "example" as *;
 @use "../src/utils/color_scheme";
+@use "../src/utils/mode";
+
+@include test-module("Color scheme is dark - ESR [mix]") {
+  @include mode.ESR;
 
-@include test-module("Color scheme is dark [mix]") {
   @include test("simple") {
     @include assert {
       @include output {
@@ -38,7 +41,9 @@
   }
 }
 
-@include test-module("Color scheme is light [mix]") {
+@include test-module("Color scheme is light - ESR [mix]") {
+  @include mode.ESR;
+
   @include test("simple") {
     @include assert {
       @include output {
@@ -74,6 +79,82 @@
   }
 }
 
+@include test-module("Color scheme is dark - Standard [mix]") {
+  @include mode.STANDARD;
+
+  @include test("simple") {
+    @include assert {
+      @include output {
+        @include color_scheme.Dark {
+          @include example;
+        }
+      }
+      @include expect {
+        @media (prefers-color-scheme: dark) {
+          @include example;
+        }
+      }
+    }
+  }
+
+  @include test("simple reversed") {
+    @include assert {
+      @include output {
+        @include example_tag {
+          @include color_scheme.Dark {
+            @include example_property;
+          }
+        }
+      }
+      @include expect {
+        @media (prefers-color-scheme: dark) {
+          @include example_tag {
+            @include example_property;
+          }
+        }
+      }
+    }
+  }
+}
+
+@include test-module("Color scheme is light - Standard [mix]") {
+  @include mode.STANDARD;
+
+  @include test("simple") {
+    @include assert {
+      @include output {
+        @include color_scheme.Light {
+          @include example;
+        }
+      }
+      @include expect {
+        @media (prefers-color-scheme: light) {
+          @include example;
+        }
+      }
+    }
+  }
+
+  @include test("simple reversed") {
+    @include assert {
+      @include output {
+        @include example_tag {
+          @media (prefers-color-scheme: light) {
+            @include example_property;
+          }
+        }
+      }
+      @include expect {
+        @media (prefers-color-scheme: light) {
+          @include example_tag {
+            @include example_property;
+          }
+        }
+      }
+    }
+  }
+}
+
 @include test-module("Color contrast [mix]") {
   @include test("simple") {
     @include assert {

diff --git a/__tests__/list.test.scss b/__tests__/list.test.scss
@@ -21,6 +21,22 @@ $dupList: (ab cd efgh efgh efgh ijk);
   }
 }
 
+@include test-module("Remove at list using list [fn]") {
+  @include test("simple") {
+    @include assert-equal(
+      list.remove-list($simpleList, ("cd" "efgh")),
+      (ab ijk)
+    );
+  }
+
+  @include test("duplicate") {
+    @include assert-equal(
+      list.remove-list($dupList, ("cd" "efgh")),
+      (ab ijk)
+    );
+  }
+}
+
 @include test-module("Convert to str [fn]") {
   @include test("simple") {
     @include assert-equal(

diff --git a/__tests__/mode.test.scss b/__tests__/mode.test.scss
@@ -0,0 +1,57 @@
+@use "true" as *;
+@use "example" as *;
+@use "../src/utils/mode";
+
+@include test-module("ESR Mode [mix]") {
+  @include mode.ESR;
+
+  @include test("simple") {
+    @include assert {
+      @include output {
+        @if mode.isESR() {
+          @include example;
+        }
+      }
+      @include expect {
+        @include example;
+      }
+    }
+    @include assert {
+      @include output {
+        @if mode.isSTANDARD() {
+          @include example;
+        }
+      }
+      @include expect {
+        // IGNORE
+      }
+    }
+  }
+}
+
+@include test-module("STANDARD Mode [mix]") {
+  @include mode.STANDARD;
+
+  @include test("simple") {
+    @include assert {
+      @include output {
+        @if mode.isESR() {
+          @include example;
+        }
+      }
+      @include expect {
+        // IGNORE
+      }
+    }
+    @include assert {
+      @include output {
+        @if mode.isSTANDARD() {
+          @include example;
+        }
+      }
+      @include expect {
+        @include example;
+      }
+    }
+  }
+}
diff --git a/__tests__/moz_document.test.scss b/__tests__/moz_document.test.scss
@@ -6,6 +6,9 @@
   @include test("simple") {
     @include assert {
       @include output {
+        @include moz-document(unobservable-document) {
+          @include example;
+        }
         @include moz-document(url "about:downloads") {
           @include example;
         }
@@ -17,6 +20,9 @@
         }
       }
       @include expect {
+        @-moz-document #{unobservable-document()} { // Invalid function name.
+          @include example;
+        }
         @-moz-document url("about:downloads") {
           @include example;
         }