Merge branch 'master' into photon-style

2026-01-11 03:32:48 -08:00 · 2021-08-16 21:01:10 +09:00 · 2021-08-16 21:01:10 +09:00 · de366bc041
commit de366bc041
parent 97809ec5f5 8fa158297f
8 changed files with 113 additions and 60 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -35,6 +35,7 @@ Check like `- [x]`.
   - [ ] Alpenglow(System: Dark)
   - [ ] System Default
     - GTK Theme Name(Only Linux User): [sample] Adwaita, Adwaita-Dark, Breath, Breath-Dark
+   - [ ] Others: [sample] [Photon Colors](https://addons.mozilla.org/en-US/firefox/addon/photon-colors/), [Google Chrome Dark](https://addons.mozilla.org/en-US/firefox/addon/google-chrome-dark/), [Fairytale Of Nature](https://addons.mozilla.org/en-US/firefox/addon/fairytale-of-nature/)

 **Additional context**
 Add any other context about the problem here.
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest an idea for this project
 title: ''
-labels: ''
+labels: 'Issue::Enhancement'
 assignees: ''

 ---
--- a/7
+++ b/7
@ -96,10 +96,17 @@ N: Burak Yigit Kaya
 E: ben@byk.im
 W: https://byk.im/

+N: hellojaccc
+E: kim@taekyeong.me
+W: https://github.com/hellojaccc
+
 N: James Upjohn
 E: jammehcow@jammehcow.co.nz
 W: https://github.com/jammehcow

+N: Jonta
+W: https://github.com/Jonta
+
 N: mamen
 W: https://www.mamen.at

--- a/README.org
+++ b/README.org
@ -81,7 +81,7 @@

 ** Installation Guide

-   *Script Installation(experimental)*
+   *Script Installation (experimental)*

   Linux, mac users:
   #+BEGIN_SRC bash
@ -90,7 +90,7 @@

   Windows users: Run powershell as administrator
   #+BEGIN_SRC powershell
-   Powershell -c "iwr https://raw.githubusercontent.com/black7375/Firefox-UI-Fix/master/install.ps1 -useb | iex"
+   Powershell -c "Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iwr https://raw.githubusercontent.com/black7375/Firefox-UI-Fix/master/install.ps1 -useb | iex"
   #+END_SRC

   *Manual Installation*
--- a/install.ps1
+++ b/install.ps1
@ -95,6 +95,7 @@ function Install-Choco() {
  Set-ExecutionPolicy Bypass -Scope Process -Force
  [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072
  iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
+  $env:Path += ";C:\ProgramData\chocolatey"
 }

 function Check-Git() {
@ -103,6 +104,7 @@ function Check-Git() {
      Install-Choco
    }
    choco install git -y
+    $env:Path += ";C:\Program Files\Git\bin"
  }

  Lepton-OKMessage "Required - git"
@ -139,6 +141,7 @@ function Copy-Auto() {
    Write-Host "${target} alreay exist."
    Write-Host "Now Backup.."
    Copy-Auto "${target}" "${target}.bak"
+    Remove-Item "${target}" -Recurse -Force
    Write-Host ""
  }

--- a/install.sh
+++ b/install.sh
@ -74,7 +74,7 @@ check_git() {
    elif [[ "${OSTYPE}" == "darwin"* ]]; then
      mac_command_line_developer_tools
    else
-      lepton_error_message "OS NOT DETECTED, couldn't install required packages"
+      lepton_error_message "OS NOT DETECTED, couldn't install required packages. Please manually install git."
    fi
  fi

@ -126,6 +126,7 @@ autocp() {
    echo "${target} alreay exist."
    echo "Now Backup.."
    autocp "${target}" "${target}.bak"
+    rm -rf "${target}"
    echo ""
  fi

--- a/userChrome.css
+++ b/userChrome.css
@ -1,9 +1,12 @@
@media (-moz-proton) {
  /** Default Thme - Contrast *************************************************/
  /*= Lightmode - Color darker ===============================================*/
-  :root[lwtheme-mozlightdark][lwthemetextcolor="dark"] {
+  :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"]) {
    --lwt-accent-color: rgb(229, 229, 235) !important; /* Original: rgb(240, 240, 244) */
  }
+  :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"]) #navigator-toolbox {
+    background-color: var(--lwt-accent-color);
+  }

  /*= Darkmode - Color lighter ===============================================*/
  :root[lwtheme-mozlightdark][lwthemetextcolor="bright"] {
@ -24,6 +27,7 @@
    background-image: var(--lwt-header-image)  !important; /* Original: var(--lwt-header-image) */
    background-repeat: no-repeat !important;
    background-position: right top !important;
+    background-size : cover;
  }
  :root[lwtheme-image] #navigator-toolbox:-moz-lwtheme {
    background-image:    var(--lwt-additional-images) !important; /* Original: var(--lwt-header-image), var(--lwt-additional-images); */
@ -37,16 +41,21 @@
    --tabs-border-color: rgba(0,0,0,.3);
  }

-  /*= Windows 7 ==============================================================*/
-  @media (-moz-os-version: windows-win7) {
+  /** Windows 7, 8 - Compatibility ********************************************/
+  @media (-moz-os-version: windows-win7),
+         (-moz-os-version: windows-win8) {
    /* Header Color */
    :root:not([lwtheme-image]) #navigator-toolbox:-moz-lwtheme {
      background-color: var(--lwt-accent-color) !important;
    }
+  }
+  @media (-moz-os-version: windows-win7) {
    #TabsToolbar:-moz-lwtheme {
      color: var(--lwt-text-color) !important;
+    }

-      /* Remove Aero */
+    /* Remove Aero */
+    #TabsToolbar {
      /* Original: radial-gradient(eclipse at bottom, rgba(255, 255, 255, 0.8), rgba(255, 255, 255, 0.5) 80%, transparent) */
      background-image: unset !important;
    }
@ -68,6 +77,24 @@
    }
  }

