From 689d55520a6b693a10bd5ecb82afa7ee0deb8cac Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Tue, 6 Dec 2016 21:58:21 +0100 Subject: [PATCH] sync both themes with toolkit windows theme changes in Mozilla 51 cycle --- EarlyBlue/global/aboutReader.css | 11 +----- EarlyBlue/global/aboutReaderContent.css | 22 ++++++++--- EarlyBlue/global/alerts/alert-common.css | 6 +++ EarlyBlue/global/global.css | 8 ++++ EarlyBlue/global/in-content/common.css | 20 ++++++++++ EarlyBlue/global/popup.css | 13 ++---- EarlyBlue/global/printPreview.css | 28 ++----------- EarlyBlue/mozapps/extensions/extensions.css | 3 +- EarlyBlue/mozapps/update/updates.css | 31 --------------- LCARStrek/browser/browser.css | 4 +- LCARStrek/browser/newtab/newTab.css | 2 +- LCARStrek/devtools/dark-theme.css | 8 ++-- LCARStrek/devtools/toolbars.css | 4 +- LCARStrek/global/aboutReader.css | 11 +----- LCARStrek/global/aboutReaderContent.css | 22 ++++++++--- LCARStrek/global/alerts/alert-common.css | 6 +++ LCARStrek/global/global.css | 8 ++++ LCARStrek/global/in-content/common.css | 20 ++++++++++ LCARStrek/global/popup.css | 11 +----- LCARStrek/global/printPreview.css | 44 ++------------------- LCARStrek/global/textbox.css | 4 +- LCARStrek/mozapps/extensions/extensions.css | 3 +- LCARStrek/mozapps/update/updates.css | 38 ------------------ 23 files changed, 132 insertions(+), 195 deletions(-) diff --git a/EarlyBlue/global/aboutReader.css b/EarlyBlue/global/aboutReader.css index 84a46574..49436de8 100644 --- a/EarlyBlue/global/aboutReader.css +++ b/EarlyBlue/global/aboutReader.css @@ -3,16 +3,7 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ body { - padding: 64px 0; -} - -@media (max-width: 785px) { - body { - padding-top: 64px; - padding-inline-end: 0; - padding-bottom: 64px; - padding-inline-start: 51px; - } + padding: 64px 51px; } @media print { diff --git a/EarlyBlue/global/aboutReaderContent.css b/EarlyBlue/global/aboutReaderContent.css index 9c70c082..633391d3 100644 --- a/EarlyBlue/global/aboutReaderContent.css +++ b/EarlyBlue/global/aboutReaderContent.css @@ -79,18 +79,21 @@ h3 { line-height: 1.66em; } -a { +a:link { text-decoration: underline; font-weight: normal; } -a, -a:visited, -a:hover, -a:active { +a:link, +a:link:hover, +a:link:active { color: #0095dd; } +a:visited { + color: #c2e; +} + * { max-width: 100%; height: auto; @@ -110,6 +113,15 @@ figure, border-radius: 5px; } +li { + margin-bottom: 0; +} + +li > ul, +li > ol { + margin-bottom: -10px; +} + p > img:only-child, p > a:only-child > img:only-child, .wp-caption img, diff --git a/EarlyBlue/global/alerts/alert-common.css b/EarlyBlue/global/alerts/alert-common.css index 943f66f6..7c86ca73 100644 --- a/EarlyBlue/global/alerts/alert-common.css +++ b/EarlyBlue/global/alerts/alert-common.css @@ -26,6 +26,12 @@ animation-name: alert-fadeout-animation; } +#alertBox[animate]:not([clicked]):not([closing]):hover { + /* !important is necessary because CSS animations have highest + importance in the cascade with exception to !important rules. */ + opacity: 1 !important; +} + @keyframes alert-animation { from { opacity: 0; diff --git a/EarlyBlue/global/global.css b/EarlyBlue/global/global.css index 25d0824e..e76b20dc 100644 --- a/EarlyBlue/global/global.css +++ b/EarlyBlue/global/global.css @@ -25,6 +25,14 @@ menulist > menupopup { -moz-binding: url("chrome://global/content/bindings/popup.xml#popup-scrollbars"); } +/* ::::: Variables ::::: */ +:root { + --panel-arrowcontent-padding: 6px; + --panel-arrowcontent-background: #CCD0DD; + --panel-arrowcontent-color: #000000; + --panel-arrowcontent-border-color: #CCD0DD; +} + /* ::::: root elements ::::: */ window, diff --git a/EarlyBlue/global/in-content/common.css b/EarlyBlue/global/in-content/common.css index f1f90b45..45d87eb3 100644 --- a/EarlyBlue/global/in-content/common.css +++ b/EarlyBlue/global/in-content/common.css @@ -296,7 +296,27 @@ xul|*.help-button > xul|*.button-box > xul|*.button-icon { xul|*.help-button > xul|*.button-box > xul|*.button-text { display: none; } +*/ +html|*.help-button { + width: 16px; + height: 16px; + border: 0; + padding: 0; + display: inline-block; + background-image: url("chrome://global/skin/in-content/help-glyph.svg#help"); + background-repeat: no-repeat; + background-position: center center; + background-size: contain; +} + +html|*.help-button:hover { + background-image: url("chrome://global/skin/in-content/help-glyph.svg#help-hover"); +} +html|*.help-button:hover:active { + background-image: url("chrome://global/skin/in-content/help-glyph.svg#help-pressed"); +} +/* xul|*.spinbuttons-button { min-height: initial; margin-inline-start: 10px !important; diff --git a/EarlyBlue/global/popup.css b/EarlyBlue/global/popup.css index ec2fd0a1..38eb25c0 100644 --- a/EarlyBlue/global/popup.css +++ b/EarlyBlue/global/popup.css @@ -8,14 +8,6 @@ @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); -/* ::::: Variables ::::: */ -.panel-arrowcontent { - --panel-arrowcontent-padding: 6px; - --panel-arrowcontent-background: #CCD0DD; - --panel-arrowcontent-color: #000000; - --panel-arrowcontent-border: 1px outset #CCD0DD; -} - /* ::::: menupopup ::::: */ menupopup, @@ -56,13 +48,14 @@ panel[type="arrow"][side="right"] { color: var(--panel-arrowcontent-color); background: var(--panel-arrowcontent-background); background-clip: padding-box; - border: var(--panel-arrowcontent-border); + border: 1px outset var(--panel-arrowcontent-border-color); margin: 0px; } .panel-arrow[side="top"], .panel-arrow[side="bottom"] { - list-style-image: url("chrome://global/skin/arrow/panelarrow-vertical.svg"); + list-style-image: var(--panel-arrow-image-vertical, + url("chrome://global/skin/arrow/panelarrow-vertical.svg")); position: relative; margin-left: 10px; margin-right: 10px; diff --git a/EarlyBlue/global/printPreview.css b/EarlyBlue/global/printPreview.css index f9c0933c..a28d98bd 100644 --- a/EarlyBlue/global/printPreview.css +++ b/EarlyBlue/global/printPreview.css @@ -36,32 +36,12 @@ /* ::::: print preview toolbar ::::: */ -/* ..... page navigation ..... */ - -.home-arrow, .end-arrow:-moz-locale-dir(rtl) { - list-style-image: url("chrome://global/skin/arrow/arrow-left-sharp-end.gif"); -} - -.end-arrow, .home-arrow:-moz-locale-dir(rtl) { - list-style-image: url("chrome://global/skin/arrow/arrow-right-sharp-end.gif"); -} - -.previous-arrow, .next-arrow:-moz-locale-dir(rtl) { - list-style-image: url("chrome://global/skin/arrow/arrow-left-sharp.gif"); -} - -.next-arrow, .previous-arrow:-moz-locale-dir(rtl) { - list-style-image: url("chrome://global/skin/arrow/arrow-right-sharp.gif"); -} - -/* ...... scale in/decrement ..... */ - -.up-arrow { - list-style-image: url("chrome://global/skin/arrow/arrow-up-sharp.gif"); +.navigate-button { + min-width: 1.9em; } -.down-arrow { - list-style-image: url("chrome://global/skin/arrow/arrow-dn-sharp.gif"); +.navigate-button > .toolbarbutton-icon { + display: none; } /* ..... orientation ..... */ diff --git a/EarlyBlue/mozapps/extensions/extensions.css b/EarlyBlue/mozapps/extensions/extensions.css index 08ffac9f..3af9c6bb 100644 --- a/EarlyBlue/mozapps/extensions/extensions.css +++ b/EarlyBlue/mozapps/extensions/extensions.css @@ -1048,7 +1048,8 @@ button.button-link:not([disabled="true"]):active:hover { #disabled-unsigned-addons-info { margin-bottom: 2em; - margin-inline-end: 48px; + margin-right: 48px; + margin-left: 48px; } #disabled-unsigned-addons-heading { diff --git a/EarlyBlue/mozapps/update/updates.css b/EarlyBlue/mozapps/update/updates.css index 37a6d7fa..114c46c5 100644 --- a/EarlyBlue/mozapps/update/updates.css +++ b/EarlyBlue/mozapps/update/updates.css @@ -21,31 +21,10 @@ wizardpage { padding: 10px; } -.loadingBox { - padding: 3px 5px; -} - -.remoteLoadingThrobber { - margin-top: 3px; -} - -.remoteLoadingThrobber[state="loading"] { - list-style-image: url("chrome://global/skin/icons/loading.gif"); -} - -.remoteLoadingThrobber[state="error"] { - list-style-image: url("chrome://global/skin/icons/information-16.png"); -} - .wizard-buttons-separator { margin-top: 0 !important; } -#licenseContent, #incompatibleListbox { - margin-inline-start: 6px; - margin-inline-end: 6px; -} - .inline-link { color: blue; text-decoration: none; @@ -67,16 +46,6 @@ wizardpage { font-size: larger; } -/* License Page */ -#licenseContent { -/* -moz-appearance: listbox; */ -} - -/* Incompatible List Page */ -#incompatibleListbox { - margin-bottom: 6px; -} - /* Downloading Page */ #downloadStatusLine { -moz-box-align: center; diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index 367e69a2..c989978d 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -1820,8 +1820,8 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:-moz-locale-dir(rtl) { -moz-box-direction: reverse; } -html|*.urlbar-input:-moz-lwtheme::-moz-placeholder, -.searchbar-textbox:-moz-lwtheme > .autocomplete-textbox-container > .textbox-input-box > html|*.textbox-input::-moz-placeholder { +html|*.urlbar-input:-moz-lwtheme::placeholder, +.searchbar-textbox:-moz-lwtheme > .autocomplete-textbox-container > .textbox-input-box > html|*.textbox-input::placeholder { color: #E7ADE7; } diff --git a/LCARStrek/browser/newtab/newTab.css b/LCARStrek/browser/newtab/newTab.css index f4df85f4..bdc57fe6 100644 --- a/LCARStrek/browser/newtab/newTab.css +++ b/LCARStrek/browser/newtab/newTab.css @@ -280,7 +280,7 @@ body { background-color: #000000; color: #E7ADE7; } -#newtab-search-text::-moz-placeholder { +#newtab-search-text::placeholder { color: #8050B0; } #newtab-search-text:focus { diff --git a/LCARStrek/devtools/dark-theme.css b/LCARStrek/devtools/dark-theme.css index 7ecfc02f..6753b7ac 100644 --- a/LCARStrek/devtools/dark-theme.css +++ b/LCARStrek/devtools/dark-theme.css @@ -398,10 +398,10 @@ div.CodeMirror span.eval-text { border-color: #008484; } -.devtools-textinput::-moz-placeholder, -.devtools-searchinput::-moz-placeholder, -.devtools-filterinput::-moz-placeholder, -.devtools-plaininput::-moz-placeholder { +.devtools-textinput::placeholder, +.devtools-searchinput::placeholder, +.devtools-filterinput::placeholder, +.devtools-plaininput::placeholder { color: #8050B0; opacity: 1.0; } diff --git a/LCARStrek/devtools/toolbars.css b/LCARStrek/devtools/toolbars.css index e7d2ed62..2bddea0a 100644 --- a/LCARStrek/devtools/toolbars.css +++ b/LCARStrek/devtools/toolbars.css @@ -484,8 +484,8 @@ div.devtools-toolbar::after { visibility: hidden; } -.devtools-searchinput .textbox-input::-moz-placeholder, -.devtools-filterinput .textbox-input::-moz-placeholder { +.devtools-searchinput .textbox-input::placeholder, +.devtools-filterinput .textbox-input::placeholder { font-style: normal; } diff --git a/LCARStrek/global/aboutReader.css b/LCARStrek/global/aboutReader.css index 84a46574..49436de8 100644 --- a/LCARStrek/global/aboutReader.css +++ b/LCARStrek/global/aboutReader.css @@ -3,16 +3,7 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ body { - padding: 64px 0; -} - -@media (max-width: 785px) { - body { - padding-top: 64px; - padding-inline-end: 0; - padding-bottom: 64px; - padding-inline-start: 51px; - } + padding: 64px 51px; } @media print { diff --git a/LCARStrek/global/aboutReaderContent.css b/LCARStrek/global/aboutReaderContent.css index 9c70c082..633391d3 100644 --- a/LCARStrek/global/aboutReaderContent.css +++ b/LCARStrek/global/aboutReaderContent.css @@ -79,18 +79,21 @@ h3 { line-height: 1.66em; } -a { +a:link { text-decoration: underline; font-weight: normal; } -a, -a:visited, -a:hover, -a:active { +a:link, +a:link:hover, +a:link:active { color: #0095dd; } +a:visited { + color: #c2e; +} + * { max-width: 100%; height: auto; @@ -110,6 +113,15 @@ figure, border-radius: 5px; } +li { + margin-bottom: 0; +} + +li > ul, +li > ol { + margin-bottom: -10px; +} + p > img:only-child, p > a:only-child > img:only-child, .wp-caption img, diff --git a/LCARStrek/global/alerts/alert-common.css b/LCARStrek/global/alerts/alert-common.css index 92036c2d..6a2db0f2 100644 --- a/LCARStrek/global/alerts/alert-common.css +++ b/LCARStrek/global/alerts/alert-common.css @@ -26,6 +26,12 @@ animation-name: alert-fadeout-animation; } +#alertBox[animate]:not([clicked]):not([closing]):hover { + /* !important is necessary because CSS animations have highest + importance in the cascade with exception to !important rules. */ + opacity: 1 !important; +} + @keyframes alert-animation { from { opacity: 0; diff --git a/LCARStrek/global/global.css b/LCARStrek/global/global.css index d6be0ebe..931b936f 100644 --- a/LCARStrek/global/global.css +++ b/LCARStrek/global/global.css @@ -51,6 +51,14 @@ toolbaritem > menubar { } } +/* ::::: Variables ::::: */ +:root { + --panel-arrowcontent-padding: 6px; + --panel-arrowcontent-background: #000000; + --panel-arrowcontent-color: #FF9F00; + --panel-arrowcontent-border-color: #FF9F00; +} + /* ::::: root elements ::::: */ window, diff --git a/LCARStrek/global/in-content/common.css b/LCARStrek/global/in-content/common.css index 868ada8a..be9fa280 100644 --- a/LCARStrek/global/in-content/common.css +++ b/LCARStrek/global/in-content/common.css @@ -325,6 +325,26 @@ xul|*.help-button > xul|*.button-box > xul|*.button-icon { xul|*.help-button > xul|*.button-box > xul|*.button-text { display: none; } + +html|*.help-button { + width: 16px; + height: 16px; + border: 0; + padding: 0; + display: inline-block; + background-image: url("chrome://global/skin/in-content/help-glyph.svg#help"); + background-repeat: no-repeat; + background-position: center center; + background-size: contain; +} + +html|*.help-button:hover { + background-image: url("chrome://global/skin/in-content/help-glyph.svg#help-hover"); +} + +html|*.help-button:hover:active { + background-image: url("chrome://global/skin/in-content/help-glyph.svg#help-pressed"); +} /* xul|*.spinbuttons-button { min-height: initial; diff --git a/LCARStrek/global/popup.css b/LCARStrek/global/popup.css index 1397ee16..d2188344 100644 --- a/LCARStrek/global/popup.css +++ b/LCARStrek/global/popup.css @@ -8,14 +8,6 @@ @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); -/* ::::: Variables ::::: */ -.panel-arrowcontent { - --panel-arrowcontent-padding: 6px; - --panel-arrowcontent-background: #000000; - --panel-arrowcontent-color: #FF9F00; - --panel-arrowcontent-border-color: #FF9F00; -} - /* ::::: menupopup ::::: */ menupopup, @@ -63,7 +55,8 @@ panel[type="arrow"][side="right"] { .panel-arrow[side="top"], .panel-arrow[side="bottom"] { - list-style-image: url("chrome://global/skin/arrow/panelarrow-vertical.svg"); + list-style-image: var(--panel-arrow-image-vertical, + url("chrome://global/skin/arrow/panelarrow-vertical.svg")); position: relative; margin-left: 10px; margin-right: 10px; diff --git a/LCARStrek/global/printPreview.css b/LCARStrek/global/printPreview.css index 1a033c78..a28d98bd 100644 --- a/LCARStrek/global/printPreview.css +++ b/LCARStrek/global/printPreview.css @@ -36,48 +36,12 @@ /* ::::: print preview toolbar ::::: */ -/* ..... page navigation ..... */ - -.home-arrow, .end-arrow:-moz-locale-dir(rtl) { - list-style-image: url("chrome://global/skin/arrow/arrow-left-sharp-end.gif"); -} - -.home-arrow:hover, .end-arrow:-moz-locale-dir(rtl):hover { - list-style-image: url("chrome://global/skin/arrow/arrow-left-sharp-end-hover.gif"); -} - -.end-arrow, .home-arrow:-moz-locale-dir(rtl) { - list-style-image: url("chrome://global/skin/arrow/arrow-right-sharp-end.gif"); -} - -.end-arrow:hover, .home-arrow:-moz-locale-dir(rtl):hover { - list-style-image: url("chrome://global/skin/arrow/arrow-right-sharp-end-hover.gif"); -} - -.previous-arrow, .next-arrow:-moz-locale-dir(rtl) { - list-style-image: url("chrome://global/skin/arrow/arrow-left-sharp.gif"); -} - -.previous-arrow:hover, .next-arrow:-moz-locale-dir(rtl):hover { - list-style-image: url("chrome://global/skin/arrow/arrow-left-sharp-hover.gif"); -} - -.next-arrow, .previous-arrow:-moz-locale-dir(rtl) { - list-style-image: url("chrome://global/skin/arrow/arrow-right-sharp.gif"); -} - -.next-arrow:hover, .previous-arrow:-moz-locale-dir(rtl):hover { - list-style-image: url("chrome://global/skin/arrow/arrow-right-sharp-hover.gif"); -} - -/* ...... scale in/decrement ..... */ - -.up-arrow { - list-style-image: url("chrome://global/skin/arrow/arrow-up-sharp.gif"); +.navigate-button { + min-width: 1.9em; } -.down-arrow { - list-style-image: url("chrome://global/skin/arrow/arrow-dn-sharp.gif"); +.navigate-button > .toolbarbutton-icon { + display: none; } /* ..... orientation ..... */ diff --git a/LCARStrek/global/textbox.css b/LCARStrek/global/textbox.css index 5f48a5f4..227757d7 100644 --- a/LCARStrek/global/textbox.css +++ b/LCARStrek/global/textbox.css @@ -35,8 +35,8 @@ html|*.textbox-textarea { font: inherit; } -html|*.textbox-input::-moz-placeholder, -html|*.textbox-textarea::-moz-placeholder { +html|*.textbox-input::placeholder, +html|*.textbox-textarea::placeholder { color: #8050B0; opacity: 1.0; } diff --git a/LCARStrek/mozapps/extensions/extensions.css b/LCARStrek/mozapps/extensions/extensions.css index 2f50b5b3..a72e4a00 100644 --- a/LCARStrek/mozapps/extensions/extensions.css +++ b/LCARStrek/mozapps/extensions/extensions.css @@ -1119,7 +1119,8 @@ button.button-link:not([disabled="true"]):active:hover { #disabled-unsigned-addons-info { margin-bottom: 2em; - margin-inline-end: 48px; + margin-right: 48px; + margin-left: 48px; } #disabled-unsigned-addons-heading { diff --git a/LCARStrek/mozapps/update/updates.css b/LCARStrek/mozapps/update/updates.css index de59c122..88c95010 100644 --- a/LCARStrek/mozapps/update/updates.css +++ b/LCARStrek/mozapps/update/updates.css @@ -21,38 +21,10 @@ wizardpage { padding: 10px; } -.loadingBox { - padding: 3px 5px; -} - -.remoteLoadingThrobber { - margin-top: 3px; -} - -.remoteLoadingThrobber[state="loading"] { - list-style-image: url("chrome://global/skin/icons/loading.png"); -} - -@media (min-resolution: 1.1dppx) { - .remoteLoadingThrobber[state="loading"] { - width: 16px; - list-style-image: url("chrome://global/skin/icons/loading@2x.png"); - } -} - -.remoteLoadingThrobber[state="error"] { - list-style-image: url("chrome://global/skin/icons/information-16.png"); -} - .wizard-buttons-separator { margin-top: 0 !important; } -#licenseContent, #incompatibleListbox { - margin-inline-start: 6px; - margin-inline-end: 6px; -} - .inline-link { color: #3333FF; text-decoration: none; @@ -74,16 +46,6 @@ wizardpage { font-size: larger; } -/* License Page */ -#licenseContent { -/* -moz-appearance: listbox; */ -} - -/* Incompatible List Page */ -#incompatibleListbox { - margin-bottom: 6px; -} - /* Downloading Page */ #downloadStatusLine { -moz-box-align: center; -- 2.35.3