Merge branch 'dev' into web-ext

css/leptonChrome.css

@@ -3890,11 +3890,6 @@
     --tab-border-radius: var(--toolbarbutton-border-radius);
   }
 }
-@supports -moz-bool-pref("userChrome.rounding.square_dialog") {
-  .dialogBox {
-    border-radius: 0 !important;
-  }
-}
 @supports -moz-bool-pref("userChrome.rounding.square_panel") {
   :root {
     --arrowpanel-border-radius: 0 !important;
@@ -3920,6 +3915,11 @@
     border-radius: 0 !important;
   }
 }
+@supports -moz-bool-pref("userChrome.rounding.square_infobox") {
+  #sanitizeEverythingWarningBox {
+    border-radius: 0 !important;
+  }
+}
 @supports -moz-bool-pref("userChrome.rounding.square_toolbar") {
   :root {
     --uc-rounding-toolbar: 0;
@@ -3961,6 +3961,12 @@
     border-radius: 0 !important;
   }
 }
+@supports -moz-bool-pref("userChrome.rounding.square_dialog") {
+  dialog,
+  .dialogBox {
+    border-radius: 0 !important;
+  }
+}
 /*= Library ==============================================================*/
 @supports -moz-bool-pref("userChrome.rounding.square_button") {
   #placesToolbar > toolbarbutton,
@@ -4087,14 +4093,14 @@
   @supports not -moz-bool-pref("userChrome.tab.photon_like_padding") {
     #tabbrowser-tabs[haspinnedtabs]:not([positionpinnedtabs])
       > #tabbrowser-arrowscrollbox
-      > .tabbrowser-tab[first-visible-unpinned-tab] {
+      > .tabbrowser-tab:is([first-visible-unpinned-tab], :nth-child(1 of :not([pinned], [hidden]))) {
       margin-inline-start: 1px !important;
     }
   }
   @supports -moz-bool-pref("userChrome.tab.photon_like_padding") {
     #tabbrowser-tabs[haspinnedtabs]:not([positionpinnedtabs])
       > #tabbrowser-arrowscrollbox
-      > .tabbrowser-tab[first-visible-unpinned-tab] {
+      > .tabbrowser-tab:is([first-visible-unpinned-tab], :nth-child(1 of :not([pinned], [hidden]))) {
       margin-inline-start: 0 !important;
     }
   }
@@ -4145,13 +4151,16 @@
   /* neighbouring tabs should "pinch" together */
   @supports not -moz-bool-pref("userChrome.tab.photon_like_padding") {
     @supports -moz-bool-pref("userChrome.tab.lepton_like_padding") {
-      .tabbrowser-tab {
+      .tabbrowser-tab[pinned] {
         padding-inline: 1px !important;
       }
+      .tabbrowser-tab:not([pinned]) {
+        margin-inline: -1px !important;
+      }
     }
     @supports not -moz-bool-pref("userChrome.tabbar.multi_row") {
       #TabsToolbar:not([multibar]) .tabbrowser-tab:not(:last-of-type) {
-        margin-inline-end: -1px !important;
+        margin-inline-end: -2px !important;
       }
     }
   }
@@ -4643,6 +4652,9 @@
   .unified-extensions-item-menu-button.subviewbutton {
     padding: 8px !important; /* Original: var(--arrowpanel-menuitem-padding-inline) */
   }
+  :root[uidensity="compact"] :is(.unified-extensions-item, .unified-extensions-item-action-button) {
+    padding-block: 0 !important;
+  }
 }
 @supports -moz-bool-pref("userChrome.padding.panel_header") {
   .panel-header {
@@ -4702,7 +4714,6 @@
   /* Don't use display: flex at not fullscreen!! side effect #372 */
   :root[sizemode="fullscreen"] #navigator-toolbox {
     display: flex !important; /* Needed for content to take up entire height, compatibility with tabs on bottom */
-    flex-wrap: wrap;
   }
   :root[sizemode="fullscreen"] #titlebar,
   :root[sizemode="fullscreen"] #nav-bar,
@@ -7333,7 +7344,8 @@
     }
     #tabbrowser-tabs[positionpinnedtabs],
     #tabbrowser-tabs:not([overflow]) .tabbrowser-tab:first-of-type,
-    #tabbrowser-tabs[overflow] .tabbrowser-tab[first-visible-unpinned-tab] {
+    #tabbrowser-tabs[overflow]
+      .tabbrowser-tab:is([first-visible-unpinned-tab], :nth-child(1 of :not([pinned], [hidden]))) {
       margin-left: var(--uc-tab-corner-half-size) !important;
     }
     .tabbrowser-tab:last-of-type {
@@ -7536,11 +7548,15 @@
     }
   }
   #navigator-toolbox:not([movingtab])
-    .tabbrowser-tab[first-visible-unpinned-tab]:is([visuallyselected], [multiselected], :hover)
+    .tabbrowser-tab:is([first-visible-unpinned-tab], :nth-child(1 of :not([pinned], [hidden]))):is(
+      [visuallyselected],
+      [multiselected],
+      :hover
+    )
     .tab-stack::before,
   #navigator-toolbox:not([movingtab])
     #tabbrowser-arrowscrollbox[overflowing]
-    tab.tabbrowser-tab[first-visible-unpinned-tab]
+    tab.tabbrowser-tab:is([first-visible-unpinned-tab], :nth-child(1 of :not([pinned], [hidden])))
     .tab-stack::before {
     opacity: 0 !important;
   }
@@ -11021,6 +11037,9 @@
       #appMenu-find-button2 {
         list-style-image: url("chrome://global/skin/icons/search-glass.svg");
       }
