From d7b7f7e155c7317942b24fc7aa53c4f9372581b9 Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Mon, 18 Apr 2016 12:00:38 +0200 Subject: [PATCH] sixth part of syncing LCARStrek with Firefox 42-44 windows theme changes --- LCARStrek/browser/Push-16.png | Bin 201 -> 0 bytes LCARStrek/browser/Push-64.png | Bin 639 -> 0 bytes LCARStrek/browser/aboutTabCrashed.css | 31 ++ LCARStrek/browser/browser.css | 305 ++++++++++++------ LCARStrek/browser/controlcenter/panel.css | 6 +- .../browser/customizableui/panelUIOverlay.css | 15 +- .../browser/customizableui/whimsy-bw.png | Bin 4296 -> 0 bytes .../browser/customizableui/whimsy-bw@2x.png | Bin 11126 -> 0 bytes .../browser/devtools/animationinspector.css | 58 +++- .../devtools/floating-scrollbars-light.css | 2 +- LCARStrek/browser/devtools/performance.css | 8 + LCARStrek/browser/newtab/newTab.css | 6 + LCARStrek/browser/notification-16.png | Bin 195 -> 0 bytes LCARStrek/browser/notification-64.png | Bin 391 -> 0 bytes .../browser/preferences/aboutPermissions.css | 4 +- .../preferences/in-content/preferences.css | 21 ++ .../browser/preferences/in-content/search.css | 14 - LCARStrek/browser/social/chat-icons.svg | 18 +- LCARStrek/global/in-content/common.css | 4 - 19 files changed, 347 insertions(+), 145 deletions(-) delete mode 100644 LCARStrek/browser/Push-16.png delete mode 100644 LCARStrek/browser/Push-64.png delete mode 100644 LCARStrek/browser/customizableui/whimsy-bw.png delete mode 100644 LCARStrek/browser/customizableui/whimsy-bw@2x.png delete mode 100644 LCARStrek/browser/notification-16.png delete mode 100644 LCARStrek/browser/notification-64.png diff --git a/LCARStrek/browser/Push-16.png b/LCARStrek/browser/Push-16.png deleted file mode 100644 index 1ce827f756aabb42063568845c72b01e9f579c9b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;V{wqX6T`Z5GB1G~wg8_H*X_!@hljQC0!qCAg>jC6&7I;J!Gca%qgD@k*tT_@uLG}_) zUsv{9+JKRVZ$9{s-}$Lc+abHQ_P0FzHzfbvXcm~j l_=JhIG01_{A@vPE!wNmY%~PXF1Atl?JYD@<);T3K0RT4CHVFU# diff --git a/LCARStrek/browser/Push-64.png b/LCARStrek/browser/Push-64.png deleted file mode 100644 index 499481aa9acf939156e2712acad67eb281b2f76c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 639 zcmV-_0)YLAP)Px#3{Xr|MF0Q*|IYxNod4&o=k^^3!~g&Q0d!JMQvg8b*k%9#00Cl4M??UK1szBL z000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igk`6*n)*MK3)700G}gL_t(I%dL~K zY8ycihVKMwls0P8yO9gOLP+UK1nr#>*lL3tS1E&>cZggokOOHJdn<#H!TS`Kv?zT6O zcSPWJt`N3hfD5P4EE71w0wkJMjC;DB0wBO;s%S0@_!DamvHn9b#2Q@}D6I#klW0YW zPtF4yLqHMy|cIAeXQR?b7 Z&Ogqrwe-kofd2ph002ovPDHLkV1kdH133Ty diff --git a/LCARStrek/browser/aboutTabCrashed.css b/LCARStrek/browser/aboutTabCrashed.css index 2ef767eb..d8658ad3 100644 --- a/LCARStrek/browser/aboutTabCrashed.css +++ b/LCARStrek/browser/aboutTabCrashed.css @@ -9,3 +9,34 @@ #reportSent { font-weight: bold; } + +#crash-reporter-container { + width: 80%; + background-color: var(--in-content-box-background); + margin: 24px 0; + padding: 14px; + border: 1px solid var(--in-content-box-border-color); + border-radius: 2px; +} + +#crash-reporter-title { + font-weight: bold; + margin: 0 0 14px 0; +} + +input[type="text"], +textarea { + width: 100%; + box-sizing: border-box; + resize: none; +} + +#options { + list-style: none; + margin-inline-start: 0; +} + +input[type="text"], +#options > li { + margin: 14px 0 0 0; +} diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index 70813dbd..32c4d9c7 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -2071,6 +2071,11 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder, #urlbar-wrapper > #urlbar > .urlbar-textbox-container > .urlbar-history-dropmarker { border: none; border-radius: 0px; + transition: opacity 0.15s ease; +} + +#navigator-toolbox:not(:hover) .urlbar-history-dropmarker { + opacity: 0; } .urlbar-history-dropmarker:hover { @@ -2932,8 +2937,8 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- .tab-icon-overlay { width: 16px; height: 16px; - /* margin-top: -12px; */ - -moz-margin-start: -16px; + margin-top: -8px; + -moz-margin-start: -15px; position: relative; } @@ -2943,7 +2948,7 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- .tab-icon-overlay[soundplaying], .tab-icon-overlay[muted]:not([crashed]) { - border-radius: 8px; + border-radius: 10px; } .tab-icon-overlay[soundplaying]:hover, @@ -3141,6 +3146,31 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- /* End selected tab */ +/* User Context UI - change tab decoration depending on userContextId. + Defaults to gray for unknown usercontextids. */ +.tabbrowser-tab[usercontextid] { + background-image: linear-gradient(to right, transparent 20%, #A09090 30%, #A09090 70%, transparent 80%); + background-size: auto 2px; + background-repeat: no-repeat; +} + +/* Personal User Context */ +.tabbrowser-tab[usercontextid="1"] { + background-image: linear-gradient(to right, transparent 20%, #9C9CFF 30%, #9C9CFF 70%, transparent 80%); +} +/* Work User Context */ +.tabbrowser-tab[usercontextid="2"] { + background-image: linear-gradient(to right, transparent 20%, #FF9F00 30%, #FF9F00 70%, transparent 80%); +} +/* Banking User Context */ +.tabbrowser-tab[usercontextid="3"] { + background-image: linear-gradient(to right, transparent 20%, #008484 30%, #008484 70%, transparent 80%); +} +/* Shopping User Context */ +.tabbrowser-tab[usercontextid="4"] { + background-image: linear-gradient(to right, transparent 20%, #E7ADE7 30%, #E7ADE7 70%, transparent 80%); +} + /* Tab pointer-events */ /* .tabbrowser-tab { @@ -3346,6 +3376,14 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- background-color: #402800; } +.alltabs-endimage[muted] { + list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted"); +} + +.alltabs-endimage[soundplaying] { + list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio"); +} + toolbarbutton.chevron { list-style-image: url("chrome://global/skin/toolbar/chevron.gif") !important; } @@ -3414,10 +3452,6 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { list-style-image: url("chrome://browser/skin/Geolocation-64.png"); } -.popup-notification-icon[popupid="push"] { - list-style-image: url(chrome://browser/skin/Push-64.png); -} - .popup-notification-icon[popupid="xpinstall-disabled"], .popup-notification-icon[popupid="addon-install-blocked"], .popup-notification-icon[popupid="addon-install-origin-blocked"] { @@ -3453,7 +3487,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { } .popup-notification-icon[popupid="web-notifications"] { - list-style-image: url("chrome://browser/skin/notification-64.png"); + list-style-image: url("chrome://browser/skin/web-notifications-icon.svg"); } .popup-notification-icon[popupid="indexedDB-permissions-prompt"], @@ -3547,10 +3581,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled list-style-image: url("chrome://browser/skin/Geolocation-16.png"); } -#push-notification-icon { - list-style-image: url(chrome://browser/skin/Push-16.png); -} - #addons-notification-icon { list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#default); } @@ -3654,7 +3684,18 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled .web-notifications-notification-icon, #web-notifications-notification-icon { - list-style-image: url("chrome://browser/skin/notification-16.png"); + list-style-image: url("chrome://browser/skin/web-notifications-tray.svg"); + -moz-image-region: rect(0, 16px, 16px, 0); +} + +.web-notifications-notification-icon:hover, +#web-notifications-notification-icon:hover { + -moz-image-region: rect(0, 32px, 16px, 16px); +} + +.web-notifications-notification-icon:hover:active, +#web-notifications-notification-icon:hover:active { + -moz-image-region: rect(0, 48px, 16px, 32px); } #pointerLock-notification-icon { @@ -3974,16 +4015,14 @@ notification[value="loop-sharing-notification"] .messageImage { margin-top: 1em; } -#sync-error-panel-title, #sync-start-panel-title { font-size: 120%; font-weight: bold; margin-bottom: 5px; } -#sync-start-panel-subtitle, -#sync-error-panel-subtitle { - margin: 0; +#sync-start-panel-subtitle { + margin-bottom: 0; } /* Status panel */ @@ -4020,7 +4059,7 @@ notification[value="loop-sharing-notification"] .messageImage { /* === BEGIN fullscreen/warning.inc.css === */ -#fullscreen-warning { +html|*#fullscreen-warning { align-items: center; background: rgba(0, 0, 0, 0.9); border: 2px solid #A09090; @@ -4030,40 +4069,39 @@ notification[value="loop-sharing-notification"] .messageImage { font: 11px "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif; } -#fullscreen-warning::before { +html|*#fullscreen-warning::before { margin: 0; width: 24px; height: 24px; } -#fullscreen-warning.verifiedIdentity::before, -#fullscreen-warning.verifiedDomain::before { +html|*#fullscreen-warning.verifiedIdentity::before, +html|*#fullscreen-warning.verifiedDomain::before { content: url("chrome://browser/skin/fullscreen/secure.svg"); } -#fullscreen-warning.unknownIdentity::before { +html|*#fullscreen-warning.unknownIdentity::before { content: url("chrome://browser/skin/fullscreen/insecure.svg"); } -#fullscreen-domain-text, -#fullscreen-generic-text { +html|*#fullscreen-domain-text, +html|*#fullscreen-generic-text { font-size: 21px; font-weight: lighter; color: #A09090; margin: 0 16px; } -#fullscreen-domain { +html|*#fullscreen-domain { font-weight: bold; margin: 0; } -#fullscreen-exit-button { - padding: 0 30px; +html|*#fullscreen-exit-button { + padding: 5px 30px; font: "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif; font-size: 14px; font-weight: lighter; margin: 0; - height: 28px; box-sizing: content-box; border-radius: 300px; @@ -4812,14 +4850,6 @@ html|*#gcli-output-frame { background: none; } -.chat-toolbarbutton:hover { -/* background-color: rgba(255,255,255,.35);*/ -} - -.chat-toolbarbutton:hover:active { -/* background-color: rgba(255,255,255,.5);*/ -} - .chat-toolbarbutton > .toolbarbutton-text { display: none; } @@ -4833,7 +4863,11 @@ html|*#gcli-output-frame { list-style-image: url("chrome://browser/skin/social/chat-icons.svg#close"); } -.chat-close-button:-moz-any(:hover,:hover:active) { +.chat-close-button:hover { + list-style-image: url("chrome://browser/skin/social/chat-icons.svg#close-hover"); +} + +.chat-close-button:hover:active { list-style-image: url("chrome://browser/skin/social/chat-icons.svg#close-active"); } @@ -4841,7 +4875,11 @@ html|*#gcli-output-frame { list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize"); } -.chat-minimize-button:-moz-any(:hover,:hover:active) { +.chat-minimize-button:hover { + list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize-hover"); +} + +.chat-minimize-button:hover:active { list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize-active"); } @@ -4850,7 +4888,11 @@ html|*#gcli-output-frame { transform: rotate(180deg); } -.chat-swap-button:-moz-any(:hover,:hover:active) { +.chat-swap-button:hover { + list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand-hover"); +} + +.chat-swap-button:hover:active { list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand-active"); } @@ -4858,9 +4900,26 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button { transform: none; } +.chat-loop-hangup { + list-style-image: url("chrome://browser/skin/social/chat-icons.svg#exit-white"); + background-color: #FF0000; + border: 1px solid #FFC000; + border-top-right-radius: 4px; + width: 32px; + height: 26px; + margin-top: -6px; + margin-bottom: -5px; + -moz-margin-start: 6px; + -moz-margin-end: -5px; +} + +.chat-toolbarbutton.chat-loop-hangup:-moz-any(:hover,:hover:active) { + background-color: #FFCF00; + border-color: #FF0000; +} + .chat-title { - font-weight: bold; - font: 11px "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif; + color: #000000; text-shadow: none; cursor: inherit; } @@ -4868,14 +4927,21 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button { .chat-titlebar { background-color: #9C9CFF; color: #000000; - height: 30px; - min-height: 30px; + height: 26px; + min-height: 26px; width: 100%; margin: 0; - padding: 7px 6px; - border: none; - border-bottom: 1px solid #008484; + padding: 5px 4px; + border: 1px solid #008484; + border-bottom: 0; + border-top-left-radius: 4px; + border-top-right-radius: 4px; cursor: pointer; + background-color: #A09090; +} + +.chat-titlebar[selected] { + background-color: #008484; } .chat-titlebar > .notification-anchor-icon { @@ -4895,18 +4961,6 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button { background-color: #E7ADE7; } -chatbox[dark=true] > .chat-titlebar, -chatbox[dark=true] > .chat-titlebar[selected] { -/* border-bottom: none; - background-color: #000; - background-image: none;*/ -} - -chatbox[dark=true] > .chat-titlebar > hbox > .chat-title { -/* font-weight: normal; - color: #c1c1c1;*/ -} - .chat-frame { padding: 0; margin: 0; @@ -4931,6 +4985,17 @@ chatbox[dark=true] > .chat-titlebar > hbox > .chat-title { } } +.chatbar-button:hover { + background-color: #FFCF00; +} +.chatbar-button[open="true"] { + background-color: #FF9F00; +} + +.chatbar-button[activity]:not([open]) { + background-image: radial-gradient(circle farthest-corner at center 2px, rgb(160,144,144) 3%, rgba(160,144,144,0.9) 12%, rgba(156,156,255,0.6) 30%, rgba(156,156,255,0.2) 70%); +} + .chatbar-button > .toolbarbutton-icon { width: 16px; } @@ -4977,15 +5042,19 @@ chatbar { -moz-margin-end: 20px; } -chatbar > chatbox { - height: 285px; - width: 260px; +chatbox { -moz-margin-start: 4px; - background-color: #000000; - border: 1px solid #9C9CFF; - border-bottom: none; - border-top-left-radius: 2.5px; - border-top-right-radius: 2.5px; + background-color: transparent; +} + +chatbar > chatbox { + /* Apply the same border-radius as the .chat-titlebar to make the box-shadow + go round nicely. */ +/* border-top-left-radius: 4px; + border-top-right-radius: 4px;*/ + /* Offset the chatbox the same amount as the box-shadows' spread, to make it + visible. */ +/* -moz-margin-end: 5px;*/ } chatbox[minimized="true"] { @@ -5002,36 +5071,6 @@ window > chatbox { /* === END chat.inc.css === */ -.chat-titlebar { -/* background-color: #c4cfde; */ -} - -.chat-titlebar[selected] { -/* background-color: #dae3f0; */ -} - -.chatbar-button { - -moz-appearance: none; -/* background-color: #c4cfde; */ -} - -.chatbar-button > .toolbarbutton-icon { -/* -moz-margin-end: 0; */ -} - -.chatbar-button:hover, -.chatbar-button[open="true"] { -/* background-color: #dae3f0; */ -} - -.chatbar-button[activity]:not([open="true"]) { -} - -chatbox { -/* border-top-left-radius: 2.5px; - border-top-right-radius: 2.5px; */ -} - /* === BEGIN plugin-doorhanger.inc.css === */ /** @@ -6223,3 +6262,77 @@ menugroup > .menuitem-iconic[disabled="true"] > .menu-iconic-left { .browser-action-panel > .panel-arrowcontainer > .panel-arrowcontent { padding: 0; } + +/* === BEGIN usercontext.inc.css === */ + +/* User Context UI browser styles */ + +#menu_newUserContextTabPersonal { + list-style-image: url("chrome://browser/skin/usercontext/personal.svg"); +} + +#menu_newUserContextTabWork { + list-style-image: url("chrome://browser/skin/usercontext/work.svg"); +} + +#menu_newUserContextTabBanking { + list-style-image: url("chrome://browser/skin/usercontext/banking.svg"); +} + +#menu_newUserContextTabShopping { + list-style-image: url("chrome://browser/skin/usercontext/shopping.svg"); +} + +/* URL Bar Decoration */ + +#userContext-indicator { + height: 16px; + width: 16px; +} + +#userContext-label { + margin-inline-end: 3px; + color: #A09090; +} + +#userContext-icons:not([usercontextid]) { + display: none; +} + +#userContext-icons { + -moz-box-align: center; +} + +/* Personal User Context */ +#userContext-icons[usercontextid="1"] > #userContext-label { + color: #9C9CFF; +} +#userContext-icons[usercontextid="1"] > #userContext-indicator { + list-style-image: url("chrome://browser/skin/usercontext/personal.svg"); +} + +/* Work User Context */ +#userContext-icons[usercontextid="2"] > #userContext-label { + color: #FF9F00; +} +#userContext-icons[usercontextid="2"] > #userContext-indicator { + list-style-image: url("chrome://browser/skin/usercontext/work.svg"); +} + +/* Banking User Context */ +#userContext-icons[usercontextid="3"] > #userContext-label { + color: #008484; +} +#userContext-icons[usercontextid="3"] > #userContext-indicator { + list-style-image: url("chrome://browser/skin/usercontext/banking.svg"); +} + +/* Shopping User Context */ +#userContext-icons[usercontextid="4"] > #userContext-label { + color: #E7ADE7; +} +#userContext-icons[usercontextid="4"] > #userContext-indicator { + list-style-image: url("chrome://browser/skin/usercontext/shopping.svg"); +} + +/* === END usercontext.inc.css === */ diff --git a/LCARStrek/browser/controlcenter/panel.css b/LCARStrek/browser/controlcenter/panel.css index 75ac48cb..4336b20e 100644 --- a/LCARStrek/browser/controlcenter/panel.css +++ b/LCARStrek/browser/controlcenter/panel.css @@ -345,10 +345,14 @@ description#identity-popup-content-verifier, min-width: 60px; } -#identity-popup-permission-list { +#identity-popup-permission-list:not(:empty) { margin-top: 5px; } +#identity-popup-permission-list:not(:empty) + description { + display: none; +} + .identity-popup-permission-label { -moz-margin-start: 0; word-wrap: break-word; diff --git a/LCARStrek/browser/customizableui/panelUIOverlay.css b/LCARStrek/browser/customizableui/panelUIOverlay.css index 8814c8ba..da83607c 100644 --- a/LCARStrek/browser/customizableui/panelUIOverlay.css +++ b/LCARStrek/browser/customizableui/panelUIOverlay.css @@ -14,7 +14,8 @@ #PanelUI-popup #PanelUI-contents:empty::before { content: ""; - background-image: url("chrome://browser/skin/customizableui/whimsy-bw.png"); + background-image: url(chrome://browser/skin/customizableui/whimsy.png); + background-size: 64px 64px; display: block; width: 64px; height: 64px; @@ -24,6 +25,10 @@ whimsyMoveY 3.4s linear 0s infinite alternate; } +#PanelUI-popup #PanelUI-contents:not(:hover):empty::before { + filter: grayscale(100%); +} + #PanelUI-popup #PanelUI-contents:active:empty::before { animation: whimsyMoveX 3.05s linear 0s infinite alternate, whimsyMoveY 3.4s linear 0s infinite alternate, @@ -41,16 +46,8 @@ whimsyRotate 1s linear 0s infinite normal; } -#PanelUI-popup #PanelUI-contents:empty:hover::before { - background-image: url("chrome://browser/skin/customizableui/whimsy.png"); -} - @media (min-resolution: 2dppx) { #PanelUI-popup #PanelUI-contents:empty::before { - background-image: url("chrome://browser/skin/customizableui/whimsy-bw@2x.png"); - background-size: 64px 64px; - } - #PanelUI-popup #PanelUI-contents:empty:hover::before { background-image: url("chrome://browser/skin/customizableui/whimsy@2x.png"); } } diff --git a/LCARStrek/browser/customizableui/whimsy-bw.png b/LCARStrek/browser/customizableui/whimsy-bw.png deleted file mode 100644 index 481d3fcd6e61673ad07830b54efdaf4cfdc60768..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4296 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 IM6N<$f>=nt3IG5A diff --git a/LCARStrek/browser/devtools/animationinspector.css b/LCARStrek/browser/devtools/animationinspector.css index a48e4e76..b3c78305 100644 --- a/LCARStrek/browser/devtools/animationinspector.css +++ b/LCARStrek/browser/devtools/animationinspector.css @@ -32,9 +32,12 @@ body { color: var(--theme-content-color3); } -/* The top toolbar, containing the toggle-all button */ +/* The top toolbar, containing the toggle-all button. And the timeline toolbar, + containing playback control buttons, shown only when there are animations + displayed in the timeline */ -#toolbar { +#global-toolbar, +#timeline-toolbar { border-bottom: 1px solid var(--theme-splitter-color); display: flex; flex-direction: row; @@ -43,13 +46,20 @@ body { height: var(--toolbar-height); } -#toolbar .label { - padding: 1px 4px; +#timeline-toolbar { + display: none; } -#toggle-all { - border-width: 0 0 0 1px; - min-height: var(--toolbar-height); +[timeline] #global-toolbar { + display: none; +} + +[timeline] #timeline-toolbar { + display: flex; +} + +#global-toolbar .label { + padding: 1px 4px; } /* The main animations container */ @@ -59,6 +69,10 @@ body { overflow: auto; } +[empty] #players { + display: none; +} + /* The error message, shown when an invalid/unanimated element is selected */ #error-message { @@ -71,15 +85,23 @@ body { display: none; } -/* Element picker and toggle-all buttons */ +[empty] #error-message { + display: block; +} + +/* Element picker, toggle-all buttons, timeline pause button, ... */ -#element-picker, -#toggle-all { +#global-toolbar .devtools-button, +#timeline-toolbar .devtools-button { + border-width: 0 0 0 1px; + min-height: var(--toolbar-height); +} + +.devtools-button { position: relative; } -#element-picker::before, -#toggle-all::before { +.devtools-button::before { content: ""; display: block; width: 16px; @@ -88,10 +110,13 @@ body { left: 50%; top: 50%; margin: -8px 0 0 -8px; +} + +#element-picker::before { background-image: url("chrome://browser/skin/devtools/command-pick.png"); } -#toggle-all::before { +.pause-button::before { background-image: url("debugger-pause.png"); } @@ -100,7 +125,7 @@ body { filter: none; /* Icon is blue when checked, don't invert for light theme */ } -#toggle-all.paused::before { +.pause-button.paused::before { background-image: url("debugger-play.png"); } @@ -110,11 +135,11 @@ body { background-size: 64px; } - #toggle-all::before { + .pause-button::before { background-image: url("debugger-pause@2x.png"); } - #toggle-all.paused::before { + .pause-button.paused::before { background-image: url("debugger-play@2x.png"); } } @@ -124,6 +149,7 @@ body { .animation-timeline { height: 100%; overflow: hidden; + position: relative; /* The timeline gets its background-image from a canvas element created in /browser/devtools/animationinspector/utils.js drawGraphElementBackground thanks to document.mozSetImageElement("time-graduations", canvas) diff --git a/LCARStrek/browser/devtools/floating-scrollbars-light.css b/LCARStrek/browser/devtools/floating-scrollbars-light.css index a92e3dc0..2d8e3f66 100644 --- a/LCARStrek/browser/devtools/floating-scrollbars-light.css +++ b/LCARStrek/browser/devtools/floating-scrollbars-light.css @@ -3,7 +3,7 @@ * 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("floating-scrollbars.css"); +@import url("chrome://browser/skin/devtools/ffloating-scrollbars.css"); scrollbar thumb { /*background-color: rgba(170,170,170,0.2) !important;*/ diff --git a/LCARStrek/browser/devtools/performance.css b/LCARStrek/browser/devtools/performance.css index 5eaf9ec3..810abecf 100644 --- a/LCARStrek/browser/devtools/performance.css +++ b/LCARStrek/browser/devtools/performance.css @@ -785,6 +785,14 @@ call-tree-item:not([origin="content"]) .call-tree-line { min-width: 200px; } +#optimizations-graph { + height: 30px; +} + +#jit-optimizations-view.empty #optimizations-graph { + display: none !important; +} + /* override default styles for tree widget */ #jit-optimizations-view .tree-widget-empty-text { font-size: inherit; diff --git a/LCARStrek/browser/newtab/newTab.css b/LCARStrek/browser/newtab/newTab.css index f583b6c9..c430cb60 100644 --- a/LCARStrek/browser/newtab/newTab.css +++ b/LCARStrek/browser/newtab/newTab.css @@ -132,6 +132,12 @@ body { overflow: hidden; } +/*** + * If you change the sizes here, change them in newTab.css + * and the preference values: + * toolkit.pageThumbs.minWidth + * toolkit.pageThumbs.minHeight + */ /* THUMBNAILS */ .newtab-thumbnail { background-origin: padding-box; diff --git a/LCARStrek/browser/notification-16.png b/LCARStrek/browser/notification-16.png deleted file mode 100644 index 5cbf3a1993859b871b77bb0a2abe382380f73dee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;TYyi9E0CTu=l{YPmkt0~j3q&S z!3+-1Zlr-YN#5=*3>~bp9zYIffk$L90|U1(2s1Lwnj--eWH0gbb!ETH#wo-q#2D~4 z11MzX>Eal|aXmR@jRu?6^qxB}@pbN(-!ap?e%#aI&L z7tG-B>_!@hljQC0!qCAg>jC6&7I;J!Gca%qgD@k*tT_@uLG}_)Usv|KY@9;entC@h z4*`XKdAc};Xq>OTv@!RvfdK1;Vvz{n1YLy#*((GVh3;{*aS+&bLg3}5E;fz{qBoYB zFpAq9=Bc-X{Qx$7|bF6&~S?5;WRZa4;vpflCh@_E?`;qD2T0nd(`C3$3N9O{&QY&;n%N^ f;+Njme`4PG=gi6^g?CKAP+;(M^>bP0l+XkK3jdao diff --git a/LCARStrek/browser/preferences/aboutPermissions.css b/LCARStrek/browser/preferences/aboutPermissions.css index 74a98095..ef188bcb 100644 --- a/LCARStrek/browser/preferences/aboutPermissions.css +++ b/LCARStrek/browser/preferences/aboutPermissions.css @@ -98,8 +98,8 @@ .pref-icon[type="geo"] { list-style-image: url("chrome://browser/skin/Geolocation-64.png"); } -.pref-icon[type="push"] { - list-style-image: url("chrome://browser/skin/Push-64.png"); +.pref-icon[type="desktop-notification"] { + list-style-image: url("chrome://browser/skin/web-notifications-icon.svg"); } .pref-icon[type="indexedDB"] { list-style-image: url("chrome://global/skin/icons/alert-question.gif"); diff --git a/LCARStrek/browser/preferences/in-content/preferences.css b/LCARStrek/browser/preferences/in-content/preferences.css index 11c3043f..55caf805 100644 --- a/LCARStrek/browser/preferences/in-content/preferences.css +++ b/LCARStrek/browser/preferences/in-content/preferences.css @@ -40,6 +40,27 @@ treecol { /* override the * rule */ -moz-user-select: none; } +/* +#engineList treechildren::-moz-tree-image(engineShown, checked), +#blocklistsTree treechildren::-moz-tree-image(selectionCol, checked) { + list-style-image: url("chrome://global/skin/in-content/check.svg#check"); + width: 21px; + height: 21px; +} + +#engineList treechildren::-moz-tree-image(engineShown, checked, selected), +#blocklistsTree treechildren::-moz-tree-image(selectionCol, checked, selected) { + list-style-image: url("chrome://global/skin/in-content/check.svg#check-inverted"); +} + +#engineList treechildren::-moz-tree-row, +#blocklistsTree treechildren::-moz-tree-row { + min-height: 36px; +} +*/ +#selectionCol { + min-width: 26px; +} /* Category List */ diff --git a/LCARStrek/browser/preferences/in-content/search.css b/LCARStrek/browser/preferences/in-content/search.css index c18749ef..7b045ca3 100644 --- a/LCARStrek/browser/preferences/in-content/search.css +++ b/LCARStrek/browser/preferences/in-content/search.css @@ -17,17 +17,7 @@ #engineList { margin: .5em 2px; } -/* -#engineList treechildren::-moz-tree-image(engineShown, checked) { - list-style-image: url("chrome://global/skin/in-content/check.svg#check"); - width: 21px; - height: 21px; -} -#engineList treechildren::-moz-tree-image(engineShown, checked, selected) { - list-style-image: url("chrome://global/skin/in-content/check.svg#check-inverted"); -} -*/ #engineList treechildren::-moz-tree-image(engineName) { -moz-margin-end: 10px; -moz-margin-start: 1px; @@ -35,10 +25,6 @@ height: 16px; } -#engineList treechildren::-moz-tree-row { -/* min-height: 36px; */ -} - #engineList treechildren::-moz-tree-drop-feedback { background-color: #008484; width: 10000px; /* 100% doesn't work; 10k is hopefully larger than any window diff --git a/LCARStrek/browser/social/chat-icons.svg b/LCARStrek/browser/social/chat-icons.svg index c4f873cf..f0036b67 100644 --- a/LCARStrek/browser/social/chat-icons.svg +++ b/LCARStrek/browser/social/chat-icons.svg @@ -10,26 +10,40 @@ use { fill: #FFCF00; } + use[id$="-hover"] { + fill: #000000; + } use[id$="-active"] { fill: #000000; } use[id$="-disabled"] { fill: #8050B0; } + use[id$="-white"] { + fill: #000000; + } - - + + + + + + + + + + diff --git a/LCARStrek/global/in-content/common.css b/LCARStrek/global/in-content/common.css index 95e1c3f4..2f25dd94 100644 --- a/LCARStrek/global/in-content/common.css +++ b/LCARStrek/global/in-content/common.css @@ -440,11 +440,7 @@ html|input[type="text"], html|textarea, xul|textbox { -moz-appearance: none; - height: 30px; color: var(--in-content-text-color); - line-height: 20px; - padding-right: 10px; - padding-left: 10px; border: 1px solid var(--in-content-box-border-color); -moz-border-top-colors: none !important; -moz-border-right-colors: none !important; -- 2.35.3