diff --git a/chrome/content/common.css b/chrome/content/common.css index 307558a..0226a4a 100644 --- a/chrome/content/common.css +++ b/chrome/content/common.css @@ -12,7 +12,7 @@ --in-content-icon-color: #666 !important; --in-content-accent-color: #006CBE !important; --in-content-accent-color-active: #1683D8 !important; - --in-content-border-hover: rgba(0,0,0,0.5) !important; + --in-content-border-hover: rgba(0, 0, 0, 0.5) !important; --in-content-border-invalid: var(--red-50) !important; --in-content-border-color: #bebebe !important; --in-content-error-text-color: #FF848A !important; @@ -38,7 +38,7 @@ --in-content-text-color: var(--in-content-page-color) !important; scrollbar-color: rgba(37, 37, 37, 0.4) #f7f7f7 !important; } - + @media (prefers-color-scheme: dark) { :root { --in-content-page-background: #252525 !important; @@ -49,7 +49,7 @@ --in-content-box-info-background: rgba(255, 255, 255, 0.15) !important; --in-content-border-color: rgba(255, 255, 255, 0.2) !important; --in-content-border-hover: rgba(255, 255, 255, 0.3) !important; - --in-content-border-invalid: rgb(255,132,139) !important; + --in-content-border-invalid: rgb(255, 132, 139) !important; --in-content-error-text-color: #FF9AA2 !important; --in-content-button-background: #3B3B3B !important; --in-content-button-background-hover: #545454 !important; @@ -72,13 +72,14 @@ --in-content-link-color-visited: var(--in-content-link-color) !important; --card-outline-color: #555 !important; --dialog-warning-text-color: var(--red-40) !important; - scrollbar-color: rgba(255,255,255,.4) #252525 !important; + scrollbar-color: rgba(255, 255, 255, .4) #252525 !important; } } } /* preferences */ -@-moz-document url-prefix(about:preferences), url-prefix(about:addons) { +@-moz-document url-prefix(about:preferences), +url-prefix(about:addons) { .category[selected] { position: relative !important; border-radius: 4px !important; diff --git a/chrome/content/newtab.css b/chrome/content/newtab.css index 2a202ad..c49555c 100644 --- a/chrome/content/newtab.css +++ b/chrome/content/newtab.css @@ -1,7 +1,8 @@ /* EdgeFr-Fox by bmFtZQ - content/newtab.css */ /* colours */ -@-moz-document url-prefix("about:newtab"), url-prefix("about:home") { +@-moz-document url-prefix("about:newtab"), +url-prefix("about:home") { body:not([lwt-newtab], [lwt-newtab-brighttext]) { --newtab-background-color: #F7F7F7 !important; --newtab-background-color-secondary: #fff !important; @@ -48,12 +49,14 @@ } } -@-moz-document url-prefix("about:newtab"), url-prefix("about:home") { +@-moz-document url-prefix("about:newtab"), +url-prefix("about:home") { + /* hide pin */ .icon.icon-pin-small { display: none !important; } - + /* unpinned sites have lower opacity title */ .top-site-button .title:not(.pinned) { opacity: 0.6 !important; @@ -63,6 +66,7 @@ .search-wrapper .search-inner-wrapper { min-height: 44px !important; } + .search-handoff-button { border-radius: 99px !important; background-position: 12px !important; @@ -72,7 +76,7 @@ --elevation: 4; box-shadow: 0 0 calc((var(--elevation) * 0.225px) + 2px) rgba(0, 0, 0, 0.11), 0 calc(var(--elevation) * 0.4px) calc((var(--elevation) * 0.9px)) rgba(0, 0, 0, 0.13) !important; } - + .search-handoff-button:hover { --elevation: 6; } diff --git a/chrome/global/colors.css b/chrome/global/colors.css index 0840f38..94d9b33 100644 --- a/chrome/global/colors.css +++ b/chrome/global/colors.css @@ -2,133 +2,134 @@ /* light */ :root:not(:-moz-lwtheme) { - --lwt-accent-color: #cecece !important; - --lwt-accent-color-inactive: #e8e8e8 !important; - --lwt-text-color: #000 !important; - --toolbar-bgcolor: #f7f7f7 !important; - --toolbar-color: #000 !important; - --toolbarbutton-icon-fill: #000 !important; - --chrome-content-separator-color: #bfbfbf !important; + --lwt-accent-color: #cecece !important; + --lwt-accent-color-inactive: #e8e8e8 !important; + --lwt-text-color: #000 !important; + --toolbar-bgcolor: #f7f7f7 !important; + --toolbar-color: #000 !important; + --toolbarbutton-icon-fill: #000 !important; + --chrome-content-separator-color: #bfbfbf !important; --lwt-toolbarbutton-icon-fill-attention: #0078D4 !important; - --toolbarbutton-icon-fill-attention: #0078D4 !important; - --lwt-tab-text: var(--toolbar-color) !important; - --lwt-selected-tab-background-color: var(--toolbar-bgcolor) !important; - --tab-selected-bgcolor: var(--toolbar-bgcolor) !important; - --toolbar-field-background-color: #fff !important; - --toolbar-field-color: #000 !important; - --toolbar-field-border-color: #0000 !important; - --toolbar-field-focus-background-color: var(--toolbar-field-background-color) !important; - --toolbar-field-focus-color: var(--toolbar-field-color) !important; + --toolbarbutton-icon-fill-attention: #0078D4 !important; + --lwt-tab-text: var(--toolbar-color) !important; + --lwt-selected-tab-background-color: var(--toolbar-bgcolor) !important; + --tab-selected-bgcolor: var(--toolbar-bgcolor) !important; + --toolbar-field-background-color: #fff !important; + --toolbar-field-color: #000 !important; + --toolbar-field-border-color: #0000 !important; + --toolbar-field-focus-background-color: var(--toolbar-field-background-color) !important; + --toolbar-field-focus-color: var(--toolbar-field-color) !important; --toolbar-field-focus-border-color: #0055D7 !important; - --urlbar-icon-fill-opacity: 1 !important; + --urlbar-icon-fill-opacity: 1 !important; --urlbar-popup-url-color: #0072C9 !important; - --lwt-brighttext-url-color: var(--urlbar-popup-url-color) !important; - --urlbar-box-bgcolor: #f7f7f7 !important; - --autocomplete-popup-background: #fff !important; - --autocomplete-popup-color: #fff !important; - --autocomplete-popup-highlight-background: #f2f2f2 !important; + --lwt-brighttext-url-color: var(--urlbar-popup-url-color) !important; + --urlbar-box-bgcolor: #f7f7f7 !important; + --autocomplete-popup-background: #fff !important; + --autocomplete-popup-color: #fff !important; + --autocomplete-popup-highlight-background: #f2f2f2 !important; --autocomplete-popup-hover-background: #e5e5e5 !important; - --autocomplete-popup-separator-color: #dadada00 !important; - --toolbarbutton-hover-background: #e0e0e0 !important; - --toolbarbutton-active-background: #d5d5d5 !important; - --button-bgcolor: #EDEDED !important; - --button-hover-bgcolor: #e5e5e5 !important; - --button-active-bgcolor: #d5d5d5 !important; - --button-primary-bgcolor: #0078D4 !important; - --button-primary-hover-bgcolor: #006CBE !important; - --button-primary-active-bgcolor: #1683D8 !important; - --button-primary-color: #fff !important; - --error-text-color: #FF9AA2 !important; - --input-bgcolor: #fff !important; - --input-color: #2b2b2b !important; - --input-border-color: #bebebe !important; - --input-error-border-color: #FF848A !important; - --zoom-controls-bgcolor: #4A4A4A !important; - --arrowpanel-background: #fff !important; - --arrowpanel-color: #000 !important; - --panel-description-color: #0009 !important; - --panel-disabled-color: #000 !important; - --arrowpanel-dimmed: #565656 !important; - --arrowpanel-dimmed-further: #707070 !important; - --panel-item-hover-bgcolor: #eee !important; - --panel-item-active-bgcolor: #ddd !important; - --arrowpanel-border-color: #dadada !important; - --panel-separator-color: #dadada !important; - --panel-banner-item-update-supported-bgcolor: #50B080 !important; - --focus-outline-color: #0055D7 !important; - --panel-shortcut-color: inherit !important; + --autocomplete-popup-separator-color: #dadada00 !important; + --toolbarbutton-hover-background: #e0e0e0 !important; + --toolbarbutton-active-background: #d5d5d5 !important; + --button-bgcolor: #EDEDED !important; + --button-hover-bgcolor: #e5e5e5 !important; + --button-active-bgcolor: #d5d5d5 !important; + --button-primary-bgcolor: #0078D4 !important; + --button-primary-hover-bgcolor: #006CBE !important; + --button-primary-active-bgcolor: #1683D8 !important; + --button-primary-color: #fff !important; + --error-text-color: #FF9AA2 !important; + --input-bgcolor: #fff !important; + --input-color: #2b2b2b !important; + --input-border-color: #bebebe !important; + --input-error-border-color: #FF848A !important; + --zoom-controls-bgcolor: #4A4A4A !important; + --arrowpanel-background: #fff !important; + --arrowpanel-color: #000 !important; + --panel-description-color: #0009 !important; + --panel-disabled-color: #000 !important; + --arrowpanel-dimmed: #565656 !important; + --arrowpanel-dimmed-further: #707070 !important; + --panel-item-hover-bgcolor: #eee !important; + --panel-item-active-bgcolor: #ddd !important; + --arrowpanel-border-color: #dadada !important; + --panel-separator-color: #dadada !important; + --panel-banner-item-update-supported-bgcolor: #50B080 !important; + --focus-outline-color: #0055D7 !important; + --panel-shortcut-color: inherit !important; --uc-urlbar-shadow: 0 0 4px #0002; } /* dark */ :root[lwt-default-theme-in-dark-mode="true"] { - --lwt-accent-color: #1C1C1C !important; - --lwt-accent-color-inactive: #2e2e2e !important; - --lwt-text-color: #E5E5E5 !important; - --toolbar-bgcolor: #3B3B3B !important; - --toolbar-color: #fff !important; - --toolbarbutton-icon-fill: #fff !important; - --chrome-content-separator-color: #686868 !important; + --lwt-accent-color: #1C1C1C !important; + --lwt-accent-color-inactive: #2e2e2e !important; + --lwt-text-color: #E5E5E5 !important; + --toolbar-bgcolor: #3B3B3B !important; + --toolbar-color: #fff !important; + --toolbarbutton-icon-fill: #fff !important; + --chrome-content-separator-color: #686868 !important; --lwt-toolbarbutton-icon-fill-attention: #4C98D1 !important; - --toolbarbutton-icon-fill-attention: #4C98D1 !important; - --lwt-tab-text: var(--toolbar-color) !important; - --lwt-selected-tab-background-color: var(--toolbar-bgcolor) !important; - --tab-selected-bgcolor: var(--toolbar-bgcolor) !important; - --toolbar-field-background-color: #2B2B2B !important; - --toolbar-field-color: #fff !important; - --toolbar-field-border-color: #0000 !important; - --toolbar-field-focus-background-color: var(--toolbar-field-background-color) !important; - --toolbar-field-focus-color: var(--toolbar-field-color) !important; + --toolbarbutton-icon-fill-attention: #4C98D1 !important; + --lwt-tab-text: var(--toolbar-color) !important; + --lwt-selected-tab-background-color: var(--toolbar-bgcolor) !important; + --tab-selected-bgcolor: var(--toolbar-bgcolor) !important; + --toolbar-field-background-color: #2B2B2B !important; + --toolbar-field-color: #fff !important; + --toolbar-field-border-color: #0000 !important; + --toolbar-field-focus-background-color: var(--toolbar-field-background-color) !important; + --toolbar-field-focus-color: var(--toolbar-field-color) !important; --toolbar-field-focus-border-color: #63ADE5 !important; - --urlbar-icon-fill-opacity: 1 !important; + --urlbar-icon-fill-opacity: 1 !important; --urlbar-popup-url-color: #75B6E8 !important; - --lwt-brighttext-url-color: var(--urlbar-popup-url-color) !important; - --urlbar-box-bgcolor: #3B3B3B !important; - --autocomplete-popup-background: #4A4A4A !important; - --autocomplete-popup-color: #fff !important; - --autocomplete-popup-highlight-background: #383838 !important; + --lwt-brighttext-url-color: var(--urlbar-popup-url-color) !important; + --urlbar-box-bgcolor: #3B3B3B !important; + --autocomplete-popup-background: #4A4A4A !important; + --autocomplete-popup-color: #fff !important; + --autocomplete-popup-highlight-background: #383838 !important; --autocomplete-popup-hover-background: #444444 !important; - --autocomplete-popup-separator-color: #63636300 !important; - --button-bgcolor: #3B3B3B !important; - --button-hover-bgcolor: #545454 !important; - --button-active-bgcolor: #606060 !important; - --button-primary-bgcolor: #006CBE !important; - --button-primary-hover-bgcolor: #0078D4 !important; - --button-primary-active-bgcolor: #005CA3 !important; - --button-primary-color: #fff !important; - --error-text-color: #FF9AA2 !important; - --input-bgcolor: #4A4A4A !important; - --input-color: #fff !important; - --input-border-color: #8A8A8A !important; - --input-error-border-color: #FF848A !important; - --zoom-controls-bgcolor: #4A4A4A !important; - --arrowpanel-background: #4A4A4A !important; - --arrowpanel-color: #fff !important; - --panel-description-color: #fffb !important; - --panel-disabled-color: #ABABAA !important; - --arrowpanel-dimmed: #565656 !important; - --arrowpanel-dimmed-further: #707070 !important; - --panel-item-hover-bgcolor: #646464 !important; - --panel-item-active-bgcolor: #747474 !important; - --arrowpanel-border-color: #636363 !important; - --panel-separator-color: #636363 !important; - --panel-banner-item-update-supported-bgcolor: #50B080 !important; - --focus-outline-color: #63ADE5 !important; - --panel-shortcut-color: inherit !important; + --autocomplete-popup-separator-color: #63636300 !important; + --button-bgcolor: #3B3B3B !important; + --button-hover-bgcolor: #545454 !important; + --button-active-bgcolor: #606060 !important; + --button-primary-bgcolor: #006CBE !important; + --button-primary-hover-bgcolor: #0078D4 !important; + --button-primary-active-bgcolor: #005CA3 !important; + --button-primary-color: #fff !important; + --error-text-color: #FF9AA2 !important; + --input-bgcolor: #4A4A4A !important; + --input-color: #fff !important; + --input-border-color: #8A8A8A !important; + --input-error-border-color: #FF848A !important; + --zoom-controls-bgcolor: #4A4A4A !important; + --arrowpanel-background: #4A4A4A !important; + --arrowpanel-color: #fff !important; + --panel-description-color: #fffb !important; + --panel-disabled-color: #ABABAA !important; + --arrowpanel-dimmed: #565656 !important; + --arrowpanel-dimmed-further: #707070 !important; + --panel-item-hover-bgcolor: #646464 !important; + --panel-item-active-bgcolor: #747474 !important; + --arrowpanel-border-color: #636363 !important; + --panel-separator-color: #636363 !important; + --panel-banner-item-update-supported-bgcolor: #50B080 !important; + --focus-outline-color: #63ADE5 !important; + --panel-shortcut-color: inherit !important; } /* Change Colour of page when loading */ :root:not(:-moz-lwtheme) #tabbrowser-tabpanels { background-color: var(--toolbar-bgcolor) !important; } + :root[lwt-default-theme-in-dark-mode="true"] #tabbrowser-tabpanels { background-color: var(--lwt-accent-color) !important; } /* needed for theming the private browsing indicator */ :root:not([style*="--button-primary-bgcolor"]) { - --button-primary-bgcolor: unset !important; - --button-primary-hover-bgcolor: unset !important; - --button-primary-active-bgcolor: unset !important; - --button-primary-color: unset !important; + --button-primary-bgcolor: unset !important; + --button-primary-hover-bgcolor: unset !important; + --button-primary-active-bgcolor: unset !important; + --button-primary-color: unset !important; } diff --git a/chrome/global/popup.css b/chrome/global/popup.css index f4dc98b..fd13317 100644 --- a/chrome/global/popup.css +++ b/chrome/global/popup.css @@ -10,152 +10,155 @@ --uc-arrowpanel-menuicon-margin-inline: 14px; --panel-separator-margin-vertical: 4px !important; --panel-separator-margin-horizontal: 0 !important; - --uc-panel-zoom-button-padding: 8px; - --uc-panel-zoom-button-inline-padding: 13px; + --uc-panel-zoom-button-padding: 8px; + --uc-panel-zoom-button-inline-padding: 13px; } /* app menu */ -.addon-banner-item, .panel-banner-item { - margin: 0 4px 4px !important; +.addon-banner-item, +.panel-banner-item { + margin: 0 4px 4px !important; padding-inline: 4px 12px !important; border-radius: 2px !important; } -#appMenu-fxa-label2 > vbox > label { - margin-block: 0 !important; +#appMenu-fxa-label2>vbox>label { + margin-block: 0 !important; } -.widget-overflow-list .toolbarbutton-1:not(.toolbarbutton-combined) > .toolbarbutton-text, -.subviewbutton:not(#appMenu-zoom-controls2 > .subviewbutton) > .toolbarbutton-icon + .toolbarbutton-text, -#appMenu-fxa-label2 > vbox { - padding-inline-start: var(--uc-arrowpanel-menuicon-margin-inline) !important; +.widget-overflow-list .toolbarbutton-1:not(.toolbarbutton-combined)>.toolbarbutton-text, +.subviewbutton:not(#appMenu-zoom-controls2 > .subviewbutton)>.toolbarbutton-icon+.toolbarbutton-text, +#appMenu-fxa-label2>vbox { + padding-inline-start: var(--uc-arrowpanel-menuicon-margin-inline) !important; } /* special case menuitems with no icons */ -#appMenu-zoom-controls2 > .toolbarbutton-text, -#fxa-manage-account-button > vbox, -#PanelUI-fxa-menu-syncnow-button > hbox { - padding-inline-start: calc(16px + var(--uc-arrowpanel-menuicon-margin-inline)) !important; +#appMenu-zoom-controls2>.toolbarbutton-text, +#fxa-manage-account-button>vbox, +#PanelUI-fxa-menu-syncnow-button>hbox { + padding-inline-start: calc(16px + var(--uc-arrowpanel-menuicon-margin-inline)) !important; } -.subviewbutton > .toolbarbutton-icon { - width: 16px !important; +.subviewbutton>.toolbarbutton-icon { + width: 16px !important; } /* firefox profile avatar in appmenu */ #appMenu-fxa-label2::before { - content: ""; - display: -moz-box; - height: 16px; - width: 16px; - background: var(--avatar-image-url) 0/16px; - scale: 1.25; - border-radius: 99px; + content: ""; + display: -moz-box; + height: 16px; + width: 16px; + background: var(--avatar-image-url) 0/16px; + scale: 1.25; + border-radius: 99px; } /* disable proton account separator */ #appMenu-fxa-separator { - border-image: none !important; + border-image: none !important; } /* zoom controls */ #appMenu-zoom-controls2 { - border-top: 1px solid var(--panel-separator-color) !important; - padding: 0 0 0 var(--arrowpanel-menuitem-padding-inline) !important; - margin: var(--panel-separator-margin-vertical) 0 calc(var(--panel-separator-margin-vertical) * -1) !important; + border-top: 1px solid var(--panel-separator-color) !important; + padding: 0 0 0 var(--arrowpanel-menuitem-padding-inline) !important; + margin: var(--panel-separator-margin-vertical) 0 calc(var(--panel-separator-margin-vertical) * -1) !important; } -#appMenu-zoom-controls2 > .subviewbutton { - padding: var(--uc-panel-zoom-button-padding) var(--uc-panel-zoom-button-inline-padding) !important; - margin: 0 !important; +#appMenu-zoom-controls2>.subviewbutton { + padding: var(--uc-panel-zoom-button-padding) var(--uc-panel-zoom-button-inline-padding) !important; + margin: 0 !important; } -#appMenu-zoom-controls2 > #appMenu-zoomReset-button2 { - padding: var(--uc-panel-zoom-button-padding) calc(var(--uc-panel-zoom-button-padding) / 2) !important; +#appMenu-zoom-controls2>#appMenu-zoomReset-button2 { + padding: var(--uc-panel-zoom-button-padding) calc(var(--uc-panel-zoom-button-padding) / 2) !important; } #appMenu-zoomReduce-button2, #appMenu-fullscreen-button2 { - border-inline-start: 1px solid var(--panel-separator-color) !important; + border-inline-start: 1px solid var(--panel-separator-color) !important; } #appMenu-zoomReset-button2 { - height: calc(16px + var(--uc-panel-zoom-button-padding) * 2) !important; - min-height: calc(16px + var(--uc-panel-zoom-button-padding) * 2) !important; + height: calc(16px + var(--uc-panel-zoom-button-padding) * 2) !important; + min-height: calc(16px + var(--uc-panel-zoom-button-padding) * 2) !important; } #appMenu-zoomReset-button2:not([disabled], [open], :active):is(:hover) { - background-color: var(--panel-item-hover-bgcolor) !important; + background-color: var(--panel-item-hover-bgcolor) !important; } #appMenu-zoomReset-button2:not([disabled]):is([open], :hover:active) { - background-color: var(--panel-item-active-bgcolor) !important; + background-color: var(--panel-item-active-bgcolor) !important; } #appMenu-zoomReduce-button2:not([disabled], [open], :active):is(:hover), #appMenu-zoomEnlarge-button2:not([disabled], [open], :active):is(:hover), #appMenu-fullscreen-button2:not([disabled], [open], :active):is(:hover) { - background-color: var(--panel-item-hover-bgcolor) !important; + background-color: var(--panel-item-hover-bgcolor) !important; } #appMenu-zoomReduce-button2:not([disabled]):is([open], :hover:active), #appMenu-zoomEnlarge-button2:not([disabled]):is([open], :hover:active), #appMenu-fullscreen-button2:not([disabled]):is([open], :hover:active) { - background-color: var(--panel-item-active-bgcolor) !important; + background-color: var(--panel-item-active-bgcolor) !important; } -#appMenu-zoomReduce-button2 > .toolbarbutton-icon, #appMenu-zoomEnlarge-button2 > .toolbarbutton-icon { - fill: currentColor !important; - stroke: none !important; +#appMenu-zoomReduce-button2>.toolbarbutton-icon, +#appMenu-zoomEnlarge-button2>.toolbarbutton-icon { + fill: currentColor !important; + stroke: none !important; } -#appMenu-fullscreen-button2 > .toolbarbutton-icon { - background-color: transparent !important; +#appMenu-fullscreen-button2>.toolbarbutton-icon { + background-color: transparent !important; } /* URL bar popup */ -.panel-footer > button { - border-radius: 2px !important; +.panel-footer>button { + border-radius: 2px !important; } #identity-popup-security-button { - padding-inline: calc(var(--arrowpanel-menuitem-padding-inline) - 4px) !important; + padding-inline: calc(var(--arrowpanel-menuitem-padding-inline) - 4px) !important; } -.identity-popup-security-connection > hbox { - margin-inline-start: calc(20px + var(--uc-arrowpanel-menuicon-margin-inline)) !important; +.identity-popup-security-connection>hbox { + margin-inline-start: calc(20px + var(--uc-arrowpanel-menuicon-margin-inline)) !important; } -.identity-popup-security-connection > hbox > description { - margin-inline-start: 0 !important; +.identity-popup-security-connection>hbox>description { + margin-inline-start: 0 !important; } .identity-popup-security-connection.identity-button { - margin-inline-end: calc(-1 * (var(--arrowpanel-menuitem-padding-inline) - 10px)) !important; + margin-inline-end: calc(-1 * (var(--arrowpanel-menuitem-padding-inline) - 10px)) !important; } /* subview */ .panel-header { - padding: 4px; - padding-top: 4px !important; + padding: 4px; + padding-top: 4px !important; } -.panel-header + toolbarseparator { - margin-block-start: 0 !important; +.panel-header+toolbarseparator { + margin-block-start: 0 !important; } .subviewbutton-back { - margin: 0 !important; - border-radius: 2px !important; + margin: 0 !important; + border-radius: 2px !important; } .panel-subview-footer-button { - margin-bottom: 4px !important; + margin-bottom: 4px !important; } -.webextension-popup-browser, .webextension-popup-stack { - margin-block-start: calc(var(--panel-separator-margin-vertical) * -.5) !important; +.webextension-popup-browser, +.webextension-popup-stack { + margin-block-start: calc(var(--panel-separator-margin-vertical) * -.5) !important; } /* downloads popup */ @@ -165,26 +168,27 @@ } .downloadButton { - min-width: calc(16px + var(--uc-toolbarbutton-inner-inline-padding) * 2) !important; - height: calc(16px + var(--toolbarbutton-inner-padding) * 2) !important; - border-radius: var(--toolbarbutton-border-radius) !important; + min-width: calc(16px + var(--uc-toolbarbutton-inner-inline-padding) * 2) !important; + height: calc(16px + var(--toolbarbutton-inner-padding) * 2) !important; + border-radius: var(--toolbarbutton-border-radius) !important; } .downloadMainArea { - padding-block: 4px !important; - padding-inline: 12px !important; - border-radius: 0 !important; + padding-block: 4px !important; + padding-inline: 12px !important; + border-radius: 0 !important; } -#downloadsListBox > richlistitem { - padding-inline-end: 8px !important; - border-radius: 0 !important; +#downloadsListBox>richlistitem { + padding-inline-end: 8px !important; + border-radius: 0 !important; } -#downloadsPanel-blockedSubview, #downloadsPanel-mainView { - padding: var(--panel-separator-margin-vertical) 0 0 !important; +#downloadsPanel-blockedSubview, +#downloadsPanel-mainView { + padding: var(--panel-separator-margin-vertical) 0 0 !important; } #emptyDownloads { - padding: 1.5em 16px 1.7em !important; -} \ No newline at end of file + padding: 1.5em 16px 1.7em !important; +} diff --git a/chrome/icons/icons.css b/chrome/icons/icons.css index 53b59bd..ebdf196 100644 --- a/chrome/icons/icons.css +++ b/chrome/icons/icons.css @@ -3,24 +3,24 @@ #appMenu-multiView .subviewbutton, #overflowMenu-customize-button { -moz-context-properties: fill, fill-opacity !important; - fill: currentColor !important; + fill: currentColor !important; } #back-button { - list-style-image: url("back.svg") !important; + list-style-image: url("back.svg") !important; } #forward-button { - list-style-image: url("forward.svg") !important; + list-style-image: url("forward.svg") !important; } #reload-button { - list-style-image: url("reload.svg") !important; + list-style-image: url("reload.svg") !important; } #stop-button, .close-icon { - list-style-image: url("close.svg") !important; + list-style-image: url("close.svg") !important; } .tab-close-button { @@ -28,18 +28,18 @@ } #sidebar-button { - list-style-image: url("sidebars-right.svg") !important; + list-style-image: url("sidebars-right.svg") !important; } #sidebar-button:-moz-locale-dir(ltr):not([positionend]), #sidebar-button:-moz-locale-dir(rtl)[positionend] { - list-style-image: url("sidebars.svg") !important; + list-style-image: url("sidebars.svg") !important; } #downloads-button, #downloads-indicator-anchor, #appMenu-downloads-button { - list-style-image: url("downloads.svg") !important; + list-style-image: url("downloads.svg") !important; } #appMenu-passwords-button { @@ -47,148 +47,148 @@ } #nav-bar-overflow-button { - list-style-image: url("chevron.svg") !important; + list-style-image: url("chevron.svg") !important; } #PanelUI-menu-button, #appMenu-more-button2 { - list-style-image: url("menu.svg") !important; + list-style-image: url("menu.svg") !important; } #appMenu-help-button2 { - list-style-image: url("help.svg") !important; + list-style-image: url("help.svg") !important; } #new-tab-button { - list-style-image: url("new-tab.svg") !important; + list-style-image: url("new-tab.svg") !important; } #sync-button, -.urlbarView-row[source="tabs"] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-favicon, -#urlbar-engine-one-off-item-tabs { +.urlbarView-row[source="tabs"]>.urlbarView-row-inner>.urlbarView-no-wrap>.urlbarView-favicon, +#urlbar-engine-one-off-item-tabs { list-style-image: url("tab.svg") !important; } #history-panelmenu, -.urlbarView-row[source="history"] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-favicon, +.urlbarView-row[source="history"]>.urlbarView-row-inner>.urlbarView-no-wrap>.urlbarView-favicon, #urlbar-engine-one-off-item-history, #appMenu-history-button { - list-style-image: url("history.svg") !important; + list-style-image: url("history.svg") !important; } #save-page-button, #appMenu-save-file-button2 { - list-style-image: url("save.svg") !important; + list-style-image: url("save.svg") !important; } #print-button, #appMenu-print-button2 { - list-style-image: url("print.svg") !important; + list-style-image: url("print.svg") !important; } #find-button, .searchbar-search-icon, #appMenu-find-button2 { - list-style-image: url("search-glass.svg") !important; + list-style-image: url("search-glass.svg") !important; } #open-file-button { - list-style-image: url("open.svg") !important; + list-style-image: url("open.svg") !important; } #add-ons-button, #appMenu-extensions-themes-button { - list-style-image: url("extension.svg") !important; + list-style-image: url("extension.svg") !important; } #zoom-out-button, #appMenu-zoomReduce-button2 { - list-style-image: url("zoom-out.svg") !important; + list-style-image: url("zoom-out.svg") !important; } #zoom-in-button, #tabs-newtab-button, #TabsToolbar #new-tab-button, #appMenu-zoomEnlarge-button2 { - list-style-image: url("plus.svg") !important; + list-style-image: url("plus.svg") !important; } #cut-button { - list-style-image: url("edit-cut.svg") !important; + list-style-image: url("edit-cut.svg") !important; } #copy-button { - list-style-image: url("edit-copy.svg") !important; + list-style-image: url("edit-copy.svg") !important; } #paste-button { - list-style-image: url("edit-paste.svg") !important; + list-style-image: url("edit-paste.svg") !important; } #email-link-button { - list-style-image: url("mail.svg") !important; + list-style-image: url("mail.svg") !important; } #screenshot-button { - list-style-image: url("screenshot.svg") !important; + list-style-image: url("screenshot.svg") !important; } #preferences-button, -.search-setting-button > .button-box > .button-icon, +.search-setting-button>.button-box>.button-icon, #appMenu-settings-button { - list-style-image: url("settings.svg") !important; + list-style-image: url("settings.svg") !important; } #panic-button { - list-style-image: url("forget.svg") !important; + list-style-image: url("forget.svg") !important; } #privatebrowsing-button, #appMenu-new-private-window-button2 { - list-style-image: url("privateBrowsing.svg") !important; + list-style-image: url("privateBrowsing.svg") !important; } #save-to-pocket-button { - list-style-image: url("pocket-outline.svg") !important; + list-style-image: url("pocket-outline.svg") !important; } -#profiler-button-button > .toolbarbutton-icon, +#profiler-button-button>.toolbarbutton-icon, .subviewbutton[label="Task Manager"] { - list-style-image: url("tool-profiler.svg") !important; + list-style-image: url("tool-profiler.svg") !important; } #developer-button { - list-style-image: url("developer.svg") !important; + list-style-image: url("developer.svg") !important; } #new-window-button, #appMenu-new-window-button2 { - list-style-image: url("window.svg") !important; + list-style-image: url("window.svg") !important; } #restore-button, #fullscreen-button, -#appMenu-fullscreen-button2{ - list-style-image: url("fullscreen.svg") !important; +#appMenu-fullscreen-button2 { + list-style-image: url("fullscreen.svg") !important; } #restore-button[checked], #fullscreen-button[checked], #appMenu-fullscreen-button2[checked] { - list-style-image: url("fullscreen-exit.svg") !important; + list-style-image: url("fullscreen-exit.svg") !important; } #bookmarks-menu-button, #appMenu-bookmarks-button { - list-style-image: url("bookmark-star-on-tray.svg") !important; + list-style-image: url("bookmark-star-on-tray.svg") !important; } #home-button { - list-style-image: url("home.svg") !important; + list-style-image: url("home.svg") !important; } #library-button { - list-style-image: url("library.svg") !important; + list-style-image: url("library.svg") !important; } /* identity icons */ @@ -204,11 +204,11 @@ list-style-image: url("page-portrait.svg") !important; } -#urlbar:not(.searchButton) > #urlbar-input-container > #identity-box[pageproxystate="invalid"] #identity-icon { +#urlbar:not(.searchButton)>#urlbar-input-container>#identity-box[pageproxystate="invalid"] #identity-icon { list-style-image: url("search-glass.svg") !important; } -#urlbar[actiontype="extension"] > #urlbar-input-container > #identity-box #identity-icon, +#urlbar[actiontype="extension"]>#urlbar-input-container>#identity-box #identity-icon, #identity-box[pageproxystate="valid"].extensionPage #identity-icon { list-style-image: url("extension.svg") !important; } @@ -218,8 +218,8 @@ list-style-image: url("security.svg") !important; } -#urlbar-input-container[pageproxystate="valid"] > #tracking-protection-icon-container > #tracking-protection-icon-box > #tracking-protection-icon { - list-style-image: url("tracking-protection.svg") !important; +#urlbar-input-container[pageproxystate="valid"]>#tracking-protection-icon-container>#tracking-protection-icon-box>#tracking-protection-icon { + list-style-image: url("tracking-protection.svg") !important; } /* security */ @@ -230,7 +230,7 @@ #identity-box[pageproxystate="valid"].notSecure #identity-icon, #identity-box[pageproxystate="valid"].mixedActiveContent #identity-icon, #identity-box[pageproxystate="valid"].httpsOnlyErrorPage #identity-icon { - list-style-image: url("security-broken.svg") !important; + list-style-image: url("security-broken.svg") !important; } #identity-popup[connection=chrome] .identity-popup-security-connection { @@ -238,7 +238,7 @@ } #identity-popup[connection="file"] .identity-popup-security-connection { - background-image: url("page-portrait.svg") !important; + background-image: url("page-portrait.svg") !important; } #identity-popup[connection^=secure] .identity-popup-security-connection { @@ -261,44 +261,46 @@ } #appMenu-new-tab-button2 { - list-style-image: url("new-tab-image.svg") !important; + list-style-image: url("new-tab-image.svg") !important; } .findbar-find-previous { - list-style-image: url("arrow-up.svg") !important; + list-style-image: url("arrow-up.svg") !important; } .findbar-find-next { - list-style-image: url("arrow-down.svg") !important; + list-style-image: url("arrow-down.svg") !important; } #protections-popup-mainView .subviewbutton-nav:not(.notFound)::after, #identity-popup-mainView .subviewbutton-nav::after, .widget-overflow-list .subviewbutton-nav::after, .PanelUI-subView .subviewbutton-nav::after { - content: url("arrow-right.svg") !important; + content: url("arrow-right.svg") !important; } #PlacesChevron, -#urlbar-go-button{ - list-style-image: url("arrow-right.svg") !important; +#urlbar-go-button { + list-style-image: url("arrow-right.svg") !important; } #overflowMenu-customize-button, #appmenu-moreTools-button { - list-style-image: url("customize.svg") !important; + list-style-image: url("customize.svg") !important; } .bookmark-item[container] { - list-style-image: url("folder.svg") !important; + list-style-image: url("folder.svg") !important; } -#pageAction-panel-bookmark, #star-button { - list-style-image: url("bookmark-hollow.svg") !important; +#pageAction-panel-bookmark, +#star-button { + list-style-image: url("bookmark-hollow.svg") !important; } -#pageAction-panel-bookmark[starred], #star-button[starred] { - list-style-image: url("bookmark.svg") !important; +#pageAction-panel-bookmark[starred], +#star-button[starred] { + list-style-image: url("bookmark.svg") !important; } /* tab icons */ @@ -307,26 +309,26 @@ .tab-icon-image[src="chrome://mozapps/skin/extensions/extension.svg"], .tab-icon-image[src="chrome://browser/skin/customize.svg"], .tab-icon-image[src="chrome://browser/skin/privatebrowsing/favicon.svg"] { - padding-left: 16px !important; - box-sizing: border-box !important; + padding-left: 16px !important; + box-sizing: border-box !important; } .tab-icon-image[src="chrome://branding/content/icon32.png"], .tab-icon-image[src="chrome://browser/skin/privatebrowsing/favicon.svg"] { - background: url("new-tab-image.svg") !important; + background: url("new-tab-image.svg") !important; } .tab-icon-image[src="chrome://global/skin/icons/settings.svg"] { - background: url("settings.svg") !important; + background: url("settings.svg") !important; } .tab-icon-image[src="chrome://mozapps/skin/extensions/extension.svg"] { - background: url("extension.svg") !important; + background: url("extension.svg") !important; } .tab-icon-image[src="chrome://browser/skin/customize.svg"] { - background: url("customize.svg") !important; + background: url("customize.svg") !important; } /* permissions */ @@ -446,10 +448,10 @@ } /* reload/stop animation */ -#stop-reload-button[animate] > #reload-button[displaystop] + #stop-button > .toolbarbutton-animatable-box > .toolbarbutton-animatable-image { +#stop-reload-button[animate]>#reload-button[displaystop]+#stop-button>.toolbarbutton-animatable-box>.toolbarbutton-animatable-image { background-image: url("reload-to-stop.svg") !important; } -#stop-reload-button[animate] > #reload-button > .toolbarbutton-animatable-box > .toolbarbutton-animatable-image { +#stop-reload-button[animate]>#reload-button>.toolbarbutton-animatable-box>.toolbarbutton-animatable-image { background-image: url("stop-to-reload.svg") !important; } diff --git a/chrome/toolbar/findbar.css b/chrome/toolbar/findbar.css index 6881975..509141f 100644 --- a/chrome/toolbar/findbar.css +++ b/chrome/toolbar/findbar.css @@ -3,28 +3,28 @@ .findbar-find-previous, .findbar-find-next, .close-icon { - border-radius: var(--toolbarbutton-border-radius) !important; + border-radius: var(--toolbarbutton-border-radius) !important; } .findbar-textbox { - border: 0 !important; - border-radius: calc(var(--toolbarbutton-border-radius) + 2px) !important; + border: 0 !important; + border-radius: calc(var(--toolbarbutton-border-radius) + 2px) !important; } .findbar-textbox:-moz-lwtheme { - background-color: var(--toolbar-field-background-color) !important; + background-color: var(--toolbar-field-background-color) !important; } .findbar-textbox:focus { - outline: 2px solid var(--focus-outline-color, -moz-accent-color) !important; - outline-offset: -1px !important; + outline: 2px solid var(--focus-outline-color, -moz-accent-color) !important; + outline-offset: -1px !important; } .findbar-textbox[status="notfound"] { - outline: 2px solid var(--input-error-border-color, #E22850) !important; - outline-offset: -1px !important; + outline: 2px solid var(--input-error-border-color, #E22850) !important; + outline-offset: -1px !important; } .findbar-container { - overflow-inline: visible !important; -} \ No newline at end of file + overflow-inline: visible !important; +} diff --git a/chrome/toolbar/navbar.css b/chrome/toolbar/navbar.css index 8b13c12..f2e7900 100644 --- a/chrome/toolbar/navbar.css +++ b/chrome/toolbar/navbar.css @@ -7,65 +7,65 @@ --tabs-navbar-shadow-size: 0 !important; } -#nav-bar .toolbarbutton-1 > .toolbarbutton-icon { - width: calc(2 * var(--uc-toolbarbutton-inner-inline-padding) + 16px) !important; +#nav-bar .toolbarbutton-1>.toolbarbutton-icon { + width: calc(2 * var(--uc-toolbarbutton-inner-inline-padding) + 16px) !important; } -#nav-bar .toolbarbutton-1 > .toolbarbutton-icon, -#nav-bar .toolbarbutton-1 > .toolbarbutton-text, -#nav-bar .toolbarbutton-1 > .toolbarbutton-badge-stack { - padding-inline: var(--uc-toolbarbutton-inner-inline-padding) !important; +#nav-bar .toolbarbutton-1>.toolbarbutton-icon, +#nav-bar .toolbarbutton-1>.toolbarbutton-text, +#nav-bar .toolbarbutton-1>.toolbarbutton-badge-stack { + padding-inline: var(--uc-toolbarbutton-inner-inline-padding) !important; } /* move reload/stop icon to middle of button */ -#reload-button > .toolbarbutton-animatable-box, -#stop-button > .toolbarbutton-animatable-box { - top: calc(50% - 10px) !important; - margin-inline-start: calc((16px + 2 * var(--uc-toolbarbutton-inner-inline-padding) - 20px) / 2) !important; +#reload-button>.toolbarbutton-animatable-box, +#stop-button>.toolbarbutton-animatable-box { + top: calc(50% - 10px) !important; + margin-inline-start: calc((16px + 2 * var(--uc-toolbarbutton-inner-inline-padding) - 20px) / 2) !important; } -#nav-bar-customization-target :where(#reload-button, #stop-button) > .toolbarbutton-icon { - padding: var(--toolbarbutton-inner-padding) var(--uc-toolbarbutton-inner-inline-padding) !important; +#nav-bar-customization-target :where(#reload-button, #stop-button)>.toolbarbutton-icon { + padding: var(--toolbarbutton-inner-padding) var(--uc-toolbarbutton-inner-inline-padding) !important; } /* account button */ -#navigator-toolbox > toolbar #fxa-toolbar-menu-button, -#navigator-toolbox > toolbar #fxa-toolbar-menu-button > .toolbarbutton-badge-stack { - border-radius: 99px !important; +#navigator-toolbox>toolbar #fxa-toolbar-menu-button, +#navigator-toolbox>toolbar #fxa-toolbar-menu-button>.toolbarbutton-badge-stack { + border-radius: 99px !important; } -#nav-bar #fxa-toolbar-menu-button > .toolbarbutton-badge-stack { - padding: var(--toolbarbutton-inner-padding) !important; - margin-inline: calc(var(--uc-toolbarbutton-inner-inline-padding) - var(--toolbarbutton-inner-padding)) !important; +#nav-bar #fxa-toolbar-menu-button>.toolbarbutton-badge-stack { + padding: var(--toolbarbutton-inner-padding) !important; + margin-inline: calc(var(--uc-toolbarbutton-inner-inline-padding) - var(--toolbarbutton-inner-padding)) !important; } :root[fxastatus="signedin"] #fxa-avatar-image { - scale: 1.5 !important; + scale: 1.5 !important; } :root[privatebrowsingmode] #fxa-toolbar-menu-button::before { content: "Private" !important; display: -moz-box !important; - font-size: 12px !important; + font-size: 12px !important; } :root[privatebrowsingmode] #fxa-toolbar-menu-button { background: var(--button-primary-bgcolor, var(--lwt-toolbarbutton-icon-fill-attention, var(--toolbarbutton-icon-fill-attention))) !important; - margin: 4px !important; - padding-inline: 8px 0 !important; - color: var(--button-primary-color, var(--toolbar-bgcolor)) !important; - fill: currentColor !important; + margin: 4px !important; + padding-inline: 8px 0 !important; + color: var(--button-primary-color, var(--toolbar-bgcolor)) !important; + fill: currentColor !important; } :root[privatebrowsingmode] #fxa-toolbar-menu-button:hover { background: var(--button-primary-hover-bgcolor, color-mix(in srgb, var(--lwt-toolbarbutton-icon-fill-attention, var(--toolbarbutton-icon-fill-attention)) 90%, transparent)) !important; } -:root[privatebrowsingmode] #fxa-toolbar-menu-button:not([disabled=true]):is([open],[checked],:hover:active) { +:root[privatebrowsingmode] #fxa-toolbar-menu-button:not([disabled=true]):is([open], [checked], :hover:active) { background: var(--button-primary-active-bgcolor, color-mix(in srgb, var(--lwt-toolbarbutton-icon-fill-attention, var(--toolbarbutton-icon-fill-attention)) 70%, transparent)) !important; } -:root[privatebrowsingmode] #nav-bar #fxa-toolbar-menu-button > .toolbarbutton-badge-stack { +:root[privatebrowsingmode] #nav-bar #fxa-toolbar-menu-button>.toolbarbutton-badge-stack { background: transparent !important; - margin-inline: 0 !important; + margin-inline: 0 !important; } diff --git a/chrome/toolbar/personalbar.css b/chrome/toolbar/personalbar.css index 3205c97..0c13f4c 100644 --- a/chrome/toolbar/personalbar.css +++ b/chrome/toolbar/personalbar.css @@ -7,23 +7,26 @@ #personal-toolbar-empty-description, #PersonalToolbar .toolbarbutton-1, toolbarbutton.bookmark-item:not(.subviewbutton) { - margin-block: 0 4px !important; - padding: var(--bookmark-block-padding) 6px !important; + margin-block: 0 4px !important; + padding: var(--bookmark-block-padding) 6px !important; font-size: 12px !important; } -#PlacesToolbarItems > toolbarseparator::before { - content: ""; - display: block; - border-inline-start: 1px solid var(--toolbarseparator-color) !important; +#PlacesToolbarItems>toolbarseparator::before { + content: ""; + display: block; + border-inline-start: 1px solid var(--toolbarseparator-color) !important; margin-block: 8px !important; - border-image-source: none !important; + border-image-source: none !important; } #PersonalToolbar { - padding-inline: var(--toolbar-start-end-padding) calc(var(--toolbar-start-end-padding) + 4px) !important; + padding-inline: var(--toolbar-start-end-padding) calc(var(--toolbar-start-end-padding) + 4px) !important; } -#managed-bookmarks > .toolbarbutton-icon, #bookmarks-toolbar-placeholder > .toolbarbutton-icon, #PlacesToolbarItems > .bookmark-item > .toolbarbutton-icon[label]:not([label=""]), #OtherBookmarks.bookmark-item[container] > .toolbarbutton-icon { - margin-inline-end: 6px !important; -} \ No newline at end of file +#managed-bookmarks>.toolbarbutton-icon, +#bookmarks-toolbar-placeholder>.toolbarbutton-icon, +#PlacesToolbarItems>.bookmark-item>.toolbarbutton-icon[label]:not([label=""]), +#OtherBookmarks.bookmark-item[container]>.toolbarbutton-icon { + margin-inline-end: 6px !important; +} diff --git a/chrome/toolbar/tabbar.css b/chrome/toolbar/tabbar.css index b1b92e6..5ee6042 100644 --- a/chrome/toolbar/tabbar.css +++ b/chrome/toolbar/tabbar.css @@ -1,11 +1,11 @@ /* EdgeFr-Fox 2 - tabbar */ :root #titlebar { - --tab-min-height: 32px !important; - --inline-tab-padding: 11px !important; - --tab-border-radius: 4px !important; + --tab-min-height: 32px !important; + --inline-tab-padding: 11px !important; + --tab-border-radius: 4px !important; --tab-block-margin: 8px !important; - + --uc-toolbarbutton-inner-padding: 6px !important; --toolbarbutton-border-radius: 2px !important; --tabs-navbar-shadow-size: 0 !important; @@ -13,9 +13,9 @@ /* tab open/close transition */ .tabbrowser-tab:not([pinned]) { - transition-property: min-width, max-width !important; + transition-property: min-width, max-width !important; transition-duration: 150ms !important; - transition-timing-function: cubic-bezier(0,.75,.25,1) !important; + transition-timing-function: cubic-bezier(0, .75, .25, 1) !important; } :root:is([inFullscreen], :not([tabsintitlebar])) #titlebar { @@ -30,10 +30,10 @@ } .tab-background { - border-radius: var(--tab-border-radius); + border-radius: var(--tab-border-radius); border-bottom-left-radius: 0 !important; border-bottom-right-radius: 0 !important; - margin-block: 0 !important; + margin-block: 0 !important; border: 0 !important; position: relative !important; --uc-tab-corner-bg: transparent; @@ -74,71 +74,71 @@ --uc-tab-corner-bg: var(--tab-selected-bgcolor, var(--toolbar-bgcolor)); } -#tabbrowser-tabs:not([movingtab]) > #tabbrowser-arrowscrollbox > .tabbrowser-tab > .tab-stack > .tab-background[multiselected="true"]:-moz-lwtheme, -#tabbrowser-tabs:not([movingtab]) > #tabbrowser-arrowscrollbox > .tabbrowser-tab > .tab-stack > .tab-background[selected="true"]:-moz-lwtheme { - background-image: linear-gradient(var(--lwt-selected-tab-background-color, transparent), var(--lwt-selected-tab-background-color, transparent)), linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor)), var(--lwt-header-image, none); - --uc-tab-corner-bg: var(--lwt-selected-tab-background-color, var(--toolbar-bgcolor)); +#tabbrowser-tabs:not([movingtab])>#tabbrowser-arrowscrollbox>.tabbrowser-tab>.tab-stack>.tab-background[multiselected="true"]:-moz-lwtheme, +#tabbrowser-tabs:not([movingtab])>#tabbrowser-arrowscrollbox>.tabbrowser-tab>.tab-stack>.tab-background[selected="true"]:-moz-lwtheme { + background-image: linear-gradient(var(--lwt-selected-tab-background-color, transparent), var(--lwt-selected-tab-background-color, transparent)), linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor)), var(--lwt-header-image, none); + --uc-tab-corner-bg: var(--lwt-selected-tab-background-color, var(--toolbar-bgcolor)); } .tabbrowser-tab .tab-background:is([selected], [multiselected]) { - --uc-tab-corner-bg: var(--tab-selected-bgcolor, var(--toolbar-bgcolor)); + --uc-tab-corner-bg: var(--tab-selected-bgcolor, var(--toolbar-bgcolor)); } -.tabbrowser-tab:hover > .tab-stack > .tab-background:not([selected="true"], [multiselected]) { +.tabbrowser-tab:hover>.tab-stack>.tab-background:not([selected="true"], [multiselected]) { --uc-tab-corner-bg: color-mix(in srgb, currentColor 11%, transparent) } #tabbrowser-tabs, -#TabsToolbar #TabsToolbar-customization-target > .toolbarbutton-1 { +#TabsToolbar #TabsToolbar-customization-target>.toolbarbutton-1 { margin-top: var(--tab-block-margin) !important; } #TabsToolbar .toolbarbutton-1 { - margin: 0 !important; + margin: 0 !important; } /* fix colours */ #navigator-toolbox:not(:-moz-lwtheme) { - background-color: var(--lwt-accent-color) !important; - color: var(--lwt-text-color) !important; + background-color: var(--lwt-accent-color) !important; + color: var(--lwt-text-color) !important; } .tab-label-container:not([selected="true"], [multiselected]) { - opacity: 1 !important; + opacity: 1 !important; } #TabsToolbar .toolbarbutton-animatable-box, #TabsToolbar .toolbarbutton-1 { - fill: var(--lwt-text-color) !important; + fill: var(--lwt-text-color) !important; } .tabbrowser-tab[multiselected]:not(:-moz-lwtheme), .tabbrowser-tab[visuallyselected="true"]:not(:-moz-lwtheme) { - color: var(--lwt-tab-text, var(--toolbar-color)) !important; + color: var(--lwt-tab-text, var(--toolbar-color)) !important; } .tab-close-button { - margin-inline-end: calc(8px - var(--inline-tab-padding)) !important; - width: 17px !important; - height: 17px !important; - padding: 4px !important; - border-radius: 2px !important; + margin-inline-end: calc(8px - var(--inline-tab-padding)) !important; + width: 17px !important; + height: 17px !important; + padding: 4px !important; + border-radius: 2px !important; } .tab-throbber:not([pinned]), .tab-icon-pending:not([pinned]), .tab-icon-image:not([pinned]), .tab-sharing-icon-overlay:not([pinned]) { - margin-inline-end: 10px !important; + margin-inline-end: 10px !important; } /* tab volume icon/text */ .tab-secondary-label { - display: none !important; + display: none !important; } -.tab-icon-stack:is([soundplaying], [muted], [activemedia-blocked]) > .tab-icon-overlay, -.tabbrowser-tab:hover .tab-icon-stack:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked]) > :not(.tab-icon-overlay) { +.tab-icon-stack:is([soundplaying], [muted], [activemedia-blocked])>.tab-icon-overlay, +.tabbrowser-tab:hover .tab-icon-stack:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked])> :not(.tab-icon-overlay) { opacity: 1 !important; } @@ -149,24 +149,24 @@ .tab-icon-overlay[soundplaying]:not([crashed]), .tab-icon-overlay[muted]:not([crashed]), .tab-icon-overlay[activemedia-blocked]:not([crashed]) { - border-radius: 2px !important; - padding: 0 !important; + border-radius: 2px !important; + padding: 0 !important; } .tabbrowser-tab { - font-size: 12px !important; + font-size: 12px !important; padding-inline: 0 !important; } -#TabsToolbar .toolbarbutton-1 > .toolbarbutton-icon, -#TabsToolbar .toolbarbutton-1 > .toolbarbutton-badge-stack { +#TabsToolbar .toolbarbutton-1>.toolbarbutton-icon, +#TabsToolbar .toolbarbutton-1>.toolbarbutton-badge-stack { border-radius: var(--toolbarbutton-border-radius) !important; padding: var(--uc-toolbarbutton-inner-padding) !important; } -#TabsToolbar .toolbarbutton-1 > .toolbarbutton-icon { - width: calc(2 * var(--uc-toolbarbutton-inner-padding) + 16px) !important; - height: calc(2 * var(--uc-toolbarbutton-inner-padding) + 16px) !important; +#TabsToolbar .toolbarbutton-1>.toolbarbutton-icon { + width: calc(2 * var(--uc-toolbarbutton-inner-padding) + 16px) !important; + height: calc(2 * var(--uc-toolbarbutton-inner-padding) + 16px) !important; } #tabbrowser-tabs #tabs-newtab-button { @@ -174,36 +174,36 @@ } .tab-content[pinned] { - padding: 0 12px !important; + padding: 0 12px !important; } -.tabbrowser-tab[usercontextid] > .tab-stack > .tab-background > .tab-context-line { - height: 8px !important; +.tabbrowser-tab[usercontextid]>.tab-stack>.tab-background>.tab-context-line { + height: 8px !important; clip-path: inset(0 0 6px) !important; - border-radius: var(--tab-border-radius) !important; + border-radius: var(--tab-border-radius) !important; border-bottom-left-radius: 0 !important; border-bottom-right-radius: 0 !important; margin: 0 !important; } .titlebar-spacer[type="post-tabs"] { - display: -moz-box !important; + display: -moz-box !important; } .titlebar-spacer[type="pre-tabs"], .private-browsing-indicator { - display: none !important; + display: none !important; } toolbarbutton[part="scrollbutton-up"], toolbarbutton[part="scrollbutton-down"] { - border-width: 2px !important; - border-radius: calc(var(--toolbarbutton-border-radius) + 2px) !important; + border-width: 2px !important; + border-radius: calc(var(--toolbarbutton-border-radius) + 2px) !important; margin-inline: 2px !important; } .tabbrowser-tab:not([pinned], [style*="max-width"])[fadein] { - max-width: 240px !important; + max-width: 240px !important; } /* tab separators */ @@ -221,8 +221,8 @@ toolbarbutton[part="scrollbutton-down"] { border-right: 1px solid color-mix(in srgb, currentColor 34%, transparent); } -#tabbrowser-tabs[haspinnedtabs]:not([positionpinnedtabs]) > #tabbrowser-arrowscrollbox > .tabbrowser-tab[first-visible-unpinned-tab] { - margin-inline-start: 0 !important; +#tabbrowser-tabs[haspinnedtabs]:not([positionpinnedtabs])>#tabbrowser-arrowscrollbox>.tabbrowser-tab[first-visible-unpinned-tab] { + margin-inline-start: 0 !important; } #scrollbutton-up[part="scrollbutton-up"]:not(.menupopup-scrollbutton), @@ -237,6 +237,7 @@ toolbarbutton[part="scrollbutton-down"] { .titlebar-buttonbox { margin-inline: 10px !important; } + .titlebar-buttonbox-container { margin-inline-end: -8px !important; } @@ -246,6 +247,7 @@ toolbarbutton[part="scrollbutton-down"] { .titlebar-buttonbox { margin-inline: calc((var(--tab-min-height) + var(--tab-block-margin) - 14px) / 2) !important; } + .titlebar-buttonbox-container { margin-inline-end: -8px !important; } @@ -273,30 +275,31 @@ toolbarbutton[part="scrollbutton-down"] { } #tabbrowser-tabs[overflow] .tabbrowser-tab[last-visible-tab]:not([pinned]) { - margin-inline-end: 8px !important;} + margin-inline-end: 8px !important; +} -.tabbrowser-tab:is([visuallyselected="true"], [multiselected]) > .tab-stack > .tab-background { - box-shadow: 0 4px 5px rgba(0,0,0,0.2), 0 0px 2px rgba(0,0,0,0.2) !important; +.tabbrowser-tab:is([visuallyselected="true"], [multiselected])>.tab-stack>.tab-background { + box-shadow: 0 4px 5px rgba(0, 0, 0, 0.2), 0 0px 2px rgba(0, 0, 0, 0.2) !important; } #titlebar { - box-shadow: 0 -3px 2px -3px rgba(0,0,0,0.2) inset !important; + box-shadow: 0 -3px 2px -3px rgba(0, 0, 0, 0.2) inset !important; } -:root[lwthemetextcolor="bright"] .tabbrowser-tab:is([visuallyselected="true"], [multiselected]) > .tab-stack > .tab-background { - box-shadow: 0 4px 5px rgba(0,0,0,0.55), 0 0px 2px rgba(0,0,0,0.6) !important; +:root[lwthemetextcolor="bright"] .tabbrowser-tab:is([visuallyselected="true"], [multiselected])>.tab-stack>.tab-background { + box-shadow: 0 4px 5px rgba(0, 0, 0, 0.55), 0 0px 2px rgba(0, 0, 0, 0.6) !important; } :root[lwthemetextcolor="bright"] #titlebar { - box-shadow: 0 -3px 2px -3px rgba(0,0,0,0.75) inset !important; + box-shadow: 0 -3px 2px -3px rgba(0, 0, 0, 0.75) inset !important; } /* force inactive window on default theme */ @media not (-moz-os-version: windows-win7) { @media not (-moz-os-version: windows-win8) { - #navigator-toolbox:-moz-window-inactive { - background-color: var(--lwt-accent-color-inactive, var(--lwt-accent-color)) !important; - } + #navigator-toolbox:-moz-window-inactive { + background-color: var(--lwt-accent-color-inactive, var(--lwt-accent-color)) !important; + } } } diff --git a/chrome/toolbar/urlbar.css b/chrome/toolbar/urlbar.css index b9e12df..8e0d369 100644 --- a/chrome/toolbar/urlbar.css +++ b/chrome/toolbar/urlbar.css @@ -1,78 +1,79 @@ /* EdgeFr-Fox by bmFtZQ - urlbar.css */ :root { - --urlbar-min-height: 28px !important; + --urlbar-min-height: 28px !important; --urlbarView-item-inline-padding: 14px !important; - --urlbar-icon-border-radius: var(--toolbarbutton-border-radius) !important; - --urlbar-icon-padding: calc(var(--toolbarbutton-inner-padding) - 2px) !important; - --uc-urlbar-icon-inline-padding: calc(var(--uc-toolbarbutton-inner-inline-padding) - 2px) !important; - --identity-box-margin-inline: 2px !important; + --urlbar-icon-border-radius: var(--toolbarbutton-border-radius) !important; + --urlbar-icon-padding: calc(var(--toolbarbutton-inner-padding) - 2px) !important; + --uc-urlbar-icon-inline-padding: calc(var(--uc-toolbarbutton-inner-inline-padding) - 2px) !important; + --identity-box-margin-inline: 2px !important; } /* color-mix(in srgb, var(--toolbar-field-focus-border-color) 50%, transparent) */ :root:not(:-moz-lwtheme) #urlbar { - --urlbar-box-bgcolor: unset !important; + --urlbar-box-bgcolor: unset !important; } -#urlbar[focused="true"]:not([suppress-focus-border]) > #urlbar-background:not(:-moz-lwtheme), +#urlbar[focused="true"]:not([suppress-focus-border])>#urlbar-background:not(:-moz-lwtheme), #searchbar:not(:-moz-lwtheme):focus-within { outline-color: color-mix(in srgb, var(--toolbar-field-focus-border-color) 50%, transparent) !important; } :root:not([lwthemetextcolor="bright"]) #urlbar-background { - box-shadow: var(--uc-urlbar-shadow, none); + box-shadow: var(--uc-urlbar-shadow, none); } -#urlbar[open] > #urlbar-background { - border-color: transparent !important; - box-shadow: 0 10px 16px #0005, 0 0 1px #0006 !important; +#urlbar[open]>#urlbar-background { + border-color: transparent !important; + box-shadow: 0 10px 16px #0005, 0 0 1px #0006 !important; } .urlbarView { - margin-inline: 0 !important; - width: 100% !important; - border-inline: 0 !important; + margin-inline: 0 !important; + width: 100% !important; + border-inline: 0 !important; } .urlbarView-row { - padding-block: 0 !important; + padding-block: 0 !important; } .urlbarView-row-inner { - border-radius: 0 !important; - padding-block: 8px !important; + border-radius: 0 !important; + padding-block: 8px !important; } -.urlbarView-row:not([type="tip"], [type="dynamic"])[selected] > .urlbarView-row-inner, .urlbarView-row-inner[selected] { - box-shadow: 3px 0 var(--toolbar-field-focus-border-color) inset !important; +.urlbarView-row:not([type="tip"], [type="dynamic"])[selected]>.urlbarView-row-inner, +.urlbarView-row-inner[selected] { + box-shadow: 3px 0 var(--toolbar-field-focus-border-color) inset !important; } #urlbar-anon-search-settings { - margin-inline-end: 8px !important; + margin-inline-end: 8px !important; } #urlbar .search-one-offs:not([hidden]) { - padding-block: 8px 0 !important; + padding-block: 8px 0 !important; } /* breakout */ #urlbar[breakout][breakout-extend] { - left: 0 !important; - width: 100% !important; + left: 0 !important; + width: 100% !important; } -#urlbar[breakout][breakout-extend] > #urlbar-input-container { - padding-inline: var(--urlbar-container-padding) !important; +#urlbar[breakout][breakout-extend]>#urlbar-input-container { + padding-inline: var(--urlbar-container-padding) !important; } .urlbarView-results { - padding-block: 0 !important; + padding-block: 0 !important; } -#urlbar[open] > .urlbarView > .urlbarView-body-outer > .urlbarView-body-inner, -.urlbarView:not([noresults]) > .search-one-offs:not([hidden]) { - border-top: 0 !important; +#urlbar[open]>.urlbarView>.urlbarView-body-outer>.urlbarView-body-inner, +.urlbarView:not([noresults])>.search-one-offs:not([hidden]) { + border-top: 0 !important; } /* urlbar spacing */ @@ -85,60 +86,58 @@ --urlbar-height: calc(16px + var(--toolbarbutton-inner-padding) * 2) !important; } -#urlbar-container, #search-container { - margin-inline: 6px !important; +#urlbar-container, +#search-container { + margin-inline: 6px !important; } -.urlbar-page-action, #urlbar-go-button, .search-go-button, +.urlbar-page-action, +#urlbar-go-button, +.search-go-button, #tracking-protection-icon-container, #identity-icon-box { - padding-inline: var(--uc-urlbar-icon-inline-padding) !important; - width: calc(var(--uc-urlbar-icon-inline-padding) * 2 + 16px) !important; + padding-inline: var(--uc-urlbar-icon-inline-padding) !important; + width: calc(var(--uc-urlbar-icon-inline-padding) * 2 + 16px) !important; } -#identity-box[pageproxystate="valid"].notSecureText > .identity-box-button, -#identity-box[pageproxystate="valid"].chromeUI > .identity-box-button, -#identity-box[pageproxystate="valid"].extensionPage > .identity-box-button, +#identity-box[pageproxystate="valid"].notSecureText>.identity-box-button, +#identity-box[pageproxystate="valid"].chromeUI>.identity-box-button, +#identity-box[pageproxystate="valid"].extensionPage>.identity-box-button, #urlbar-label-box { - width: unset !important; + width: unset !important; } #identity-icon-box { - padding-inline: var(--uc-toolbarbutton-inner-inline-padding) !important; + padding-inline: var(--uc-toolbarbutton-inner-inline-padding) !important; } /* workaround for bringing lock icon and permission icon closer */ #identity-permission-box { - padding-inline: 2px var(--uc-urlbar-icon-inline-padding) !important; - margin-inline-start: -8px !important; + padding-inline: 2px var(--uc-urlbar-icon-inline-padding) !important; + margin-inline-start: -8px !important; } -#urlbar-background, #searchbar { - border-radius: calc(var(--toolbarbutton-border-radius) + 2px) !important; +#urlbar-background, +#searchbar { + border-radius: calc(var(--toolbarbutton-border-radius) + 2px) !important; } /* move tracking protection button */ #tracking-protection-icon-container, #page-action-buttons { - -moz-box-ordinal-group: 2 !important; + -moz-box-ordinal-group: 2 !important; } -#urlbar[focused="true"]:not([suppress-focus-border]) > #urlbar-background, +#urlbar[focused="true"]:not([suppress-focus-border])>#urlbar-background, #searchbar:focus-within { outline-offset: calc(var(--focus-outline-width) * -1 + 1px) !important; } .urlbarView { - padding-block-end: 8px !important; + padding-block-end: 8px !important; } -.urlbarView-row[pinned] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-type-icon { - fill: var(--toolbar-field-color) !important; +.urlbarView-row[pinned]>.urlbarView-row-inner>.urlbarView-no-wrap>.urlbarView-type-icon { + fill: var(--toolbar-field-color) !important; } - - - - - - diff --git a/chrome/userChrome.css b/chrome/userChrome.css index 190c1a0..f295d9f 100644 --- a/chrome/userChrome.css +++ b/chrome/userChrome.css @@ -17,6 +17,6 @@ /* force tabs to toolbar bg (useful for proton themes) (might experience some bugs with certain themes eg. dark text on dark background.) */ -:root { +:root { --lwt-selected-tab-background-color: unset !important; }