+      #appMenu-translate-button {
+        list-style-image: url(chrome://browser/skin/translations.svg);
+      }
       #appMenu-zoom-controls2::before,
       #appMenu-zoom-controls::before {
         content: url("../icons/screenshot.svg");
@@ -11164,6 +11183,9 @@
     #appMenuRecentlyClosedWindows {
       list-style-image: url("chrome://browser/skin/window.svg");
     }
+    #appMenuSearchHistory {
+      list-style-image: url("chrome://global/skin/icons/search-glass.svg");
+    }
     #appMenuRestoreSession,
     #appMenu-restoreSession {
       list-style-image: url("../icons/restore-session.svg");
@@ -11256,6 +11278,9 @@
     #appMenu_menu_HelpPopup_reportPhishingtoolmenu {
       list-style-image: url("chrome://global/skin/icons/warning.svg");
     }
+    #appMenu_helpSwitchDevice {
+      list-style-image: url("../icons/add-device.svg");
+    }
     #appMenu_aboutName {
       list-style-image: url("chrome://global/skin/icons/info.svg");
     }
@@ -11395,6 +11420,8 @@
   @supports -moz-bool-pref("userChrome.icon.menu") {
     menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]),
     menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]),
+    menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]) .menu-iconic-icon,
+    menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]) .menu-iconic-icon,
     #main-menubar > menu {
       -moz-appearance: none !important; /* Linux: menulist */
     }
@@ -11433,7 +11460,12 @@
     menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
       > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
     menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
-    menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup)
+    menupopup:is(
+        #context_sendTabToDevicePopupMenu,
+        #context-sendpagetodevice-popup,
+        #context-sendlinktodevice-popup,
+        #frame > menupopup
+      )
       > menuitem,
     .openintabs-menuitem,
     #blockedPopupDontShowMessage,
@@ -11509,7 +11541,12 @@
     menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
       > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
     menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
-    menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup)
+    menupopup:is(
+        #context_sendTabToDevicePopupMenu,
+        #context-sendpagetodevice-popup,
+        #context-sendlinktodevice-popup,
+        #frame > menupopup
+      )
       > menuitem,
     .openintabs-menuitem,
     #blockedPopupDontShowMessage,
@@ -11593,7 +11630,8 @@
         menupopup:is(
             #context_sendTabToDevicePopupMenu,
             #context-sendpagetodevice-popup,
-            #context-sendlinktodevice-popup
+            #context-sendlinktodevice-popup,
+            #frame > menupopup
           )
           > menuitem,
         .openintabs-menuitem,
