diff --git a/README.org b/README.org
index 4500b91..495caf5 100644
--- a/README.org
+++ b/README.org
@@ -142,7 +142,8 @@ Windows users: Run with powershell ([[https://github.com/black7375/Firefox-UI-Fi
- Select ":package: Download ZIP"
2. Find your profile directory
- Open =about:support= in a new tab
- - Find the =Profile Folder= entry and click the =Open Folder= button
+ - Find the =Profile Directory(Linux)= / =Profile Folder(Windows)= entry
+ - Click the =Open Directory(Linux)= / =Open Folder(Windows)= button
3. Copy downloaded files
- Extract the downloaded zip file
- Copy the =user.js= file to the previously opened profile directory
diff --git a/__tests__/accent_color.test.scss b/__tests__/accent_color.test.scss
index 206760e..ce85923 100644
--- a/__tests__/accent_color.test.scss
+++ b/__tests__/accent_color.test.scss
@@ -7,6 +7,7 @@
@include output {
@include AccentColor {
body {
+ border-color: $accentBorder;
background-color: $accentColor;
color: $accentTextColor;
}
@@ -14,11 +15,13 @@
}
@include expect {
body {
+ border-color: ActiveBorder;
background-color: AccentColor;
color: AccentColorText;
}
@supports -moz-bool-pref("userChrome.compatibility.accent_color") {
body {
+ border-color: -moz-accent-color;
background-color: -moz-accent-color;
color: -moz-accent-color-foreground;
}
@@ -32,10 +35,12 @@
:root {
@include AccentColor {
// Don't use like this!!
+ --uc-accent-border: $accentBorder;
--uc-accent-color: $accentColor;
--uc-accent-text-color: $accentTextColor;
// Use like this
+ --uc-accent-border: #{$accentBorder};
--uc-accent-color: #{$accentColor};
--uc-accent-text-color: #{$accentTextColor};
}
@@ -43,15 +48,19 @@
}
@include expect {
:root {
+ --uc-accent-border: $accentBorder;
--uc-accent-color: $accentColor;
--uc-accent-text-color: $accentTextColor;
+ --uc-accent-border: ActiveBorder;
--uc-accent-color: AccentColor;
--uc-accent-text-color: AccentColorText;
}
@supports -moz-bool-pref("userChrome.compatibility.accent_color") {
:root {
+ --uc-accent-border: $accentBorder;
--uc-accent-color: $accentColor;
--uc-accent-text-color: $accentTextColor;
+ --uc-accent-border: -moz-accent-color;
--uc-accent-color: -moz-accent-color;
--uc-accent-text-color: -moz-accent-color-foreground;
}
@@ -64,6 +73,7 @@
@include output {
@include AccentColor("Highlight") {
body {
+ border-color: $accentBorder;
background-color: $accentColor;
color: $accentTextColor;
}
@@ -71,11 +81,13 @@
}
@include expect {
body {
+ border-color: ActiveBorder;
background-color: AccentColor;
color: AccentColorText;
}
@supports -moz-bool-pref("userChrome.compatibility.accent_color") {
body {
+ border-color: -moz-accent-color;
background-color: Highlight;
color: HighlightText;
}
diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index cff37bb..421f74b 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -55,6 +55,9 @@
menu.subviewbutton {
padding-inline-end: 0 !important;
}
+ #allTabsMenu-allTabsView .subviewbutton.subviewbutton-nav:not([shortcut]) {
+ padding-inline-end: var(--arrowpanel-menuitem-padding-inline) !important;
+ }
/*= Icon Fill Color ==========================================================*/
:root:-moz-lwtheme {
/* Auto create --lwt-toolbarbutton-icon-fill-attention, fix for nightly default theme
@@ -391,6 +394,39 @@
}
}
}
+ /*= Windows - Classic Theme #734 =============================================*/
+ @media (-moz-os-version: windows-win7),
+ (-moz-platform: windows-win7),
+ (-moz-os-version: windows-win8),
+ (-moz-platform: windows-win8),
+ (-moz-os-version: windows-win10),
+ (-moz-platform: windows-win10) {
+ @media (-moz-windows-classic) {
+ :root[tabsintitlebar][sizemode="normal"]:not(:-moz-lwtheme) #navigator-toolbox {
+ appearance: auto !important;
+ -moz-default-appearance: -moz-window-titlebar !important;
+ }
+ :root[tabsintitlebar][sizemode="maximized"]:not(:-moz-lwtheme) #navigator-toolbox {
+ appearance: auto !important;
+ -moz-default-appearance: -moz-window-titlebar !important;
+ }
+ :root[tabsintitlebar]:not(:-moz-lwtheme) #tabbrowser-arrowscrollbox {
+ color: -moz-dialogtext !important;
+ }
+ :root[tabsintitlebar][sizemode="normal"] #navigator-toolbox:-moz-lwtheme {
+ background-image: linear-gradient(
+ to bottom,
+ ThreeDLightShadow 0,
+ ThreeDLightShadow 1px,
+ ThreeDHighlight 1px,
+ ThreeDHighlight 2px,
+ ActiveBorder 2px,
+ ActiveBorder 4px,
+ transparent 4px
+ ) !important;
+ }
+ }
+ }
}
/*= Others - Compatibility ===================================================*/
@supports -moz-bool-pref("userChrome.compatibility.panel_cutoff") {
@@ -1799,8 +1835,8 @@
--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))
+ --panel-separator-color,
+ var(--toolbarbutton-active-background, var(--button-active-bgcolor, var(--card-outline-color)))
) !important;
--menuitem-hover-background-color: var(
--toolbarbutton-hover-background,
@@ -1821,8 +1857,9 @@
--panel-border-color: var(--menu-border-color) !important;
}
html#main-window menupopup:not(.in-menulist):not([placespopup]) menuseparator,
+ html#main-window menupopup:not(.in-menulist):not([placespopup]) menuseparator::before,
html#main-window menupopup:not(.in-menulist)[placespopup] menuseparator::before {
- border-top: 1px solid var(--menu-border-color) !important;
+ border-color: var(--menu-border-color) !important;
}
html#main-window menupopup:not(.in-menulist) menu[disabled="true"],
html#main-window menupopup:not(.in-menulist) menu[_moz-menuactive="true"][disabled="true"],
@@ -1868,8 +1905,9 @@
--panel-border-color: var(--menu-border-color) !important;
}
html#main-window menupopup:not(.in-menulist):not([placespopup]) menuseparator,
+ html#main-window menupopup:not(.in-menulist):not([placespopup]) menuseparator::before,
html#main-window menupopup:not(.in-menulist)[placespopup] menuseparator::before {
- border-top: 1px solid var(--menu-border-color) !important;
+ border-color: var(--menu-border-color) !important;
}
html#main-window menupopup:not(.in-menulist) menu[disabled="true"],
html#main-window menupopup:not(.in-menulist) menu[_moz-menuactive="true"][disabled="true"],
@@ -4082,6 +4120,10 @@
--newtab-button-minus-width-padding: 2px;
--newtab-button-width-padding: calc(var(--toolbarbutton-inner-padding) - var(--newtab-button-minus-width-padding));
}
+ #widget-overflow-mainView #new-tab-button,
+ #widget-overflow-mainView #alltabs-button {
+ --newtab-button-width-padding: 0px;
+ }
#new-tab-button > .toolbarbutton-icon,
#alltabs-button > .toolbarbutton-badge-stack {
/* Original: calc(2 * var(--toolbarbutton-inner-padding) + 16px) */
@@ -4149,6 +4191,11 @@
max-width: var(--tab-max-width) !important; /* Original: 225px */
}
/* neighbouring tabs should "pinch" together */
+ #tabbrowser-tabs:not([hasadjacentnewtabbutton]):not([overflow="true"])
+ > #tabbrowser-arrowscrollbox
+ > #tabbrowser-arrowscrollbox-periphery {
+ min-width: 3px;
+ }
@supports not -moz-bool-pref("userChrome.tab.photon_like_padding") {
@supports -moz-bool-pref("userChrome.tab.lepton_like_padding") {
.tabbrowser-tab[pinned] {
@@ -4497,14 +4544,25 @@
--menu-padding: 0px;
}
}
- menupopup:not(.in-menulist) > menuitem,
+ menupopup > menuitem,
menupopup > menu {
/* Original: 0.5em */
padding-block: var(--menu-padding) !important;
}
- #ContentSelectDropdown > menupopup > menucaption,
- #ContentSelectDropdown > menupopup > menuitem {
- padding-block: 0 !important;
+ @media (-moz-os-version: windows-win7),
+ (-moz-platform: windows-win7),
+ (-moz-os-version: windows-win8),
+ (-moz-platform: windows-win8),
+ (-moz-os-version: windows-win10),
+ (-moz-platform: windows-win10) {
+ #ContentSelectDropdown > menupopup > menucaption,
+ #ContentSelectDropdown > menupopup > menuitem {
+ padding-block: 0 !important;
+ }
+ #ContentSelectDropdown > menupopup > menucaption > .menu-iconic-text,
+ #ContentSelectDropdown > menupopup > menuitem > .menu-iconic-text {
+ padding-block: var(--menu-padding) !important;
+ }
}
@media (-moz-gtk-csd-available) {
#ContentSelectDropdown > menupopup > menucaption,
@@ -4512,6 +4570,12 @@
padding-block: var(--menu-padding) !important;
}
}
+ @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") {
+ #ContentSelectDropdown > menupopup > menucaption,
+ #ContentSelectDropdown > menupopup > menuitem {
+ padding-block: var(--menu-padding) !important;
+ }
+ }
@supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") {
:root:not([uidensity="touch"]) .menu-text,
:root:not([uidensity="touch"]) .menu-iconic-text {
@@ -6813,8 +6877,12 @@
/** Tab UI ********************************************************************/
/*= Tab - Connect to window ==============================================*/
@supports -moz-bool-pref("userChrome.tab.connect_to_window") {
+ #tabbrowser-tabs[orient="vertical"] {
+ --uc-tab-border-bottom-radius: var(--tab-border-radius);
+ }
.tab-background {
- border-radius: var(--tab-border-radius) var(--tab-border-radius) 0px 0px !important;
+ border-radius: var(--tab-border-radius) var(--tab-border-radius) var(--uc-tab-border-bottom-radius, 0px)
+ var(--uc-tab-border-bottom-radius, 0px) !important;
margin-bottom: 0px !important;
}
.tab-content {
@@ -10380,11 +10448,14 @@
max-width: var(--uc-sidebar-width) !important;
will-change: min-width, max-width;
}
- #sidebar-box:is(:hover, :focus-within) {
+ #sidebar-box:is(:hover, :focus-within),
+ #sidebar-box:has(#sidebar-switcher-target.active) {
--uc-sidebar-shadow-width: calc(var(--uc-sidebar-activate-width) - var(--uc-sidebar-width));
}
#sidebar-box:is(:hover, :focus-within) > #sidebar-header,
- #sidebar-box:is(:hover, :focus-within) > #sidebar {
+ #sidebar-box:is(:hover, :focus-within) > #sidebar,
+ #sidebar-box:has(#sidebar-switcher-target.active) > #sidebar-header,
+ #sidebar-box:has(#sidebar-switcher-target.active) > #sidebar {
min-width: var(--uc-sidebar-activate-width) !important;
max-width: var(--uc-sidebar-activate-width) !important;
}
@@ -10410,14 +10481,17 @@
transition: min-width var(--uc-autohide-sidebar-speed) var(--animation-easing-function)
var(--uc-autohide-sidebar-delay) !important;
}
- #sidebar-box:is(:hover, :focus-within) {
+ #sidebar-box:is(:hover, :focus-within),
+ #siebar-box:has(#sidebar-switcher-target.active) {
transition: margin-inline-start var(--uc-autohide-sidebar-speed) var(--animation-easing-function),
opacity var(--uc-autohide-sidebar-speed) ease-in-out,
box-shadow var(--uc-autohide-sidebar-speed) var(--animation-easing-function) var(--uc-autohide-sidebar-speed),
visibility 0s linear !important;
}
#sidebar-box:is(:hover, :focus-within) > #sidebar-header,
- #sidebar-box:is(:hover, :focus-within) > #sidebar {
+ #sidebar-box:is(:hover, :focus-within) > #sidebar,
+ #siebar-box:has(#sidebar-switcher-target.active) > #sidebar-header,
+ #siebar-box:has(#sidebar-switcher-target.active) > #sidebar {
transition-delay: 0ms !important;
}
:root[inFullscreen="true"] #sidebar-box {
@@ -10427,7 +10501,8 @@
box-shadow calc(var(--uc-autohide-fullscreen-sidebar-speed) + 0.05s) var(--animation-easing-function),
visibility 0s linear !important;
}
- :root[inFullscreen="true"] #sidebar-box:is(:hover, :focus-within) {
+ :root[inFullscreen="true"] #sidebar-box:is(:hover, :focus-within),
+ :root[inFullscreen="true"] #sidebar-box:has(#sidebar-switcher-target.active) {
transition-delay: 0ms !important;
}
}
@@ -10440,7 +10515,8 @@
overflow: hidden;
will-change: min-width, max-width;
}
- #sidebar-box:is(:hover, :focus-within) {
+ #sidebar-box:is(:hover, :focus-within),
+ #sidebar-box:has(#sidebar-switcher-target.active) {
min-width: var(--uc-sidebar-activate-width) !important;
max-width: var(--uc-sidebar-activate-width) !important;
}
@@ -10464,7 +10540,8 @@
var(--uc-autohide-sidebar-delay),
max-width var(--uc-autohide-sidebar-speed) var(--animation-easing-function) var(--uc-autohide-sidebar-delay) !important;
}
- #sidebar-box:is(:hover, :focus-within) {
+ #sidebar-box:is(:hover, :focus-within),
+ #sidebar-box:has(#sidebar-switcher-target.active) {
transition-delay: 0ms !important;
}
:root[inFullscreen="true"] #sidebar-box {
@@ -10474,7 +10551,8 @@
:root[inFullscreen="true"] #sidebar-box[positionend="true"] {
transition-property: margin-inline-end !important;
}
- :root[inFullscreen="true"] #sidebar-box:is(:hover, :focus-within) {
+ :root[inFullscreen="true"] #sidebar-box:is(:hover, :focus-within),
+ :root[inFullscreen="true"] #sidebar-box:has(#sidebar-switcher-target.active) {
transition-delay: 0ms !important;
}
}
@@ -11382,24 +11460,42 @@
list-style-image: url("../icons/broom.svg");
}
/*= sidebarMenu-popup ========================================================*/
- #identity-popup-more-info {
+ #identity-popup-more-info.subviewbutton {
list-style-image: url("chrome://global/skin/icons/info.svg");
}
- #sidebar-switcher-bookmarks {
+ #identity-popup-more-info:is(menuitem) {
+ --menuitem-image: url("chrome://global/skin/icons/info.svg");
+ }
+ #sidebar-switcher-bookmarks.subviewbutton {
list-style-image: url("chrome://browser/skin/bookmark.svg");
}
- #sidebar-switcher-history {
+ #sidebar-switcher-bookmarks:is(menuitem) {
+ --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+ }
+ #sidebar-switcher-history.subviewbutton {
list-style-image: url("chrome://browser/skin/history.svg");
}
- #sidebar-switcher-tabs {
+ #sidebar-switcher-history:is(menuitem) {
+ --menuitem-image: url("chrome://browser/skin/history.svg");
+ }
+ #sidebar-switcher-tabs.subviewbutton {
list-style-image: url("../icons/synced-tabs.svg");
}
- #sidebar-reverse-position {
+ #sidebar-switcher-tabs:is(menuitem) {
+ --menuitem-image: url("../icons/synced-tabs.svg");
+ }
+ #sidebar-reverse-position.subviewbutton {
list-style-image: var(--uc-sidebar-icon-reverse);
}
- #sidebarMenu-popup > .subviewbutton[data-l10n-id="sidebar-menu-close"] {
+ #sidebar-reverse-position:is(menuitem) {
+ --menuitem-image: var(--uc-sidebar-icon-reverse);
+ }
+ #sidebarMenu-popup > *.subviewbutton[data-l10n-id="sidebar-menu-close"] {
list-style-image: url("chrome://global/skin/icons/close.svg");
}
+ #sidebarMenu-popup > *:is(menuitem)[data-l10n-id="sidebar-menu-close"] {
+ --menuitem-image: url("chrome://global/skin/icons/close.svg");
+ }
/*= unified-extensions-view ===================================================*/
#unified-extensions-manage-extensions {
list-style-image: url("chrome://mozapps/skin/extensions/extension.svg");
@@ -11420,8 +11516,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,
+ menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-iconic-left > .menu-iconic-icon,
+ menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-iconic-left > .menu-iconic-icon,
#main-menubar > menu {
-moz-appearance: none !important; /* Linux: menulist */
}
@@ -11470,6 +11566,7 @@
.openintabs-menuitem,
#blockedPopupDontShowMessage,
#BMB_viewBookmarksToolbar,
+ #sidebarMenu-popup,
#context_openANewTab.tabmix-newtab-menu-icon {
/* Color */
-moz-context-properties: fill, fill-opacity, stroke !important;
@@ -11551,10 +11648,21 @@
.openintabs-menuitem,
#blockedPopupDontShowMessage,
#BMB_viewBookmarksToolbar,
+ #sidebarMenu-popup,
#context_openANewTab.tabmix-newtab-menu-icon {
background-position: var(--uc-menu-background-position) var(--context-menu-background-padding) center !important;
padding-inline-start: var(--context-menu-background-padding) !important;
}
+ #sidebarMenu-popup:has(menuitem) {
+ margin-inline-start: calc(
+ (var(--context-menu-background-padding) + var(--panel-shadow-margin, 4px)) * -1
+ ) !important;
+ }
+ :not(menu, #ContentSelectDropdown, #context-navigation)
+ > #sidebarMenu-popup:has(menuitem)
+ > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]) {
+ padding-inline-start: 28px !important;
+ }
/* Menubar */
@supports -moz-bool-pref("userChrome.icon.global_menubar") {
#main-menubar > menu {
@@ -11637,6 +11745,7 @@
.openintabs-menuitem,
#blockedPopupDontShowMessage,
#BMB_viewBookmarksToolbar,
+ #sidebarMenu-popup,
#context_openANewTab.tabmix-newtab-menu-icon {
padding-inline-start: var(--menu-background-padding-default) !important;
margin-left: 0 !important;
@@ -11697,6 +11806,7 @@
.openintabs-menuitem,
#blockedPopupDontShowMessage,
#BMB_viewBookmarksToolbar,
+ #sidebarMenu-popup,
#context_openANewTab.tabmix-newtab-menu-icon {
padding-inline-start: var(--menu-background-padding-default) !important;
margin-left: 0 !important;
@@ -11848,6 +11958,7 @@
.openintabs-menuitem,
#blockedPopupDontShowMessage,
#BMB_viewBookmarksToolbar,
+ #sidebarMenu-popup,
#context_openANewTab.tabmix-newtab-menu-icon {
background-position: left var(--context-menu-background-padding) center !important;
padding-inline-start: 0 !important;
@@ -12606,7 +12717,7 @@
--menuitem-image: url("../icons/checkmark-circle.svg");
}
.downloadUseSystemDefaultMenuItem {
- --menuitem-image: url("chrome://browser/skin/open.svg");
+ --menuitem-image: url("../icons/toolbarButton-upload.svg");
}
.downloadAlwaysUseSystemDefaultMenuItem {
/* checkbox */
@@ -12759,7 +12870,7 @@
.pageActionContextMenuItem.extensionPinned.extensionUnpinned.manageExtensionItem {
--menuitem-image: url("chrome://global/skin/icons/settings.svg");
}
- .pageActionContextMenuItem.extensionPinned.extensionUnpinned .removeExtensionItem {
+ .pageActionContextMenuItem.extensionPinned.extensionUnpinned.removeExtensionItem {
--menuitem-image: url("chrome://global/skin/icons/delete.svg");
}
/*= customizationPanelItemContextMenu ========================================*/
@@ -12936,6 +13047,13 @@
.unified-extensions-context-menu-report-extension {
--menuitem-image: url("../icons/send.svg");
}
+ /*= urlbarView-result-menu ===================================================*/
+ .urlbarView-result-menuitem[data-command="dismiss"] {
+ --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+ }
+ .urlbarView-result-menuitem[data-command="help"] {
+ --menuitem-image: url("chrome://global/skin/icons/info.svg");
+ }
}
@supports -moz-bool-pref("userChrome.icon.global_menubar") {
/*= main-menubar =============================================================*/
@@ -12977,7 +13095,7 @@
--menuitem-image: url("chrome://browser/skin/privateBrowsing.svg");
}
#menu_openFile {
- --menuitem-image: url("chrome://browser/skin/open.svg");
+ --menuitem-image: url("../icons/toolbarButton-upload.svg");
}
#menu_savePage {
--menuitem-image: url("../icons/toolbarButton-download.svg");
@@ -13115,6 +13233,9 @@
#hiddenTabsMenu {
--menuitem-image: url("../icons/eye-hide.svg");
}
+ #menu_searchHistory {
+ --menuitem-image: url("chrome://global/skin/icons/search-glass.svg");
+ }
#historyUndoMenu {
--menuitem-image: url("chrome://browser/skin/tab.svg");
}
@@ -13139,6 +13260,9 @@
#menu_bookmarkThisPage[data-l10n-id="menu-bookmark-edit"] {
--menuitem-image: url("chrome://browser/skin/bookmark.svg");
}
+ #menu_searchBookmarks {
+ --menuitem-image: url("chrome://global/skin/icons/search-glass.svg");
+ }
/*= menu_ToolsPopup ==========================================================*/
#menu_openDownloads {
--menuitem-image: url("chrome://browser/skin/downloads/downloads.svg");
@@ -13251,6 +13375,11 @@
#orgUndo {
--menuitem-image: url("../icons/undo.svg");
}
+ @supports -moz-bool-pref("userChrome.icon.menu.full") {
+ #orgRedo {
+ --menuitem-image: url("../icons/redo.svg");
+ }
+ }
#orgCut {
--menuitem-image: url("chrome://browser/skin/edit-cut.svg");
}
@@ -13278,13 +13407,18 @@
}
/*= maintenanceButtonPopup ===================================================*/
#backupBookmarks {
- --menuitem-image: url("chrome://devtools/skin/images/datastore.svg");
+ --menuitem-image: url("../icons/datastore.svg");
+ }
+ @supports -moz-bool-pref("userChrome.icon.menu.full") {
+ #fileRestoreMenu {
+ --menuitem-image: url("../icons/datarestore.svg");
+ }
}
#fileImport {
--menuitem-image: url("../icons/toolbarButton-download.svg");
}
#fileExport {
- --menuitem-image: url("chrome://browser/skin/open.svg");
+ --menuitem-image: url("../icons/toolbarButton-upload.svg");
}
#browserImport {
--menuitem-image: url("chrome://browser/skin/import.svg");
@@ -13345,5 +13479,22 @@
#usercssloader-menu {
--menuitem-image: url("../icons/developer.svg");
}
+ #toggle_statusBar {
+ --menuitem-image: url("../icons/pulse-square.svg");
+ }
+ #muteMenu {
+ --menuitem-image: url("chrome://browser/skin/tabbrowser/tab-audio-muted-small.svg");
+ stroke: transparent !important;
+ }
+ #unloadWebpanelMenu {
+ --menuitem-image: url("../icons/tab-unload.svg");
+ }
+ #changeUAWebpanelMenu {
+ --menuitem-image: url("chrome://devtools/skin/images/command-responsivemode.svg");
+ fill-opacity: 0;
+ }
+ #deleteWebpanelMenu {
+ --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+ }
}
}
diff --git a/css/leptonContent.css b/css/leptonContent.css
index eee6465..e8071dd 100644
--- a/css/leptonContent.css
+++ b/css/leptonContent.css
@@ -7,6 +7,30 @@
margin-inline-end: 8px !important;
width: 20px !important;
}
+ #pane-experimental-search-results-header,
+ #pane-experimental-subtitle {
+ min-height: 27px !important;
+ padding-inline-start: 35px !important;
+ }
+ #firefoxExperimentalCategory:not([hidden="true"]) {
+ display: inline-block;
+ }
+ #firefoxExperimentalCategory > label {
+ float: left;
+ }
+ #firefoxExperimentalCategory > hbox {
+ transform: translateY(5px);
+ }
+ #pane-experimental-featureGates > html|p[data-l10n-id="pane-experimental-description2"] {
+ border-bottom: 1px solid var(--in-content-border-color);
+ padding-bottom: 1.5em;
+ }
+}
+@-moz-document url-prefix("about:addons") {
+ #updates-message + .page-options-menu > .more-options-button {
+ box-sizing: content-box;
+ padding: 0 !important;
+ }
}
/** Video player **************************************************************/
/* Control Bar Size */
@@ -1767,6 +1791,12 @@
/** Fully Proton Mode *********************************************************/
@supports -moz-bool-pref("userContent.page.proton") {
/*= Common contents ==========================================================*/ /*= abouts' common ===========================================================*/
+ @-moz-document url-prefix("about:"), url-prefix("chrome://pippki/content/"), url-prefix("chrome://browser/content/")
+ {
+ xul|treecols {
+ border-bottom-color: var(--in-content-box-border-color) !important;
+ }
+ }
@-moz-document url-prefix("about:plugins"), url-prefix("about:cache"), url-prefix("about:checkerboard"), url-prefix("about:sync-log"), url-prefix("about:memory"), regexp("^(((jar:)?file:///)|(chrome://)).*/$")
{
/* Base */
@@ -2144,6 +2174,22 @@
height: 48px;
}
}
+ @-moz-document url-prefix("about:preferences") {
+ #handlersView > richlistitem:hover,
+ #translations-manage-install-list > .translations-manage-language:hover {
+ background-color: var(--in-content-item-hover);
+ color: var(--in-content-item-hover-text);
+ }
+ #handlersView > richlistitem[selected="true"],
+ #translations-manage-install-list > .translations-manage-language[selected="true"] {
+ background-color: var(--in-content-item-selected);
+ color: var(--in-content-item-selected-text);
+ }
+ #handlersView > richlistitem:nth-child(even):not([selected="true"], :hover),
+ #translations-manage-install-list > .translations-manage-language:nth-child(even):not([selected="true"], :hover) {
+ background-color: var(--in-content-box-background-odd);
+ }
+ }
/*= chrome://browser/content/places/places.xhtml =============================*/
@-moz-document url("chrome://browser/content/places/places.xhtml")
{
@@ -2987,7 +3033,8 @@
richlistbox,
search-textbox,
.web-appearance-choice,
- .content-blocking-category {
+ .content-blocking-category,
+ #translations-manage-install-list {
border-radius: 0 !important;
}
}
@@ -3113,8 +3160,8 @@
{
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 {
+ menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-iconic-left > .menu-iconic-icon,
+ menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]) > .menu-iconic-left > .menu-iconic-icon {
-moz-appearance: none !important; /* Linux: menulist */
}
menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
@@ -3400,7 +3447,7 @@
--menuitem-image: url("../icons/checkmark-circle.svg");
}
.downloadUseSystemDefaultMenuItem {
- --menuitem-image: url("chrome://browser/skin/open.svg");
+ --menuitem-image: url("../icons/toolbarButton-upload.svg");
}
.downloadAlwaysUseSystemDefaultMenuItem {
/* checkbox */
@@ -3536,6 +3583,11 @@
#orgUndo {
--menuitem-image: url("../icons/undo.svg");
}
+ @supports -moz-bool-pref("userChrome.icon.menu.full") {
+ #orgRedo {
+ --menuitem-image: url("../icons/redo.svg");
+ }
+ }
#orgCut {
--menuitem-image: url("chrome://browser/skin/edit-cut.svg");
}
@@ -3563,13 +3615,18 @@
}
/*= maintenanceButtonPopup ===================================================*/
#backupBookmarks {
- --menuitem-image: url("chrome://devtools/skin/images/datastore.svg");
+ --menuitem-image: url("../icons/datastore.svg");
+ }
+ @supports -moz-bool-pref("userChrome.icon.menu.full") {
+ #fileRestoreMenu {
+ --menuitem-image: url("../icons/datarestore.svg");
+ }
}
#fileImport {
--menuitem-image: url("../icons/toolbarButton-download.svg");
}
#fileExport {
- --menuitem-image: url("chrome://browser/skin/open.svg");
+ --menuitem-image: url("../icons/toolbarButton-upload.svg");
}
#browserImport {
--menuitem-image: url("chrome://browser/skin/import.svg");
diff --git a/docs/README.md b/docs/README.md
index 3174acb..d82589f 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -71,23 +71,23 @@ yarn validate
```
### Project Structure
-- [Doc: Project\_Structure.md](./Project_Structure.md).
+- [Doc: Project\_Structure.md](./Project_Structure.md)
### Rules
This is a rough guideline. (Not forced)
-- [Doc: Rules.md](./Rules.md).
+- [Doc: Rules.md](./Rules.md)
## Advanced Customizing
### Smart Bookmarks
-- [Doc: Smart_Bookmarks.md](./Smart_Bookmarks.md).
+- [Doc: Smart_Bookmarks.md](./Smart_Bookmarks.md)
### Policies
- [Support Mozilla: Policies overview](https://support.mozilla.org/en-US/products/firefox-enterprise/policies-customization-enterprise/policies-overview-enterprise)
- [Policy Templates](https://github.com/mozilla/policy-templates)
### Preference
-- [Doc: Preference.md](./Preference.md).
+- [Doc: Preference.md](./Preference.md)
## User Custom CSS
### Basics
@@ -117,4 +117,4 @@ Advanced CSS keywords:
- [UDN: Mozilla CSS extensions](https://udn.realityripple.com/docs/Web/CSS/Mozilla_Extensions)
### Restrictions
-- [Doc: Restrictions.md](./Restrictions.md).
+- [Doc: Restrictions.md](./Restrictions.md)
diff --git a/icons/datarestore.svg b/icons/datarestore.svg
new file mode 100644
index 0000000..34be076
--- /dev/null
+++ b/icons/datarestore.svg
@@ -0,0 +1,6 @@
+
diff --git a/icons/datastore.svg b/icons/datastore.svg
new file mode 100644
index 0000000..ee87f8c
--- /dev/null
+++ b/icons/datastore.svg
@@ -0,0 +1,6 @@
+
diff --git a/icons/toolbarButton-upload.svg b/icons/toolbarButton-upload.svg
new file mode 100644
index 0000000..723f6fb
--- /dev/null
+++ b/icons/toolbarButton-upload.svg
@@ -0,0 +1,4 @@
+
diff --git a/src/autohide/sidebar/_overlap.scss b/src/autohide/sidebar/_overlap.scss
index 4ad310a..89727e8 100644
--- a/src/autohide/sidebar/_overlap.scss
+++ b/src/autohide/sidebar/_overlap.scss
@@ -6,7 +6,8 @@
will-change: min-width, max-width;
}
-#sidebar-box:is(:hover, :focus-within) {
+#sidebar-box:is(:hover, :focus-within),
+#sidebar-box:has(#sidebar-switcher-target.active) {
--uc-sidebar-shadow-width: calc(var(--uc-sidebar-activate-width) - var(--uc-sidebar-width));
> {
@@ -46,7 +47,8 @@
transition: min-width var(--uc-autohide-sidebar-speed) var(--animation-easing-function) var(--uc-autohide-sidebar-delay) !important;
}
- #sidebar-box:is(:hover, :focus-within) {
+ #sidebar-box:is(:hover, :focus-within),
+ #siebar-box:has(#sidebar-switcher-target.active) {
transition: margin-inline-start var(--uc-autohide-sidebar-speed) var(--animation-easing-function), opacity var(--uc-autohide-sidebar-speed) ease-in-out,
box-shadow var(--uc-autohide-sidebar-speed) var(--animation-easing-function) var(--uc-autohide-sidebar-speed), visibility 0s linear !important;
> {
@@ -63,7 +65,8 @@
box-shadow calc(var(--uc-autohide-fullscreen-sidebar-speed) + 0.05s) var(--animation-easing-function),
visibility 0s linear !important;
- &:is(:hover, :focus-within) {
+ &:is(:hover, :focus-within),
+ &:has(#sidebar-switcher-target.active) {
transition-delay: 0ms !important;
}
}
diff --git a/src/autohide/sidebar/_static.scss b/src/autohide/sidebar/_static.scss
index 60f848a..3524e72 100644
--- a/src/autohide/sidebar/_static.scss
+++ b/src/autohide/sidebar/_static.scss
@@ -3,7 +3,8 @@
overflow: hidden;
will-change: min-width, max-width;
- &:is(:hover, :focus-within) {
+ &:is(:hover, :focus-within),
+ &:has(#sidebar-switcher-target.active) {
min-width: var(--uc-sidebar-activate-width) !important;
max-width: var(--uc-sidebar-activate-width) !important;
}
@@ -35,7 +36,8 @@
transition: min-width var(--uc-autohide-sidebar-speed) var(--animation-easing-function) var(--uc-autohide-sidebar-delay),
max-width var(--uc-autohide-sidebar-speed) var(--animation-easing-function) var(--uc-autohide-sidebar-delay) !important;
- &:is(:hover, :focus-within) {
+ &:is(:hover, :focus-within),
+ &:has(#sidebar-switcher-target.active) {
transition-delay: 0ms !important;
}
}
@@ -46,7 +48,8 @@
&[positionend="true"] {
transition-property: margin-inline-end !important;
}
- &:is(:hover, :focus-within) {
+ &:is(:hover, :focus-within),
+ &:has(#sidebar-switcher-target.active) {
transition-delay: 0ms !important;
}
}
diff --git a/src/compatibility/_os.scss b/src/compatibility/_os.scss
index a0ab63c..611359c 100644
--- a/src/compatibility/_os.scss
+++ b/src/compatibility/_os.scss
@@ -246,3 +246,35 @@ $_os_linuxDefaultShadow: 0 0 4px rgba(128, 128, 142, 0.5);
}
}
}
+
+/*= Windows - Classic Theme #734 =============================================*/
+// It occurs by #titlebar { appearance: none !important; } above
+// https://github.com/mozilla/gecko-dev/blob/4334cb91a3762ac497c50a1c7b86b8004690229e/browser/themes/windows/browser.css#L96-L109
+// https://github.com/mozilla/gecko-dev/blob/4334cb91a3762ac497c50a1c7b86b8004690229e/browser/themes/windows/browser.css#L164-L174
+// https://github.com/mozilla/gecko-dev/blob/4334cb91a3762ac497c50a1c7b86b8004690229e/browser/themes/windows/browser-aero.css#L71-L81
+@include OS($win) {
+ @media (-moz-windows-classic) {
+ :root[tabsintitlebar][sizemode="normal"]:not(:-moz-lwtheme) #navigator-toolbox {
+ appearance: auto !important;
+ -moz-default-appearance: -moz-window-titlebar !important;;
+ }
+
+ :root[tabsintitlebar][sizemode="maximized"]:not(:-moz-lwtheme) #navigator-toolbox {
+ appearance: auto !important;;
+ -moz-default-appearance:-moz-window-titlebar !important;;
+ }
+
+ :root[tabsintitlebar]:not(:-moz-lwtheme) #tabbrowser-arrowscrollbox {
+ color: -moz-dialogtext !important;
+ }
+
+ :root[tabsintitlebar][sizemode="normal"] #navigator-toolbox:-moz-lwtheme {
+ background-image: linear-gradient(
+ to bottom,
+ ThreeDLightShadow 0, ThreeDLightShadow 1px,
+ ThreeDHighlight 1px, ThreeDHighlight 2px,
+ ActiveBorder 2px, ActiveBorder 4px, transparent 4px
+ ) !important;
+ }
+ }
+}
diff --git a/src/compatibility/_theme.scss b/src/compatibility/_theme.scss
index d63b14a..418fad8 100644
--- a/src/compatibility/_theme.scss
+++ b/src/compatibility/_theme.scss
@@ -30,6 +30,9 @@
menu.subviewbutton {
padding-inline-end: 0 !important;
}
+#allTabsMenu-allTabsView .subviewbutton.subviewbutton-nav:not([shortcut]) {
+ padding-inline-end: var(--arrowpanel-menuitem-padding-inline) !important; // #717
+}
/*= Icon Fill Color ==========================================================*/
:root:-moz-lwtheme {
diff --git a/src/contents/_compatibility.scss b/src/contents/_compatibility.scss
index 6b5ab3e..d9863f1 100644
--- a/src/contents/_compatibility.scss
+++ b/src/contents/_compatibility.scss
@@ -4,4 +4,36 @@
margin-inline-end: 8px !important; // Original: 6px
width: 20px !important; // ESR(102): 16px, Nightly(116): 27px
}
+
+ #pane-experimental-search-results-header,
+ #pane-experimental-subtitle {
+ min-height: 27px !important; // Original: 30px
+ padding-inline-start: 35px !important;
+ }
+
+ // Align & Separator #722
+ #firefoxExperimentalCategory {
+ &:not([hidden="true"]) {
+ display: inline-block;
+ }
+
+ > label {
+ float: left;
+ }
+ > hbox {
+ transform: translateY(5px);
+ }
+ }
+ #pane-experimental-featureGates > html|p[data-l10n-id="pane-experimental-description2"] {
+ border-bottom: 1px solid var(--in-content-border-color);
+ padding-bottom: 1.5em;
+ }
+}
+
+// #695
+@include moz-document(url-prefix "about:addons") {
+ #updates-message + .page-options-menu > .more-options-button {
+ box-sizing: content-box;
+ padding: 0 !important;
+ }
}
diff --git a/src/contents/_rounding.scss b/src/contents/_rounding.scss
index 1056498..b6de0a6 100644
--- a/src/contents/_rounding.scss
+++ b/src/contents/_rounding.scss
@@ -83,7 +83,8 @@
richlistbox,
search-textbox,
.web-appearance-choice,
- .content-blocking-category {
+ .content-blocking-category,
+ #translations-manage-install-list {
border-radius: 0 !important;
}
}
diff --git a/src/contents/proton_contents/_about_preferences.scss b/src/contents/proton_contents/_about_preferences.scss
index 20e6894..6dcd5f3 100644
--- a/src/contents/proton_contents/_about_preferences.scss
+++ b/src/contents/proton_contents/_about_preferences.scss
@@ -1,3 +1,21 @@
@include moz-document(url-prefix "chrome://browser/content") {
@import "../../theme/proton_chrome/sanitize_everything";
}
+
+@include moz-document(url-prefix "about:preferences") {
+ // Odd table #737
+ #handlersView > richlistitem,
+ #translations-manage-install-list > .translations-manage-language {
+ &:hover {
+ background-color: var(--in-content-item-hover);
+ color: var(--in-content-item-hover-text);
+ }
+ &[selected="true"] {
+ background-color: var(--in-content-item-selected);
+ color: var(--in-content-item-selected-text);
+ }
+ &:nth-child(even):not([selected="true"], :hover) {
+ background-color: var(--in-content-box-background-odd);
+ }
+ }
+}
diff --git a/src/contents/proton_contents/_proton_commons.scss b/src/contents/proton_contents/_proton_commons.scss
index ee2e7b6..510dddc 100644
--- a/src/contents/proton_contents/_proton_commons.scss
+++ b/src/contents/proton_contents/_proton_commons.scss
@@ -1,4 +1,17 @@
/*= abouts' common ===========================================================*/
+@include moz-document(
+ url-prefix "about:",
+ url-prefix "chrome://pippki/content/",
+ url-prefix "chrome://browser/content/"
+) {
+ // The first row separator line #736
+ xul|treecols {
+ // border-bottom: 1px solid var(--in-content-border-color);
+ border-bottom-color: var(--in-content-box-border-color) !important;
+ }
+}
+
+
@include moz-document(
url-prefix "about:plugins",
url-prefix "about:cache",
diff --git a/src/icons/_global_menu.scss b/src/icons/_global_menu.scss
index 03b199d..deb4025 100644
--- a/src/icons/_global_menu.scss
+++ b/src/icons/_global_menu.scss
@@ -19,7 +19,7 @@
#menu_openLocation {
}
#menu_openFile {
- --menuitem-image: url("chrome://browser/skin/open.svg");
+ --menuitem-image: url("../icons/toolbarButton-upload.svg");
}
#menu_close {
}
@@ -189,6 +189,9 @@ menu.share-tab-url-item {
#hiddenTabsMenu {
--menuitem-image: url("../icons/eye-hide.svg")
}
+#menu_searchHistory {
+ --menuitem-image: url("chrome://global/skin/icons/search-glass.svg");
+}
#historyUndoMenu {
--menuitem-image: url("chrome://browser/skin/tab.svg");
}
@@ -217,6 +220,10 @@ menu.share-tab-url-item {
--menuitem-image: url("chrome://browser/skin/bookmark.svg");
}
+#menu_searchBookmarks {
+ --menuitem-image: url("chrome://global/skin/icons/search-glass.svg");
+}
+
#bookmarksToolbarFolderMenu {
}
#menu_unsortedBookmarks {
diff --git a/src/icons/_library.scss b/src/icons/_library.scss
index a65d505..7ada433 100644
--- a/src/icons/_library.scss
+++ b/src/icons/_library.scss
@@ -16,6 +16,9 @@
--menuitem-image: url("../icons/undo.svg");
}
#orgRedo {
+ @include Option("userChrome.icon.menu.full") {
+ --menuitem-image: url("../icons/redo.svg");
+ }
}
#orgCut {
@@ -49,16 +52,19 @@
/*= maintenanceButtonPopup ===================================================*/
#backupBookmarks {
- --menuitem-image: url("chrome://devtools/skin/images/datastore.svg");
+ --menuitem-image: url("../icons/datastore.svg");
}
#fileRestoreMenu {
+ @include Option("userChrome.icon.menu.full") {
+ --menuitem-image: url("../icons/datarestore.svg");
+ }
}
#fileImport {
--menuitem-image: url("../icons/toolbarButton-download.svg");
}
#fileExport {
- --menuitem-image: url("chrome://browser/skin/open.svg");
+ --menuitem-image: url("../icons/toolbarButton-upload.svg");
}
#browserImport {
diff --git a/src/icons/_panel.scss b/src/icons/_panel.scss
index 007de7d..ce8e55e 100644
--- a/src/icons/_panel.scss
+++ b/src/icons/_panel.scss
@@ -469,28 +469,40 @@ panelMenuBookmarkThisPage[starred] {
}
/*= sidebarMenu-popup ========================================================*/
+@mixin _subviewMenuitem($icon, $selector: null) {
+ &.subviewbutton#{$selector} {
+ list-style-image: $icon;
+ }
+ &:is(menuitem)#{$selector} {
+ --menuitem-image: #{$icon};
+ }
+}
+
#identity-popup-more-info {
- list-style-image: url("chrome://global/skin/icons/info.svg");
+ @include _subviewMenuitem(url("chrome://global/skin/icons/info.svg"));
}
#sidebar-switcher-bookmarks {
- list-style-image: url("chrome://browser/skin/bookmark.svg");
+ @include _subviewMenuitem(url("chrome://browser/skin/bookmark.svg"));
}
#sidebar-switcher-history {
- list-style-image: url("chrome://browser/skin/history.svg");
+ @include _subviewMenuitem(url("chrome://browser/skin/history.svg"));
}
#sidebar-switcher-tabs {
- list-style-image: url("../icons/synced-tabs.svg");
+ @include _subviewMenuitem(url("../icons/synced-tabs.svg"));
}
#sidebar-reverse-position {
- list-style-image: var(--uc-sidebar-icon-reverse);
+ @include _subviewMenuitem(var(--uc-sidebar-icon-reverse));
}
-#sidebarMenu-popup > .subviewbutton[data-l10n-id="sidebar-menu-close"] {
- list-style-image: url("chrome://global/skin/icons/close.svg");
+#sidebarMenu-popup > * {
+ @include _subviewMenuitem(
+ url("chrome://global/skin/icons/close.svg"),
+ "[data-l10n-id=\"sidebar-menu-close\"]"
+ );
}
/*= unified-extensions-view ===================================================*/
diff --git a/src/icons/context_menu/_downloads.scss b/src/icons/context_menu/_downloads.scss
index 957853d..4273633 100644
--- a/src/icons/context_menu/_downloads.scss
+++ b/src/icons/context_menu/_downloads.scss
@@ -9,7 +9,7 @@
--menuitem-image: url("../icons/checkmark-circle.svg");
}
.downloadUseSystemDefaultMenuItem {
- --menuitem-image: url("chrome://browser/skin/open.svg");
+ --menuitem-image: url("../icons/toolbarButton-upload.svg");
}
.downloadAlwaysUseSystemDefaultMenuItem {
/* checkbox */
diff --git a/src/icons/context_menu/_others.scss b/src/icons/context_menu/_others.scss
index 361a821..4df45f7 100644
--- a/src/icons/context_menu/_others.scss
+++ b/src/icons/context_menu/_others.scss
@@ -42,7 +42,7 @@
&.manageExtensionItem {
--menuitem-image: url("chrome://global/skin/icons/settings.svg");
}
- .removeExtensionItem {
+ &.removeExtensionItem {
--menuitem-image: url("chrome://global/skin/icons/delete.svg");
}
}
@@ -240,3 +240,13 @@ menuitem.searchbar-clear-history {
.unified-extensions-context-menu-report-extension {
--menuitem-image: url("../icons/send.svg");
}
+
+/*= urlbarView-result-menu ===================================================*/
+.urlbarView-result-menuitem {
+ &[data-command="dismiss"] {
+ --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+ }
+ &[data-command="help"] {
+ --menuitem-image: url("chrome://global/skin/icons/info.svg");
+ }
+}
diff --git a/src/icons/fork_browsers/_floorp.scss b/src/icons/fork_browsers/_floorp.scss
index dcd15dd..0b9f576 100644
--- a/src/icons/fork_browsers/_floorp.scss
+++ b/src/icons/fork_browsers/_floorp.scss
@@ -2,6 +2,7 @@
#rebootappmenu {
list-style-image: url("../icons/refresh-cw.svg");
}
+
#openprofiledir {
list-style-image: url("../icons//folder.svg");
}
@@ -10,4 +11,24 @@
#usercssloader-menu {
--menuitem-image: url("../icons/developer.svg");
}
+
+ #toggle_statusBar {
+ --menuitem-image: url("../icons/pulse-square.svg");
+ }
+
+ // Sidebar
+ #muteMenu {
+ --menuitem-image: url("chrome://browser/skin/tabbrowser/tab-audio-muted-small.svg");
+ stroke: transparent !important;
+ }
+ #unloadWebpanelMenu {
+ --menuitem-image: url("../icons/tab-unload.svg");
+ }
+ #changeUAWebpanelMenu {
+ --menuitem-image: url("chrome://devtools/skin/images/command-responsivemode.svg");
+ fill-opacity: 0;
+ }
+ #deleteWebpanelMenu {
+ --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+ }
}
diff --git a/src/icons/layout/_menu.scss b/src/icons/layout/_menu.scss
index ddd377d..d00e98b 100644
--- a/src/icons/layout/_menu.scss
+++ b/src/icons/layout/_menu.scss
@@ -57,6 +57,12 @@ $_layoutCommonMenus: (
@include _layoutInitPaddingMenus {
@include _layout_init_padding;
}
+#sidebarMenu-popup:has(menuitem) {
+ @include _layout_init_margin;
+ :not(menu, #ContentSelectDropdown, #context-navigation) > & > #{$_iconMenuitem} {
+ padding-inline-start: 28px !important;
+ }
+}
/* Menubar */
@include Option("userChrome.icon.global_menubar") {
diff --git a/src/icons/layout/_menu_common.scss b/src/icons/layout/_menu_common.scss
index 0112819..a3d32e0 100644
--- a/src/icons/layout/_menu_common.scss
+++ b/src/icons/layout/_menu_common.scss
@@ -31,7 +31,7 @@ $_libraryMenuitem: "menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
$_libraryMenu: "menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > #{$_iconMenu}";
$_sendTabMenuPopup: "#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup";
$_otherPopupMenuitem: "menupopup:is(#{$_sendTabMenuPopup}, #frame > menupopup) > menuitem";
-$_otherIconMenu: ".openintabs-menuitem, #blockedPopupDontShowMessage, #BMB_viewBookmarksToolbar";
+$_otherIconMenu: ".openintabs-menuitem, #blockedPopupDontShowMessage, #BMB_viewBookmarksToolbar, #sidebarMenu-popup";
//-- Mixin ---------------------------------------------------------------------
// Init Menu
@@ -40,7 +40,7 @@ $_initialMenus: selector.append(
":not([type=\"checkbox\"][checked=\"true\"], [type=\"radio\"])"
);
$_initialMenus: $_initialMenus + "," +
- selector.nest($_initialMenus, ".menu-iconic-icon");
+ selector.nest($_initialMenus, "> .menu-iconic-left > .menu-iconic-icon");
@mixin _initial_menus() {
-moz-appearance: none !important; /* Linux: menulist */
}
@@ -79,6 +79,10 @@ $_initialMenus: $_initialMenus + "," +
background-position: var(--uc-menu-background-position) var(--context-menu-background-padding) center !important;
padding-inline-start: var(--context-menu-background-padding) !important;
}
+@mixin _layout_init_margin() {
+ // Fix sidebar position
+ margin-inline-start: calc((var(--context-menu-background-padding) + var(--panel-shadow-margin, 4px)) * -1) !important
+}
@mixin _layout_root_non_native() {
:root {
diff --git a/src/padding/_menu.scss b/src/padding/_menu.scss
index e4c7c4e..a8b56bb 100644
--- a/src/padding/_menu.scss
+++ b/src/padding/_menu.scss
@@ -16,7 +16,7 @@
}
}
-menupopup:not(.in-menulist) > menuitem,
+menupopup > menuitem,
menupopup > menu {
/* Original: 0.5em */
padding-block: var(--menu-padding) !important;
@@ -24,9 +24,17 @@ menupopup > menu {
#ContentSelectDropdown > menupopup > menucaption,
#ContentSelectDropdown > menupopup > menuitem {
- padding-block: 0 !important;
+ @include OS($win) {
+ // https://github.com/mozilla/gecko-dev/blob/fe0348c6e6926fd033eef256a272180a85684aa1/toolkit/themes/windows/global/global.css#L133-L148
+ padding-block: 0 !important;
- @include OS($linux) {
+ > .menu-iconic-text {
+ padding-block: var(--menu-padding) !important;
+ }
+ }
+
+ @include OS($linux, $mac) {
+ // Linux - padding: 4px 6px
padding-block: var(--menu-padding) !important;
}
}
diff --git a/src/padding/_tabbar_width.scss b/src/padding/_tabbar_width.scss
index e33e6c5..c2f84ca 100644
--- a/src/padding/_tabbar_width.scss
+++ b/src/padding/_tabbar_width.scss
@@ -29,6 +29,12 @@
--newtab-button-minus-width-padding: 2px;
--newtab-button-width-padding: calc(var(--toolbarbutton-inner-padding) - var(--newtab-button-minus-width-padding));
}
+#widget-overflow-mainView {
+ #new-tab-button,
+ #alltabs-button {
+ --newtab-button-width-padding: 0px;
+ }
+}
#new-tab-button > .toolbarbutton-icon,
#alltabs-button > .toolbarbutton-badge-stack {
/* Original: calc(2 * var(--toolbarbutton-inner-padding) + 16px) */
@@ -89,6 +95,10 @@
}
/* neighbouring tabs should "pinch" together */
+#tabbrowser-tabs:not([hasadjacentnewtabbutton]):not([overflow="true"])
+ > #tabbrowser-arrowscrollbox > #tabbrowser-arrowscrollbox-periphery {
+ min-width: 3px; // With Panorama Tab Groups #643
+}
@include NotOption("userChrome.tab.photon_like_padding") {
@include Option("userChrome.tab.lepton_like_padding") {
.tabbrowser-tab {
diff --git a/src/tab/_connect_to_window.scss b/src/tab/_connect_to_window.scss
index bf4b9da..641130a 100644
--- a/src/tab/_connect_to_window.scss
+++ b/src/tab/_connect_to_window.scss
@@ -1,5 +1,8 @@
+#tabbrowser-tabs[orient="vertical"] {
+ --uc-tab-border-bottom-radius: var(--tab-border-radius);
+}
.tab-background {
- border-radius: var(--tab-border-radius) var(--tab-border-radius) 0px 0px !important;
+ border-radius: var(--tab-border-radius) var(--tab-border-radius) var(--uc-tab-border-bottom-radius, 0px) var(--uc-tab-border-bottom-radius, 0px) !important;
margin-bottom: 0px !important;
}
diff --git a/src/theme/_fully_color.scss b/src/theme/_fully_color.scss
index ce9e53b..a389fcf 100644
--- a/src/theme/_fully_color.scss
+++ b/src/theme/_fully_color.scss
@@ -5,9 +5,10 @@ html#main-window menupopup:not(.in-menulist) {
--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;
+ --panel-separator-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))
@@ -30,9 +31,11 @@ html#main-window menupopup:not(.in-menulist) {
--panel-border-color: var(--menu-border-color) !important;
&:not([placespopup]) menuseparator,
+ &:not([placespopup]) menuseparator::before,
&[placespopup] menuseparator::before {
+ // #732
// toolbarbutton menupopup[placespopup] menuseparator::before
- border-top: 1px solid var(--menu-border-color) !important;
+ border-color: var(--menu-border-color) !important;
}
menu,
diff --git a/src/theme/system_default_theme/_win10.scss b/src/theme/system_default_theme/_win10.scss
index 8c92eda..c06aea5 100644
--- a/src/theme/system_default_theme/_win10.scss
+++ b/src/theme/system_default_theme/_win10.scss
@@ -364,7 +364,7 @@
.titlebar-color {
@include AccentColor {
color: $accentTextColor;
- background-color: $accentColor;
+ background-color: $accentColor; // TODO: Use $accentBorder
}
}
diff --git a/src/utils/_accent_color.scss b/src/utils/_accent_color.scss
index 9da9896..abe12b1 100644
--- a/src/utils/_accent_color.scss
+++ b/src/utils/_accent_color.scss
@@ -4,6 +4,7 @@
// https://github.com/mozilla/gecko-dev/commit/4c5f20179e8d3b963dc588efb9dc2c7b49e7bb31
//
// Need to hard coded #437
+$accentBorder: ActiveBorder;
$accentColor: AccentColor;
$accentTextColor: AccentColorText;
@@ -11,6 +12,8 @@ $accentTextColor: AccentColorText;
@content;
@include Option("userChrome.compatibility.accent_color") {
+ $accentBorder: -moz-accent-color !global;
+
@if $mode == "Highlight" {
$accentColor: Highlight !global;
$accentTextColor: HighlightText !global;
@@ -22,6 +25,7 @@ $accentTextColor: AccentColorText;
@content;
}
+ $accentBorder: ActiveBorder !global;
$accentColor: AccentColor !global;
$accentTextColor: AccentColorText !global;
}
diff --git a/yarn.lock b/yarn.lock
index a97fdc1..04c2bd6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2089,14 +2089,14 @@ sass@^1.57.1:
source-map-js ">=0.6.2 <2.0.0"
semver@^6.0.0, semver@^6.3.0:
- version "6.3.0"
- resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
- integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+ version "6.3.1"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+ integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
semver@^7.3.5:
- version "7.3.8"
- resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
- integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
+ version "7.5.4"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+ integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
dependencies:
lru-cache "^6.0.0"