Merge branch 'master' into proton-style

install.ps1

@@ -142,7 +142,7 @@ function Copy-Auto() {
     Write-Host ""
   }
 
-  Copy-Item -Path "${file}" -Destination "${target}" -Force
+  Copy-Item -Path "${file}" -Destination "${target}" -Force -Recurse
 }
 
 function Move-Auto() {
@@ -165,10 +165,10 @@ function Move-Auto() {
     Write-Host ""
   }
 
-  Move-Item -Path "${file}" -Destination "${target}" -Force
+  Get-ChildItem -Path "${target}" -Recurse | Move-Item -Path "${file}" -Destination "${target}" -Force
 }
 
-function Restore-Auto() {
+ function Restore-Auto() {
   Param (
     [Parameter(Mandatory=$true, Position=0)]
     [string] $file
@@ -178,9 +178,9 @@ function Restore-Auto() {
   if ( Test-Path -Path "${file}" ) {
     Remove-Item "${file}" -Recurse -Force
   }
-  Move-Item -Path "${target}" -Destination "${file}" -Force
+  Get-ChildItem -Path "${target}" -Recurse | Move-Item -Destination "${file}" -Force
 
-  $local:loopupTarget = "${target}.bak"
+  $local:lookupTarget = "${target}.bak"
   if ( Test-Path -Path "${lookupTarget}" ) {
     Restore-Auto "${target}"
   }
@@ -437,7 +437,7 @@ function Select-Profile() {
 
   if ( "${profileName}" -ne "" ) {
     $local:targetPath = ""
-    foreach ( $global:profilePath in $firefoxProfilePaths ) {
+    foreach ( $profilePath in $global:firefoxProfilePaths ) {
       if ( "${profilePath}" -like "*${profileName}" ) {
         $targetPath = "${profilePath}"
         break
@@ -451,7 +451,8 @@ function Select-Profile() {
     else {
       Lepton-ErrorMessage "Unable to find ${profileName}"
     }
-  else
+  }
+  else {
     if ( $firefoxProfilePaths.Length -eq 1 ) {
       Lepton-OkMessage "Auto detected profile"
     }

userChrome.css

@@ -89,6 +89,12 @@
     :root:not(:-moz-lwtheme) .urlbarView-url {
       --urlbar-popup-url-color: -moz-accent-color;
     }
+
+    /* Nightly Compatibility */
+    :root:not(:-moz-lwtheme) #urlbar {
+      --toolbar-field-focus-color: var(--toolbar-field-color); /* Nightly: rgba(0, 0, 0, 1)  */
+      --toolbar-field-focus-background-color: var(--toolbar-field-background-color); /* Nightly: white */
+    }
   }
 
   /** Fully Theme Mode ********************************************************/

userContent.css

@@ -727,7 +727,7 @@
                  url-prefix("about:checkerboard"),
                  url-prefix("about:sync-log"),
                  url-prefix("about:memory"),
-                 regexp("^[file:///].*[^(html|svg|pdf)]$") {
+                 regexp("^[file:///].*[^(html|svg|pdf|json)]$") {
     /* Base */
     html,
     body {
@@ -955,7 +955,7 @@
 
   /*= Directory View =========================================================*/
   @-moz-document url-prefix("about:sync-log"),
-                 regexp("^[file:///].*[^(html|svg|pdf)]$") {
+                 regexp("^[file:///].*[^(html|svg|pdf|json)]$") {
     body {
       background-color: var(--in-content-box-background) !important;
     }