@@ -11652,7 +11690,8 @@
           menupopup:is(
               #context_sendTabToDevicePopupMenu,
               #context-sendpagetodevice-popup,
-              #context-sendlinktodevice-popup
+              #context-sendlinktodevice-popup,
+              #frame > menupopup
             )
             > menuitem,
           .openintabs-menuitem,
@@ -11802,7 +11841,8 @@
         menupopup:is(
             #context_sendTabToDevicePopupMenu,
             #context-sendpagetodevice-popup,
-            #context-sendlinktodevice-popup
+            #context-sendlinktodevice-popup,
+            #frame > menupopup
           )
           > menuitem,
         .openintabs-menuitem,
@@ -12484,6 +12524,37 @@
           --menuitem-image: url("chrome://browser/skin/bookmark.svg");
         }
       }
+      /*= main-context-menu-frame ==================================================*/
+      #context-showonlythisframe {
+        --menuitem-image: url("../icons/eye-show.svg");
+      }
+      #context-openframeintab {
+        --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+      }
+      #context-openframe {
+        --menuitem-image: url("chrome://browser/skin/window.svg");
+      }
+      #context-reloadframe {
+        --menuitem-image: url("../icons/reload.svg");
+      }
+      #context-bookmarkframe {
+        --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+      }
+      #context-saveframe {
+        --menuitem-image: url("../icons/toolbarButton-download.svg");
+      }
+      #context-printframe {
+        --menuitem-image: url("chrome://global/skin/icons/print.svg");
+      }
+      #context-take-frame-screenshot {
+        --menuitem-image: url("chrome://browser/skin/screenshot.svg");
+      }
+      #context-viewframesource {
+        --menuitem-image: url("../icons/document-search.svg");
+      }
+      #context-viewframeinfo {
+        --menuitem-image: url("chrome://global/skin/icons/info.svg");
+      }
       /*= Tab Mix Plus =============================================================*/
       #tm-autoreload_menu {
         --menuitem-image: url("../icons/timer10.svg");
@@ -13151,6 +13222,12 @@
       #menu_HelpPopup_reportPhishingtoolmenu {
         --menuitem-image: url("chrome://global/skin/icons/warning.svg");
       }
+      #menu_HelpPopup_reportPhishingErrortoolmenu {
+        --menuitem-image: url("../icons/checkmark-circle.svg");
+      }
+      #helpSwitchDevice {
+        --menuitem-image: url("../icons/add-device.svg");
+      }
       #aboutName {
         --menuitem-image: url("chrome://global/skin/icons/info.svg");
       }
@@ -13214,7 +13291,8 @@
       }
     }
   }
-  /** Waterfox ******************************************************************/
+  /** Icons for fork browsers ***************************************************/
+  /*= Waterfox =================================================================*/
   @supports -moz-bool-pref("userChrome.icon.panel") {
     #appMenu-restart-button {
       list-style-image: url("../icons/refresh-cw.svg") !important;
@@ -13231,7 +13309,7 @@
       --menuitem-image: url("../icons/private-favicon.svg");
     }
   }
-  /** Tor Browser ***************************************************************/
+  /*= Tor Browser ==============================================================*/
   @supports -moz-bool-pref("userChrome.icon.panel") {
     #appMenuNewIdentity {
       list-style-image: url("chrome://browser/skin/new_identity.svg");
@@ -13254,4 +13332,18 @@
       --menuitem-image: url("chrome://browser/skin/onion.svg");
     }
   }
+  /*= Floorp Browser ===========================================================*/
+  @supports -moz-bool-pref("userChrome.icon.panel") {
+    #rebootappmenu {
+      list-style-image: url("../icons/refresh-cw.svg");
+    }
+    #openprofiledir {
+      list-style-image: url("../icons//folder.svg");
+    }
+  }
+  @supports -moz-bool-pref("userChrome.icon.menu") {
+    #usercssloader-menu {
+      --menuitem-image: url("../icons/developer.svg");
+    }
+  }
 }

css/leptonContent.css

@@ -1,5 +1,13 @@
 @namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 @namespace html url("http://www.w3.org/1999/xhtml");
