Merge branch 'master' into proton-style

.github/pull_request_template.md

@@ -1,11 +1,3 @@
----
-name: Pull Request Template
-about: Pull Request
-title: ''
-assignees: ''
-
----
-
 **Describe the PR**
 A clear and concise description of what the PR is.
 
@@ -18,10 +10,10 @@ If applicable, add screenshots to help explain your commit.
 Check like `- [x]`.
 
  - PR Type
-  - `Add:` Add feature or enhanced.
-  - `Fix:` Bug fix or change default values.
-  - `Clean:` Refactoring.
-  - `Doc:` Update docs.
+   - [ ] `Add:` Add feature or enhanced.
+   - [ ] `Fix:` Bug fix or change default values.
+   - [ ] `Clean:` Refactoring.
+   - [ ] `Doc:` Update docs.
  - Distribution
    - [ ] [Original Lepton](https://github.com/black7375/Firefox-UI-Fix)
    - [ ] [Lepton's photon style](https://github.com/black7375/Firefox-UI-Fix/tree/photon-style)

README.org

@@ -74,6 +74,8 @@
       - Size: Fill(Changes dynamically to your size)
   - *Error Page Design*
     - Illerstrations: Restore error page illerstrations
+  - *Others*
+    - Activate calculator at addressbar
 
 ** Installation Guide
 
@@ -107,7 +109,9 @@
   4. Restart Firefox
      - Click the =Clear startup cache...= at the top of =about:support=
 
-  If you prefer Photon, see [[https://github.com/black7375/Firefox-UI-Fix/tree/photon-style][Lepton's photon-style]].
+  If you prefer Photon, see [[https://github.com/black7375/Firefox-UI-Fix/tree/photon-style][Lepton's photon-style]].\\
+  If you prefer Proton, see [[https://github.com/black7375/Firefox-UI-Fix/tree/proton-style][Lepton's proton-style]].
+
 
 ** WHY Proton?
    I think a lot has improved.

install.ps1

@@ -631,7 +631,7 @@ function Check-InstallTypes() {
 #== Install Helpers ============================================================
 $chromeDuplicate = $false
 function Check-ChromeExist() {
-  if ( Test-Path -Path "chrome" -and -Not (Test-Path -Path "chrome\${LEPTONINFOFILE}") ) {
+  if ( (Test-Path -Path "chrome") -and (-Not (Test-Path -Path "chrome\${LEPTONINFOFILE}")) ) {
     $global:chromeDuplicate = $true
     Move-Auto "chrome" "chrome.bak"
     Lepton-OkMessage "Backup files"
@@ -656,7 +656,6 @@ function Clone-Lepton() {
     [Parameter(Position=0)]
     [string] $branch = ""
   )
-  local branch="$1"
 
   if ( "${branch}" -eq "" ) {
     $branch = "${leptonBranch}"

user.js

@@ -20,3 +20,6 @@ user_pref("browser.compactmode.show", true);
 // ** Useful Options ***********************************************************
 // Integrated calculator at urlbar
 user_pref("browser.urlbar.suggest.calculator", true);
+
+// Integrated unit convertor at urlbar
+// user_pref("browser.urlbar.unitConversion.enabled", true);

userContent.css

@@ -4,7 +4,8 @@
     /* At DarkMode, Color */
     body[style*="--newtab-background-color:rgba(28, 27, 34, 1);"],
     body[style*="--newtab-background-color:rgba(42, 42, 46, 1);"],
-    body[style*="--newtab-background-color: rgba(42, 42, 46, 1);"] {
+    body[style*="--newtab-background-color: rgba(42, 42, 46, 1);"],
+    body[style*="--newtab-background-color: rgba(43, 42, 51, 1);"] {
       /* inner */
       --newtab-focus-border: rgba(0, 221, 255, 0.5) !important; /* Original: #B5D3FF, Better color-mix(in srgb, #B5D3FF 70%, transparent) */
       --newtab-focus-border-selected: rgba(0, 221, 255, 0.5) !important; /* Original: #B5D3FF */
@@ -411,7 +412,7 @@
       .blogpost-nav * {
         background: var(--in-content-table-background) !important;
       }
-      
+
       .Paginate .Button.Paginate-item:is(:active, :hover) {
         background: var(--in-content-button-background-hover) !important;
       }
@@ -726,7 +727,7 @@
                  url-prefix("about:checkerboard"),
                  url-prefix("about:sync-log"),
                  url-prefix("about:memory"),
-                 url-prefix("file://") {
+                 regexp("^[file:///].*[^(html|svg|pdf)]$") {
     /* Base */
     html,
     body {
@@ -954,7 +955,7 @@
 
   /*= Directory View =========================================================*/
   @-moz-document url-prefix("about:sync-log"),
-                 url-prefix("file://") {
+                 regexp("^[file:///].*[^(html|svg|pdf)]$") {
     body {
       background-color: var(--in-content-box-background) !important;
     }