From b336389b03be6c31afa4a33a56b2650dfd950dcb Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Sat, 2 Jan 2016 15:59:36 +0100 Subject: [PATCH] fifth part of syncing LCARStrek with Firefox 41 windows theme changes --- LCARStrek/browser/aboutNetError.css | 2 +- LCARStrek/browser/browser.css | 8 + .../controlcenter/arrow-subview-back.svg | 7 + LCARStrek/browser/controlcenter/panel.css | 149 +++++------------- .../browser/controlcenter/warning-gray.svg | 9 ++ .../browser/controlcenter/warning-yellow.svg | 9 ++ .../browser/customizableui/panelUIOverlay.css | 22 ++- .../browser/devtools/animation-fast-track.svg | 6 + .../browser/devtools/animationinspector.css | 11 ++ LCARStrek/browser/devtools/layoutview.css | 2 +- LCARStrek/browser/devtools/performance.css | 40 ++++- LCARStrek/browser/devtools/ruleview.css | 24 +++ LCARStrek/browser/devtools/widgets.css | 4 - LCARStrek/browser/identity.png | Bin 807 -> 0 bytes .../preferences/in-content/preferences.css | 14 ++ 15 files changed, 182 insertions(+), 125 deletions(-) create mode 100644 LCARStrek/browser/controlcenter/arrow-subview-back.svg create mode 100644 LCARStrek/browser/controlcenter/warning-gray.svg create mode 100644 LCARStrek/browser/controlcenter/warning-yellow.svg create mode 100644 LCARStrek/browser/devtools/animation-fast-track.svg delete mode 100644 LCARStrek/browser/identity.png diff --git a/LCARStrek/browser/aboutNetError.css b/LCARStrek/browser/aboutNetError.css index a143766b..eb06ff0b 100644 --- a/LCARStrek/browser/aboutNetError.css +++ b/LCARStrek/browser/aboutNetError.css @@ -45,7 +45,7 @@ ul { padding-bottom: 0.4em; } -#errorTitleText[sslv3] { +#errorTitle[sslv3] { background-image: url("aboutNetError_alert.svg"); } diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index 4433309c..7fb1cbea 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -2175,6 +2175,14 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but max-width: 50ch; } +#urlbar[actiontype="searchengine"] > #identity-box > #page-proxy-favicon { + -moz-image-region: inherit; + list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon); + width: 16px; + height: 16px; + opacity: 1; +} + /* === END identity-block.inc.css === */ #page-proxy-favicon { diff --git a/LCARStrek/browser/controlcenter/arrow-subview-back.svg b/LCARStrek/browser/controlcenter/arrow-subview-back.svg new file mode 100644 index 00000000..8d8796a6 --- /dev/null +++ b/LCARStrek/browser/controlcenter/arrow-subview-back.svg @@ -0,0 +1,7 @@ + + + + + diff --git a/LCARStrek/browser/controlcenter/panel.css b/LCARStrek/browser/controlcenter/panel.css index ebc5a8e8..b351999e 100644 --- a/LCARStrek/browser/controlcenter/panel.css +++ b/LCARStrek/browser/controlcenter/panel.css @@ -99,7 +99,7 @@ #identity-popup-security-content, #identity-popup-permissions-content, #tracking-protection-content { - padding: 0.75em 0 1em; + padding: 0.5em 0 1em; -moz-padding-start: calc(2em + 24px); -moz-padding-end: 1em; background-repeat: no-repeat; @@ -114,32 +114,6 @@ background-position: calc(100% - 1em) 1em; } -/* IN-CONTENT-PREF STYLE BUTTONS */ -/* -.identity-popup-button { - -moz-appearance: none; - margin: 5px 0; - height: 30px; - color: #333; - line-height: 20px; - border: 1px solid #c1c1c1; - border-radius: 2px; - background-color: #fbfbfb; -} - -.identity-popup-button:not([disabled="true"]):hover { - background-color: #ebebeb; -} - -.identity-popup-button:not([disabled="true"]):hover:active { - background-color: #dadada; -} - -.identity-popup-button[disabled="true"] { - cursor: not-allowed; - opacity: 0.5; -} -*/ /* EXPAND BUTTON */ .identity-popup-expander { @@ -161,13 +135,7 @@ .identity-popup-expander[panel-multiview-anchor] { transition: background-color 250ms ease-in; background-color: #008484; - background-image: url("chrome://browser/skin/customizableui/subView-arrow-back-inverted.png"); -} - -@media (min-resolution: 1.1dppx) { - .identity-popup-expander[panel-multiview-anchor] { - background-image: url("chrome://browser/skin/customizableui/subView-arrow-back-inverted@2x.png"); - } + background-image: url("chrome://browser/skin/controlcenter/arrow-subview-back.svg"); } .identity-popup-expander > .button-box, @@ -192,6 +160,12 @@ /* CONTENT */ +#identity-popup-security-content > description, +#identity-popup-security-descriptions > description, +#identity-popup-securityView-header > description, +#identity-popup-securityView-body > description, +#identity-popup-permissions-content > description, +#tracking-protection-content > label, .identity-popup-text { white-space: pre-wrap; font-size: 110%; @@ -202,6 +176,20 @@ margin: 2px 0 4px; font-size: 150%; } +.identity-popup-warning-gray { + -moz-padding-start: 24px; + background: url(chrome://browser/skin/controlcenter/warning-gray.svg) no-repeat 0 50%; +} + +.identity-popup-warning-yellow { + -moz-padding-start: 24px; + background: url(chrome://browser/skin/controlcenter/warning-yellow.svg) no-repeat 0 50%; +} + +.identity-popup-warning-gray:-moz-locale-dir(rtl), +.identity-popup-warning-yellow:-moz-locale-dir(rtl) { + background-position: 100% 50%; +} /* SECURITY */ @@ -249,7 +237,7 @@ } #identity-popup-securityView-header { - border-bottom: 1px solid #A09090; + border-bottom: 1px solid #A09090; /*var(--panel-separator-color);*/ padding-bottom: 1em; margin-bottom: 1em; } @@ -273,15 +261,27 @@ background-image: url("chrome://browser/skin/controlcenter/tracking-protection.svg"); } +#tracking-protection-content[state="loaded-tracking-content"], #tracking-protection-content[block-disabled] { background-image: url("chrome://browser/skin/controlcenter/tracking-protection-disabled.svg"); } #tracking-action-block, -#tracking-action-unblock { +#tracking-action-unblock, +#tracking-action-unblock-private { margin: 1em 0 0; } +#tracking-protection-content[state] > #tracking-not-detected, +#tracking-protection-content:not([state="blocked-tracking-content"]) > #tracking-blocked, +#main-window[privatebrowsingmode] #tracking-action-unblock, +#main-window:not([privatebrowsingmode]) #tracking-action-unblock-private, +#tracking-protection-content:not([state="blocked-tracking-content"]) #tracking-action-unblock, +#tracking-protection-content:not([state="blocked-tracking-content"]) #tracking-action-unblock-private, +#tracking-protection-content:not([state="loaded-tracking-content"]) > #tracking-loaded, +#tracking-protection-content:not([state="loaded-tracking-content"]) #tracking-action-block, +#tracking-protection-content:not([state]) > #tracking-actions, + #tracking-protection-content[block-active] > #tracking-not-detected, #tracking-protection-content[block-disabled] > #tracking-not-detected, #tracking-protection-content:not([block-active]) > #tracking-blocked, @@ -326,79 +326,10 @@ /* === END panel.inc.css === */ -/* Popup Icons */ -#identity-popup-icon { - height: 64px; - width: 64px; - padding: 0; - list-style-image: url("chrome://browser/skin/identity.png"); - -moz-image-region: rect(0px, 64px, 64px, 0px); -} - -#identity-popup.verifiedDomain > #identity-popup-container > #identity-popup-icon { - -moz-image-region: rect(64px, 64px, 128px, 0px); -} - -#identity-popup.verifiedIdentity > #identity-popup-container > #identity-popup-icon { - -moz-image-region: rect(128px, 64px, 192px, 0px); -} - -/* Popup Body Text */ -.identity-popup-description { - white-space: pre-wrap; - -moz-padding-start: 15px; - margin: 2px 0 4px; -} - -.identity-popup-label { - white-space: pre-wrap; - -moz-padding-start: 15px; - margin: 0; -} - -#identity-popup-content-host, -#identity-popup-content-box.verifiedIdentity > #identity-popup-content-owner { - font-size: 1.2em; -} - -#identity-popup-content-host { - margin-top: 3px; - margin-bottom: 5px; - font-weight: bold; - max-width: 300px; -} - -#identity-popup-content-owner { - margin-top: 4px; - margin-bottom: 0 !important; - font-weight: bold; - max-width: 300px; -} - -.verifiedDomain > #identity-popup-content-owner { - font-weight: normal; -} - -#identity-popup-content-verifier { - margin: 4px 0 2px; -} - -#identity-popup-content-box.verifiedIdentity > #identity-popup-encryption , -#identity-popup-content-box.verifiedDomain > #identity-popup-encryption { - margin-top: 10px; - -moz-margin-start: -24px; -} - -#identity-popup-content-box.verifiedIdentity > #identity-popup-encryption > vbox > #identity-popup-encryption-icon , -#identity-popup-content-box.verifiedDomain > #identity-popup-encryption > vbox > #identity-popup-encryption-icon { - list-style-image: url("chrome://browser/skin/Secure24.png"); -} - -#identity-popup > .panel-arrowcontainer > .panel-arrowcontent { - padding: 0; +.identity-popup-expander:-moz-focusring { + padding: 1px; } -#identity-popup-container { - min-width: 280px; - padding: 10px; +.identity-popup-expander:-moz-focusring > .button-box { + outline: 1px #008484 dotted; } diff --git a/LCARStrek/browser/controlcenter/warning-gray.svg b/LCARStrek/browser/controlcenter/warning-gray.svg new file mode 100644 index 00000000..7febcedf --- /dev/null +++ b/LCARStrek/browser/controlcenter/warning-gray.svg @@ -0,0 +1,9 @@ + + + + + + diff --git a/LCARStrek/browser/controlcenter/warning-yellow.svg b/LCARStrek/browser/controlcenter/warning-yellow.svg new file mode 100644 index 00000000..b02c9dab --- /dev/null +++ b/LCARStrek/browser/controlcenter/warning-yellow.svg @@ -0,0 +1,9 @@ + + + + + + diff --git a/LCARStrek/browser/customizableui/panelUIOverlay.css b/LCARStrek/browser/customizableui/panelUIOverlay.css index 442086a3..9a5e70ef 100644 --- a/LCARStrek/browser/customizableui/panelUIOverlay.css +++ b/LCARStrek/browser/customizableui/panelUIOverlay.css @@ -4,6 +4,10 @@ /* === BEGIN panelUIOverlay.inc.css === */ +:root { + --panel-ui-exit-subview-gutter-width: 38px; +} + #PanelUI-popup #PanelUI-contents:empty { height: 128px; } @@ -89,7 +93,7 @@ .panel-subviews { padding: 4px; - -moz-margin-start: 38px; + -moz-margin-start: var(--panel-ui-exit-subview-gutter-width); } .panel-viewstack[viewtype="main"] > .panel-subviews { @@ -656,6 +660,10 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { display: none; } +#PanelUI-fxa-status[disabled] { + pointer-events: none; +} + #PanelUI-fxa-avatar { width: 32px; height: 32px; @@ -688,14 +696,12 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { -moz-image-region: rect(0, 48px, 16px, 32px); } -#PanelUI-fxa-status:not([disabled]):hover, #PanelUI-fxa-icon:not([disabled]):hover, #PanelUI-help:not([disabled]):hover, #PanelUI-customize:hover, #PanelUI-quit:not([disabled]):hover { } -#PanelUI-fxa-status:not([disabled]):hover:active, #PanelUI-fxa-icon:not([disabled]):hover:active, #PanelUI-help:not([disabled]):hover:active, #PanelUI-customize:hover:active, @@ -703,7 +709,9 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { } #PanelUI-fxa-status:not([disabled]):hover, -#PanelUI-fxa-status:not([disabled]):hover:active { +#PanelUI-fxa-status:not([disabled]):hover:active, +#PanelUI-fxa-icon:not([disabled]):hover, +#PanelUI-fxa-icon:not([disabled]):hover:active { } #PanelUI-footer-fxa[fxastatus="error"] { @@ -1019,7 +1027,7 @@ toolbarbutton[panel-multiview-anchor="true"] > .toolbarbutton-menubutton-button position: absolute; top: 0; height: 100%; - width: 38px; + width: var(--panel-ui-exit-subview-gutter-width); background-image: url("chrome://browser/skin/customizableui/subView-arrow-back-inverted.png"); background-repeat: no-repeat; background-color: #008484; @@ -1033,13 +1041,13 @@ toolbarbutton[panel-multiview-anchor="true"] > .toolbarbutton-menubutton-button toolbarbutton[panel-multiview-anchor="true"] { background-image: url("chrome://browser/skin/customizableui/subView-arrow-back-inverted.png"); - background-position: right calc((22.35em / 3 - 0.1px) / 2 - 38px + 2px) center; + background-position: right calc((22.35em / 3 - 0.1px) / 2 - var(--panel-ui-exit-subview-gutter-width) + 2px) center; background-repeat: no-repeat; } toolbarbutton[panel-multiview-anchor="true"]:-moz-locale-dir(rtl) { background-image: url("chrome://browser/skin/customizableui/subView-arrow-back-inverted-rtl.png"); - background-position: left calc((22.35em / 3 - 0.1px) / 2 - 38px + 2px) center; + background-position: left calc((22.35em / 3 - 0.1px) / 2 - var(--panel-ui-exit-subview-gutter-width) + 2px) center; } toolbarpaletteitem[place="palette"] > .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker, diff --git a/LCARStrek/browser/devtools/animation-fast-track.svg b/LCARStrek/browser/devtools/animation-fast-track.svg new file mode 100644 index 00000000..3ee1d822 --- /dev/null +++ b/LCARStrek/browser/devtools/animation-fast-track.svg @@ -0,0 +1,6 @@ + + + + diff --git a/LCARStrek/browser/devtools/animationinspector.css b/LCARStrek/browser/devtools/animationinspector.css index d425c3ab..c752f1b8 100644 --- a/LCARStrek/browser/devtools/animationinspector.css +++ b/LCARStrek/browser/devtools/animationinspector.css @@ -308,6 +308,17 @@ body { margin: 0 .5em; } +.animation-title .meta-data .compositor-icon { + display: none; + background-image: url("animation-fast-track.svg"); + background-repeat: no-repeat; + padding-left: 12px; + /* Make sure the icon is positioned above the timeline range input so that + its tooltip appears on hover */ + z-index: 1; + position: relative; +} + /* Timeline wiget */ .timeline { diff --git a/LCARStrek/browser/devtools/layoutview.css b/LCARStrek/browser/devtools/layoutview.css index 0c295a3a..9bea927f 100644 --- a/LCARStrek/browser/devtools/layoutview.css +++ b/LCARStrek/browser/devtools/layoutview.css @@ -1,6 +1,6 @@ /* This 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/. */ + * file, You can obtain one at http://mozilla.org/MPL/2.0/ */ .theme-sidebar { box-sizing: border-box; diff --git a/LCARStrek/browser/devtools/performance.css b/LCARStrek/browser/devtools/performance.css index c13a26c9..003ba35a 100644 --- a/LCARStrek/browser/devtools/performance.css +++ b/LCARStrek/browser/devtools/performance.css @@ -110,6 +110,10 @@ list-style-image: url(performance-icons.svg#details-flamegraph-active); } +#select-optimizations-view { + list-style-image: url(profiler-stopwatch.svg); +} + /* Recording buttons */ #main-record-button { @@ -832,22 +836,52 @@ call-tree-item:not([origin="content"]) .call-tree-line { cursor: pointer; } -#jit-optimizations-view .opt-icon::before { +.opt-icon::before { content: ""; background-image: url(chrome://browser/skin/devtools/webconsole.svg); background-repeat: no-repeat; background-size: 72px 60px; + /* show grey "i" bubble by default */ + background-position: -36px -36px; width: 12px; height: 12px; display: inline-block; - margin: 5px 6px 0 0; max-height: 12px; } -#jit-optimizations-view .opt-icon[severity=warning]::before { +#jit-optimizations-view .opt-icon::before { + margin: 5px 6px 0 0; +} +description.opt-icon { + margin: 0px 0px 0px 0px; +} +description.opt-icon::before { + margin: 1px 4px 0px 0px; +} + +.opt-icon[severity=warning]::before { background-position: -24px -24px; } +.opt-icon[type=linkable]::before { + cursor: pointer; +} + + +ul.frames-list { + list-style-type: none; + padding: 0px; + margin: 0px; +} + +ul.frames-list li { + cursor: pointer; +} + +ul.frames-list li.selected { + background-color: var(--theme-selection-background); + color: var(--theme-selection-color); +} /** * Configurable Options diff --git a/LCARStrek/browser/devtools/ruleview.css b/LCARStrek/browser/devtools/ruleview.css index ab64840e..b3529121 100644 --- a/LCARStrek/browser/devtools/ruleview.css +++ b/LCARStrek/browser/devtools/ruleview.css @@ -270,3 +270,27 @@ background-image: url("chrome://browser/skin/devtools/pseudo-class.svg#pseudo-class-checked"); filter: none !important; } + +/** + * These buttons are using opacity instead of background color to indicate + * the state + */ +/* +#ruleview-add-rule-button, +#pseudo-class-panel-toggle { + opacity: 0.8; +} + +#ruleview-add-rule-button:not([disabled]):hover, +#pseudo-class-panel-toggle:hover, +#pseudo-class-panel-toggle[checked] { + opacity: 1; +} + +#ruleview-add-rule-button, +#pseudo-class-panel-toggle, +#pseudo-class-panel-toggle:hover, +#pseudo-class-panel-toggle[checked]::before { + background-color: transparent !important; +} +*/ diff --git a/LCARStrek/browser/devtools/widgets.css b/LCARStrek/browser/devtools/widgets.css index 110c4bc8..b401f242 100644 --- a/LCARStrek/browser/devtools/widgets.css +++ b/LCARStrek/browser/devtools/widgets.css @@ -930,10 +930,6 @@ /* Bar graph widget */ -.bar-graph-widget-canvas { - background: #000000; -} - .bar-graph-widget-legend { position: absolute; top: 4px; diff --git a/LCARStrek/browser/identity.png b/LCARStrek/browser/identity.png deleted file mode 100644 index 323b7ff9aa65bffc7fc81d684c984b90a65acfaa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 807 zcmeAS@N?(olHy`uVBq!ia0vp^4nTZ>g&9b?eXlSDQjEnx?oJHr&dIz4a`*#$LR=Xc z85#mMFtoJHne+eGpI@sjemH^Dl?3?(GdMiEkp|)^#EcCde(J znWOOF@A{S94e}BO_HzTf{=MXCKYjE%r@Z`r1GD5OKmECXY!=v|GLOmP#9@YYl@^?- zGa78ljczkmZeqye+4E1!;Nyh!+yw^5#MWnCR$>WFo9=IEXNb`~>RI>Y`@%g3H~2Q*l2H1@ z`5>nuyX@S)KyQYPyBWIvtZih!Z=tqfPsH@_&;KRb4L|+a&iW^sBSy%d@zB*|wt!g% zf~O1^EAAEV}|N0$pFTrA&!$nV^2Lyl~n3i^bh3bVb4|p9O z%>Lesx5dcEVP5x{Zw@X8{23e)UMa3)h{$EU zXx7;f&!|zT{b1v($2uR*q|Gu4f5X1gDo5ge&V|`)DnHq%IybP-bU7y$;@{-MA2eXdeG|%ERv8`Z!@H49}`N2W+K29C|YfrD%{QklC-lL80 U{+ETWz$D7x>FVdQ&MBb@0BuZ5egFUf diff --git a/LCARStrek/browser/preferences/in-content/preferences.css b/LCARStrek/browser/preferences/in-content/preferences.css index f54c5809..9bdbfe74 100644 --- a/LCARStrek/browser/preferences/in-content/preferences.css +++ b/LCARStrek/browser/preferences/in-content/preferences.css @@ -365,6 +365,7 @@ description > html|a { #dialogTitle { text-align: center; + -moz-user-select: none; } .close-icon { @@ -436,6 +437,19 @@ description > html|a { to { opacity: 1; } } +/** + * Sync + */ + +#fxaDeviceName { + margin: 14px 0px; +} + +#fxaSyncComputerName.plain { + background-color: transparent; + opacity: 1; +} + /* === END shared/in-content/preferences.css === */ caption { -- 2.35.3