+/** Compatibility *************************************************************/
+@-moz-document url-prefix("about:preferences") {
+  .content-blocking-warning.info-box-container > hbox > .content-blocking-warning-image {
+    margin-inline-start: -7px !important;
+    margin-inline-end: 8px !important;
+    width: 20px !important;
+  }
+}
 /** Video player **************************************************************/
 /* Control Bar Size */
 @supports -moz-bool-pref("userContent.player.size") {
@@ -2943,21 +2951,11 @@
   }
 }
 @supports -moz-bool-pref("userChrome.rounding.square_dialog") {
-  @-moz-document url-prefix("about:") {
-    .dialogBox {
-      border-radius: 0 !important;
-    }
-  }
   @-moz-document url("about:home"), url("about:newtab") {
     .modal {
       border-radius: 0 !important;
     }
   }
-  @-moz-document regexp(".*.pdf$") {
-    dialog {
-      border-radius: 0 !important;
-    }
-  }
 }
 @supports -moz-bool-pref("userChrome.rounding.square_checklabel") {
   @-moz-document url-prefix("about:"), regexp("^chrome://\\w+/content/.*.xhtml$")
@@ -3014,6 +3012,7 @@
 @supports -moz-bool-pref("userChrome.rounding.square_menupopup") {
   @-moz-document url-prefix("about:"), url-prefix("chrome://")
   {
+    panel,
     menupopup {
       --panel-border-radius: 0 !important;
     }
@@ -3061,6 +3060,23 @@
       border-radius: 0 !important;
     }
   }
+  @-moz-document url-prefix("about:firefoxview") {
+    .card,
+    .card::before,
+    .empty-container,
+    .synced-tab-a,
+    .synced-tab-li-placeholder {
+      border-radius: 0 !important;
+    }
+  }
+}
+@-moz-document url-prefix("about:"), regexp(".*.pdf$") {
+  @supports -moz-bool-pref("userChrome.rounding.square_dialog") {
+    dialog,
+    .dialogBox {
+      border-radius: 0 !important;
+    }
+  }
 }
 @-moz-document url("chrome://browser/content/places/places.xhtml")
 {
@@ -3096,7 +3112,9 @@
     @-moz-document url("chrome://browser/content/places/places.xhtml"), url("about:downloads")
     {
       menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]),
-      menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]) {
+      menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]),
+      menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]) .menu-iconic-icon,
+      menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]) .menu-iconic-icon {
         -moz-appearance: none !important; /* Linux: menulist */
       }
       menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)

docs/Restrictions.md