+  /*= Windows7 - Aero Based Theme ============================================*/
+  @media (-moz-os-version: windows-win7) {
+    #TabsToolbar:not(:-moz-lwtheme) {
+      --background-color: rgb(229, 229, 235);
+    }
+   .tabbrowser-tab > .tab-stack > .tab-background:not([selected="true"], [multiselected]) {
+      color: var(--background-color);
+      background-color: color-mix(in srgb, currentColor 60%, transparent);
+    }
+   .tabbrowser-tab:hover > .tab-stack > .tab-background:not([selected="true"], [multiselected]) {
+      background-color: color-mix(in srgb, currentColor 85%, transparent) !important; /* Original: color-mix(in srgb, currentColor 11%, transparent) */
+    }
+   #TabsToolbar:not(:-moz-lwtheme) .toolbarbutton-1 > .toolbarbutton-icon {
+     color: var(--background-color);
+     background-color: color-mix(in srgb, currentColor 50%, transparent);
+   }
+  }
+
  /*= Windows10 - Titlebar accent color ======================================*/
  @media (-moz-windows-accent-color-in-titlebar) {
    /* Tab Bar */
@ -264,11 +291,10 @@
  }

   /*== Menu color ===========================================================*/
-  :root,
  menupopup {
    /* is same as toolbar color https://github.com/mozilla/gecko-dev/blob/master/toolkit/themes/windows/global/global.css#L17-L67 */
-    --menu-color: var(--toolbar-color, var(--in-content-page-color)) !important;
-    --menu-background-color: var(--toolbar-bgcolor, var(--in-content-button-background)) !important;
+    --menu-color: var(--arrowpanel-color, var(--in-content-page-color)) !important;
+    --menu-background-color: var(--arrowpanel-background, var(--in-content-button-background)) !important;

    --menu-border-color: var(--toolbarbutton-active-background, var(--button-active-bgcolor, var(--card-outline-color))) !important;
    --menuitem-hover-background-color: var(--toolbarbutton-hover-background, var(--button-hover-bgcolor, var(--in-content-button-background-hover))) !important;
@ -278,10 +304,16 @@
  }

  /* Fallback background */
