From 702d3d616e8e01b04dfa92d676bda96543a75560 Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Fri, 7 Nov 2014 22:16:38 +0100 Subject: [PATCH] sync both themes with toolkit windows theme changes in Mozilla 34 cycle --- EarlyBlue/global/in-content/common.css | 626 ++++++++++++++++++++ EarlyBlue/mozapps/extensions/extensions.css | 6 +- LCARStrek/mozapps/extensions/extensions.css | 6 +- 3 files changed, 636 insertions(+), 2 deletions(-) create mode 100644 EarlyBlue/global/in-content/common.css diff --git a/EarlyBlue/global/in-content/common.css b/EarlyBlue/global/in-content/common.css new file mode 100644 index 00000000..b50fb302 --- /dev/null +++ b/EarlyBlue/global/in-content/common.css @@ -0,0 +1,626 @@ +/* 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/. */ + +/* === BEGIN common.inc.css === */ + +@namespace html "http://www.w3.org/1999/xhtml"; +@namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; + +html|body, +xul|page { + font: 11px "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif; + -moz-appearance: none; + background-color: #CCD0DD; + color: #000000; +} + +html|body { + font-size: 15px; + font-weight: normal; + margin: 0; +} + +html|h1 { + font-size: 2.5em; + font-weight: lighter; + line-height: 1.2; + margin: 0; + margin-bottom: .5em; +} + +xul|caption { +} + +xul|caption > xul|label { + margin-top: 0; + margin-bottom: 0; +} + +*|*.main-content { + padding: 40px 48px 48px; + overflow: auto; +} + +xul|prefpane > xul|*.content-box { + overflow: visible; +} + +/* groupboxes */ +/* +xul|groupbox { + -moz-appearance: none; + border: none; + margin-top: 15px; + margin-bottom: 15px; + -moz-margin-end: 0; + -moz-padding-start: 0; + -moz-padding-end: 0; + font-size: 1.25rem; +} + +xul|groupbox xul|label { + / !important needed to override toolkit !important rule / + -moz-margin-start: 0 !important; + -moz-margin-end: 0 !important; +} +*/ +/* tabpanels and tabs */ +/* +xul|tabpanels { + -moz-appearance: none; + font-size: 1.25rem; + line-height: 22px; + border: none; + padding: 0; + background-color: transparent; +} + +xul|tabs { + margin-bottom: 15px; + border-top: 1px solid #c1c1c1; + border-bottom: 1px solid #c1c1c1; + background-color: #fbfbfb; +} + +xul|*.tabs-left, +xul|*.tabs-right { + border-bottom: none; +} + +xul|tab { + -moz-appearance: none; + margin-top: 0; + padding: 0 20px; + min-height: 44px; + color: #424f5a; + background-color: #fbfbfb; + border-width: 0; + transition: background-color 50ms ease 0s; +} + +xul|tab:hover { + background-color: #ebebeb; +} + +xul|tab[selected] { + background-color: #ebebeb; + box-shadow: inset 0 -4px 0 0 #ff9500; +} + +xul|*.tab-text { + font-size: 1.3rem; + line-height: 22px; +} +*/ +/* html buttons */ + +html|button { + border-radius: 0px; + border: 1px outset #CCD0DD; + background-color: #CCD0DD; + color: #000000; + / * override forms.css * / + font: inherit; +} + +/* xul buttons and menulists */ +/* +*|button, +xul|colorpicker[type="button"], +xul|menulist { + -moz-appearance: none; + height: 30px; + color: #333; + line-height: 20px; + text-shadow: 0 1px 1px #fefffe; + border: 1px solid #c1c1c1; + -moz-border-top-colors: none !important; + -moz-border-right-colors: none !important; + -moz-border-bottom-colors: none !important; + -moz-border-left-colors: none !important; + border-radius: 2px; + background-color: #fbfbfb; +} +*/ +html|button:enabled:hover, +xul|button:not([disabled="true"]):hover, +xul|colorpicker[type="button"]:not([disabled="true"]):hover, +xul|menulist:not([disabled="true"]):hover { +} + +html|button:enabled:hover:active, +xul|button:not([disabled="true"]):hover:active, +xul|colorpicker[type="button"]:not([disabled="true"]):hover:active, +xul|menulist[open="true"]:not([disabled="true"]) { + border: 1px inset #CCD0DD; +} + +html|button:disabled, +xul|button[disabled="true"], +xul|colorpicker[type="button"][disabled="true"], +xul|menulist[disabled="true"] { + cursor: not-allowed; + border: 1px outset #CCD0DD; + color: #999999; +} +/* +xul|colorpicker[type="button"] { + padding: 6px; + width: 50px; +} + +xul|button > xul|*.button-box, +xul|menulist > xul|*.menulist-label-box { + padding-right: 10px !important; + padding-left: 10px !important; +} + +xul|button[type="menu"] > xul|*.button-box > xul|*.button-menu-dropmarker { + -moz-appearance: none; + margin: 1px 0; + -moz-margin-start: 10px; + padding: 0; + width: 10px; + height: 16px; + border: none; + background-color: transparent; + list-style-image: url("chrome://global/skin/in-content/dropdown.png"); +} + +xul|*.help-button { + min-width: 30px; + border-radius: 2px; + border: 1px solid #c1c1c1; + background-color: #ffcb00; + background-image: none; + box-shadow: none; +} + +xul|*.help-button:not([disabled="true"]):hover { + background-color: #f4c200; + background-image: none; +} + +xul|*.help-button:not([disabled="true"]):hover:active { + background-color: #eaba00; + background-image: none; +} + +xul|*.close-icon > xul|*.button-box, +xul|*.help-button > xul|*.button-box { + padding-top: 0; + padding-bottom: 0; + padding-right: 0 !important; + padding-left: 0 !important; +} + +xul|*.help-button > xul|*.button-box > xul|*.button-icon { + width: 26px; + height: 26px; + background-image: url("chrome://global/skin/in-content/help-glyph.png"); + background-position: center; +} + +@media (min-resolution: 2dppx) { + xul|*.help-button > xul|*.button-box > xul|*.button-icon { + background-size: 26px 26px; + background-image: url("chrome://global/skin/in-content/help-glyph@2x.png"); + } +} + +xul|*.help-button > xul|*.button-box > xul|*.button-text { + display: none; +} + +xul|*.spinbuttons-button { + -moz-margin-start: 10px !important; + -moz-margin-end: 2px !important; +} + +xul|*.spinbuttons-up { + margin-top: 2px !important; + border-radius: 1px 1px 0 0; +} + +xul|*.spinbuttons-down { + margin-bottom: 2px !important; + border-radius: 0 0 1px 1px; +} + +xul|*.spinbuttons-button > xul|*.button-box { + padding: 1px 5px 2px !important; +} + +xul|*.spinbuttons-up > xul|*.button-box > xul|*.button-icon { + list-style-image: url("chrome://global/skin/arrow/arrow-up.gif"); +} + +xul|*.spinbuttons-up[disabled="true"] > xul|*.button-box > xul|*.button-icon { + list-style-image: url("chrome://global/skin/arrow/arrow-up-dis.gif"); +} + +xul|*.spinbuttons-down > xul|*.button-box > xul|*.button-icon { + list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif"); +} + +xul|*.spinbuttons-down[disabled="true"] > xul|*.button-box > xul|*.button-icon { + list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif"); +} + +xul|menulist:not([editable="true"]) > xul|*.menulist-dropmarker { + -moz-appearance: none; + -moz-margin-end: 10px; + padding: 0; + border: none; + background-color: transparent; + list-style-image: url("chrome://global/skin/in-content/dropdown.png"); +} + +xul|menulist[disabled="true"]:not([editable="true"]) > xul|*.menulist-dropmarker { + list-style-image: url("chrome://global/skin/in-content/dropdown-disabled.png") +} + +@media (min-resolution: 2dppx) { + xul|menulist:not([editable="true"]) > xul|*.menulist-dropmarker, + xul|button[type="menu"] > xul|*.button-box > xul|*.button-menu-dropmarker { + list-style-image: url("chrome://global/skin/in-content/dropdown@2x.png"); + } + + xul|menulist[disabled="true"]:not([editable="true"]) > xul|*.menulist-dropmarker { + list-style-image: url("chrome://global/skin/in-content/dropdown-disabled@2x.png") + } + + xul|menulist:not([editable="true"]) > xul|*.menulist-dropmarker > xul|*.dropmarker-icon, + xul|button[type="menu"] > xul|*.button-box > xul|*.button-menu-dropmarker > xul|*.dropmarker-icon { + width: 10px; + height: 16px; + } +} + +xul|menulist > xul|menupopup, +xul|button[type="menu"] > xul|menupopup { + -moz-appearance: none; + border: 1px solid rgba(23,50,77,0.4); + border-radius: 2px; + background-color: #fff; +} + +xul|menulist > xul|menupopup xul|menu, +xul|menulist > xul|menupopup xul|menuitem, +xul|button[type="menu"] > xul|menupopup xul|menu, +xul|button[type="menu"] > xul|menupopup xul|menuitem { + -moz-appearance: none; + font-size: 1.25rem; + line-height: 22px; + height: 40px; + color: #333; + -moz-padding-start: 10px; + -moz-padding-end: 30px; +} + +xul|menulist > xul|menupopup > xul|menu[_moz-menuactive="true"], +xul|menulist > xul|menupopup > xul|menuitem[_moz-menuactive="true"], +xul|button[type="menu"] > xul|menupopup > xul|menu[_moz-menuactive="true"], +xul|button[type="menu"] > xul|menupopup > xul|menuitem[_moz-menuactive="true"] { + color: #333; + background-color: transparent; + background-image: linear-gradient(rgba(76,177,255,0.25), rgba(23,146,229,0.25)); +} + +xul|menulist > xul|menupopup > xul|menu[selected="true"], +xul|menulist > xul|menupopup > xul|menuitem[selected="true"], +xul|button[type="menu"] > xul|menupopup > xul|menu[selected="true"], +xul|button[type="menu"] > xul|menupopup > xul|menuitem[selected="true"] { + color: #fff; + background-image: linear-gradient(#4cb1ff, #1792e5); +} + +xul|menulist > xul|menupopup xul|menuseparator, +xul|button[type="menu"] > xul|menupopup xul|menuseparator { + -moz-appearance: none; + margin-top: 2px; + margin-bottom: 2px; + padding: 0; + border-top: 1px solid rgba(23,50,77,0.4); + border-bottom: none; +} +*/ +/* textboxes */ +/* +*|textbox { + -moz-appearance: none; + height: 30px; + color: #333; + line-height: 20px; + text-shadow: 0 1px 1px #fefffe; + padding-right: 10px; + padding-left: 10px; + border: 1px solid #c1c1c1; + -moz-border-top-colors: none !important; + -moz-border-right-colors: none !important; + -moz-border-bottom-colors: none !important; + -moz-border-left-colors: none !important; + border-radius: 2px; + background-color: #fff; +} + +html|textbox:focus, +xul|textbox[focused] { + border-color: #0095dd; +} + +html|textbox:disabled, +xul|textbox[disabled="true"] { + opacity: 0.5; +} +*/ +/* Links */ +/* +html|a, +xul|*.text-link, +xul|*.inline-link { + font-size: 1.25rem; + line-height: 22px; + color: #0095dd; + text-decoration: none; +} + +html|a:hover, +xul|*.text-link:hover, +xul|*.inline-link:hover { + color: #4cb1ff; + text-decoration: none; +} + +html|a:hover:active, +xul|*.text-link:hover:active, +xul|*.inline-link:hover:active { + color: #ff9500; + text-decoration: none; +} +*/ +/* Checkboxes and radio buttons */ +/* +xul|checkbox { + -moz-margin-start: 0; +} + +xul|*.checkbox-check { + -moz-appearance: none; + width: 23px; + height: 23px; + border-radius: 2px; + border: 1px solid #c1c1c1; + -moz-margin-end: 10px; + background-color: #f1f1f1; + background-image: linear-gradient(#fff, rgba(255,255,255,0.8)); + background-position: center center; + background-repeat: no-repeat; + box-shadow: 0 1px 1px 0 #fff, inset 0 2px 0 0 rgba(0,0,0,0.03); +} + +xul|checkbox:not([disabled="true"]):hover > xul|*.checkbox-check { + border-color: #0095dd; +} + +xul|*.checkbox-check[checked] { + background-image: url("chrome://global/skin/in-content/check.png"), + / * !important needed to override toolkit !important rule * / + linear-gradient(#fff, rgba(255,255,255,0.8)) !important; +} + +xul|checkbox[disabled="true"] > xul|*.checkbox-check { + opacity: 0.5; +} + +xul|*.checkbox-label-box { + -moz-margin-start: -1px; / * negative margin for the transparent border * / + -moz-padding-start: 0; +} + +@media (min-resolution: 2dppx) { + xul|*.checkbox-check[checked] { + background-size: 12px 12px, auto; + background-image: url("chrome://global/skin/in-content/check@2x.png"), + linear-gradient(#fff, rgba(255,255,255,0.8)) !important; + } +} + +xul|*.radio-check { + -moz-appearance: none; + width: 23px; + height: 23px; + border: 1px solid #c1c1c1; + border-radius: 50%; + -moz-margin-end: 10px; + background-color: #f1f1f1; + background-image: linear-gradient(#fff, rgba(255,255,255,0.80)); + box-shadow: 0 1px 1px 0 #fff, inset 0 2px 0 0 rgba(0,0,0,0.03); +} + +xul|radio:not([disabled="true"]):hover > xul|*.radio-check { + border-color: #0095dd; +} + +xul|*.radio-check[selected] { + background-image: radial-gradient(circle, rgb(23,146,229), + rgb(76,177,255) 5.5px, rgba(76,177,255,0.2) 6px, + transparent 6px), + linear-gradient(rgb(255,255,255), rgba(255,255,255,0.8)); +} + +xul|radio[disabled="true"] > xul|*.radio-check { + opacity: 0.5; +} + +xul|*.radio-label-box { + -moz-margin-start: -1px; / * negative margin for the transparent border * / + -moz-margin-end: 10px; + -moz-padding-start: 0; +} +*/ +/* Category List */ +/* +xul|*#categories { + -moz-appearance: none; + background-color: #424f5a; + padding-top: 39px; + margin: 0; +} + +xul|*.category { + -moz-appearance: none; + color: #c1c1c1; + -moz-border-end-width: 0; + -moz-padding-start: 15px; + -moz-padding-end: 21px; + min-height: 40px; + transition: background-color 150ms; +} + +xul|*.category:hover { + background-color: #5e6972; +} + +xul|*.category[selected] { + background-color: #343f48; + color: #f2f2f2; + box-shadow: inset 4px 0 0 0 #ff9500; +} + +xul|*#categories[keyboard-navigation="true"]:-moz-focusring > xul|*.category[current] { + border-top: 1px #ffffff dotted; + border-bottom: 1px #ffffff dotted; +} + +*|*.category-name { + line-height: 22px; + font-size: 1.25rem; + padding-bottom: 2px; + -moz-padding-start: 9px; + margin: 0; +} + +*|*.category-icon { + width: 24px; + height: 24px; +} +*/ +/* header */ +/* +*|*.header { + border-bottom: 1px solid #c8c8c8; + margin-bottom: 15px; + padding-bottom: 15px; +} + +*|*.header-name { + font-size: 2.5rem; + font-weight: normal; + line-height: 40px; + margin: 0; +} +*/ +/* File fields */ +/* +xul|filefield { + -moz-appearance: none; + background-color: transparent; + border: none; + padding: 0; +} + +xul|*.fileFieldContentBox { + background-color: transparent; +} + +xul|*.fileFieldIcon { + -moz-margin-start: 10px; + -moz-margin-end: 0; +} + +xul|*.fileFieldLabel { + -moz-margin-start: -26px; + -moz-padding-start: 36px; +} + +xul|textbox:-moz-locale-dir(rtl), +xul|*.fileFieldLabel:-moz-locale-dir(rtl), +xul|textbox + xul|button:-moz-locale-dir(ltr), +xul|filefield + xul|button:-moz-locale-dir(ltr) { + border-top-left-radius: 0; + border-bottom-left-radius: 0; +} + +xul|textbox:-moz-locale-dir(ltr), +xul|*.fileFieldLabel:-moz-locale-dir(ltr), +xul|textbox + xul|button:-moz-locale-dir(rtl), +xul|filefield + xul|button:-moz-locale-dir(rtl) { + border-top-right-radius: 0; + border-bottom-right-radius: 0; +} + +xul|textbox + xul|button, +xul|filefield + xul|button { + -moz-border-start: none; +} +*/ +/* === END common.inc.css === */ +/* +xul|caption { + background-color: transparent; +} + +xul|button, +xul|colorpicker[type="button"], +xul|menulist { + margin: 2px 4px; +} + +xul|menulist:not([editable="true"]) > xul|*.menulist-dropmarker { + margin-top: 1px; + margin-bottom: 1px; +} + +xul|checkbox { + -moz-padding-start: 0; +} + +xul|radio { + -moz-binding: url("chrome://global/content/bindings/radio.xml#radio"); + -moz-margin-start: 0; + -moz-padding-start: 0; +} + +xul|*.radio-icon, +xul|*.checkbox-icon { + -moz-margin-end: 0; +} + +html|a:-moz-focusring, +xul|*.text-link:-moz-focusring, +xul|*.inline-link:-moz-focusring { + border: 1px dotted -moz-DialogText; +} +*/ \ No newline at end of file diff --git a/EarlyBlue/mozapps/extensions/extensions.css b/EarlyBlue/mozapps/extensions/extensions.css index 1d67cf6b..1d9b7109 100644 --- a/EarlyBlue/mozapps/extensions/extensions.css +++ b/EarlyBlue/mozapps/extensions/extensions.css @@ -1004,10 +1004,14 @@ menulist { /* Fixes some styling inconsistencies */ /*** buttons ***/ -.addon-control[disabled="true"] { +.addon-control[disabled="true"]:not(.no-auto-hide) { display: none; } +.no-auto-hide .addon-control { + display: block !important; +} + button.button-link { background: transparent; border: none; diff --git a/LCARStrek/mozapps/extensions/extensions.css b/LCARStrek/mozapps/extensions/extensions.css index bf7145cc..8d095108 100644 --- a/LCARStrek/mozapps/extensions/extensions.css +++ b/LCARStrek/mozapps/extensions/extensions.css @@ -1053,10 +1053,14 @@ menulist { /* Fixes some styling inconsistencies */ /*** buttons ***/ -.addon-control[disabled="true"] { +.addon-control[disabled="true"]:not(.no-auto-hide) { display: none; } +.no-auto-hide .addon-control { + display: block !important; +} + button.button-link { background: transparent; border: none; -- 2.35.3