@@ -40,6 +40,8 @@ Complex UI emulation is quite tricky. [[Linux's Proton UI Library Chrome](https:
 
 [Bookmark menu](https://github.com/black7375/Firefox-UI-Fix/issues/136) is also similar example([code](https://github.com/black7375/Firefox-UI-Fix/blob/36e9c94844fee2417662251cbd50c2b874d5b576/userChrome.css#L4745-L4840)).
 
+In the case of the Mac native menu, there may be a menu that [cannot be displayed icon or added at the OS level](https://github.com/black7375/Firefox-UI-Fix/issues/699).
+
 ### Firefox Version
 There may be changes that change by version of Firefox.
 
@@ -62,6 +64,7 @@ This project is using SCSS to make a [reusable compatible mixins](../src/utils).
 - `:root[lwtheme-mozlightdark]` is removed [#288](https://github.com/black7375/Firefox-UI-Fix/issues/288)
 - `-moz-os-version` -> `-moz-platform` [#331](https://github.com/black7375/Firefox-UI-Fix/issues/331)
 - Breaking change with `-moz-accent-color`/`-moz-accent-color-foreground` -> `AccentColor`/`AccentColorText` [#433](https://github.com/black7375/Firefox-UI-Fix/issues/433)
+- `-moz-box` to `flex` layout [670](https://github.com/black7375/Firefox-UI-Fix/issues/670)
 
 ### Side Effect
 Only CSS modifications can cause bugs that are hard to think of in the general web, such as the [context menu not appearing](https://github.com/black7375/Firefox-UI-Fix/issues/114).  
@@ -98,6 +101,7 @@ Fork browsers have a different installation location ([bash](https://github.com/
 
 List of fork browsers supported by this project:
 - [Waterfox](https://www.waterfox.net/)
+- [Floorp](https://floorp.app/)
 - [LibreWolf](https://librewolf.net/)
 - [Tor Browser](https://www.torproject.org/download/)
 - [Pulse Browser](https://pulsebrowser.app/)

icons/checkmark-circle.svg

@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 2C11.3137 2 14 4.68629 14 8C14 11.3137 11.3137 14 8 14C4.68629 14 2 11.3137 2 8C2 4.68629 4.68629 2 8 2ZM8 3C5.23858 3 3 5.23858 3 8C3 10.7614 5.23858 13 8 13C10.7614 13 13 10.7614 13 8C13 5.23858 10.7614 3 8 3ZM7.24953 9.04242L10.1203 6.16398C10.3153 5.96846 10.6319 5.96803 10.8274 6.16304C11.0012 6.33637 11.0208 6.60577 10.8861 6.80082L10.8283 6.87014L7.60403 10.1031C7.43053 10.277 7.16082 10.2965 6.96576 10.1615L6.89645 10.1036L5.14645 8.35355C4.95118 8.15829 4.95118 7.84171 5.14645 7.64645C5.32001 7.47288 5.58944 7.4536 5.78431 7.58859L5.85355 7.64645L7.24953 9.04242L10.1203 6.16398L7.24953 9.04242Z"/>
+  <path d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0Zm0 1.333a6.667 6.667 0 1 0 0 13.334A6.667 6.667 0 0 0 8 1.333zM7 9.39l3.827-3.838a.667.667 0 0 1 1.021.85l-.077.092-4.299 4.31a.667.667 0 0 1-.851.078l-.092-.077L4.195 8.47a.667.667 0 0 1 .85-1.02l.093.078L7 9.389l3.828-3.837z"/>
 </svg>

src/contents/_compatibility.scss

@@ -0,0 +1,7 @@
+@include moz-document(url-prefix "about:preferences") {
+  .content-blocking-warning.info-box-container > hbox > .content-blocking-warning-image {
+    margin-inline-start: -7px !important;
+    margin-inline-end: 8px !important; // Original: 6px
+    width: 20px !important; // ESR(102): 16px, Nightly(116): 27px
+  }
+}

src/contents/_rounding.scss

@@ -49,23 +49,11 @@
 }
 
 @include Option("userChrome.rounding.square_dialog") {
-  @include moz-document(url-prefix "about:") {
-    .dialogBox {
-      border-radius: 0 !important;
-    }
-  }
-
   @include moz-document(url "about:home", url "about:newtab") {
     .modal {
       border-radius: 0 !important;
     }
   }
-
-  @include moz-document(regexp ".*\.pdf$") {
-    dialog {
-      border-radius: 0 !important;
-    }
-  }
 }
 
 @include Option("userChrome.rounding.square_checklabel") {
@@ -125,6 +113,7 @@
 
 @include Option("userChrome.rounding.square_menupopup") {
   @include moz-document(url-prefix "about:", url-prefix "chrome://") {
+    panel,
     menupopup {
       --panel-border-radius: 0 !important;
     }
@@ -180,4 +169,14 @@
       border-radius: 0 !important;
     }
   }
+
+  @include moz-document(url-prefix "about:firefoxview") {
+    .card,
+    .card::before, // .zap-card border
+    .empty-container,
+    .synced-tab-a,
+    .synced-tab-li-placeholder {
+      border-radius: 0 !important;
+    }
+  }
 }

src/icons/_global_menu.scss

@@ -322,6 +322,10 @@ menu.share-tab-url-item {
   --menuitem-image: url("chrome://global/skin/icons/warning.svg");
 }
 #menu_HelpPopup_reportPhishingErrortoolmenu {
+  --menuitem-image: url("../icons/checkmark-circle.svg");
+}
+#helpSwitchDevice {
+  --menuitem-image: url("../icons/add-device.svg");
 }
 
 #aboutName {

src/icons/_index.scss

@@ -38,8 +38,5 @@
   }
 }
 
-/** Waterfox ******************************************************************/
+/** Icons for fork browsers ***************************************************/
-@import "waterfox";
+@import "fork_browsers/index";
-
-/** Tor Browser ***************************************************************/
-@import "tor_browser";

src/icons/_panel.scss

@@ -95,6 +95,9 @@
   #appMenu-find-button2 {
     list-style-image: url("chrome://global/skin/icons/search-glass.svg");
   }
+  #appMenu-translate-button {
+    list-style-image: url(chrome://browser/skin/translations.svg);
+  }
   #appMenu-zoom-controls2::before, /* Legacy v104 */
   #appMenu-zoom-controls::before {
     content: url("../icons/screenshot.svg");
@@ -245,6 +248,9 @@ panelMenuBookmarkThisPage[starred] {
 #appMenuRecentlyClosedWindows {
   list-style-image: url("chrome://browser/skin/window.svg");
 }
+#appMenuSearchHistory {
+  list-style-image: url("chrome://global/skin/icons/search-glass.svg");
+}
 #appMenuRestoreSession, /* Legacy - v103 */
 #appMenu-restoreSession {
   list-style-image: url("../icons/restore-session.svg");
@@ -342,6 +348,9 @@ panelMenuBookmarkThisPage[starred] {
 #appMenu_menu_HelpPopup_reportPhishingtoolmenu {
   list-style-image: url("chrome://global/skin/icons/warning.svg");
 }
+#appMenu_helpSwitchDevice {
+  list-style-image: url("../icons/add-device.svg");
+}
 #appMenu_aboutName {
   list-style-image: url("chrome://global/skin/icons/info.svg");
 }

src/icons/context_menu/_content_area.scss

@@ -265,6 +265,45 @@
   }
 }
 
+/*= main-context-menu-frame ==================================================*/
+#context-showonlythisframe {
+  --menuitem-image: url("../icons/eye-show.svg");
+}
+#context-openframeintab {
+  --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+}
+#context-openframe {
+  --menuitem-image: url("chrome://browser/skin/window.svg");
+}
+
+#context-reloadframe {
+  --menuitem-image: url("../icons/reload.svg");
+}
+
+#context-bookmarkframe {
+  --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+}
+#context-saveframe{
+  --menuitem-image: url("../icons/toolbarButton-download.svg");
+}
+
+#context-printframe {
+  --menuitem-image: url("chrome://global/skin/icons/print.svg");
+}
+
+#context-take-frame-screenshot {
+  --menuitem-image: url("chrome://browser/skin/screenshot.svg");
+}
+
+#context-viewframesource {
+  --menuitem-image: url("../icons/document-search.svg");
+}
+#context-viewframeinfo {
+  --menuitem-image: url("chrome://global/skin/icons/info.svg");
+}
+#context-frameOsPid {
+}
+
 /*= Tab Mix Plus =============================================================*/
 #tm-autoreload_menu {
   // --menuitem-image: url("../icons/reload-auto.svg");