-  menupopup {
+  menupopup:not(.cui-widget-panel.cui-widget-panelview, [placespopup="true"]) {
    background-color: var(--lwt-accent-color, var(--in-content-page-background)) !important;
  }

+  /* Default theme color preservation */
+  :root[lwtheme-mozlightdark] menupopup {
+    --menu-color: var(--toolbar-color) !important;
+    --menu-background-color: var(--toolbar-bgcolor) !important;
+  }
+
  /* Fully Dark Mode **********************************************************/
  /*= Remove White Flash =====================================================*/
  #tabbrowser-tabbox,
@ -293,13 +325,30 @@

  /*= Notification ===========================================================*/
  @-moz-document url("chrome://global/content/alerts/alert.xhtml") {
+    /* Color */
+    :root{
+      --menu-color: #15141a;
+      --menu-background-color: #f9f9fb;
+      --menu-border-color: #cfcfd8;
+      --menuitem-hover-background-color: #e0e0e6;
+    }
+    @media (-moz-toolbar-prefers-color-scheme:dark) {
+      :root {
+        --menu-border-color: rgba(107,107,107,.3);
+        --menu-color: #fbfbfe;
+        --menu-background-color: #2b2a33;
+        --menuitem-hover-background-color: #52525e;
+      }
+      #alertSourceLabel { color: rgb(5,209,241) !important; }
+    }
+
    /* line below removes background from the notification "window" on linux */
    #alertNotification{ background: transparent !important; }

    #alertBox {
-      color: var(--menu-color, #15141a) !important;
-      background-color: var(--menu-background-color, #f9f9fb) !important;
-      border-color: var(--menu-border-color, #cfcfd8) !important;
+      color: var(--menu-color) !important;
+      background-color: var(--menu-background-color) !important;
+      border-color: var(--menu-border-color) !important;
      border-radius: 6px !important;
      -moz-window-shadow: cliprounded !important;
    }
@ -310,6 +359,14 @@
      margin-inline: 0 !important;
      margin-bottom: -4px !important;
    }
+    .close-icon,
+    #alertSettings {
+      background: transparent !important
+    }
+    .close-icon:hover > .toolbarbutton-icon,
+    #alertSettings:is(:hover,[open]) > .button-box > .box-inherit {
+      background-color: var(--menuitem-hover-background-color, #e0e0e6) !important;
+    }

    /* Shape */
    .close-icon > .toolbarbutton-icon,
@ -324,35 +381,6 @@
    #alertSettings > .button-box > .box-inherit > .button-icon {
      padding: 1px;
    }
-
-    /* Color */
-    .close-icon,
-    #alertSettings {
-      background: transparent !important
-    }
-    .close-icon:hover > .toolbarbutton-icon,
-    #alertSettings:is(:hover,[open]) > .button-box > .box-inherit {
-      background-color: var(--menuitem-hover-background-color, #e0e0e6) !important;
-    }
-
-    @media (-moz-toolbar-prefers-color-scheme:dark) {
-      :root {
-        --menu-border-color: rgba(107,107,107,.3) !important;
-      }
-
-      #alertBox {
-        color: var(--menu-color, #fbfbfe) !important;
-        background-color: var(--menu-background-color, #2b2a33) !important;
-      }
-      .close-icon:hover > .toolbarbutton-icon,
-      #alertSettings:is(:hover, [open]) > .button-box > .box-inherit {
-        background-color: var(--menuitem-hover-background-color, #52525e) !important;
-      }
-
-      #alertSourceLabel {
-        color: rgb(5,209,241) !important;
-      }
-    }
  }

  /*= Downloads ==============================================================*/
@ -632,7 +660,7 @@

  /*= Menu - Reduce Padding ==================================================*/
  :root {
-    --menu-padding: 0.35em;
+    --menu-padding: 0.35em; /* Win7, 8: 0px */
  }
  :root[uidensity=compact] {
    --menu-padding: 0.25em;
@ -825,8 +853,10 @@
    --tab-corner-padding:  1px;
  }

