diff --git a/install.sh b/install.sh index 6513de3..e44ec9c 100755 --- a/install.sh +++ b/install.sh @@ -236,7 +236,7 @@ set_ini_value() { #== Multiselect ================================================================ # https://stackoverflow.com/questions/45382472/bash-select-multiple-answers-at-once/54261882 multiselect() { - echo 'Select with , Done with !!!' + echo 'Select with , confirm with ' # little helpers for terminal print control and key input ESC=$( printf "\033") diff --git a/userChrome.css b/userChrome.css index f863e0c..e78051a 100644 --- a/userChrome.css +++ b/userChrome.css @@ -7,7 +7,7 @@ :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"]) { --lwt-accent-color: rgb(229, 229, 235) !important; /* Original: rgb(240, 240, 244) */ } - @media not all and ((-moz-os-version: windows-win7) or (-moz-os-version: windows-win8)) { + @media not all and ((-moz-os-version: windows-win7) or (-moz-os-version: windows-win8) or (-moz-gtk-csd-available)) { /* Level 4 */ :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"]) #navigator-toolbox { background-color: var(--lwt-accent-color) !important; @@ -844,8 +844,10 @@ } } #unknownContentType { + -moz-appearance: none !important; /* For Mac */ color: var(--in-content-page-color) !important; background-color: var(--in-content-page-background) !important; + /* border-radius: 0 0 8px 8px !important; */ } /*- Button ---------------------------------------------------------------*/ @@ -946,7 +948,7 @@ /*- Radio Button ---------------------------------------------------------*/ xul|radio { - margin-inline-start: 0 !important; + /* margin-inline-start: 0 !important; */ appearance: none !important; } @@ -1117,7 +1119,134 @@ margin: 3px 6px !important; } - /* Each OS */ + /*- Menulist -------------------------------------------------------------*/ + /* From mulist.css */ + xul|menulist { + appearance: none !important; + background-color: var(--in-content-button-background, ButtonFace) !important; + color: var(--in-content-button-text-color, ButtonText) !important; + border-radius: 4px !important; + padding-block: 4px !important; + padding-inline: 12px 8px !important; + margin: 5px 2px 3px !important; + } + + xul|menulist[size="medium"] { + padding-block: 6px !important; + padding-inline: 16px 10px !important; + } + + xul|menulist[size="large"] { + padding-block: 8px !important; + padding-inline: 16px 12px !important; + } + + xul|menulist:hover { + background-color: var(--button-hover-bgcolor, color-mix(in srgb, currentColor 10%, ButtonFace)) !important; + } + + xul|menulist:hover:active { + background-color: var(--button-active-bgcolor, color-mix(in srgb, currentColor 20%, ButtonFace)) !important; + } + + xul|menulist:-moz-focusring { + outline: 2px solid var(--focus-outline-color, -moz-accent-color) !important; + outline-offset: var(--focus-outline-offset, 2px) !important; + } + + #label-box { + -moz-box-align: center !important; + -moz-box-pack: center !important; + font-weight: 600 !important; + } + + dropmarker { + display: -moz-box !important; + appearance: none !important; + width: 12px !important; + height: 12px !important; + } + + dropmarker::part(icon) { + list-style-image: url(chrome://global/skin/icons/arrow-down.svg) !important; + -moz-context-properties: fill !important; + fill: currentColor !important; + } + + #highlightable-label:not([highlightable="true"]), + #label[highlightable="true"] { + display: none !important; + } + + label { + margin: 0 3px !important; + } + + /* From common.css */ + xul|menulist > xul|menupopup { + appearance: none !important; + + /* Reset native styles on Windows and macOS */ + border: none !important; + background-color: transparent !important; + + --panel-border-color: var(--in-content-box-border-color) !important; + --panel-border-radius: 2px !important; + --panel-background: var(--in-content-box-background) !important; + --panel-color: var(--in-content-text-color) !important; + --panel-padding: 0 !important; + } + + xul|menulist > xul|menupopup xul|menu, + xul|menulist > xul|menupopup xul|menuitem { + appearance: none !important; + font-size: 1em !important; + padding-block: 0.2em !important; + padding-inline: 10px 30px !important; + } + + xul|menulist > xul|menupopup > xul|menu:not([disabled="true"])[_moz-menuactive="true"], + xul|menulist > xul|menupopup > xul|menuitem:not([disabled="true"])[_moz-menuactive="true"] { + color: var(--in-content-item-hover-text) !important; + background-color: var(--in-content-item-hover) !important; + } + + xul|menulist > xul|menupopup > xul|menu:not([disabled="true"])[selected="true"], + xul|menulist > xul|menupopup > xul|menuitem:not([disabled="true"])[selected="true"] { + color: var(--in-content-item-selected-text) !important; + background-color: var(--in-content-item-selected) !important; + } + + xul|menulist > xul|menupopup > xul|menu[disabled="true"], + xul|menulist > xul|menupopup > xul|menuitem[disabled="true"] { + color: #999 !important; + /* override the [_moz-menuactive="true"] background color from + global/menu.css */ + background-color: transparent !important; + } + + xul|menulist > xul|menupopup xul|menuseparator { + appearance: none !important; + margin: 0 !important; + padding: 0 !important; + border-top: 1px solid var(--in-content-box-border-color) !important; + border-bottom: none !important; + } + + xul|menulist::part(dropmarker) { + margin-block: 1px !important; + } + + /* Override menulist.css */ + xul|menulist[disabled="true"] { + background-color: var(--in-content-button-background) !important; + } + + xul|menulist:-moz-focusring > xul|*.menulist-label-box { + outline: none !important; + } + + /*- Each OS --------------------------------------------------------------*/ @media (-moz-os-version: windows-win7), (-moz-os-version: windows-win8), (-moz-os-version: windows-win10) { xul|checkbox, xul|radio { diff --git a/userContent.css b/userContent.css index 7fb0fcc..9288587 100644 --- a/userContent.css +++ b/userContent.css @@ -573,6 +573,7 @@ :root { --color-blue-06: var(--in-content-link-color) !important; --color-blue-07: var(--in-content-link-color-hover) !important; + --color-blue-09: var(--in-content-link-color-active) !important; --page-bg: var(--in-content-page-background) !important; --color-white: var(--in-content-page-background) !important; @@ -586,7 +587,7 @@ --color-text-light: var(--in-content-deemphasized-text) !important; --color-link: var(--in-content-link-color) !important; --color-success: var(--green-70) !important; - --color-warning: var(--yellow-70) !important; + --color-warning: var(--yellow-80) !important; --color-error: var(--red-60) !important; --color-error-hover: var(--red-50) !important; --color-moz-heading: #fff; @@ -594,6 +595,10 @@ --focus-shadow: 0 0 0 4px color-mix(in srgb, var(--in-content-primary-button-background) 30%, transparent), 0 0 0 2px var(--in-content-primary-button-background-active); } + .warning { + --color-link: rgb(55, 255, 255) !important; + } + body, #main-content, #instant-search-content,