src/icons/fork_browsers/_floorp.scss

@@ -0,0 +1,13 @@
+@include Option("userChrome.icon.panel") {
+  #rebootappmenu {
+    list-style-image: url("../icons/refresh-cw.svg");
+  }
+  #openprofiledir {
+    list-style-image: url("../icons//folder.svg");
+  }
+}
+@include Option("userChrome.icon.menu") {
+  #usercssloader-menu {
+    --menuitem-image: url("../icons/developer.svg");
+  }
+}

src/icons/fork_browsers/_index.scss

@@ -0,0 +1,8 @@
+/*= Waterfox =================================================================*/
+@import "waterfox";
+
+/*= Tor Browser ==============================================================*/
+@import "tor_browser";
+
+/*= Floorp Browser ===========================================================*/
+@import "floorp";

src/icons/layout/_menu.scss

@@ -6,7 +6,7 @@ $_layoutCommonMenus: (
   $_iconMenuPopupMenus,
   $_libraryMenuitem,
   $_libraryMenu,
-  $_sendTabMenuitem,
+  $_otherPopupMenuitem,
   $_otherIconMenu,
   "#context_openANewTab.tabmix-newtab-menu-icon"
 );

src/icons/layout/_menu_common.scss

@@ -29,7 +29,8 @@ $_iconMenuPopupMenus: selector.nest(
 $_globalMenus: "#main-menubar > menu";
 $_libraryMenuitem: "menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > #{$_iconMenuitem}";
 $_libraryMenu: "menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > #{$_iconMenu}";
-$_sendTabMenuitem: "menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup) > menuitem";
+$_sendTabMenuPopup: "#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup";
+$_otherPopupMenuitem: "menupopup:is(#{$_sendTabMenuPopup}, #frame > menupopup) > menuitem";
 $_otherIconMenu: ".openintabs-menuitem, #blockedPopupDontShowMessage, #BMB_viewBookmarksToolbar";
 
 //-- Mixin ---------------------------------------------------------------------
@@ -38,6 +39,8 @@ $_initialMenus: selector.append(
   "menupopup menuitem, menupopup menu",
   ":not([type=\"checkbox\"][checked=\"true\"], [type=\"radio\"])"
 );
+$_initialMenus: $_initialMenus + "," +
+                selector.nest($_initialMenus, ".menu-iconic-icon");
 @mixin _initial_menus() {
   -moz-appearance: none !important; /* Linux: menulist */
 }

src/leptonContent.scss

@@ -11,6 +11,9 @@
 @namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 @namespace html url("http://www.w3.org/1999/xhtml");
 
+/** Compatibility *************************************************************/
+@import "contents/compatibility";
+
 /** Video player **************************************************************/
 @import "contents/video_player";
 
@@ -39,6 +42,10 @@
 /** Rounding ******************************************************************/
 @import "contents/rounding";
 
+@include moz-document(url-prefix "about:", regexp ".*\.pdf$") {
+  @import "rounding/dialog";
+}
+
 // Put here to include library as a tab
 @include moz-document(url "chrome://browser/content/places/places.xhtml") {
   @import "rounding/library";

src/padding/_panel.scss

@@ -30,11 +30,18 @@
   }
 }
 
