From 1cf9b0825ab3c891686ef5cdcde86e6a8efbf701 Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Mon, 27 Feb 2017 03:31:38 +0100 Subject: [PATCH] second part of syncing LCARStrek with Firefox 52 browser windows theme changes --- LCARStrek/browser/browser.css | 159 ++++++++++++++-- LCARStrek/browser/customizableui/panelUI.css | 3 +- .../downloads/allDownloadsViewOverlay.css | 63 +++++- LCARStrek/browser/downloads/buttons.png | Bin 333 -> 0 bytes LCARStrek/browser/downloads/downloads.css | 180 ++++++++++-------- LCARStrek/browser/menuPanel.svg | 1 - LCARStrek/browser/panel-icons.svg | 10 + LCARStrek/browser/preferences/containers.css | 57 ++++++ .../preferences/in-content/containers.css | 32 ++++ .../preferences/in-content/preferences.css | 1 - LCARStrek/browser/searchbar.css | 33 +++- .../browser/tabbrowser/tab-audio-small.svg | 14 ++ LCARStrek/browser/tabbrowser/tab-audio.svg | 4 + LCARStrek/browser/usercontext/banking.svg | 8 - LCARStrek/browser/usercontext/personal.svg | 8 - LCARStrek/browser/usercontext/shopping.svg | 8 - LCARStrek/browser/usercontext/work.svg | 8 - LCARStrek/browser/warning-white.svg | 6 + LCARStrek/global/in-content/common.css | 2 +- 19 files changed, 467 insertions(+), 130 deletions(-) delete mode 100644 LCARStrek/browser/downloads/buttons.png create mode 100644 LCARStrek/browser/preferences/containers.css create mode 100644 LCARStrek/browser/preferences/in-content/containers.css delete mode 100644 LCARStrek/browser/usercontext/banking.svg delete mode 100644 LCARStrek/browser/usercontext/personal.svg delete mode 100644 LCARStrek/browser/usercontext/shopping.svg delete mode 100644 LCARStrek/browser/usercontext/work.svg create mode 100644 LCARStrek/browser/warning-white.svg diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index ada02a6b..6a07f64b 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -50,8 +50,8 @@ menubar { --arrowpanel-hover: #FFCF00; --arrowpanel-active: #FF9F00; --arrowpanel-dimmed: #402000; -/* --arrowpanel-dimmed-further: hsla(0,0%,80%,.45); - --arrowpanel-dimmed-even-further: hsla(0,0%,80%,.8); */ + --arrowpanel-dimmed-further: #794900; + --arrowpanel-dimmed-even-further: 603000; --urlbar-separator-color: #9C9CFF; } @@ -2160,6 +2160,31 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box /* autocomplete */ +/* === BEGIN autocomplete.inc.css === */ + +#PopupAutoComplete > richlistbox > richlistitem { + height: 20px; + min-height: 20px; + border: 0; + border-radius: 0; + padding: 0px 1px 0px 1px; +} + +#PopupAutoComplete > richlistbox > richlistitem > .ac-title { + font: icon; + margin-inline-start: 6px; +} + +#PopupAutoComplete > richlistbox { + padding: 0; +} + +/* === END autocomplete.inc.css === */ + +#PopupAutoComplete > richlistbox > richlistitem[originaltype~="datalist-first"] { + border-top: 1px solid #A09090; +} + #treecolAutoCompleteImage { max-width: 36px; } @@ -2790,12 +2815,14 @@ richlistitem[selected="true"][current="true"] > .ac-title-box > .ac-result-type- } .tab-icon-overlay[soundplaying], -.tab-icon-overlay[muted]:not([crashed]) { +.tab-icon-overlay[muted]:not([crashed]), +.tab-icon-overlay[blocked]:not([crashed]) { border-radius: 10px; } .tab-icon-overlay[soundplaying]:hover, -.tab-icon-overlay[muted]:hover { +.tab-icon-overlay[muted]:hover, +.tab-icon-overlay[blocked]:not([crashed]):hover { background-color: #FFCF00; } @@ -2807,15 +2834,25 @@ richlistitem[selected="true"][current="true"] > .ac-title-box > .ac-result-type- list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-muted"); } -#TabsToolbar[brighttext] .tab-icon-overlay[soundplaying]:not(:hover) { - list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-white"); +.tab-icon-overlay[blocked]:not([crashed]) { + list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-blocked"); } +#TabsToolbar[brighttext] .tab-icon-overlay[soundplaying]:not([selected]):not(:hover), +.tab-icon-overlay[soundplaying][selected]:-moz-lwtheme-brighttext:not(:hover) { + list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-white"); +} -#TabsToolbar[brighttext] .tab-icon-overlay[muted]:not([crashed]):not(:hover) { +#TabsToolbar[brighttext] .tab-icon-overlay[muted]:not([crashed]):not([selected]):not(:hover), +.tab-icon-overlay[mouted][selected]:-moz-lwtheme-brighttext:not(:hover) { list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-white-muted"); } +#TabsToolbar[brighttext] .tab-icon-overlay[blocked]:not([crashed]):not([selected]):not(:hover), +.tab-icon-overlay[blocked][selected]:-moz-lwtheme-brighttext:not(:hover) { + list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-white-blocked"); +} + .tab-throbber[busy] { list-style-image: url("chrome://communicator/skin/brand/throbber16-anim-connect.png"); } @@ -2855,7 +2892,8 @@ richlistitem[selected="true"][current="true"] > .ac-title-box > .ac-result-type- } .tab-icon-sound[soundplaying], -.tab-icon-sound[muted] { +.tab-icon-sound[muted], +.tab-icon-sound[blocked] { list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio); filter: url(chrome://browser/skin/filters.svg#fill); fill: currentColor; @@ -2865,11 +2903,21 @@ richlistitem[selected="true"][current="true"] > .ac-title-box > .ac-result-type- list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted); } +.tab-icon-sound[blocked] { + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-blocked); +} + .tab-close-button { margin-top: 1px; padding: 0; } +.tab-icon-sound[soundplaying-scheduledremoval]:not(:hover), +.tab-icon-overlay[soundplaying-scheduledremoval]:not(:hover) { + transition: opacity .3s linear var(--soundplaying-removal-delay); + opacity: 0; +} + .tab-background, .tabs-newtab-button { /* overlap the tab curves */ @@ -2935,6 +2983,7 @@ richlistitem[selected="true"][current="true"] > .ac-title-box > .ac-result-type- .tabs-newtab-button, .tab-icon-overlay[soundplaying], .tab-icon-overlay[muted]:not([crashed]), +.tab-icon-overlay[blocked]:not([crashed]), .tab-icon-sound, .tab-close-button { pointer-events: auto; @@ -3024,7 +3073,8 @@ richlistitem[selected="true"][current="true"] > .ac-title-box > .ac-result-type- } .alltabs-endimage[soundplaying], -.alltabs-endimage[muted] { +.alltabs-endimage[muted], +.alltabs-endimage[blocked] { list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio); filter: url(chrome://browser/skin/filters.svg#fill); fill: currentColor; @@ -3034,6 +3084,10 @@ richlistitem[selected="true"][current="true"] > .ac-title-box > .ac-result-type- list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted); } +.alltabs-endimage[blocked] { + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-blocked); +} + /* === END tabs.inc.css === */ /* Tab DnD indicator */ @@ -3332,8 +3386,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { list-style-image: url(chrome://browser/skin/notification-icons.svg#login-detailed); } -.camera-icon, -.popup-notification-icon[popupid="webRTC-shareDevices"] { +.camera-icon { list-style-image: url(chrome://browser/skin/notification-icons.svg#camera); } @@ -3357,11 +3410,10 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { list-style-image: url(chrome://browser/skin/notification-icons.svg#microphone-blocked); } -.popup-notification-icon[popupid="webRTC-shareMicrophone"] { +.popup-notification-icon.microphone-icon { list-style-image: url(chrome://browser/skin/notification-icons.svg#microphone-detailed); } -.popup-notification-icon[popupid="webRTC-shareScreen"], .screen-icon { list-style-image: url(chrome://browser/skin/notification-icons.svg#screen); } @@ -3374,6 +3426,34 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { list-style-image: url(chrome://browser/skin/notification-icons.svg#screen-blocked); } +#webRTC-preview:not([hidden]) { + display: -moz-stack; + border-radius: 4px; + border: 1px solid #A09090; + overflow: hidden; + min-width: 300px; + min-height: 10em; +} + +html|*#webRTC-previewVideo { + width: 300px; + /* If we don't set the min-width, width is ignored. */ + min-width: 300px; + max-height: 200px; +} + +#webRTC-previewWarning { + background: #FF0000 url("chrome://browser/skin/warning-white.svg") no-repeat .75em .75em; + margin: 0; + padding: .5em; + padding-inline-start: calc(1.5em + 16px); + border-top: 1px solid #A09090; +} + +#webRTC-previewWarning > .text-link { + margin-inline-start: 0; +} + /* This icon has a block sign in it, so we don't need a blocked version. */ .popup-icon { list-style-image: url("chrome://browser/skin/notification-icons.svg#popup"); @@ -4597,6 +4677,7 @@ notification.pluginVulnerable .messageImage { width: 20px; height: 20px; border-radius: 2px; + background-image: url("chrome://browser/skin/theme-switcher-icon.png"); background-size: contain; } @@ -5415,3 +5496,55 @@ menugroup > .menuitem-iconic[disabled="true"] > .menu-iconic-left { .webextension-popup-browser { border-radius: inherit; } + +.contentSelectDropdown-ingroup > .menu-iconic-text { + padding-inline-start: 20px; +} + +#ContentSelectDropdown > menupopup { + background-color: #000000; + -moz-border-top-colors: #A09090; + -moz-border-right-colors: #A09090; + -moz-border-bottom-colors: #A09090; + -moz-border-left-colors: #A09090; +} + +#ContentSelectDropdown > menupopup > menucaption, +#ContentSelectDropdown > menupopup > menuitem { + padding: 4px 6px; +} + +#ContentSelectDropdown > menupopup > menucaption > .menu-iconic-text, +#ContentSelectDropdown > menupopup > menuitem > .menu-iconic-text { + font-family: "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif; + font-size: 11px; + /** + * Remove the extra vertical padding set by menu.css since + * the menuitem itself will include enough padding. + */ + padding-top: 0px; + padding-bottom: 0px; +} + +#ContentSelectDropdown > menupopup > menucaption > .menu-iconic-text { + font-weight: bold; +} + +#ContentSelectDropdown > menupopup > menuitem[_moz-menuactive="true"][disabled="true"] { + color: #A09090; + background-color: unset; +} + +#ContentSelectDropdown > menupopup > menucaption { + background-color: buttonface; +} + +#ContentSelectDropdown > menupopup > menucaption[disabled="true"] { + color: #A09090; +} + +#ContentSelectDropdown > .isOpenedViaTouch > menucaption, +#ContentSelectDropdown > .isOpenedViaTouch > menuitem { + padding-top: 11px; + padding-bottom: 11px; +} diff --git a/LCARStrek/browser/customizableui/panelUI.css b/LCARStrek/browser/customizableui/panelUI.css index 94fe0847..ba5007a4 100644 --- a/LCARStrek/browser/customizableui/panelUI.css +++ b/LCARStrek/browser/customizableui/panelUI.css @@ -569,7 +569,7 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { content: ""; width: 14px; height: 14px; - margin-right: 16.5px; + margin-inline-end: 16.5px; border-radius: 2px; background-size: contain; display: -moz-box; @@ -1635,6 +1635,7 @@ menuitem[checked="true"].subviewbutton > .menu-iconic-left { /* emulating chrome://browser/content/places/menu.xml#places-popup-arrow but without the arrow */ /* box-shadow: 0 0 4px rgba(0,0,0,0.2); background: var(--arrowpanel-background); + color: var(--arrowpanel-color); border: 1px solid var(--arrowpanel-border-color); border-radius: 3.5px; margin-top: -4px;*/ diff --git a/LCARStrek/browser/downloads/allDownloadsViewOverlay.css b/LCARStrek/browser/downloads/allDownloadsViewOverlay.css index e8ceebb9..1c945f23 100644 --- a/LCARStrek/browser/downloads/allDownloadsViewOverlay.css +++ b/LCARStrek/browser/downloads/allDownloadsViewOverlay.css @@ -46,6 +46,10 @@ richlistitem.download[verdict="Uncommon"] .downloadBlockedBadge { background-image: url("chrome://browser/skin/info.svg"); } +richlistitem.download > toolbarseparator { + display: none; +} + .downloadTarget { margin-bottom: 3px; cursor: inherit; @@ -58,13 +62,70 @@ richlistitem.download[verdict="Uncommon"] .downloadBlockedBadge { } .downloadButton { + -moz-box-align: center; background: transparent; min-width: 0; min-height: 0; margin: 3px; border: none; padding: 5px; - list-style-image: url("chrome://browser/skin/downloads/buttons.png"); + color: inherit; +} + +.downloadButton > .button-box { + -moz-appearance: none; + padding: 2px !important; + border-radius: 50%; + color: graytext; +} + +.downloadButton > .button-box > .button-icon { + width: 16px; + height: 16px; + margin: 0; + filter: url("chrome://browser/skin/filters.svg#fill"); + fill: currentColor; +} + +.downloadButton > .button-box > .button-text { + display: none; +} + +.downloadButton:hover > .button-box { + background-color: #A09090; + color: #000000; +} + +.downloadButton:hover:active > .button-box { + background-color: #FF9F00; +} + +richlistitem.download[selected] > .downloadButtonArea > .downloadButton > .button-box { + color: inherit; +} + +richlistitem.download[selected] > .downloadButtonArea > .downloadButton:hover > .button-box { + background-color: #FFCF00; + color: #000000; +} + +richlistitem.download[selected] > .downloadButtonArea > .downloadButton:hover:active > .button-box { + background-color: #FF9F00; + color: #000000; +} + +/*** Button icons ***/ + +.downloadIconCancel > .button-box > .button-icon { + list-style-image: url("chrome://browser/skin/panel-icons.svg#cancel"); +} + +.downloadIconShow > .button-box > .button-icon { + list-style-image: url("chrome://browser/skin/panel-icons.svg#folder"); +} + +.downloadIconRetry > .button-box > .button-icon { + list-style-image: url("chrome://browser/skin/panel-icons.svg#retry"); } /* === END allDownloadsViewOverlay.inc.css === */ diff --git a/LCARStrek/browser/downloads/buttons.png b/LCARStrek/browser/downloads/buttons.png deleted file mode 100644 index 9f5b24f0f902f2977def1fe731f3b941dde70207..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 333 zcmeAS@N?(olHy`uVBq!ia0vp^3P2pd#0(@^&E_uyQk(%kA+GTZ9zf>*^9-w}Efxi` z7)yfuf*Bm1-ADs*lDyqr7&=&GL25V)JR*x37`TN&n2}-D90{Nxdx@v7EBga(Rz@=k zMjc_0341+V978nDFP-4X#bn6iT7R_Z%&FF!yQj=c+T+;z&F<)Ak#J}Km;Of$lwR?$ zG4+2j|1X^2d6ltao&l=@r=m}T%Ao*8`R57#YTMrbzk1=t1nVuYiu+m)om?^bK toolbarseparator { margin: 0; border: 0; min-width: 0; @@ -88,6 +89,11 @@ toolbarseparator.downloadsDropmarkerSplitter { margin: 7px 0; } +richlistitem[type="download"] > toolbarseparator { + margin: 10px 0; +} + +richlistitem[type="download"]:hover > toolbarseparator, #downloadsFooter:hover toolbarseparator.downloadsDropmarkerSplitter, #downloadsFooter[showingdropdown] toolbarseparator { margin: 0; @@ -146,14 +152,17 @@ richlistitem[type="download"] { richlistitem[type="download"] { margin: 0; - /*border-top: 1px solid var(--downloads-item-border-top-color);*/ - border-bottom: 1px solid var(--downloads-item-border-bottom-color); + border-bottom: 1px solid var(--panel-separator-color); background: transparent; - padding: 8px; + padding: 0; } -richlistitem[type="download"]:first-child { -/* border-top: 1px solid transparent;*/ +richlistitem[type="download"]:last-child { + border-bottom: none; +} + +richlistitem[type="download"] > .downloadMainArea { + padding: 8px; } .downloadTypeIcon { @@ -218,20 +227,89 @@ richlistitem[type="download"][verdict="Uncommon"] .downloadBlockedBadge { cursor: inherit; } +richlistitem[type="download"][verdict] > toolbarseparator { + visibility: hidden; +} + .downloadButton { - min-width: 0; - min-height: 0; - margin: 3px; + min-width: 58px; + margin: 0; /* border: none; */ background: transparent; - padding: 5px; - list-style-image: url("chrome://browser/skin/downloads/buttons.png"); + padding: 8px; + color: #A09090; } -.downloadButton > .button-box { +.downloadButton > .button-box > .button-icon { + width: 16px; + height: 16px; + margin: 1px; + filter: url("chrome://browser/skin/filters.svg#fill"); + fill: currentColor; +} + +.downloadButton > .button-box > .button-text { + margin: 0 !important; padding: 0; } +richlistitem[type="download"][state="1"][exists]:hover > .downloadMainArea, +richlistitem[type="download"]:not([verdict]):hover > .downloadButtonArea { + background-color: var(--arrowpanel-dimmed); +} + +richlistitem[type="download"][state="1"][exists] .downloadMainArea:hover, +richlistitem[type="download"]:not([verdict]) > .downloadButtonArea:hover, +richlistitem[type="download"][verdict]:hover { + background-color: var(--arrowpanel-dimmed-further); +} + +richlistitem[type="download"][state="1"][exists] > .downloadMainArea:hover:active, +richlistitem[type="download"]:not([verdict]) > .downloadButtonArea:hover:active, +richlistitem[type="download"][verdict]:hover:active { + background-color: var(--arrowpanel-dimmed-even-further); +} + +richlistitem[type="download"][showingsubview] { + background-color: #794900; + color: #FFCF00; + transition: background-color var(--panelui-subview-transition-duration), + color var(--panelui-subview-transition-duration); +} + +richlistitem[type="download"][verdict="Malware"]:hover, +richlistitem[type="download"][verdict="Malware"]:hover:active, +richlistitem[type="download"][verdict="Malware"][showingsubview] { + background-color: #FF0000; + color: #000000; +} + +richlistitem[type="download"][verdict="Malware"]:hover > .downloadButtonArea > .downloadButton { + color: inherit; +} + +/*** Button icons ***/ + +.downloadIconCancel > .button-box > .button-icon { + list-style-image: url("chrome://browser/skin/panel-icons.svg#cancel"); +} + +.downloadIconShow > .button-box > .button-icon { + list-style-image: url("chrome://browser/skin/panel-icons.svg#folder"); +} + +.downloadIconRetry > .button-box > .button-icon { + list-style-image: url("chrome://browser/skin/panel-icons.svg#retry"); +} + +.downloadShowBlockedInfo > .button-box > .button-icon { + list-style-image: url("chrome://browser/skin/panel-icons.svg#arrow-right"); +} + +.downloadShowBlockedInfo > .button-box > .button-icon:-moz-locale-dir(rtl) { + list-style-image: url("chrome://browser/skin/panel-icons.svg#arrow-left"); +} + /*** Blocked subview ***/ #downloadsPanel-multiView > .panel-viewcontainer > .panel-viewstack[viewtype=main] > .panel-subviews { @@ -243,11 +321,15 @@ richlistitem[type="download"][verdict="Uncommon"] .downloadBlockedBadge { /* When the subview is showing, turn the download button into an arrow pointing back to the main view. */ #downloadsPanel-multiView > .panel-viewcontainer > .panel-viewstack[viewtype="subview"] .download-state[showingsubview] .downloadButton { - list-style-image: url("chrome://browser/skin/customizableui/subView-arrow-back-inverted.png"); + color: #FFCF00; +} + +#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"); } -#downloadsPanel-multiView > .panel-viewcontainer > .panel-viewstack[viewtype="subview"] .download-state[showingsubview] .downloadButton:-moz-locale-dir(rtl) { - list-style-image: url("chrome://browser/skin/customizableui/subView-arrow-back-inverted-rtl.png"); +#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"); } #downloadsPanel-blockedSubview { @@ -327,8 +409,6 @@ richlistitem[type="download"][showingsubview][verdict="Malware"] { :root { --downloads-item-height: 7em; - /*--downloads-item-border-top-color: hsla(0,0%,100%,.3);*/ - --downloads-item-border-bottom-color: #9C9CFF; --downloads-item-font-size-factor: 0.9; --downloads-item-target-margin-bottom: 6px; --downloads-item-details-margin-top: 0; @@ -351,6 +431,12 @@ richlistitem[type="download"][verdict="Uncommon"] .blockedIcon { list-style-image: url("chrome://global/skin/icons/information-32.png"); } +@media (-moz-windows-default-theme) { + richlistitem[type="download"][verdict="Malware"] { + color: #FF0000; + } +} + /*** Highlighted list items ***/ #downloadsListBox:-moz-focusring > richlistitem[type="download"][selected] { @@ -358,61 +444,3 @@ richlistitem[type="download"][verdict="Uncommon"] .blockedIcon { outline-offset: -1px; /*-moz-outline-radius: 3px;*/ } - -/* #downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"][exists]:hover { */ -#downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"]:hover { - border-radius: 3px; - background-color: #794900; - color: #FFCF00; - cursor: pointer; -} - -#downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"][exists]:hover:active { -} - -/*** Button icons ***/ - -.downloadButton.downloadIconCancel { - -moz-image-region: rect(0px, 16px, 16px, 0px); -} -richlistitem[type="download"]:hover > stack > .downloadButton.downloadIconCancel, -richlistitem[type="download"]:hover > stack > .downloadButton.downloadIconCancel:hover, -richlistitem[type="download"]:hover > stack > .downloadButton.downloadIconCancel:active { - -moz-image-region: rect(0px, 32px, 16px, 16px); -} - -.downloadButton.downloadIconShow { - -moz-image-region: rect(16px, 16px, 32px, 0px); -} -richlistitem[type="download"]:hover > stack > .downloadButton.downloadIconShow, -richlistitem[type="download"]:hover > stack > .downloadButton.downloadIconShow:hover, -richlistitem[type="download"]:hover > stack > .downloadButton.downloadIconShow:active { - -moz-image-region: rect(16px, 32px, 32px, 16px); -} - -.downloadButton.downloadIconRetry { - -moz-image-region: rect(32px, 16px, 48px, 0px); -} -richlistitem[type="download"]:hover > stack > .downloadButton.downloadIconRetry, -richlistitem[type="download"]:hover > stack > .downloadButton.downloadIconRetry:hover, -richlistitem[type="download"]:hover > stack > .downloadButton.downloadIconRetry:active { - -moz-image-region: rect(32px, 32px, 48px, 16px); -} - -.downloadButton.downloadShowBlockedInfo { - -moz-image-region: rect(48px, 16px, 64px, 0px); -} -richlistitem[type="download"]:hover .downloadButton.downloadShowBlockedInfo, -richlistitem[type="download"]:hover .downloadButton.downloadShowBlockedInfo:hover, -richlistitem[type="download"]:hover .downloadButton.downloadShowBlockedInfo:active { -/* -moz-image-region: rect(48px, 32px, 64px, 16px);*/ -} - -.downloadButton.downloadShowBlockedInfo:-moz-locale-dir(rtl) { - -moz-image-region: rect(64px, 16px, 80px, 0px); -} -richlistitem[type="download"]:hover .downloadButton.downloadShowBlockedInfo:-moz-locale-dir(rtl), -richlistitem[type="download"]:hover .downloadButton.downloadShowBlockedInfo:hover:-moz-locale-dir(rtl), -richlistitem[type="download"]:hover .downloadButton.downloadShowBlockedInfo:active:-moz-locale-dir(rtl) { -/* -moz-image-region: rect(64px, 32px, 80px, 16px);*/ -} diff --git a/LCARStrek/browser/menuPanel.svg b/LCARStrek/browser/menuPanel.svg index c0e6abf8..ecfeafb0 100644 --- a/LCARStrek/browser/menuPanel.svg +++ b/LCARStrek/browser/menuPanel.svg @@ -38,7 +38,6 @@ - diff --git a/LCARStrek/browser/panel-icons.svg b/LCARStrek/browser/panel-icons.svg index 2f936077..2092e0f6 100644 --- a/LCARStrek/browser/panel-icons.svg +++ b/LCARStrek/browser/panel-icons.svg @@ -4,5 +4,15 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + + + + + + diff --git a/LCARStrek/browser/preferences/containers.css b/LCARStrek/browser/preferences/containers.css new file mode 100644 index 00000000..270e680a --- /dev/null +++ b/LCARStrek/browser/preferences/containers.css @@ -0,0 +1,57 @@ +/* Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +@import url("chrome://browser/content/usercontext/usercontext.css"); + +:root { + --preference-selected-color: #008484; + --preference-unselected-color: #9C9CFF; + --preference-active-color: #FF9F00; +} + +.radio-buttons { + display: flex; + margin-inline-start: 0.35rem; +} + +.radio-buttons > radio { + flex: auto; + display: flex; + align-items: center; + justify-content: center; + -moz-user-select: none; + outline: 2px solid transparent; + outline-offset: 4px; + -moz-outline-radius: 100%; + min-block-size: 24px; + min-inline-size: 24px; + border-radius: 50%; + padding: 2px; + margin: 10px; +} + +.icon-buttons > radio > [data-identity-icon] { + fill: #A09090; +} + +.radio-buttons > radio { + padding-inline-start: 2px; +} + +radio > [data-identity-icon] { + inline-size: 22px; + block-size: 22px; +} + +.radio-buttons > radio[selected=true] { + outline-color: var(--preference-unselected-color); +} + +.radio-buttons > radio[focused=true] { + outline-color: var(--preference-selected-color); +} + +.radio-buttons > radio:hover:active { + outline-color: var(--preference-active-color); +} diff --git a/LCARStrek/browser/preferences/in-content/containers.css b/LCARStrek/browser/preferences/in-content/containers.css new file mode 100644 index 00000000..888fb007 --- /dev/null +++ b/LCARStrek/browser/preferences/in-content/containers.css @@ -0,0 +1,32 @@ +/* Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +@import url("chrome://browser/content/usercontext/usercontext.css"); + +.container-header-links { + margin-block-end: 15px; +} + +[data-identity-icon] { + margin: 0; + margin-inline-end: 16px; +} + +#containersView { + border: 0 none; + background: transparent; +} + +#containersView richlistitem { + margin: 0px; + margin-inline-end: 8px; + padding: 0; + padding-block-end: 8px; + border-block-end: 1px solid var(--in-content-header-border-color); +} + +#containersView richlistitem:last-of-type { + border-block-end: 0 none; + margin-block-end: 8px; +} diff --git a/LCARStrek/browser/preferences/in-content/preferences.css b/LCARStrek/browser/preferences/in-content/preferences.css index c2001384..3e1b4b4b 100644 --- a/LCARStrek/browser/preferences/in-content/preferences.css +++ b/LCARStrek/browser/preferences/in-content/preferences.css @@ -449,7 +449,6 @@ description > html|a { #dialogFrame { -moz-box-flex: 1; /* Default dialog dimensions */ - height: 20em; width: 66ch; } diff --git a/LCARStrek/browser/searchbar.css b/LCARStrek/browser/searchbar.css index c36e471c..290ffdbd 100644 --- a/LCARStrek/browser/searchbar.css +++ b/LCARStrek/browser/searchbar.css @@ -94,14 +94,39 @@ } .search-panel-current-engine { - border-top: none !important; -moz-box-align: center; +} + +/** + * The borders of the various elements are specified as follows. + * + * The current engine always has a bottom border. + * The search results never have a border. + * + * When the search results are not collapsed: + * - The elements underneath the search results all have a top border. + * + * When the search results are collapsed: + * - The elements underneath the search results all have a bottom border, except + * the lowest one: search-setting-button. + */ + +.search-panel-current-engine { + border-top: none !important; + border-bottom: 1px solid var(--panel-separator-color) !important; +} - border-bottom: none; +.search-panel-tree[collapsed=true] + .search-one-offs > .search-panel-header, +.search-panel-tree[collapsed=true] + .search-one-offs > .search-panel-one-offs, +.search-panel-tree[collapsed=true] + .search-one-offs > vbox > .addengine-item:first-of-type { + border-top: none !important; } -.search-panel-tree { - border-top: 1px solid var(--panel-separator-color) !important; +.search-panel-tree[collapsed=true] + .search-one-offs > .searchbar-engine-one-off-item, +.search-panel-tree[collapsed=true] + .search-one-offs > .search-panel-current-input, +.search-panel-tree[collapsed=true] + .search-one-offs > .search-panel-one-offs, +.search-panel-tree[collapsed=true] + .search-one-offs > vbox > .addengine-item:last-of-type { + border-bottom: 1px solid var(--panel-separator-color) !important; } .search-panel-header { diff --git a/LCARStrek/browser/tabbrowser/tab-audio-small.svg b/LCARStrek/browser/tabbrowser/tab-audio-small.svg index 532d54be..d5ba1dc5 100644 --- a/LCARStrek/browser/tabbrowser/tab-audio-small.svg +++ b/LCARStrek/browser/tabbrowser/tab-audio-small.svg @@ -41,4 +41,18 @@ + + + + + + + + + diff --git a/LCARStrek/browser/tabbrowser/tab-audio.svg b/LCARStrek/browser/tabbrowser/tab-audio.svg index 98866cad..228c3803 100644 --- a/LCARStrek/browser/tabbrowser/tab-audio.svg +++ b/LCARStrek/browser/tabbrowser/tab-audio.svg @@ -12,4 +12,8 @@ + + + diff --git a/LCARStrek/browser/usercontext/banking.svg b/LCARStrek/browser/usercontext/banking.svg deleted file mode 100644 index d021c48f..00000000 --- a/LCARStrek/browser/usercontext/banking.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/LCARStrek/browser/usercontext/personal.svg b/LCARStrek/browser/usercontext/personal.svg deleted file mode 100644 index 105c627a..00000000 --- a/LCARStrek/browser/usercontext/personal.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/LCARStrek/browser/usercontext/shopping.svg b/LCARStrek/browser/usercontext/shopping.svg deleted file mode 100644 index 2993abae..00000000 --- a/LCARStrek/browser/usercontext/shopping.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/LCARStrek/browser/usercontext/work.svg b/LCARStrek/browser/usercontext/work.svg deleted file mode 100644 index 584ca576..00000000 --- a/LCARStrek/browser/usercontext/work.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/LCARStrek/browser/warning-white.svg b/LCARStrek/browser/warning-white.svg new file mode 100644 index 00000000..76e0024a --- /dev/null +++ b/LCARStrek/browser/warning-white.svg @@ -0,0 +1,6 @@ + + + + diff --git a/LCARStrek/global/in-content/common.css b/LCARStrek/global/in-content/common.css index 4d39c5ad..f396a216 100644 --- a/LCARStrek/global/in-content/common.css +++ b/LCARStrek/global/in-content/common.css @@ -12,7 +12,7 @@ --in-content-page-background: #000000; --in-content-text-color: #FF9F00; --in-content-selected-text: #000000; - ---in-content-header-border-color: #c8c8c8; + --in-content-header-border-color: #A09090; --in-content-button-background: #C09070; --in-content-box-background: #000000; ---in-content-box-background-odd: #f3f6fa; -- 2.35.3