clean up formatting

This commit is contained in:
bmFtZQ 2021-04-15 07:08:53 +08:00 committed by GitHub
parent 8e9977c809
commit 000bc590dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 370 additions and 417 deletions

View file

@ -1,50 +1,42 @@
@media (-moz-windows-compositor)
{
@media not (-moz-os-version: windows-win7)
{
@media not (-moz-os-version: windows-win8)
{
@media (-moz-windows-default-theme)
{
:root[tabsintitlebar] .titlebar-buttonbox-container
{
@media (-moz-windows-compositor) {
@media not (-moz-os-version: windows-win7) {
@media not (-moz-os-version: windows-win8) {
@media (-moz-windows-default-theme) {
:root[tabsintitlebar] .titlebar-buttonbox-container {
height: 32px !important;
margin: 0 !important;
}
:root[tabsintitlebar][sizemode=normal] .titlebar-buttonbox-container:not(#toolbar-menubar .titlebar-buttonbox-container)
{
:root[tabsintitlebar][sizemode=normal] .titlebar-buttonbox-container:not(#toolbar-menubar .titlebar-buttonbox-container) {
margin-block-start: calc(0px - (var(--space-above-tabbar) + 1px)) !important;
}
:root[tabsintitlebar][sizemode=maximized] #toolbar-menubar .titlebar-buttonbox-container
{
:root[tabsintitlebar][sizemode=maximized] #toolbar-menubar .titlebar-buttonbox-container {
height: 30px !important;
margin-top: -4px !important;
margin-bottom: -4px !important;
}
:root[tabsintitlebar] #toolbar-menubar:not([inactive="true"]) {
height: 24px !important;
}
:root[tabsintitlebar] #toolbar-menubar:not([inactive="true"]) .titlebar-button {
padding-block: 4px !important;
}
:root[tabsintitlebar][sizemode=maximized]:not([extradragspace]) .titlebar-buttonbox-container:not(#toolbar-menubar .titlebar-buttonbox-container)
{
:root[tabsintitlebar][sizemode=maximized]:not([extradragspace]) .titlebar-buttonbox-container:not(#toolbar-menubar .titlebar-buttonbox-container) {
-moz-box-align: start !important;
margin-block-start: -5px !important;
}
@media (-moz-windows-accent-color-in-titlebar: 0)
{
:root[tabsintitlebar]:not(:-moz-lwtheme):not([privatebrowsingmode=temporary])
{
@media (-moz-windows-accent-color-in-titlebar: 0) {
:root[tabsintitlebar]:not(:-moz-lwtheme):not([privatebrowsingmode=temporary]) {
background-color: #dee1e6 !important;
color: #3c4043 !important;
}
:root[tabsintitlebar]:not(:-moz-lwtheme):not([privatebrowsingmode=temporary]):-moz-window-inactive
{
:root[tabsintitlebar]:not(:-moz-lwtheme):not([privatebrowsingmode=temporary]):-moz-window-inactive {
background-color: #e7eaed !important;
color: #666a6d !important;
}
@ -54,16 +46,14 @@
}
}
#navigator-toolbox :-moz-any(toolbar, #nav-bar-customization-target):not(#toolbar-menubar)
{
#navigator-toolbox :-moz-any(toolbar, #nav-bar-customization-target):not(#toolbar-menubar) {
-moz-box-align: center !important;
}
#navigator-toolbox :-moz-any(.toolbarbutton-1, toolbarbutton.bookmark-item:not(.subviewbutton)),
/* no ::part workaround - may have side effects */
#scrollbutton-up[part="scrollbutton-up"]:not(.menupopup-scrollbutton),
#scrollbutton-down[part="scrollbutton-down"]:not(.menupopup-scrollbutton)
{
#scrollbutton-down[part="scrollbutton-down"]:not(.menupopup-scrollbutton) {
border-radius: 4px !important;
transition: background-color .2s var(--ease-basic) !important;
}
@ -71,8 +61,7 @@
#navigator-toolbox :-moz-any(.toolbarbutton-1, toolbarbutton.bookmark-item:not(.subviewbutton)),
/* no ::part workaround - may have side effects */
#scrollbutton-up[part="scrollbutton-up"]:not(.menupopup-scrollbutton),
#scrollbutton-down[part="scrollbutton-down"]:not(.menupopup-scrollbutton)
{
#scrollbutton-down[part="scrollbutton-down"]:not(.menupopup-scrollbutton) {
font-size: 12px !important;
padding: 0 !important;
margin: 0 !important;
@ -83,8 +72,7 @@
/*
#navigator-toolbox :-moz-any(.toolbarbutton-1, .scrollbutton-up, .scrollbutton-down),
#scrollbutton-up[part="scrollbutton-up"]:not(.menupopup-scrollbutton),
#scrollbutton-down[part="scrollbutton-down"]:not(.menupopup-scrollbutton)
{
#scrollbutton-down[part="scrollbutton-down"]:not(.menupopup-scrollbutton) {
max-height: 32px !important;
height: 32px !important;
min-height: 32px !important;
@ -94,8 +82,7 @@
#navigator-toolbox :-moz-any(.toolbarbutton-1, toolbarbutton.bookmark-item:not(.subviewbutton))[disabled],
/* no ::part workaround - may have side effects */
#scrollbutton-up[part="scrollbutton-up"]:not(.menupopup-scrollbutton)[disabled],
#scrollbutton-down[part="scrollbutton-down"]:not(.menupopup-scrollbutton)[disabled]
{
#scrollbutton-down[part="scrollbutton-down"]:not(.menupopup-scrollbutton)[disabled] {
opacity: .42 !important;
}
@ -103,47 +90,41 @@
#navigator-toolbox :-moz-any(.toolbarbutton-1, toolbarbutton.bookmark-item:not(.subviewbutton)):-moz-any(:hover:active, [checked], [open]):not([disabled]),
/* no ::part workaround - may have side effects */
#scrollbutton-up[part="scrollbutton-up"]:not(.menupopup-scrollbutton):hover:not([disabled]),
#scrollbutton-down[part="scrollbutton-down"]:not(.menupopup-scrollbutton):hover:not([disabled])
{
#scrollbutton-down[part="scrollbutton-down"]:not(.menupopup-scrollbutton):hover:not([disabled]) {
background-color: var(--toolbarbutton-hover-background) !important;
}
#navigator-toolbox :-moz-any(.toolbarbutton-1, toolbarbutton.bookmark-item:not(.subviewbutton)):-moz-any(:hover:active, [checked], [open]):not([disabled]),
/* no ::part workaround - may have side effects */
#scrollbutton-up[part="scrollbutton-up"]:not(.menupopup-scrollbutton):hover:active:not([disabled]),
#scrollbutton-down[part="scrollbutton-down"]:not(.menupopup-scrollbutton):hover:active:not([disabled])
{
#scrollbutton-down[part="scrollbutton-down"]:not(.menupopup-scrollbutton):hover:active:not([disabled]) {
background-color: var(--toolbarbutton-active-background) !important;
transition: none !important;
}
#navigator-toolbox :-moz-any(.toolbarbutton-icon, .toolbarbutton-badge-stack),
/* no ::part workaround - may have side effects */
#scrollbutton-up[part="scrollbutton-up"]:not(.menupopup-scrollbutton) > .toolbarbutton-icon,
#scrollbutton-down[part="scrollbutton-down"]:not(.menupopup-scrollbutton) > .toolbarbutton-icon
{
#scrollbutton-up[part="scrollbutton-up"]:not(.menupopup-scrollbutton)>.toolbarbutton-icon,
#scrollbutton-down[part="scrollbutton-down"]:not(.menupopup-scrollbutton)>.toolbarbutton-icon {
fill-opacity: 1 !important;
border: 0 !important;
box-shadow: none !important;
}
#navigator-toolbox .toolbarbutton-1 > :-moz-any(.toolbarbutton-icon, .toolbarbutton-badge-stack)
{
#navigator-toolbox .toolbarbutton-1> :-moz-any(.toolbarbutton-icon, .toolbarbutton-badge-stack) {
width: 40px !important;
height: 30px !important;
}
#navigator-toolbox .toolbarbutton-1 > :-moz-any(.toolbarbutton-icon, .toolbarbutton-badge-stack)
{
#navigator-toolbox .toolbarbutton-1> :-moz-any(.toolbarbutton-icon, .toolbarbutton-badge-stack) {
padding: 7px 12px !important;
background: 0 !important;
}
#TabsToolbar .toolbarbutton-1 > :-moz-any(.toolbarbutton-icon, .toolbarbutton-badge-stack),
#TabsToolbar .toolbarbutton-1> :-moz-any(.toolbarbutton-icon, .toolbarbutton-badge-stack),
/* no ::part workaround - may have side effects */
#scrollbutton-up[part="scrollbutton-up"]:not(.menupopup-scrollbutton) > .toolbarbutton-icon,
#scrollbutton-down[part="scrollbutton-down"]:not(.menupopup-scrollbutton) > .toolbarbutton-icon
{
#scrollbutton-up[part="scrollbutton-up"]:not(.menupopup-scrollbutton)>.toolbarbutton-icon,
#scrollbutton-down[part="scrollbutton-down"]:not(.menupopup-scrollbutton)>.toolbarbutton-icon {
padding: 6px !important;
width: 28px !important;
height: 28px !important;
@ -154,36 +135,30 @@
icon size is enforced and it doesn't like it when the normal density
nav-bar height is less than 38px (it's 36px due to smaller back icon)
*/
:root:not([uidensity=compact]) #customization-content-container
{
:root:not([uidensity=compact]) #customization-content-container {
padding-top: 1px !important;
}
:root:not([uidensity=compact]) :-moz-any(#customization-palette-container, #customization-panel-container)
{
:root:not([uidensity=compact]) :-moz-any(#customization-palette-container, #customization-panel-container) {
margin-top: -1px !important;
}
.menu-iconic,
.menuitem-iconic
{
.menuitem-iconic {
fill: currentColor !important;
}
/* legacy */
#navigator-toolbox
{
#navigator-toolbox {
border-bottom: 1px solid var(--chrome-content-separator-color, var(--toolbox-border-bottom-color)) !important;
}
/* legacy */
#navigator-toolbox::after
{
#navigator-toolbox::after {
display: none !important;
}
.pointerlockfswarning
{
.pointerlockfswarning {
display: flex !important;
border-radius: 4px !important;
padding: 6px !important;
@ -191,44 +166,38 @@
border: 0 !important;
font-size: 14px !important;
box-shadow:
0 3px 5px -1px rgba(0,0,0,.2),
0 6px 10px 0 rgba(0,0,0,.14),
0 1px 18px 0 rgba(0,0,0,.12) !important;
color: hsla(0,0%,100%,.87) !important;
0 3px 5px -1px rgba(0, 0, 0, .2),
0 6px 10px 0 rgba(0, 0, 0, .14),
0 1px 18px 0 rgba(0, 0, 0, .12) !important;
color: hsla(0, 0%, 100%, .87) !important;
transition-timing-function: var(--ease-out), linear !important;
transition-property: transform, top !important;
}
#fullscreen-warning
{
#fullscreen-warning {
flex-direction: column !important;
min-width: 344px !important;
}
.pointerlockfswarning[hidden]
{
.pointerlockfswarning[hidden] {
visibility: hidden !important;
}
/* hack to keep it in same place as [ontop] */
/* probably doesn't work for single-line */
.pointerlockfswarning:not([hidden]):not([ontop])
{
.pointerlockfswarning:not([hidden]):not([ontop]) {
top: -32px !important;
}
.pointerlockfswarning[ontop]
{
.pointerlockfswarning[ontop] {
top: 28px !important;
}
.pointerlockfswarning::before
{
.pointerlockfswarning::before {
display: none !important;
}
.pointerlockfswarning-domain-text
{
.pointerlockfswarning-domain-text {
margin-block: 8px 18px !important;
margin-inline: 10px !important;
font-size: unset !important;
@ -236,13 +205,11 @@
align-self: start !important;
}
.pointerlockfswarning-domain
{
.pointerlockfswarning-domain {
font-weight: unset !important;
}
#fullscreen-exit-button
{
#fullscreen-exit-button {
-moz-appearance: none !important;
border: 0 !important;
height: 32px !important;
@ -259,8 +226,7 @@
font-family: Roboto, inherit !important;
}
#fullscreen-exit-button::before
{
#fullscreen-exit-button::before {
content: "" !important;
display: block !important;
z-index: -1 !important;
@ -275,44 +241,45 @@
transition: opacity .3s var(--ease-basic) !important;
}
#fullscreen-exit-button:hover::before
{
#fullscreen-exit-button:hover::before {
opacity: .12 !important;
}
#fullscreen-exit-button:hover:active::before
{
#fullscreen-exit-button:hover:active::before {
opacity: .24 !important;
transition-duration: .1s !important;
}
/* note: use Firefox account button instead */
#TabsToolbar .private-browsing-indicator
{
#TabsToolbar .private-browsing-indicator {
display: none !important;
}
.toolbarbutton-1:not(:hover):-moz-window-inactive, .bookmark-item:not(:hover):-moz-window-inactive, :root:not([customizing]) .toolbarbutton-1:-moz-window-inactive[disabled="true"] {
.toolbarbutton-1:not(:hover):-moz-window-inactive,
.bookmark-item:not(:hover):-moz-window-inactive,
:root:not([customizing]) .toolbarbutton-1:-moz-window-inactive[disabled="true"] {
opacity: 1 !important;
}
/* high DPI adjustments */
@media (min--moz-device-pixel-ratio: 2)
{
#navigator-toolbox
{
@media (min--moz-device-pixel-ratio: 2) {
#navigator-toolbox {
border-bottom-width: .5px !important;
padding-bottom: .5px !important;
box-shadow: inset 0 -.5px var(--toolbar-bgcolor) !important;
}
}
#sidebar-box, #sidebar {
#sidebar-box,
#sidebar {
appearance: none !important;
}
.sidebar-placesTree, #viewButton {
.sidebar-placesTree,
#viewButton {
color: #000 !important;
}
:root[lwt-sidebar-brighttext] :-moz-any(.sidebar-placesTree, #viewButton) {
color: #fff !important;
}

View file

@ -1,5 +1,4 @@
:root
{
:root {
--toolbar-field-background-color: var(--lwt-toolbar-field-background-color) !important;
--toolbar-field-hover-background-color: var(--lwt-toolbar-field-background-color) !important;
--toolbar-field-focus-background-color: var(--lwt-toolbar-field-focus) !important;
@ -11,7 +10,7 @@
:root:not([lwtheme]),
:root[style*="--lwt-accent-color:rgb(227, 228, 230); --lwt-text-color:rgba(24, 25, 26);"],
:root[style*="--lwt-accent-color:rgb(240, 240, 244); --lwt-text-color:rgba(21, 20, 26);"] /* Used for Proton (May be changed in future) */
{
{
/* accentcolor */
--lwt-accent-color: #cecece !important;
@ -21,8 +20,8 @@
/* toolbar */
--toolbar-bgcolor: #f7f7f7 !important;
/* Force tabs to match --toolbar-bgcolor */
--lwt-selected-tab-background-color: var(--toolbar-bgcolor) !important;
/* tab background (unset to match toolbar-bgcolor) */
--lwt-selected-tab-background-color: unset !important;
/* toolbar_text */
--toolbar-color: #000 !important;
@ -61,10 +60,11 @@
--toolbar-field-focus-border-color: #0078d4a0 !important;
--private-browsing-indicator: #0078d4 !important;
}
/* Dark Mode */
:root[style*="--lwt-accent-color:rgb(12, 12, 13); --lwt-text-color:rgba(249, 249, 250);"],
:root[style*="--lwt-accent-color:rgb(28, 27, 34); --lwt-text-color:rgba(251, 251, 254);"] /* Used for Proton (May be changed in future) */
{
{
/* accentcolor */
--lwt-accent-color: #1b1b1b !important;
@ -74,8 +74,8 @@
/* toolbar */
--toolbar-bgcolor: #3b3b3b !important;
/* Force tabs to match --toolbar-bgcolor */
--lwt-selected-tab-background-color: var(--toolbar-bgcolor) !important;
/* tab background (unset to match toolbar-bgcolor) */
--lwt-selected-tab-background-color: unset !important;
/* toolbar_text */
--toolbar-color: #fff !important;
@ -143,8 +143,7 @@
/* Sidebar Light Mode */
:-moz-any(#sidebar-box, #sidebar),
:-moz-any(.sidebar-panel, body)
{
:-moz-any(.sidebar-panel, body) {
/* sidebar */
--sidebar-background-color: #f5f5f5 !important;
--lwt-sidebar-background-color: var(--sidebar-background-color) !important;
@ -155,9 +154,8 @@
}
/* Sidebar Dark Mode */
:-moz-any(#sidebar-box, #sidebar)[style*="--sidebar-background-color:rgb(56, 56, 61);"], :-moz-any(.sidebar-panel, body)[style*="--lwt-sidebar-background-color:rgb(56, 56, 61);"],
:-moz-any(.sidebar-panel, body)[style*="--lwt-sidebar-background-color:rgb(56, 56, 61);"]
{
:-moz-any(#sidebar-box, #sidebar)[style*="--sidebar-background-color:rgb(56, 56, 61);"],
:-moz-any(.sidebar-panel, body)[style*="--lwt-sidebar-background-color:rgb(56, 56, 61);"] {
/* sidebar */
--sidebar-background-color: #3b3b3b !important;
--lwt-sidebar-background-color: var(--sidebar-background-color) !important;
@ -167,8 +165,7 @@
--lwt-sidebar-text-color: var(--sidebar-text-color) !important;
}
:root
{
:root {
--ease-in: cubic-bezier(.4, 0, 1, 1);
--ease-out: cubic-bezier(0, 0, .2, 1);
--ease-basic: linear;
@ -192,32 +189,25 @@
}
#titlebar,
#tabbrowser-tabs
{
#tabbrowser-tabs {
--tab-min-height: 32px !important;
}
@supports -moz-bool-pref("materialFox.reduceTabOverflow")
{
#tabbrowser-tabs
{
@supports -moz-bool-pref("materialFox.reduceTabOverflow") {
#tabbrowser-tabs {
--tab-min-width: 32px !important;
}
}
@media (-moz-mac-yosemite-theme)
{
:root[extradragspace]
{
@media (-moz-mac-yosemite-theme) {
:root[extradragspace] {
--space-above-tabbar: 8px !important;
}
}
/* Ubuntu */
@media (-moz-gtk-csd-available)
{
:root:not(:-moz-lwtheme)
{
@media (-moz-gtk-csd-available) {
:root:not(:-moz-lwtheme) {
--toolbar-bgcolor: -moz-dialog !important;
--toolbar-color: -moz-dialogtext !important;
}
@ -225,29 +215,25 @@
:root:-moz-lwtheme-darktext,
:root toolbar:not([brighttext]),
.tabbrowser-tab[visuallyselected]
{
.tabbrowser-tab[visuallyselected] {
--toolbarbutton-hover-background: var(--lwt-toolbarbutton-hover-background, hsla(0, 0%, 0%, .07)) !important;
--toolbarbutton-active-background: var(--lwt-toolbarbutton-active-background, hsla(0, 0%, 0%, .11)) !important;
}
:root:-moz-lwtheme-brighttext,
:root toolbar[brighttext],
.tabbrowser-tab[visuallyselected]:-moz-lwtheme-brighttext
{
.tabbrowser-tab[visuallyselected]:-moz-lwtheme-brighttext {
--toolbarbutton-hover-background: var(--lwt-toolbarbutton-hover-background, hsla(0, 0%, 100%, .1)) !important;
--toolbarbutton-active-background: var(--lwt-toolbarbutton-active-background, hsla(0, 0%, 100%, .17)) !important;
}
/* special case for urlbar buttons */
:-moz-any(#urlbar, #searchbar)
{
:-moz-any(#urlbar, #searchbar) {
--toolbarbutton-hover-background: #0001 !important;
--toolbarbutton-active-background: #0002 !important;
}
:root:-moz-lwtheme-brighttext :-moz-any(#urlbar, #searchbar)
{
:root:-moz-lwtheme-brighttext :-moz-any(#urlbar, #searchbar) {
--toolbarbutton-hover-background: #fff1 !important;
--toolbarbutton-active-background: #fff2 !important;
}
@ -257,8 +243,8 @@
}
:-moz-any(:root:not([style]),
:root:not([lwtheme]),
:root[style*="--lwt-accent-color:rgb(227, 228, 230); --lwt-text-color:rgba(24, 25, 26);"],
:root[style*="--lwt-accent-color:rgb(12, 12, 13); --lwt-text-color:rgba(249, 249, 250);"]) #tabbrowser-tabs {
:root:not([lwtheme]),
:root[style*="--lwt-accent-color:rgb(227, 228, 230); --lwt-text-color:rgba(24, 25, 26);"],
:root[style*="--lwt-accent-color:rgb(12, 12, 13); --lwt-text-color:rgba(249, 249, 250);"]) #tabbrowser-tabs {
--tab-line-color: var(--tab-line-col) !important;
}