-// #603
+.unified-extensions-item {
-.unified-extensions-item-menu-button.subviewbutton {
+  // #603
-  padding: 8px !important; /* Original: var(--arrowpanel-menuitem-padding-inline) */
+  &-menu-button.subviewbutton {
+    padding: 8px !important; /* Original: var(--arrowpanel-menuitem-padding-inline) */
+  }
+  // Or
+  // toolbaritem.unified-extensions-item[unified-extensions="true"] .unified-extensions-item-menu-button.subviewbutton {
+  //   padding: var(--arrowpanel-menuitem-padding-inline) !important;
+  // }
+
+  // #711
+  :root[uidensity="compact"] :is(&, &-action-button) {
+    padding-block: 0 !important;
+  }
 }
-// Or
-// toolbaritem.unified-extensions-item[unified-extensions="true"] .unified-extensions-item-menu-button.subviewbutton {
-//   padding: var(--arrowpanel-menuitem-padding-inline) !important;
-// }

src/padding/_tabbar_width.scss

@@ -42,14 +42,14 @@
 @include NotOption("userChrome.tab.photon_like_padding") {
   #tabbrowser-tabs[haspinnedtabs]:not([positionpinnedtabs])
     > #tabbrowser-arrowscrollbox
-    > .tabbrowser-tab[first-visible-unpinned-tab] {
+    > .tabbrowser-tab:is([first-visible-unpinned-tab], :nth-child(1 of :not([pinned], [hidden]))) {
     margin-inline-start: 1px !important;
   }
 }
 @include Option("userChrome.tab.photon_like_padding") {
   #tabbrowser-tabs[haspinnedtabs]:not([positionpinnedtabs])
     > #tabbrowser-arrowscrollbox
-    > .tabbrowser-tab[first-visible-unpinned-tab] {
+    > .tabbrowser-tab:is([first-visible-unpinned-tab], :nth-child(1 of :not([pinned], [hidden]))) {
     margin-inline-start: 0 !important;
   }
 }
@@ -92,12 +92,18 @@
 @include NotOption("userChrome.tab.photon_like_padding") {
   @include Option("userChrome.tab.lepton_like_padding") {
     .tabbrowser-tab {
-      padding-inline: 1px !important;
+      // Original: padding-inline 2px, margin-inline 0px #643
+      &[pinned] {
+        padding-inline: 1px !important;
+      }
+      &:not([pinned]) {
+        margin-inline: -1px !important;
+      }
     }
   }
   @include NotOption("userChrome.tabbar.multi_row") {
     #TabsToolbar:not([multibar]) .tabbrowser-tab:not(:last-of-type) {
-      margin-inline-end: -1px !important;
+      margin-inline-end: -2px !important;
     }
   }
 }

src/rounding/_dialog.scss

@@ -0,0 +1,5 @@
+@include Option("userChrome.rounding.square_dialog") {
+  dialog, .dialogBox {
+    border-radius: 0 !important;
+  }
+}

src/rounding/_index.scss

@@ -1,5 +1,6 @@
 /** Rounding ******************************************************************/
 @import "square";
+@import "dialog";
 @import "library";
 
 /*

src/rounding/_square.scss

@@ -38,12 +38,6 @@
   }
 }
 
-@include Option("userChrome.rounding.square_dialog") {
-  .dialogBox {
-    border-radius: 0 !important;
-  }
-}
-
 @include Option("userChrome.rounding.square_panel") {
   :root {
     --arrowpanel-border-radius: 0 !important;
@@ -71,6 +65,12 @@
   }
 }
 
+@include Option("userChrome.rounding.square_infobox") {
+  #sanitizeEverythingWarningBox {
+    border-radius: 0 !important;
+  }
+}
+
 @include Option("userChrome.rounding.square_toolbar") {
   :root {
     --uc-rounding-toolbar: 0;

src/tab/selected_tab/_bottom_rounded_corner_others.scss

@@ -218,7 +218,7 @@
 #tabbrowser-tabs {
   &[positionpinnedtabs],
   &:not([overflow]) .tabbrowser-tab:first-of-type,
-  &[overflow] .tabbrowser-tab[first-visible-unpinned-tab] {
+  &[overflow] .tabbrowser-tab:is([first-visible-unpinned-tab], :nth-child(1 of :not([pinned], [hidden]))) {
     margin-left: var(--uc-tab-corner-half-size) !important;
   }
 }

src/tab/unselected_tab/_dynamic_separator.scss

@@ -96,11 +96,11 @@
 }
 
 #navigator-toolbox:not([movingtab])
-  .tabbrowser-tab[first-visible-unpinned-tab]:is([visuallyselected], [multiselected], :hover)
+  .tabbrowser-tab:is([first-visible-unpinned-tab], :nth-child(1 of :not([pinned], [hidden]))):is([visuallyselected], [multiselected], :hover)
   .tab-stack::before,
 #navigator-toolbox:not([movingtab])
   #tabbrowser-arrowscrollbox[overflowing]
-  tab.tabbrowser-tab[first-visible-unpinned-tab]
+  tab.tabbrowser-tab:is([first-visible-unpinned-tab], :nth-child(1 of :not([pinned], [hidden])))
   .tab-stack::before {
   opacity: 0 !important;
 }

src/tabbar/_index.scss

@@ -3,7 +3,7 @@
   /* Don't use display: flex at not fullscreen!! side effect #372 */
   :root[sizemode="fullscreen"] #navigator-toolbox {
     display: flex !important; /* Needed for content to take up entire height, compatibility with tabs on bottom */
-    flex-wrap: wrap;
+    // flex-wrap: wrap; // Disabled at #700
   }
   :root[sizemode="fullscreen"] #titlebar,
   :root[sizemode="fullscreen"] #nav-bar,

userChrome.css

@@ -6,8 +6,8 @@
 
 /* Enable option to edit bookmark URLs under Add Bookmark (blue star) menu */
 /*
- * #editBMPanel_locationRow {
+ * .editBMPanel_locationRow {
- *   visibility: visible !important;
+ *   display: initial !important;
  * }
 */