-  :root[lwtheme="true"] tab[visuallyselected] > stack::before,
-  :root[lwtheme="true"] tab[visuallyselected] > stack::after {
+  :root[gtktiledwindow="true"][lwtheme="true"] tab[visuallyselected] > stack::before,
+  :root:not([gtktiledwindow="true"]) tab[visuallyselected] > stack::before,
+  :root[gtktiledwindow="true"][lwtheme="true"] tab[visuallyselected] > stack::after,
+  :root:not([gtktiledwindow="true"]) tab[visuallyselected] > stack::after {
    /* Box */
    content: "" !important;
    display: block !important;
@ -848,11 +878,13 @@
    background-position-y: bottom;
  }

-  :root[lwtheme="true"] tab[visuallyselected] > stack::before {
+  :root[gtktiledwindow="true"][lwtheme="true"] tab[visuallyselected] > stack::before,
+  :root:not([gtktiledwindow="true"]) tab[visuallyselected] > stack::before {
    left: calc(var(--tab-corner-padding) - var(--tab-corner-rounding)) !important;
    background-image: url(./icons/tab-bottom-corner-left.svg);
  }
-  :root[lwtheme="true"] tab[visuallyselected] > stack::after {
+  :root[gtktiledwindow="true"][lwtheme="true"] tab[visuallyselected] > stack::after,
+  :root:not([gtktiledwindow="true"]) tab[visuallyselected] > stack::after {
    left:  auto;
    right: calc(var(--tab-corner-padding) - var(--tab-corner-rounding));
    background-image: url(./icons/tab-bottom-corner-right.svg);
@ -1192,6 +1224,10 @@
    margin-inline-end: 0 !important;
  }

+  .subviewbutton[type="checkbox"]:not([checked=true]) > .toolbarbutton-text {
+    margin-left: 16px !important;
+  }
+
  /* Icons Color */
  #appMenu-multiView .subviewbutton::before,
  #appMenu-proton-update-banner::before,
@ -1504,8 +1540,8 @@

  /** Context Menu - Icons ****************************************************/
  /*= Layout =================================================================*/
-  menupopup menuitem:not([type="checkbox"]),
-  menupopup menu:not([type="checkbox"]) {
+  menupopup menuitem:not([type="checkbox"], [type="radio"]),
+  menupopup menu:not([type="checkbox"], [type="radio"]) {
    -moz-appearance: none !important;  /* Linux: menulist */
  }

@ -1536,8 +1572,8 @@
    --context-menu-background-padding-default: 5px;
    --context-menu-background-padding: var(--context-menu-background-padding-default);
  }
-  :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menuitem,
-  :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menu,
+  :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menuitem:not(.menuitem-iconic),
+  :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menu:not(.menu-iconic),
  #blockedPopupDontShowMessage {
    background-position: left var(--context-menu-background-padding) center !important;
    padding-inline-start: var(--context-menu-background-padding) !important;
@ -1556,7 +1592,11 @@
    }
  }

-  @media (-moz-os-version: windows-win7 ){
+  @media (-moz-os-version: windows-win7 ),
+         (-moz-os-version: windows-win8 ) {
+    :root {
+      --context-menu-background-padding-default: 3px;
+    }
    :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menuitem:not(.menuitem-iconic, [type="checkbox"], [checked="true"], .in-menulist),
    :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menu:not(.menu-iconic, [type="checkbox"], [checked="true"], .in-menulist),
    #blockedPopupDontShowMessage {
@ -1564,8 +1604,7 @@
      padding-inline-start: 0 !important;
    }
  }
-  @media (-moz-os-version: windows-win8 ),
-         (-moz-os-version: windows-win10) {
+  @media (-moz-os-version: windows-win10) {
    :root {
      --context-menu-background-padding: 1em;
    }
--- a/userContent.css
+++ b/userContent.css
@ -379,7 +379,8 @@
      .Select,
      .Button--neutral,
      .Button--neutral:link,
-      .Notice-button {
+      .Notice-button,
+      .AMInstallButton .AMInstallButton-loading-button {
        background-color: var(--in-content-button-background) !important;
      }
      .Button--neutral.Button--micro:not(.Button--disabled):hover,
@ -441,12 +442,13 @@
      .Notice-icon {
        filter: invert(65%) !important;
      }
+      .PermissionsCard-learn-more .Icon,
+      .Permission .Icon {
+        filter: invert(100%) !important;
+      }
      .Icon-heart {
        filter:  brightness(0) !important;
      }
-      .Permission .Icon {
-        filter:  grayscale(100%) brightness(30) !important;
-      }

      /* Others */
      .DropdownMenu-items {