From 9a225e4b44ec04c62ddff63f06c913d67e705711 Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Tue, 15 Aug 2017 22:04:45 +0200 Subject: [PATCH] fourth and last part of syncing LCARStrek with Firefox 55 browser windows theme changes --- LCARStrek/browser/browser.css | 284 ++++++++---------- LCARStrek/browser/controlcenter/panel.css | 15 +- LCARStrek/browser/customizableui/panelUI.css | 52 ++-- .../downloads/allDownloadsViewOverlay.css | 8 +- LCARStrek/browser/downloads/downloads.css | 17 +- LCARStrek/browser/gear.svg | 3 +- LCARStrek/browser/heartbeat-icon.svg | 13 - LCARStrek/browser/heartbeat-star-lit.svg | 7 - LCARStrek/browser/heartbeat-star-off.svg | 7 - LCARStrek/browser/notification-icons.svg | 114 +++---- LCARStrek/browser/panel-icon-arrow-left.svg | 8 + LCARStrek/browser/panel-icon-arrow-right.svg | 8 + LCARStrek/browser/panel-icon-cancel.svg | 8 + LCARStrek/browser/panel-icon-folder.svg | 8 + LCARStrek/browser/panel-icon-magnifier.svg | 8 + LCARStrek/browser/panel-icon-retry.svg | 8 + LCARStrek/browser/panel-icons.svg | 18 -- .../containers.css | 0 .../default-profile-image.svg | 0 .../dialog.css | 0 .../favicon.ico | Bin .../preferences/in-content-new/icons.svg | 83 +++++ .../preferences.css | 152 ++++++---- .../search.css | 0 .../siteDataSettings.css | 0 .../preferences/in-content-old/icons.svg | 63 ---- .../browser/preferences/in-content/icons.svg | 76 ++--- .../preferences/in-content/preferences.css | 117 ++++---- LCARStrek/browser/searchbar.css | 2 +- LCARStrek/browser/synced-tabs.svg | 6 + .../browser/tabbrowser/tab-audio-blocked.svg | 9 + .../browser/tabbrowser/tab-audio-muted.svg | 9 + .../browser/tabbrowser/tab-audio-playing.svg | 9 + LCARStrek/browser/tabbrowser/tab-audio.svg | 19 -- LCARStrek/browser/webRTC-indicator.css | 6 + 35 files changed, 546 insertions(+), 591 deletions(-) delete mode 100644 LCARStrek/browser/heartbeat-icon.svg delete mode 100644 LCARStrek/browser/heartbeat-star-lit.svg delete mode 100644 LCARStrek/browser/heartbeat-star-off.svg create mode 100644 LCARStrek/browser/panel-icon-arrow-left.svg create mode 100644 LCARStrek/browser/panel-icon-arrow-right.svg create mode 100644 LCARStrek/browser/panel-icon-cancel.svg create mode 100644 LCARStrek/browser/panel-icon-folder.svg create mode 100644 LCARStrek/browser/panel-icon-magnifier.svg create mode 100644 LCARStrek/browser/panel-icon-retry.svg delete mode 100644 LCARStrek/browser/panel-icons.svg rename LCARStrek/browser/preferences/{in-content-old => in-content-new}/containers.css (100%) rename LCARStrek/browser/preferences/{in-content-old => in-content-new}/default-profile-image.svg (100%) rename LCARStrek/browser/preferences/{in-content-old => in-content-new}/dialog.css (100%) rename LCARStrek/browser/preferences/{in-content-old => in-content-new}/favicon.ico (100%) create mode 100644 LCARStrek/browser/preferences/in-content-new/icons.svg rename LCARStrek/browser/preferences/{in-content-old => in-content-new}/preferences.css (87%) rename LCARStrek/browser/preferences/{in-content-old => in-content-new}/search.css (100%) rename LCARStrek/browser/preferences/{in-content-old => in-content-new}/siteDataSettings.css (100%) delete mode 100644 LCARStrek/browser/preferences/in-content-old/icons.svg create mode 100644 LCARStrek/browser/synced-tabs.svg create mode 100644 LCARStrek/browser/tabbrowser/tab-audio-blocked.svg create mode 100644 LCARStrek/browser/tabbrowser/tab-audio-muted.svg create mode 100644 LCARStrek/browser/tabbrowser/tab-audio-playing.svg delete mode 100644 LCARStrek/browser/tabbrowser/tab-audio.svg diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index d475b646..ecebcc6a 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -106,9 +106,9 @@ menubar { /* Page action button */ #urlbar-page-action-button { list-style-image: url("chrome://browser/skin/page-action.svg"); + -moz-context-properties: fill; /* margin: 0; padding: 0 6px;*/ - -moz-context-properties: fill; fill: currentColor; } @@ -621,8 +621,8 @@ menuitem.bookmark-item { #main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-icon, #main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-menu-dropmarker, #main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-dropmarker, -#main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-button > .toolbarbutton-icon, -#main-window:not([customizing]) .toolbarbutton-1 > .toolbarbutton-menubutton-button[disabled=true] > .toolbarbutton-icon { +#main-window:not([customizing]) .toolbarbutton-1 > .toolbarbutton-menubutton-button[disabled=true] > .toolbarbutton-icon, +#main-window:not([customizing]) .toolbarbutton-1[disabled=true] > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon { } .toolbarbutton-1 > .toolbarbutton-menu-dropmarker, @@ -1880,6 +1880,13 @@ html|*.urlbar-input:-moz-lwtheme::placeholder, min-height: 3em; } +/* Limit the size of the hidden description, since a deck takes the size of the biggest child */ + +#PopupAutoCompleteRichResult > deck[anonid="search-suggestions-notification"][selectedIndex="0"] #search-suggestions-hint, +#PopupAutoCompleteRichResult > deck[anonid="search-suggestions-notification"][selectedIndex="1"] #search-suggestions-question { + max-height: 5em; +} + /* Opt-in notification */ #PopupAutoCompleteRichResult > deck[anonid="search-suggestions-notification"] > hbox[anonid="search-suggestions-opt-in"] { @@ -1930,7 +1937,15 @@ html|*.urlbar-input:-moz-lwtheme::placeholder, /* Opt-out hint */ #PopupAutoCompleteRichResult > deck[anonid="search-suggestions-notification"] > hbox[anonid="search-suggestions-opt-out"] { - font: message-box; +/* font: message-box;*/ + display: flex; + flex-direction: row; + align-items: center; + flex-wrap: nowrap; +} + +#PopupAutoCompleteRichResult > deck[anonid="search-suggestions-notification"] hbox[anonid="search-suggestions-hint-box"] { + flex-basis: 100%; } #PopupAutoCompleteRichResult > deck[anonid="search-suggestions-notification"] hbox[anonid="search-suggestions-hint-box"] > description { @@ -1958,6 +1973,7 @@ html|*.urlbar-input:-moz-lwtheme::placeholder, animation-iteration-count: 1; animation-timing-function: ease-in-out; animation-fill-mode: forwards; + min-width: 16px; } @keyframes search-suggestions-hint-grow { @@ -1974,7 +1990,7 @@ html|*.urlbar-input:-moz-lwtheme::placeholder, #PopupAutoCompleteRichResult > deck[anonid="search-suggestions-notification"][animate] hbox[anonid="search-suggestions-hint-typing"] { overflow: hidden; - max-width: 8ch; + max-width: 12ch; width: 0; animation-name: search-suggestions-hint-typing; animation-duration: 500ms; @@ -1983,9 +1999,16 @@ html|*.urlbar-input:-moz-lwtheme::placeholder, animation-fill-mode: forwards; } +@media all and (max-width: 800px) { + /* Hide the typing animation block */ + #PopupAutoCompleteRichResult > deck[anonid="search-suggestions-notification"] hbox[anonid="search-suggestions-hint-typing"] { + display: none; + } +} + @keyframes search-suggestions-hint-typing { from { width: 0; } - to { width: 8ch; } + to { width: 12ch; } } #PopupAutoCompleteRichResult > deck[anonid="search-suggestions-notification"][animate] hbox[anonid="search-suggestions-hint-box"] { @@ -2157,9 +2180,12 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but #identity-icon, #tracking-protection-icon, #connection-icon, +.notification-anchor-icon, +#blocked-permissions-container > .blocked-permission-icon, #extension-icon { width: 16px; height: 16px; + margin-inline-start: 2px; -moz-context-properties: fill; fill: #A09090; } @@ -2167,6 +2193,8 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but #identity-icon:-moz-lwtheme, #tracking-protection-icon:-moz-lwtheme, #connection-icon:-moz-lwtheme, +.notification-anchor-icon:-moz-lwtheme, +#blocked-permissions-container > .blocked-permission-icon:-moz-lwtheme, #extension-icon:-moz-lwtheme { /* fill: rgba(0,0,0,.6);*/ } @@ -2174,6 +2202,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but /* MAIN IDENTITY ICON */ #identity-icon { + margin-inline-start: 0; width: 16px; height: 16px; list-style-image: url(chrome://browser/skin/identity-icon.svg#normal); @@ -2216,6 +2245,8 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but height: 16px; margin-inline-start: -16px; position: relative; + -moz-context-properties: fill; + fill: #FF0000; display: none; } @@ -2256,7 +2287,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but #tracking-protection-icon { list-style-image: url(chrome://browser/skin/tracking-protection-16.svg#enabled); - margin-inline-start: 2px; margin-inline-end: 0; } @@ -2287,7 +2317,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but #extension-icon { width: 16px; height: 16px; - margin-inline-start: 2px; visibility: collapse; } @@ -2320,7 +2349,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but /* REMOTE CONTROL ICON */ #main-window[remotecontrol] #remote-control-icon { - list-style-image: url(chrome://browser/content/robot.ico); + list-style-image: url(chrome://browser/content/static-robot.png); visibility: visible; width: 16px; height: 16px; @@ -2419,10 +2448,12 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box #PopupAutoComplete > richlistbox > richlistitem[originaltype="login"] > .ac-site-icon { display: initial; list-style-image: url(chrome://browser/skin/notification-icons.svg#login); + -moz-context-properties: fill; + fill: #A09090; } #PopupAutoComplete > richlistbox > richlistitem[originaltype="login"] > .ac-site-icon[selected] { - list-style-image: url(chrome://browser/skin/notification-icons.svg#login-highlighted); + fill: #FFCF00; } /* Insecure field warning */ @@ -3047,11 +3078,10 @@ richlistitem[selected="true"][current="true"] > .ac-title-box > .ac-result-type- #sidebar-switcher-tabs > .toolbarbutton-icon, #sidebar-box[sidebarcommand="viewTabsSidebar"] > #sidebar-header > #sidebar-switcher-target > #sidebar-icon { -/* list-style-image: url(chrome://browser/skin/synced-tabs.svg); + list-style-image: url(chrome://browser/skin/synced-tabs.svg); -moz-context-properties: fill; fill: currentColor; - opacity: 0.8;*/ - list-style-image: url(chrome://browser/skin/urlbar-tab.svg#tab); +/* opacity: 0.8;*/ } /* === END sidebar.inc.css === */ @@ -3181,6 +3211,8 @@ richlistitem[selected="true"][current="true"] > .ac-title-box > .ac-result-type- /* 16px of the icon + 6px of margin-inline-end of .tab-icon-image */ margin-inline-start: -22px; position: relative; + -moz-context-properties: fill; + fill: #FF0000; } .tab-sharing-icon-overlay[sharing="camera"] { @@ -3288,17 +3320,17 @@ richlistitem[selected="true"][current="true"] > .ac-title-box > .ac-result-type- .tab-icon-sound[soundplaying], .tab-icon-sound[muted], .tab-icon-sound[blocked] { - list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio); - filter: url(chrome://global/skin/filters.svg#fill); + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio-playing.svg); + -moz-context-properties: fill; fill: currentColor; } .tab-icon-sound[muted] { - list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted); + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio-muted.svg); } .tab-icon-sound[blocked] { - list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-blocked); + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio-blocked.svg); } .tab-close-button { @@ -3435,6 +3467,16 @@ richlistitem[selected="true"][current="true"] > .ac-title-box > .ac-result-type- width: 28px; /* width: calc(36px + var(--tab-curve-width)); */ } + +.tabs-newtab-button > .toolbarbutton-menu-dropmarker { + display: none; +} + +.tabs-newtab-button > .toolbarbutton-icon { + /* override drop marker image padding */ + margin-inline-end: 0; +} + @media (min-resolution: 1.1dppx) { /* image preloading hack from like lowdpi styles */ #tabbrowser-tabs::before { @@ -3465,17 +3507,17 @@ richlistitem[selected="true"][current="true"] > .ac-title-box > .ac-result-type- .alltabs-endimage[soundplaying], .alltabs-endimage[muted], .alltabs-endimage[blocked] { - list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio); - filter: url(chrome://global/skin/filters.svg#fill); + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio-playing.svg); + -moz-context-properties: fill; fill: currentColor; } .alltabs-endimage[muted] { - list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted); + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio-muted.svg); } .alltabs-endimage[blocked] { - list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-blocked); + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio-blocked.svg); } /* === END tabs.inc.css === */ @@ -3690,6 +3732,12 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { /* === BEGIN notification-icons.inc.css === */ +.popup-notification-icon, +.identity-popup-permission-icon { + -moz-context-properties: fill; + fill: #A09090; +} + #notification-popup-box { border-radius: 3px 0 0 3px; padding: 5px 0px; @@ -3698,13 +3746,6 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { padding-inline-end: 5px; } -.notification-anchor-icon, -#blocked-permissions-container > .blocked-permission-icon { - width: 16px; - height: 16px; - margin-inline-start: 2px; -} - /* This class can be used alone or in combination with the class defining the type of icon displayed. This rule must be defined before the others in order for its list-style-image to be overridden. */ @@ -3722,12 +3763,6 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { } } -.notification-anchor-icon:not(.plugin-blocked), -#blocked-permissions-container > .blocked-permission-icon { - filter: url(chrome://global/skin/filters.svg#fill); - fill: currentColor; -} - /* INDIVIDUAL NOTIFICATIONS */ .focus-tab-by-prompt-icon { @@ -3931,6 +3966,7 @@ html|*#webRTC-previewVideo { .plugin-icon.plugin-blocked { list-style-image: url(chrome://browser/skin/notification-icons.svg#plugin-blocked); + fill: #FF0000 !important; } #notification-popup-box[hidden] { @@ -4004,9 +4040,25 @@ html|*.addon-webext-perm-list { margin-inline-start: 0; } -.popup-notification-description[popupid="addon-webext-permissions"] { - margin: 0; - padding: 0; +.popup-notification-description[popupid="addon-webext-permissions"], +.popup-notification-description[popupid="addon-installed"] { + display: none; +} + +.addon-webext-perm-notification-content, +.addon-installed-notification-content { + margin-top: 0; +} + +#addon-webext-perm-header { + /* Align the text more closely with the icon by clearing some top line height. */ + margin-top: -1px; + margin-inline-start: 0; +} + +#addon-installed-notification-header { + /* Align the text more closely with the icon by clearing some top line height. */ + margin-top: -1px; } .addon-webext-name { @@ -4015,16 +4067,20 @@ html|*.addon-webext-perm-list { margin: 0; } -.addon-addon-icon { +.addon-addon-icon, +.addon-toolbar-icon { width: 14px; height: 14px; + vertical-align: bottom; + margin-bottom: 1px; +} + +.addon-addon-icon { list-style-image: url("chrome://browser/skin/menuPanel.svg"); -moz-image-region: rect(0px, 288px, 32px, 256px); } .addon-toolbar-icon { - width: 14px; - height: 14px; list-style-image: url("chrome://browser/skin/ToolbarFx.png"); -moz-image-region: rect(0, 486px, 18px, 468px); } @@ -4507,22 +4563,39 @@ notification.pluginVulnerable .messageImage { margin: 5px; } -.customizationmode-button:hover { +.customizationmode-checkbox { +} + +#customization-reset-button, +#customization-undo-reset-button, +#customization-done-button { +} + +#customization-done-button { } .customizationmode-button > .box-inherit { } -.customizationmode-button > .button-icon { +/* We use a smaller padding to ensure images don't have padding. + * We can't detect whether a button has an image. This button doesn't + * so it needs more padding, so we unfortunately hardcode the extra + * padding in here: + */ +#customization-toolbar-visibility-button { } -.customizationmode-button:not([type=menu]) > .button-text { +.customizationmode-button[type=menu] > .box-inherit > .box-inherit > .button-text { } -.customizationmode-button > .button-menu-dropmarker { +.customizationmode-button > .button-icon { } +.customizationmode-button:not([type=menu]) > .button-text { +} +.customizationmode-button > .box-inherit > .button-menu-dropmarker { +} .customizationmode-button[checked] { background-color: #008484; @@ -4544,7 +4617,7 @@ notification.pluginVulnerable .messageImage { .customizationmode-button > .box-inherit > .box-inherit > .button-icon, .customizationmode-button > .button-box > .button-icon { -/* height: 24px;*/ +/* height: 16px;*/ } #customization-titlebar-visibility-button { @@ -4573,8 +4646,8 @@ notification.pluginVulnerable .messageImage { } #customization-lwtheme-button > .box-inherit > .box-inherit > .button-icon { - width: 20px; - height: 20px; + width: 16px; + height: 16px; border-radius: 2px; background-image: url("chrome://browser/content/default-theme-icon.svg"); background-size: contain; @@ -5175,123 +5248,6 @@ toolbarpaletteitem[place="toolbar"]:not([mousedown="true"]):-moz-focusring { color: #000000; } -/* Notification overrides for Heartbeat UI */ - -notification.heartbeat { - background-color: #A09090; -/* height: 40px;*/ -} - -@keyframes pulse-onshow { - 0% { - opacity: 0; - transform: scale(1.0); - } - 25% { - opacity: 1; - transform: scale(1.1); - } - 50% { - transform: scale(1.0); - } - 75% { - transform: scale(1.1); - } - 100% { - transform: scale(1.0); - } -} - -@keyframes pulse-twice { - 0% { - transform: scale(1.1); - } - 50% { - transform: scale(0.8); - } - 100% { - transform: scale(1); - } -} - -.messageText.heartbeat { - color: #000000; -/* text-shadow: none; */ - margin-inline-start: 0px; -} - -.messageImage.heartbeat { - width: 24px; - height: 24px; - margin-inline-start: 8px; - margin-inline-end: 8px; -} - -.messageImage.heartbeat.pulse-onshow { - animation-name: pulse-onshow; - animation-duration: 1.5s; - animation-iteration-count: 1; - animation-timing-function: cubic-bezier(.7,1.8,.9,1.1); -} - -.messageImage.heartbeat.pulse-twice { - animation-name: pulse-twice; - animation-duration: 1s; - animation-iteration-count: 2; - animation-timing-function: linear; -} - -/* Learn More link styles */ -.heartbeat > .text-link { - color: #3333FF; - margin-inline-start: 0px; -} - -.heartbeat > .text-link:hover { - color: #9C9CFF; - text-decoration: none; -} - -.heartbeat > .text-link:hover:active { - color: #FF9F00; -} - -/* Heartbeat UI Rating Star Classes */ -.heartbeat > #star-rating-container { - display: -moz-box; -/* margin-bottom: 4px;*/ -} - -.heartbeat > #star-rating-container > #star5 { - -moz-box-ordinal-group: 5; -} - -.heartbeat > #star-rating-container > #star4 { - -moz-box-ordinal-group: 4; -} - -.heartbeat > #star-rating-container > #star3 { - -moz-box-ordinal-group: 3; -} - -.heartbeat > #star-rating-container > #star2 { - -moz-box-ordinal-group: 2; -} - -.heartbeat > #star-rating-container > .star-x { - background: url("chrome://browser/skin/heartbeat-star-off.svg"); - cursor: pointer; - /* Overrides the margin-inline-end for all platforms defined in the .plain class */ - margin-inline-end: 4px !important; - width: 16px; - height: 16px; -} - -.heartbeat > #star-rating-container > .star-x:hover, -.heartbeat > #star-rating-container > .star-x:hover ~ .star-x { - background: url("chrome://browser/skin/heartbeat-star-lit.svg"); -} - /* === END UITour.inc.css === */ #UITourTooltipButtons { diff --git a/LCARStrek/browser/controlcenter/panel.css b/LCARStrek/browser/controlcenter/panel.css index 67f1b454..1c084af6 100644 --- a/LCARStrek/browser/controlcenter/panel.css +++ b/LCARStrek/browser/controlcenter/panel.css @@ -172,13 +172,17 @@ #identity-popup-securityView-header > description, #identity-popup-securityView-body > description, #identity-popup-permissions-content > description, -#tracking-protection-content > label, +#tracking-protection-content > description, .identity-popup-text { - white-space: pre-wrap; font-size: 110%; margin: 0; } +/* This element needs the pre-wrap because we add newlines to it in the code. */ +#identity-popup-content-supplemental { + white-space: pre-wrap; +} + .identity-popup-headline { margin: 3px 0 4px; font-size: 150%; @@ -360,6 +364,7 @@ description#identity-popup-content-verifier, #identity-popup-permissions-content { background-image: url(chrome://browser/skin/controlcenter/permissions.svg); + padding-bottom: 1.5em; } #identity-popup-permissions-headline { @@ -389,6 +394,8 @@ description#identity-popup-content-verifier, } .identity-popup-permission-icon.in-use { + -moz-context-properties: fill; + fill: #FF0000; animation: 1.5s ease in-use-blink infinite; } @@ -433,8 +440,8 @@ description#identity-popup-content-verifier, margin: 0; width: 16px; height: 16px; - list-style-image: url(chrome://browser/skin/panel-icons.svg#cancel); - filter: url(chrome://global/skin/filters.svg#fill); + list-style-image: url(chrome://browser/skin/panel-icon-cancel.svg); + -moz-context-properties: fill; fill: #A09090; } diff --git a/LCARStrek/browser/customizableui/panelUI.css b/LCARStrek/browser/customizableui/panelUI.css index a929de58..b59f84be 100644 --- a/LCARStrek/browser/customizableui/panelUI.css +++ b/LCARStrek/browser/customizableui/panelUI.css @@ -188,7 +188,8 @@ panelmultiview[nosubviews=true] > .panel-viewcontainer > .panel-viewstack > .pan display: none; } -.panel-viewstack:not([viewtype="main"]) > .panel-mainview > #PanelUI-mainView { +panelview { + -moz-box-orient: vertical; -moz-box-flex: 1; } @@ -198,6 +199,11 @@ panelmultiview[nosubviews=true] > .panel-viewcontainer > .panel-viewstack > .pan -moz-box-flex: 1; } +.panel-view-body-unscrollable { + overflow: hidden; + -moz-box-flex: 1; +} + #PanelUI-popup .panel-subview-body { margin: -4px; padding: 4px 4px; @@ -216,6 +222,8 @@ panelmultiview[nosubviews=true] > .panel-viewcontainer > .panel-viewstack > .pan color: #000000; font-variant: small-caps; border-radius: 4px; + /* Workaround for min-height not being accounted for in vertical layout. */ + height: 41px; } .panel-subview-footer { @@ -461,9 +469,6 @@ toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"] > iframe { #PanelUI-multiView[viewtype="subview"] #PanelUI-mainView > #PanelUI-contents-scroller > #PanelUI-contents > .panel-wide-item, #PanelUI-multiView[viewtype="subview"] #PanelUI-mainView > #PanelUI-contents-scroller > #PanelUI-contents > .toolbarbutton-1:not([panel-multiview-anchor="true"]), #PanelUI-multiView[viewtype="subview"] #PanelUI-mainView > #PanelUI-footer > .panel-banner-item, -#PanelUI-multiView[viewtype="subview"] #PanelUI-mainView > #PanelUI-footer > #PanelUI-footer-fxa > #PanelUI-fxa-status > #PanelUI-fxa-avatar, -#PanelUI-multiView[viewtype="subview"] #PanelUI-mainView > #PanelUI-footer > #PanelUI-footer-fxa > #PanelUI-fxa-status > #PanelUI-fxa-label, -#PanelUI-multiView[viewtype="subview"] #PanelUI-mainView > #PanelUI-footer > #PanelUI-footer-fxa > #PanelUI-fxa-icon, #PanelUI-multiView[viewtype="subview"] #PanelUI-mainView > #PanelUI-footer > #PanelUI-fxa-container > #PanelUI-fxa-status > #PanelUI-fxa-avatar, #PanelUI-multiView[viewtype="subview"] #PanelUI-mainView > #PanelUI-footer > #PanelUI-fxa-container > #PanelUI-fxa-status > #PanelUI-fxa-label, #PanelUI-multiView[viewtype="subview"] #PanelUI-mainView > #PanelUI-footer > #PanelUI-fxa-container > #PanelUI-fxa-icon, @@ -566,15 +571,12 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { border-bottom-left-radius: 4px; } -#main-window[customizing] #PanelUI-fxa-container, -#main-window[customizing] #PanelUI-footer-fxa { +#main-window[customizing] #PanelUI-fxa-container { display: none; } #PanelUI-fxa-container:not([fxastatus="signedin"]) > toolbarseparator, -#PanelUI-fxa-container:not([fxastatus="signedin"]) > #PanelUI-fxa-icon, -#PanelUI-footer-fxa:not([fxastatus="signedin"]) > toolbarseparator, -#PanelUI-footer-fxa:not([fxastatus="signedin"]) > #PanelUI-fxa-icon { +#PanelUI-fxa-container:not([fxastatus="signedin"]) > #PanelUI-fxa-icon { display: none; } @@ -633,29 +635,25 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { } #PanelUI-footer-inner, -#PanelUI-fxa-container:not([hidden]), -#PanelUI-footer-fxa:not([hidden]) { +#PanelUI-fxa-container:not([hidden]) { display: flex; border-top: 1px solid var(--panel-separator-color); } #PanelUI-multiView[viewtype="subview"] #PanelUI-footer-inner, -#PanelUI-multiView[viewtype="subview"] #PanelUI-fxa-container, -#PanelUI-multiView[viewtype="subview"] #PanelUI-footer-fxa { +#PanelUI-multiView[viewtype="subview"] #PanelUI-fxa-container { position: relative; } #PanelUI-footer-inner > toolbarseparator, -#PanelUI-fxa-container > toolbarseparator, -#PanelUI-footer-fxa > toolbarseparator { +#PanelUI-fxa-container > toolbarseparator { border: 0; border-left: 1px solid var(--panel-separator-color); margin: 0; } #PanelUI-footer-inner:hover > toolbarseparator, -#PanelUI-fxa-container:hover > toolbarseparator, -#PanelUI-footer-fxa:hover > toolbarseparator { +#PanelUI-fxa-container:hover > toolbarseparator { /* margin: 0;*/ } @@ -829,8 +827,7 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { border-inline-start-style: none; } -#PanelUI-fxa-container[fxastatus="signedin"] > #PanelUI-fxa-status > #PanelUI-fxa-label, -#PanelUI-footer-fxa[fxastatus="signedin"] > #PanelUI-fxa-status > #PanelUI-fxa-label { +#PanelUI-fxa-container[fxastatus="signedin"] > #PanelUI-fxa-status > #PanelUI-fxa-label { padding-inline-start: 0px; } @@ -1000,9 +997,7 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { } #PanelUI-fxa-container[fxastatus="signedin"] > #PanelUI-fxa-status > #PanelUI-fxa-label > .toolbarbutton-icon, -#PanelUI-fxa-container:not([fxastatus="signedin"]) > #PanelUI-fxa-status > #PanelUI-fxa-avatar, -#PanelUI-footer-fxa[fxastatus="signedin"] > #PanelUI-fxa-status > #PanelUI-fxa-label > .toolbarbutton-icon, -#PanelUI-footer-fxa:not([fxastatus="signedin"]) > #PanelUI-fxa-status > #PanelUI-fxa-avatar { +#PanelUI-fxa-container:not([fxastatus="signedin"]) > #PanelUI-fxa-status > #PanelUI-fxa-avatar { display: none; } @@ -1020,7 +1015,6 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { margin-inline-end: 0; } -#PanelUI-footer-fxa > #PanelUI-fxa-status > #PanelUI-fxa-avatar, #PanelUI-fxa-container > #PanelUI-fxa-status > #PanelUI-fxa-avatar { list-style-image: url(chrome://browser/skin/fxa/default-avatar.svg); } @@ -1061,24 +1055,18 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { } #PanelUI-fxa-container[fxastatus="login-failed"], -#PanelUI-fxa-container[fxastatus="unverified"], -#PanelUI-footer-fxa[fxastatus="login-failed"], -#PanelUI-footer-fxa[fxastatus="unverified"] { +#PanelUI-fxa-container[fxastatus="unverified"] { background-color: #FF0000; color: #000000; } #PanelUI-fxa-container[fxastatus="login-failed"] > #PanelUI-fxa-status:hover, -#PanelUI-fxa-container[fxastatus="unverified"] > #PanelUI-fxa-status:hover, -#PanelUI-footer-fxa[fxastatus="login-failed"] > #PanelUI-fxa-status:hover, -#PanelUI-footer-fxa[fxastatus="unverified"] > #PanelUI-fxa-status:hover { +#PanelUI-fxa-container[fxastatus="unverified"] > #PanelUI-fxa-status:hover { background-color: #FFCF00; } #PanelUI-fxa-container[fxastatus="login-failed"] > #PanelUI-fxa-status:hover:active, -#PanelUI-fxa-container[fxastatus="unverified"] > #PanelUI-fxa-status:hover:active, -#PanelUI-footer-fxa[fxastatus="login-failed"] > #PanelUI-fxa-status:hover:active, -#PanelUI-footer-fxa[fxastatus="unverified"] > #PanelUI-fxa-status:hover:active { +#PanelUI-fxa-container[fxastatus="unverified"] > #PanelUI-fxa-status:hover:active { background-color: #FF9F00; } diff --git a/LCARStrek/browser/downloads/allDownloadsViewOverlay.css b/LCARStrek/browser/downloads/allDownloadsViewOverlay.css index 2ebb1b11..7a1a40ae 100644 --- a/LCARStrek/browser/downloads/allDownloadsViewOverlay.css +++ b/LCARStrek/browser/downloads/allDownloadsViewOverlay.css @@ -90,7 +90,7 @@ richlistitem.download > toolbarseparator { width: 16px; height: 16px; margin: 0; - filter: url("chrome://global/skin/filters.svg#fill"); + -moz-context-properties: fill; fill: currentColor; } @@ -120,15 +120,15 @@ richlistitem.download[selected] > .downloadButtonArea > .downloadButton:hover:ac /*** Button icons ***/ .downloadIconCancel > .button-box > .button-icon { - list-style-image: url("chrome://browser/skin/panel-icons.svg#cancel"); + list-style-image: url("chrome://browser/skin/panel-icon-cancel.svg"); } .downloadIconShow > .button-box > .button-icon { - list-style-image: url("chrome://browser/skin/panel-icons.svg#folder"); + list-style-image: url("chrome://browser/skin/panel-icon-folder.svg"); } .downloadIconRetry > .button-box > .button-icon { - list-style-image: url("chrome://browser/skin/panel-icons.svg#retry"); + list-style-image: url("chrome://browser/skin/panel-icon-retry.svg"); } /*** Progressmeter ***/ diff --git a/LCARStrek/browser/downloads/downloads.css b/LCARStrek/browser/downloads/downloads.css index ce1c7b91..a2586d2e 100644 --- a/LCARStrek/browser/downloads/downloads.css +++ b/LCARStrek/browser/downloads/downloads.css @@ -11,7 +11,6 @@ #downloadsPanel > .panel-arrowcontainer > .panel-arrowcontent { overflow: hidden; - display: block; } #downloadsPanel > .panel-arrowcontainer > .panel-arrowcontent, @@ -234,7 +233,7 @@ richlistitem[type="download"][verdict] > toolbarseparator { width: 16px; height: 16px; margin: 1px; - filter: url("chrome://global/skin/filters.svg#fill"); + -moz-context-properties: fill; fill: currentColor; } @@ -272,23 +271,23 @@ richlistitem[type="download"][verdict="Malware"][showingsubview] { /*** Button icons ***/ .downloadIconCancel > .button-box > .button-icon { - list-style-image: url("chrome://browser/skin/panel-icons.svg#cancel"); + list-style-image: url("chrome://browser/skin/panel-icon-cancel.svg"); } .downloadIconShow > .button-box > .button-icon { - list-style-image: url("chrome://browser/skin/panel-icons.svg#folder"); + list-style-image: url("chrome://browser/skin/panel-icon-folder.svg"); } .downloadIconRetry > .button-box > .button-icon { - list-style-image: url("chrome://browser/skin/panel-icons.svg#retry"); + list-style-image: url("chrome://browser/skin/panel-icon-retry.svg"); } .downloadShowBlockedInfo > .button-box > .button-icon { - list-style-image: url("chrome://browser/skin/panel-icons.svg#arrow-right"); + list-style-image: url("chrome://browser/skin/panel-icon-arrow-right.svg"); } .downloadShowBlockedInfo > .button-box > .button-icon:-moz-locale-dir(rtl) { - list-style-image: url("chrome://browser/skin/panel-icons.svg#arrow-left"); + list-style-image: url("chrome://browser/skin/panel-icon-arrow-left.svg"); } /*** Blocked subview ***/ @@ -306,11 +305,11 @@ richlistitem[type="download"][verdict="Malware"][showingsubview] { } #downloadsPanel-multiView > .panel-viewcontainer > .panel-viewstack[viewtype="subview"] .download-state[showingsubview] .downloadButton > .button-box > .button-icon { - list-style-image: url("chrome://browser/skin/panel-icons.svg#arrow-left"); + list-style-image: url("chrome://browser/skin/panel-icon-arrow-left.svg"); } #downloadsPanel-multiView > .panel-viewcontainer > .panel-viewstack[viewtype="subview"] .download-state[showingsubview] .downloadButton > .button-box > .button-icon:-moz-locale-dir(rtl) { - list-style-image: url("chrome://browser/skin/panel-icons.svg#arrow-right"); + list-style-image: url("chrome://browser/skin/panel-icon-arrow-right.svg"); } #downloadsPanel-blockedSubview { diff --git a/LCARStrek/browser/gear.svg b/LCARStrek/browser/gear.svg index b765f3df..c0b35fdf 100755 --- a/LCARStrek/browser/gear.svg +++ b/LCARStrek/browser/gear.svg @@ -1,7 +1,6 @@ - - + diff --git a/LCARStrek/browser/heartbeat-icon.svg b/LCARStrek/browser/heartbeat-icon.svg deleted file mode 100644 index 779850ab..00000000 --- a/LCARStrek/browser/heartbeat-icon.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - diff --git a/LCARStrek/browser/heartbeat-star-lit.svg b/LCARStrek/browser/heartbeat-star-lit.svg deleted file mode 100644 index 59568831..00000000 --- a/LCARStrek/browser/heartbeat-star-lit.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/LCARStrek/browser/heartbeat-star-off.svg b/LCARStrek/browser/heartbeat-star-off.svg deleted file mode 100644 index cccf628c..00000000 --- a/LCARStrek/browser/heartbeat-star-off.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/LCARStrek/browser/notification-icons.svg b/LCARStrek/browser/notification-icons.svg index 2a0c4f16..8bbf3b83 100644 --- a/LCARStrek/browser/notification-icons.svg +++ b/LCARStrek/browser/notification-icons.svg @@ -1,28 +1,8 @@ - - - diff --git a/LCARStrek/browser/panel-icon-arrow-left.svg b/LCARStrek/browser/panel-icon-arrow-left.svg new file mode 100644 index 00000000..c28c689e --- /dev/null +++ b/LCARStrek/browser/panel-icon-arrow-left.svg @@ -0,0 +1,8 @@ + + + + + diff --git a/LCARStrek/browser/panel-icon-arrow-right.svg b/LCARStrek/browser/panel-icon-arrow-right.svg new file mode 100644 index 00000000..62042a27 --- /dev/null +++ b/LCARStrek/browser/panel-icon-arrow-right.svg @@ -0,0 +1,8 @@ + + + + + diff --git a/LCARStrek/browser/panel-icon-cancel.svg b/LCARStrek/browser/panel-icon-cancel.svg new file mode 100644 index 00000000..32ee55fa --- /dev/null +++ b/LCARStrek/browser/panel-icon-cancel.svg @@ -0,0 +1,8 @@ + + + + + diff --git a/LCARStrek/browser/panel-icon-folder.svg b/LCARStrek/browser/panel-icon-folder.svg new file mode 100644 index 00000000..dfed3af8 --- /dev/null +++ b/LCARStrek/browser/panel-icon-folder.svg @@ -0,0 +1,8 @@ + + + + + diff --git a/LCARStrek/browser/panel-icon-magnifier.svg b/LCARStrek/browser/panel-icon-magnifier.svg new file mode 100644 index 00000000..068a686d --- /dev/null +++ b/LCARStrek/browser/panel-icon-magnifier.svg @@ -0,0 +1,8 @@ + + + + + diff --git a/LCARStrek/browser/panel-icon-retry.svg b/LCARStrek/browser/panel-icon-retry.svg new file mode 100644 index 00000000..00287da4 --- /dev/null +++ b/LCARStrek/browser/panel-icon-retry.svg @@ -0,0 +1,8 @@ + + + + + diff --git a/LCARStrek/browser/panel-icons.svg b/LCARStrek/browser/panel-icons.svg deleted file mode 100644 index 2092e0f6..00000000 --- a/LCARStrek/browser/panel-icons.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - diff --git a/LCARStrek/browser/preferences/in-content-old/containers.css b/LCARStrek/browser/preferences/in-content-new/containers.css similarity index 100% rename from LCARStrek/browser/preferences/in-content-old/containers.css rename to LCARStrek/browser/preferences/in-content-new/containers.css diff --git a/LCARStrek/browser/preferences/in-content-old/default-profile-image.svg b/LCARStrek/browser/preferences/in-content-new/default-profile-image.svg similarity index 100% rename from LCARStrek/browser/preferences/in-content-old/default-profile-image.svg rename to LCARStrek/browser/preferences/in-content-new/default-profile-image.svg diff --git a/LCARStrek/browser/preferences/in-content-old/dialog.css b/LCARStrek/browser/preferences/in-content-new/dialog.css similarity index 100% rename from LCARStrek/browser/preferences/in-content-old/dialog.css rename to LCARStrek/browser/preferences/in-content-new/dialog.css diff --git a/LCARStrek/browser/preferences/in-content-old/favicon.ico b/LCARStrek/browser/preferences/in-content-new/favicon.ico similarity index 100% rename from LCARStrek/browser/preferences/in-content-old/favicon.ico rename to LCARStrek/browser/preferences/in-content-new/favicon.ico diff --git a/LCARStrek/browser/preferences/in-content-new/icons.svg b/LCARStrek/browser/preferences/in-content-new/icons.svg new file mode 100644 index 00000000..3e9dd6a6 --- /dev/null +++ b/LCARStrek/browser/preferences/in-content-new/icons.svg @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/LCARStrek/browser/preferences/in-content-old/preferences.css b/LCARStrek/browser/preferences/in-content-new/preferences.css similarity index 87% rename from LCARStrek/browser/preferences/in-content-old/preferences.css rename to LCARStrek/browser/preferences/in-content-new/preferences.css index 68a025be..07f97e33 100644 --- a/LCARStrek/browser/preferences/in-content-old/preferences.css +++ b/LCARStrek/browser/preferences/in-content-new/preferences.css @@ -68,6 +68,10 @@ treecol { white-space: nowrap; } +.accessory-button { + min-width: 145px; +} + /* Category List */ #categories { @@ -89,75 +93,56 @@ treecol { } #category-general > .category-icon { - list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#general"); + list-style-image: url("chrome://browser/skin/preferences/in-content-new/icons.svg#general"); } #category-general:hover > .category-icon, #category-general[selected] > .category-icon { - list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#general-active"); -} - -#category-search > .category-icon { - list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#search"); -} - -#category-search:hover > .category-icon, -#category-search[selected] > .category-icon { - list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#search-active"); -} - -#category-content > .category-icon { - list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#content"); -} - -#category-content:hover > .category-icon, -#category-content[selected] > .category-icon { - list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#content-active"); + list-style-image: url("chrome://browser/skin/preferences/in-content-new/icons.svg#general-active"); } #category-application > .category-icon { - list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#applications"); + list-style-image: url("chrome://browser/skin/preferences/in-content-new/icons.svg#content"); } #category-application:hover > .category-icon, #category-application[selected] > .category-icon { - list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#applications-active"); + list-style-image: url("chrome://browser/skin/preferences/in-content-new/icons.svg#content-active"); } #category-privacy > .category-icon { - list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#privacy"); + list-style-image: url("chrome://browser/skin/preferences/in-content-new/icons.svg#security"); } #category-privacy:hover > .category-icon, #category-privacy[selected] > .category-icon { - list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#privacy-active"); -} - -#category-security > .category-icon { - list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#security"); -} - -#category-security:hover > .category-icon, -#category-security[selected] > .category-icon { - list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#security-active"); + list-style-image: url("chrome://browser/skin/preferences/in-content-new/icons.svg#security-active"); } #category-sync > .category-icon { - list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#sync"); + list-style-image: url("chrome://browser/skin/preferences/in-content-new/icons.svg#sync"); } #category-sync:hover > .category-icon, #category-sync[selected] > .category-icon { - list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#sync-active"); + list-style-image: url("chrome://browser/skin/preferences/in-content-new/icons.svg#sync-active"); } #category-advanced > .category-icon { - list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#advanced"); + list-style-image: url("chrome://browser/skin/preferences/in-content-new/icons.svg#advanced"); } #category-advanced:hover > .category-icon, #category-advanced[selected] > .category-icon { - list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#advanced-active"); + list-style-image: url("chrome://browser/skin/preferences/in-content-new/icons.svg#advanced-active"); +} + +#category-search-results > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content-new/icons.svg#searchResults"); +} + +#category-search-results > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content-new/icons.svg#searchResults-active"); } @media (max-width: 800px) { @@ -182,11 +167,6 @@ treecol { display: none; } -#header-advanced { - border-bottom: none; - padding-bottom: 0; -} - .indent { margin-top: 7px; margin-bottom: 7px; @@ -249,7 +229,6 @@ treecol { direction: rtl; } -/* Content pane */ #defaultFontSizeLabel { /* !important needed to override common !important rule */ margin-inline-start: 4px !important; @@ -257,10 +236,6 @@ treecol { /* Applications Pane Styles */ -#applicationsContent { - padding: 15px 0; -} - #filter { margin-inline-start: 0; } @@ -308,6 +283,21 @@ treecol { margin-left: 0; } +/* This learn-more link is inserted at the end of a + xul:description element so it should behave like normal text. */ +#trackingProtectionLearnMore { + white-space: normal; + margin-inline-start: 0; +} + +#trackingProtectionAdvancedSettings { + margin-inline-start: 15px; +} + +#crashReporterGroup { + margin-top: 0; +} + /* Collapse the non-active vboxes in decks to use only the height the active vbox needs */ #historyPane:not([selectedIndex="1"]) > #historyDontRememberPane, @@ -369,12 +359,15 @@ description > html|a { * Dialog */ -#dialogOverlay { - background-color: rgba(0,0,0,0.75); +.dialogOverlay { visibility: hidden; } -#dialogBox { +.dialogOverlay[topmost="true"] { + background-color: rgba(0,0,0,0.75); +} + +.dialogBox { background-color: #000000; background-clip: content-box; color: #FF9F00; @@ -387,21 +380,21 @@ description > html|a { padding-left: 6px; } -#dialogBox[resizable="true"] { +.dialogBox[resizable="true"] { resize: both; overflow: hidden; min-height: 20em; min-width: 66ch; } -#dialogBox > .groupbox-title { +.dialogBox > .groupbox-title { margin-inline-start: 0; margin-inline-end: 0; /* padding: 3.5px 0; background-color: #F1F1F1; */ } -#dialogTitle { +.dialogTitle { text-align: center; -moz-user-select: none; } @@ -416,18 +409,18 @@ description > html|a { min-width: 0; } -#dialogBox > .groupbox-title > caption { +.dialogBox > .groupbox-title > caption { margin: 0; border-radius: 1000px; background-color: #A09090; } -#dialogBox > .groupbox-body { +.dialogBox > .groupbox-body { -moz-appearance: none; padding: 0; } -#dialogFrame { +.dialogFrame { -moz-box-flex: 1; /* Default dialog dimensions */ width: 66ch; @@ -709,6 +702,53 @@ description > html|a { background-color: var(--in-content-category-background-hover); border-color: var(--in-content-category-background-hover); } +.help-button { + position: fixed; + left: 0; + + /* Needs to have enough gap from the bottom to not + get behind the status panel (bug 1357841). */ + bottom: 2rem; + font-size: 13px; + line-height: 13px; + height: 14px; + background-position: 15px; + padding-inline-start: 35px; + white-space: nowrap; +} + +.help-button:-moz-locale-dir(rtl) { + left: auto; + right: 0; + background-position: right 15px top 0; +} + +.help-button:link, +.help-button:visited { + color: var(--in-content-category-text); + text-decoration: none; +} + +.search-tooltip { + position: absolute; + pointer-events: none; + padding: 0 10px; + bottom: 100%; + background-color: #000000; +} + +.search-tooltip::before { + position: absolute; + content: ""; + border: 6px solid transparent; + border-top-color: #FFCF00; + top: 100%; + offset-inline-start: calc(50% - 6px); +} + +.search-tooltip-parent { + position: relative; +} /* === END shared/incontentprefs/preferences.inc.css === */ diff --git a/LCARStrek/browser/preferences/in-content-old/search.css b/LCARStrek/browser/preferences/in-content-new/search.css similarity index 100% rename from LCARStrek/browser/preferences/in-content-old/search.css rename to LCARStrek/browser/preferences/in-content-new/search.css diff --git a/LCARStrek/browser/preferences/in-content-old/siteDataSettings.css b/LCARStrek/browser/preferences/in-content-new/siteDataSettings.css similarity index 100% rename from LCARStrek/browser/preferences/in-content-old/siteDataSettings.css rename to LCARStrek/browser/preferences/in-content-new/siteDataSettings.css diff --git a/LCARStrek/browser/preferences/in-content-old/icons.svg b/LCARStrek/browser/preferences/in-content-old/icons.svg deleted file mode 100644 index 91b6c63b..00000000 --- a/LCARStrek/browser/preferences/in-content-old/icons.svg +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/LCARStrek/browser/preferences/in-content/icons.svg b/LCARStrek/browser/preferences/in-content/icons.svg index 3e9dd6a6..91b6c63b 100644 --- a/LCARStrek/browser/preferences/in-content/icons.svg +++ b/LCARStrek/browser/preferences/in-content/icons.svg @@ -2,7 +2,7 @@ - + diff --git a/LCARStrek/browser/preferences/in-content/preferences.css b/LCARStrek/browser/preferences/in-content/preferences.css index 2b6abadf..18176886 100644 --- a/LCARStrek/browser/preferences/in-content/preferences.css +++ b/LCARStrek/browser/preferences/in-content/preferences.css @@ -68,10 +68,6 @@ treecol { white-space: nowrap; } -.accessory-button { - min-width: 145px; -} - /* Category List */ #categories { @@ -101,21 +97,48 @@ treecol { list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#general-active"); } -#category-application > .category-icon { +#category-search > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#search"); +} + +#category-search:hover > .category-icon, +#category-search[selected] > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#search-active"); +} + +#category-content > .category-icon { list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#content"); } +#category-content:hover > .category-icon, +#category-content[selected] > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#content-active"); +} + +#category-application > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#applications"); +} + #category-application:hover > .category-icon, #category-application[selected] > .category-icon { - list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#content-active"); + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#applications-active"); } #category-privacy > .category-icon { - list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#security"); + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#privacy"); } #category-privacy:hover > .category-icon, #category-privacy[selected] > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#privacy-active"); +} + +#category-security > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#security"); +} + +#category-security:hover > .category-icon, +#category-security[selected] > .category-icon { list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#security-active"); } @@ -137,14 +160,6 @@ treecol { list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#advanced-active"); } -#category-search-results > .category-icon { - list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#searchResults"); -} - -#category-search-results > .category-icon { - list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#searchResults-active"); -} - @media (max-width: 800px) { .category-name { display: none; @@ -167,6 +182,11 @@ treecol { display: none; } +#header-advanced { + border-bottom: none; + padding-bottom: 0; +} + .indent { margin-top: 7px; margin-bottom: 7px; @@ -229,6 +249,7 @@ treecol { direction: rtl; } +/* Content pane */ #defaultFontSizeLabel { /* !important needed to override common !important rule */ margin-inline-start: 4px !important; @@ -236,6 +257,10 @@ treecol { /* Applications Pane Styles */ +#applicationsContent { + padding: 15px 0; +} + #filter { margin-inline-start: 0; } @@ -283,21 +308,6 @@ treecol { margin-left: 0; } -/* This learn-more link is inserted at the end of a - xul:description element so it should behave like normal text. */ -#trackingProtectionLearnMore { - white-space: normal; - margin-inline-start: 0; -} - -#trackingProtectionAdvancedSettings { - margin-inline-start: 15px; -} - -#crashReporterGroup { - margin-top: 0; -} - /* Collapse the non-active vboxes in decks to use only the height the active vbox needs */ #historyPane:not([selectedIndex="1"]) > #historyDontRememberPane, @@ -359,12 +369,15 @@ description > html|a { * Dialog */ -#dialogOverlay { - background-color: rgba(0,0,0,0.75); +.dialogOverlay { visibility: hidden; } -#dialogBox { +.dialogOverlay[topmost="true"] { + background-color: rgba(0,0,0,0.75); +} + +.dialogBox { background-color: #000000; background-clip: content-box; color: #FF9F00; @@ -377,21 +390,21 @@ description > html|a { padding-left: 6px; } -#dialogBox[resizable="true"] { +.dialogBox[resizable="true"] { resize: both; overflow: hidden; min-height: 20em; min-width: 66ch; } -#dialogBox > .groupbox-title { +.dialogBox > .groupbox-title { margin-inline-start: 0; margin-inline-end: 0; /* padding: 3.5px 0; background-color: #F1F1F1; */ } -#dialogTitle { +.dialogTitle { text-align: center; -moz-user-select: none; } @@ -406,18 +419,18 @@ description > html|a { min-width: 0; } -#dialogBox > .groupbox-title > caption { +.dialogBox > .groupbox-title > caption { margin: 0; border-radius: 1000px; background-color: #A09090; } -#dialogBox > .groupbox-body { +.dialogBox > .groupbox-body { -moz-appearance: none; padding: 0; } -#dialogFrame { +.dialogFrame { -moz-box-flex: 1; /* Default dialog dimensions */ width: 66ch; @@ -699,32 +712,6 @@ description > html|a { background-color: var(--in-content-category-background-hover); border-color: var(--in-content-category-background-hover); } -.help-button { - position: fixed; - left: 0; - - /* Needs to have enough gap from the bottom to not - get behind the status panel (bug 1357841). */ - bottom: 2rem; - font-size: 13px; - line-height: 13px; - height: 14px; - background-position: 15px; - padding-inline-start: 35px; - white-space: nowrap; -} - -.help-button:-moz-locale-dir(rtl) { - left: auto; - right: 0; - background-position: right 15px top 0; -} - -.help-button:link, -.help-button:visited { - color: var(--in-content-category-text); - text-decoration: none; -} /* === END shared/incontentprefs/preferences.inc.css === */ diff --git a/LCARStrek/browser/searchbar.css b/LCARStrek/browser/searchbar.css index b590e1dd..1fee6edc 100644 --- a/LCARStrek/browser/searchbar.css +++ b/LCARStrek/browser/searchbar.css @@ -297,7 +297,7 @@ .search-setting-button-compact > .button-box > .button-icon { list-style-image: url("chrome://browser/skin/gear.svg"); - filter: url(chrome://global/skin/filters.svg#fill); + -moz-context-properties: fill; fill: currentColor; } diff --git a/LCARStrek/browser/synced-tabs.svg b/LCARStrek/browser/synced-tabs.svg new file mode 100644 index 00000000..b847497b --- /dev/null +++ b/LCARStrek/browser/synced-tabs.svg @@ -0,0 +1,6 @@ + + + + diff --git a/LCARStrek/browser/tabbrowser/tab-audio-blocked.svg b/LCARStrek/browser/tabbrowser/tab-audio-blocked.svg new file mode 100644 index 00000000..7ee7979f --- /dev/null +++ b/LCARStrek/browser/tabbrowser/tab-audio-blocked.svg @@ -0,0 +1,9 @@ + + + + + diff --git a/LCARStrek/browser/tabbrowser/tab-audio-muted.svg b/LCARStrek/browser/tabbrowser/tab-audio-muted.svg new file mode 100644 index 00000000..51966f41 --- /dev/null +++ b/LCARStrek/browser/tabbrowser/tab-audio-muted.svg @@ -0,0 +1,9 @@ + + + + c-3.4,0-6.2-2.8-6.2-6.2S4.6,1.8,8,1.8s6.2,2.8,6.2,6.2S11.4,14.2,8,14.2z"/> + + diff --git a/LCARStrek/browser/tabbrowser/tab-audio-playing.svg b/LCARStrek/browser/tabbrowser/tab-audio-playing.svg new file mode 100644 index 00000000..4680d633 --- /dev/null +++ b/LCARStrek/browser/tabbrowser/tab-audio-playing.svg @@ -0,0 +1,9 @@ + + + + c-3.4,0-6.2-2.8-6.2-6.2S4.6,1.8,8,1.8s6.2,2.8,6.2,6.2S11.4,14.2,8,14.2z"/> + + diff --git a/LCARStrek/browser/tabbrowser/tab-audio.svg b/LCARStrek/browser/tabbrowser/tab-audio.svg deleted file mode 100644 index 228c3803..00000000 --- a/LCARStrek/browser/tabbrowser/tab-audio.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - diff --git a/LCARStrek/browser/webRTC-indicator.css b/LCARStrek/browser/webRTC-indicator.css index c5a8f644..c53cd1c6 100644 --- a/LCARStrek/browser/webRTC-indicator.css +++ b/LCARStrek/browser/webRTC-indicator.css @@ -15,6 +15,12 @@ window { border-style: none; } +#audioVideoButton, +#screenShareButton { + -moz-context-properties: fill; + fill: #FFCF00; +} + #firefoxButton { background-image: url("chrome://branding/content/icon48.png"); background-repeat: no-repeat; -- 2.43.0