From ed351b9114c8a9d94d604e671f92cc19a2900b68 Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Mon, 19 Oct 2015 13:05:58 +0200 Subject: [PATCH] sync EarlyBlue theme with toolkit windows theme changes in Mozilla 41 cycle --- EarlyBlue/global/aboutSupport.css | 45 ++-- .../global/arrow/panelarrow-horizontal.svg | 11 +- .../global/arrow/panelarrow-vertical.svg | 11 +- .../global/icons/autocomplete-search.svg | 45 ++-- EarlyBlue/global/in-content/common.css | 195 +++++++++------- EarlyBlue/global/in-content/help-glyph.svg | 11 +- EarlyBlue/global/in-content/info-pages.css | 198 ++++++++-------- EarlyBlue/global/inContentUI.css | 42 ---- .../global/media/videoClickToPlayButton.svg | 29 +++ EarlyBlue/global/menu.css | 12 +- EarlyBlue/global/popup.css | 3 +- EarlyBlue/global/reader/RM-Add-24x24.svg | 9 +- EarlyBlue/global/reader/RM-Close-24x24.svg | 16 +- EarlyBlue/global/reader/RM-Delete-24x24.svg | 9 +- EarlyBlue/global/reader/RM-Minus-24x24.svg | 42 +--- EarlyBlue/global/reader/RM-Plus-24x24.svg | 42 +--- .../global/reader/RM-Reading-List-24x24.svg | 54 +---- .../global/reader/RM-Type-Controls-24x24.svg | 27 +-- .../global/reader/RM-Type-Controls-Arrow.svg | 46 +--- EarlyBlue/global/reader/pocket.svg | 20 +- EarlyBlue/mozapps/extensions/extensions.css | 2 +- EarlyBlue/mozapps/extensions/utilities.svg | 13 +- .../mozapps/places/defaultFavicon@2x.png | Bin 0 -> 245 bytes LCARStrek/global/aboutSupport.css | 66 +++--- .../global/arrow/panelarrow-horizontal.svg | 11 +- .../global/arrow/panelarrow-vertical.svg | 11 +- .../global/icons/autocomplete-search.svg | 45 ++-- LCARStrek/global/in-content/common.css | 209 ++++++++++------- LCARStrek/global/in-content/help-glyph.svg | 11 +- LCARStrek/global/in-content/info-pages.css | 215 +++++++++--------- LCARStrek/global/inContentUI.css | 3 + .../global/media/videoClickToPlayButton.svg | 83 ++----- LCARStrek/global/menu.css | 12 +- LCARStrek/global/popup.css | 3 +- LCARStrek/global/reader/RM-Add-24x24.svg | 9 +- LCARStrek/global/reader/RM-Close-24x24.svg | 16 +- LCARStrek/global/reader/RM-Delete-24x24.svg | 9 +- LCARStrek/global/reader/RM-Minus-24x24.svg | 42 +--- LCARStrek/global/reader/RM-Plus-24x24.svg | 42 +--- .../global/reader/RM-Reading-List-24x24.svg | 54 +---- .../global/reader/RM-Type-Controls-24x24.svg | 27 +-- .../global/reader/RM-Type-Controls-Arrow.svg | 46 +--- LCARStrek/global/reader/pocket.svg | 20 +- LCARStrek/mozapps/extensions/extensions.css | 10 +- LCARStrek/mozapps/extensions/utilities.svg | 13 +- LCARStrek/mozapps/places/defaultFavicon.png | Bin 183 -> 170 bytes .../mozapps/places/defaultFavicon@2x.png | Bin 0 -> 214 bytes 47 files changed, 789 insertions(+), 1050 deletions(-) delete mode 100644 EarlyBlue/global/inContentUI.css create mode 100644 EarlyBlue/mozapps/places/defaultFavicon@2x.png create mode 100644 LCARStrek/mozapps/places/defaultFavicon@2x.png diff --git a/EarlyBlue/global/aboutSupport.css b/EarlyBlue/global/aboutSupport.css index 990091a8..6e805322 100644 --- a/EarlyBlue/global/aboutSupport.css +++ b/EarlyBlue/global/aboutSupport.css @@ -3,15 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ html { - background-color: #CCD0DD; - color: #000000; - font: 11px "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif; + --aboutSupport-table-background: #CCD0DD; + background-color: var(--in-content-page-background); } body { - width: 90%; - margin-left: 5%; - margin-right: 5%; + margin: 40px 48px; } .page-subtitle { @@ -26,22 +23,27 @@ body { font-weight: bold; } +button { + -moz-margin-start: 0; + -moz-margin-end: 8px; +} + table { - background-color: #CCD0DD; - color: #000000; + background-color: var(--aboutSupport-table-background); + color: var(--in-content-text-color); text-align: start; width: 100%; - border: 1px solid #9999CC; + border: 1px solid var(--in-content-border-color); border-spacing: 0px; } th, td { - padding: 3px; + padding: 4px; } -th + th, -td + td { - border-left: 1px dotted #9999CC; +th:not(:first-child), +td:not(:first-child) { + border-left: 1px dotted var(--in-content-border-color); } thead th { @@ -50,8 +52,8 @@ thead th { th { text-align: start; - background-color: #666699; - color: #CCD0DD; + background-color: var(--in-content-table-header-background); + color: var(--in-content-selected-text); } th.column { @@ -61,7 +63,12 @@ th.column { td { text-align: start; - border-top: 1px dotted #9999CC; +} + +tr:not(:first-child) > td, +tr:not(:first-child) > th { + text-align: start; + border-top: 1px dotted var(--in-content-table-border-dark-color); } .prefs-table { @@ -82,9 +89,9 @@ td { } #action-box { - background-color: #CCD0DD; - border: 1px solid #666699; - color: #000000; + background-color: var(--aboutSupport-table-background); + border: 1px solid var(--in-content-border-color); + color: var(--in-content-text-color); float: right; margin-top: 2em; margin-bottom: 20px; diff --git a/EarlyBlue/global/arrow/panelarrow-horizontal.svg b/EarlyBlue/global/arrow/panelarrow-horizontal.svg index ddc31bfe..09b33865 100644 --- a/EarlyBlue/global/arrow/panelarrow-horizontal.svg +++ b/EarlyBlue/global/arrow/panelarrow-horizontal.svg @@ -2,12 +2,7 @@ - - - - + + + diff --git a/EarlyBlue/global/arrow/panelarrow-vertical.svg b/EarlyBlue/global/arrow/panelarrow-vertical.svg index 6bb7a12a..b8ac274d 100644 --- a/EarlyBlue/global/arrow/panelarrow-vertical.svg +++ b/EarlyBlue/global/arrow/panelarrow-vertical.svg @@ -2,12 +2,7 @@ - - - - + + + diff --git a/EarlyBlue/global/icons/autocomplete-search.svg b/EarlyBlue/global/icons/autocomplete-search.svg index 90322fc5..ed5c6716 100644 --- a/EarlyBlue/global/icons/autocomplete-search.svg +++ b/EarlyBlue/global/icons/autocomplete-search.svg @@ -2,32 +2,21 @@ - - - - - - - + + + + + + + diff --git a/EarlyBlue/global/in-content/common.css b/EarlyBlue/global/in-content/common.css index 0b211eb5..4c3a2e27 100644 --- a/EarlyBlue/global/in-content/common.css +++ b/EarlyBlue/global/in-content/common.css @@ -7,13 +7,51 @@ @namespace html "http://www.w3.org/1999/xhtml"; @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; +*|*:root { + --in-content-page-color: #000000; + --in-content-page-background: #CCD0DD; + --in-content-text-color: #000000; + --in-content-selected-text: #000000; + ---in-content-header-border-color: #c8c8c8; + --in-content-box-background: #CCD0DD; + ---in-content-box-background-odd: #f3f6fa; + ---in-content-box-background-hover: #ebebeb; + ---in-content-box-background-active: #dadada; + --in-content-box-border-color: #CCD0DD; + ---in-content-item-hover: rgba(0,149,221,0.25); + ---in-content-item-selected: #0095dd; + --in-content-border-highlight: #33FF33; + ---in-content-border-focus: #0095dd; + --in-content-border-color: #9999CC; + --in-content-category-text: #000000; + --in-content-category-border-focus: 1px dotted #FFFFFF; + --in-content-category-text-selected: #FFFFFF; + --in-content-category-background: #666699; + --in-content-category-background-hover: #CCD0DD; + --in-content-category-background-active: #336699; + ---in-content-tab-color: #424f5a; + ---in-content-link-color: #0095dd; + ---in-content-link-color-hover: #178ce5; + ---in-content-link-color-active: #ff9500; + ---in-content-link-color-visited: #551a8b; + ---in-content-primary-button-background: #0095dd; + ---in-content-primary-button-background-hover: #008acb; + ---in-content-primary-button-background-active: #006b9d; + --in-content-table-border-dark-color: #9999CC; + --in-content-table-header-background: #666699; + ---in-content-help-button-background: #ffcb00; + ---in-content-help-button-background-hover: #f4c200; + ---in-content-help-button-background-active: #eaba00; + --in-content-disabled-text: #999999; +} + html|body, xul|page, xul|window { font: 11px "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif; -moz-appearance: none; - background-color: #CCD0DD; - color: #000000; + background-color: var(--in-content-page-background); + color: var(--in-content-page-color); } html|body { @@ -26,14 +64,14 @@ html|h1 { font-size: 2.5em; font-weight: lighter; line-height: 1.2; - color: #000000; + color: var(--in-content-text-color); margin: 0; margin-bottom: .5em; } html|hr { border-style: solid none none none; - border-color: #666699; + border-color: var(--in-content-border-color); } xul|caption { @@ -89,9 +127,9 @@ xul|tabpanels { xul|tabs { margin-bottom: 15px; - border-top: 1px solid #c1c1c1; - border-bottom: 1px solid #c1c1c1; - background-color: #fbfbfb; + border-top: 1px solid var(--in-content-box-border-color); + border-bottom: 1px solid var(--in-content-box-border-color); + background-color: var(--in-content-page-background); } xul|*.tabs-left, @@ -104,20 +142,20 @@ xul|tab { margin-top: 0; padding: 4px 20px; min-height: 44px; - color: #424f5a; - background-color: #fbfbfb; + color: var(--in-content-tab-color); + background-color: var(--in-content-page-background); border-width: 0; transition: background-color 50ms ease 0s; } xul|tab:hover { - background-color: #ebebeb; + background-color: var(--in-content-box-background-hover); } -xul|tab[visuallyselected] { - background-color: #ebebeb; +xul|tab[selected] { + background-color: var(--in-content-box-background-hover); padding-bottom: 0; / compensate the 4px border / - border-bottom: 4px solid #ff9500; + border-bottom: 4px solid var(--in-content-border-highlight); } xul|*.tab-text { @@ -129,10 +167,10 @@ xul|*.tab-text { html|button { border-radius: 0px; - border: 1px outset #CCD0DD; - background-color: #CCD0DD; - color: #000000; - / * override forms.css * / + border: 1px outset var(--in-content-box-border-color); + background-color: var(--in-content-box-background); + color: var(--in-content-text-color); + /* override forms.css */ font: inherit; } @@ -143,15 +181,14 @@ xul|colorpicker[type="button"], xul|menulist { -moz-appearance: none; height: 30px; - color: #333; - line-height: 20px; - border: 1px solid #c1c1c1; + color: var(--in-content-text-color); + border: 1px solid var(--in-content-box-border-color); -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; + background-color: var(--in-content-page-background); } */ html|button:enabled:hover, @@ -164,7 +201,7 @@ 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; + border: 1px inset var(--in-content-box-border-color); } html|button:disabled, @@ -172,24 +209,24 @@ xul|button[disabled="true"], xul|colorpicker[type="button"][disabled="true"], xul|menulist[disabled="true"] { cursor: not-allowed; - border: 1px outset #CCD0DD; - color: #999999; + border: 1px outset var(--in-content-box-border-color); + color: var(--in-content-disabled-text); } /* *|button.primary { - background-color: #0095dd; + background-color: var(--in-content-primary-button-background); border-color: transparent; - color: #fff; + color: var(--in-content-selected-text); } html|button.primary:enabled:hover, xul|button.primary:not([disabled="true"]):hover { - background-color: #008acb; + background-color: var(--in-content-primary-button-background-hover); } html|button.primary:enabled:hover:active, xul|button.primary:not([disabled="true"]):hover:active { - background-color: #006b9d; + background-color: var(--in-content-primary-button-background-active); } xul|colorpicker[type="button"] { @@ -223,19 +260,19 @@ xul|*.help-button { min-width: 30px; border-radius: 2px; border-width: 0; - background-color: #ffcb00; + background-color: var(--in-content-help-button-background); background-image: none; box-shadow: none; list-style-image: url("chrome://global/skin/in-content/help-glyph.svg"); } xul|*.help-button:not([disabled="true"]):hover { - background-color: #f4c200; + background-color: var(--in-content-help-button-background-hover); background-image: none; } xul|*.help-button:not([disabled="true"]):hover:active { - background-color: #eaba00; + background-color: var(--in-content-help-button-background-active); background-image: none; } @@ -312,9 +349,9 @@ xul|menulist[disabled="true"]:not([editable="true"]) > xul|*.menulist-dropmarker xul|menulist > xul|menupopup, xul|button[type="menu"] > xul|menupopup { -moz-appearance: none; - border: 1px solid #c1c1c1; + border: 1px solid var(--in-content-box-border-color); border-radius: 2px; - background-color: #fff; + background-color: var(--in-content-box-background); } xul|menulist > xul|menupopup xul|menu, @@ -323,7 +360,7 @@ xul|button[type="menu"] > xul|menupopup xul|menu, xul|button[type="menu"] > xul|menupopup xul|menuitem { -moz-appearance: none; font-size: 1rem; - color: #333; + color: var(--in-content-text-color); padding-top: 0.2em; padding-bottom: 0.2em; -moz-padding-start: 10px; @@ -334,23 +371,23 @@ xul|menulist > xul|menupopup > xul|menu:not([disabled="true"])[_moz-menuactive=" xul|menulist > xul|menupopup > xul|menuitem:not([disabled="true"])[_moz-menuactive="true"], xul|button[type="menu"] > xul|menupopup > xul|menu:not([disabled="true"])[_moz-menuactive="true"], xul|button[type="menu"] > xul|menupopup > xul|menuitem:not([disabled="true"])[_moz-menuactive="true"] { - color: #333; - background-color: rgba(0,149,221,0.25); + color: var(--in-content-text-color); + background-color: var(--in-content-item-hover); } xul|menulist > xul|menupopup > xul|menu:not([disabled="true"])[selected="true"], xul|menulist > xul|menupopup > xul|menuitem:not([disabled="true"])[selected="true"], xul|button[type="menu"] > xul|menupopup > xul|menu:not([disabled="true"])[selected="true"], xul|button[type="menu"] > xul|menupopup > xul|menuitem:not([disabled="true"])[selected="true"] { - color: #fff; - background-color: #0095dd; + color: var(--in-content-selected-text); + background-color: var(--in-content-item-selected); } xul|menulist > xul|menupopup > xul|menu[disabled="true"], xul|menulist > xul|menupopup > xul|menuitem[disabled="true"], xul|button[type="menu"] > xul|menupopup > xul|menu[disabled="true"], xul|button[type="menu"] > xul|menupopup > xul|menuitem[disabled="true"] { - color: #999; + color: var(--in-content-box-border-color); / override the [_moz-menuactive="true"] background color from global/menu.css / background-color: transparent; @@ -361,7 +398,7 @@ xul|button[type="menu"] > xul|menupopup xul|menuseparator { -moz-appearance: none; margin: 0; padding: 0; - border-top: 1px solid #c1c1c1; + border-top: 1px solid var(--in-content-box-border-color); border-bottom: none; } */ @@ -370,22 +407,22 @@ xul|button[type="menu"] > xul|menupopup xul|menuseparator { *|textbox { -moz-appearance: none; height: 30px; - color: #333; + color: var(--in-content-text-color); line-height: 20px; padding-right: 10px; padding-left: 10px; - border: 1px solid #c1c1c1; + border: 1px solid var(--in-content-box-border-color); -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; + background-color: var(--in-content-box-background); } html|textbox:focus, xul|textbox[focused] { - border-color: #0095dd; + border-color: var(--in-content-border-focus); } html|textbox:disabled, @@ -398,25 +435,25 @@ xul|textbox[disabled="true"] { html|a, .text-link, .inline-link { - color: #0095dd; + color: var(--in-content-link-color); text-decoration: none; } -html|a:visited { - color: #551a8b; -} - html|a:hover, .text-link:hover, .inline-link:hover { - color: #4cb1ff; + color: var(--in-content-link-color-hover); text-decoration: none; } +html|a:visited { + color: var(--in-content-link-color-visited); +} + html|a:hover:active, .text-link:hover:active, .inline-link:hover:active { - color: #ff9500; + color: var(--in-content-link-color-active); text-decoration: none; } */ @@ -449,7 +486,7 @@ html|input[type="checkbox"] + html|label:before { width: 23px; height: 23px; border-radius: 2px; - border: 1px solid #c1c1c1; + border: 1px solid var(--in-content-box-border-color); -moz-margin-end: 10px; background-color: #f1f1f1; / !important needed to override toolkit checked !important rule / @@ -461,7 +498,7 @@ html|input[type="checkbox"] + html|label:before { xul|checkbox:not([disabled="true"]):hover > xul|*.checkbox-check, html|input[type="checkbox"]:not(:disabled) + html|label:hover:before { - border-color: #0095dd; + border-color: var(--in-content-border-focus); } xul|*.checkbox-check[checked] { @@ -496,7 +533,7 @@ xul|*.radio-check { -moz-appearance: none; width: 23px; height: 23px; - border: 1px solid #c1c1c1; + border: 1px solid var(--in-content-box-border-color); border-radius: 50%; -moz-margin-end: 10px; background-color: #f1f1f1; @@ -505,7 +542,7 @@ xul|*.radio-check { } xul|radio:not([disabled="true"]):hover > xul|*.radio-check { - border-color: #0095dd; + border-color: var(--in-content-border-focus); } xul|*.radio-check[selected] { @@ -526,7 +563,7 @@ xul|*.radio-label-box { xul|*#categories { -moz-appearance: none; - background-color: #666699; + background-color: var(--in-content-category-background); padding-top: 39px; margin: 0; border-width: 0; @@ -534,7 +571,7 @@ xul|*#categories { xul|*.category { -moz-appearance: none; - color: #000000; + color: var(--in-content-category-text); -moz-border-end-width: 0; -moz-padding-start: 15px; -moz-padding-end: 21px; @@ -543,19 +580,19 @@ xul|*.category { } xul|*.category:hover { - background-color: #CCD0DD; + background-color: var(--in-content-category-background-hover); } xul|*.category[selected] { - background-color: #336699; - color: #FFFFFF; + background-color: var(--in-content-category-background-active); + color: var(--in-content-category-text-selected); -moz-padding-start: 11px; /* compensate the 4px border */ - -moz-border-start: solid 4px #33FF33; + -moz-border-start: solid 4px var(--in-content-border-highlight); } xul|*#categories[keyboard-navigation="true"]:-moz-focusring > xul|*.category[current] { - border-top: 1px #ffffff dotted; - border-bottom: 1px #ffffff dotted; + border-top: var(--in-content-category-border-focus); + border-bottom: var(--in-content-category-border-focus); } *|*.category-name { @@ -576,7 +613,7 @@ xul|*#categories[keyboard-navigation="true"]:-moz-focusring > xul|*.category[cur /* *|*.header { -moz-margin-end: 4px; / add the 4px end-margin of other elements / - border-bottom: 1px solid #c8c8c8; + border-bottom: 1px solid var(--in-content-header-border-color); margin-bottom: 15px; padding-bottom: 15px; } @@ -639,9 +676,9 @@ xul|richlistbox, xul|listbox { -moz-appearance: none; -moz-margin-start: 0; - background-color: #fff; - border: 1px solid #c1c1c1; - color: #333; + background-color: var(--in-content-box-background); + border: 1px solid var(--in-content-box-border-color); + color: var(--in-content-text-color); } xul|treechildren::-moz-tree-row, @@ -655,13 +692,13 @@ xul|listbox xul|listitem { xul|treechildren::-moz-tree-row(hover), xul|listbox xul|listitem:hover { - background-color: rgba(0,149,221,0.25); + background-color: var(--in-content-item-hover); } xul|treechildren::-moz-tree-row(selected), xul|listbox xul|listitem[selected="true"] { - background-color: #0095dd; - color: #fff; + background-color: var(--in-content-item-selected); + color: var(--in-content-selected-text); } */ /* Trees */ @@ -669,19 +706,21 @@ xul|listbox xul|listitem[selected="true"] { xul|tree { -moz-appearance: none; font-size: 1em; - border: 1px solid #c1c1c1; + border: 1px solid var(--in-content-box-border-color); + background-color: var(--in-content-box-background); + margin: 0; } xul|tree:-moz-focusring, xul|richlistbox:-moz-focusring { - border: 1px dotted #0095dd; + border: 1px dotted var(--in-content-border-focus); } xul|listheader, xul|treecols { -moz-appearance: none; border: none; - border-bottom: 1px solid #c1c1c1; + border-bottom: 1px solid var(--in-content-box-border-color); padding: 0; } @@ -689,15 +728,15 @@ xul|treecol:not([hideheader="true"]), xul|treecolpicker { -moz-appearance: none; border: none; - background-color: #ebebeb; + background-color: var(--in-content-box-background-hover); color: #808080; padding: 5px 10px; } xul|treecol:not([hideheader="true"]):not([sortable="false"]):hover, xul|treecolpicker:hover { - background-color: #dadada; - color: #333; + background-color: var(--in-content-box-background-active); + color: var(--in-content-text-color); } xul|treecol:not([hideheader="true"]):not(:first-child), @@ -724,11 +763,11 @@ xul|treechildren::-moz-tree-row { / Color needs to be set on tree cell in order to be applied / xul|treechildren::-moz-tree-cell-text { - color: #333; + color: var(--in-content-text-color); } xul|treechildren::-moz-tree-cell-text(selected) { - color: #fff; + color: var(--in-content-selected-text); } */ /* === END common.inc.css === */ diff --git a/EarlyBlue/global/in-content/help-glyph.svg b/EarlyBlue/global/in-content/help-glyph.svg index 738f1d73..1645bd9a 100644 --- a/EarlyBlue/global/in-content/help-glyph.svg +++ b/EarlyBlue/global/in-content/help-glyph.svg @@ -1,8 +1,7 @@ - - + + + diff --git a/EarlyBlue/global/in-content/info-pages.css b/EarlyBlue/global/in-content/info-pages.css index 45f6a0b3..69ed5a59 100644 --- a/EarlyBlue/global/in-content/info-pages.css +++ b/EarlyBlue/global/in-content/info-pages.css @@ -1,89 +1,109 @@ -@import url("chrome://global/skin/in-content/common.css"); -/* Body and container */ -body { - display: flex; - box-sizing: padding-box; - min-height: 100vh; - padding-top: 0; - padding-bottom: 0; - -moz-padding-start: calc(48px + 4.6em); - -moz-padding-end: 48px; - align-items: center; - justify-content: center; -} - -.container { - min-width: 13em; - max-width: 52em; -} - -/* Typography */ -.title { - background-image: url("chrome://browser/skin/aboutNetError_info.svg"); - background-position: left 0; - background-repeat: no-repeat; - background-size: 1.6em; - -moz-margin-start: -2.3em; - -moz-padding-start: 2.3em; - font-size: 2.5em; -} - -.title:-moz-dir(rtl) { - background-position: right 0; -} - -.title-text { - border-bottom: 1px solid #666699; - font-size: inherit; - padding-bottom: 0.4em; -} - -@media (max-width: 675px) { - body { - padding: 0 48px; - } - - .title { - background-image: none !important; - -moz-padding-start: 0; - -moz-margin-start: 0; - } - - .title-text { - padding-top: 0; - } -} - -ul, ol { - margin: 0; - padding: 0; - -moz-margin-start: 1em; -} - -ul > li, ol > li { - margin-bottom: .5em; -} - -ul { - list-style: disc; -} - -/* Buttons */ -.button-container { - margin-top: 1.2em; -} - -.button-container > button { - min-width: 150px; -} - -.button-container > button:first-child { - -moz-margin-start: 0; -} - -/* Trees */ -tree { - min-height: 12em; - margin-top: 1.2em; - width: 100%; -} \ No newline at end of file +/* 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/. */ + +@import url("chrome://global/skin/in-content/common.css"); +/* Body and container */ +body { + display: flex; + flex-direction: column; + box-sizing: border-box; + min-height: 100vh; + padding-top: 0; + padding-bottom: 0; + -moz-padding-start: calc(48px + 4.6em); + -moz-padding-end: 48px; + align-items: center; + justify-content: center; +} + +.container { + min-width: 13em; + max-width: 52em; +} + +.container.restore-chosen { + display: flex; + flex-direction: column; + flex-grow: 1; + margin: 10vh 0; +} + +/* Typography */ +.title { + background-image: url("chrome://browser/skin/aboutNetError_info.svg"); + background-position: left 0; + background-repeat: no-repeat; + background-size: 1.6em; + -moz-margin-start: -2.3em; + -moz-padding-start: 2.3em; + font-size: 2.5em; +} + +.title:-moz-dir(rtl) { + background-position: right 0; +} + +.title-text { + border-bottom: 1px solid #666699; + font-size: inherit; + padding-bottom: 0.4em; +} + +@media (max-width: 675px) { + body { + padding: 0 48px; + } + + .title { + background-image: none !important; + -moz-padding-start: 0; + -moz-margin-start: 0; + } + + .title-text { + padding-top: 0; + } +} + +ul, ol { + margin: 0; + padding: 0; + -moz-margin-start: 1em; +} + +ul > li, ol > li { + margin-bottom: .5em; +} + +ul { + list-style: disc; +} + +/* Buttons */ +.button-container { + margin-top: 1.2em; +} + +.button-container > button { + min-width: 150px; +} + +.button-container > button:first-child { + -moz-margin-start: 0; +} + +/* Trees */ +.tree-container { + margin-top: 1.2em; + flex-grow: 1; + min-height: 12em; +} + +.tree-container > tree { + height: 100%; +} + +tree { + width: 100%; +} diff --git a/EarlyBlue/global/inContentUI.css b/EarlyBlue/global/inContentUI.css deleted file mode 100644 index fa29ca25..00000000 --- a/EarlyBlue/global/inContentUI.css +++ /dev/null @@ -1,42 +0,0 @@ -/* 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/. */ - -/* - * The default namespace for this file is XUL. Be sure to prefix rules that - * are applicable to both XUL and HTML with '*|'. - */ -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); -@namespace html url("http://www.w3.org/1999/xhtml"); - -/* Page background */ -*|*:root { - background-color: #CCD0DD; - color: #000000; - margin: 20px; -} - -html|html { - font: 11px "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif; -} - -/* Use the new in-content colors for #contentAreaDownloadsView. After landing - of bug 989469 the colors can be moved to *|*:root */ -*|*#contentAreaDownloadsView { - background: #CCD0DD; - color: #000000; -} - -/* Content */ -*|*.main-content { - /* Needed to allow the radius to clip the inner content, see bug 595656 */ - overflow: hidden; - background-color: #FFFFFF; - border: 1px solid #666699; -} - -colorpicker[type="button"] { - margin: 1px 5px 2px 5px; - padding: 3px; - height: 25px; -} diff --git a/EarlyBlue/global/media/videoClickToPlayButton.svg b/EarlyBlue/global/media/videoClickToPlayButton.svg index f118afb0..68c63a79 100644 --- a/EarlyBlue/global/media/videoClickToPlayButton.svg +++ b/EarlyBlue/global/media/videoClickToPlayButton.svg @@ -1,6 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + menu, popup > menu, menupopup > menuitem, -popup > menuitem { +popup > menuitem, +menupopup > menucaption { padding: 2px; } /* ::::: menu/menuitems in menulist popups ::::: */ menulist > menupopup > menuitem, +menulist > menupopup > menucaption, menulist > menupopup > menu { padding: 1px 5px; max-width: none; @@ -110,6 +113,12 @@ menulist > menupopup > menu { font-weight: inherit; } +menucaption > .menu-text, +menucaption > .menu-iconic-text { + font-weight: bold; + -moz-padding-start: 0 !important; +} + .menu-description { font-style: italic; color: #808080; @@ -181,6 +190,7 @@ menulist > menupopup > menu { } menulist > menupopup > menuitem > .menu-iconic-left, +menulist > menupopup > menucaption > .menu-iconic-left, menulist > menupopup > menu > .menu-iconic-left { display: none; } diff --git a/EarlyBlue/global/popup.css b/EarlyBlue/global/popup.css index 0e4b896b..ec2fd0a1 100644 --- a/EarlyBlue/global/popup.css +++ b/EarlyBlue/global/popup.css @@ -10,6 +10,7 @@ /* ::::: Variables ::::: */ .panel-arrowcontent { + --panel-arrowcontent-padding: 6px; --panel-arrowcontent-background: #CCD0DD; --panel-arrowcontent-color: #000000; --panel-arrowcontent-border: 1px outset #CCD0DD; @@ -51,7 +52,7 @@ panel[type="arrow"][side="right"] { } .panel-arrowcontent { - padding: 6px; + padding: var(--panel-arrowcontent-padding); color: var(--panel-arrowcontent-color); background: var(--panel-arrowcontent-background); background-clip: padding-box; diff --git a/EarlyBlue/global/reader/RM-Add-24x24.svg b/EarlyBlue/global/reader/RM-Add-24x24.svg index 66551ef1..20713815 100644 --- a/EarlyBlue/global/reader/RM-Add-24x24.svg +++ b/EarlyBlue/global/reader/RM-Add-24x24.svg @@ -1,6 +1,7 @@ - - + + + diff --git a/EarlyBlue/global/reader/RM-Close-24x24.svg b/EarlyBlue/global/reader/RM-Close-24x24.svg index b0674b2d..e57a475b 100644 --- a/EarlyBlue/global/reader/RM-Close-24x24.svg +++ b/EarlyBlue/global/reader/RM-Close-24x24.svg @@ -2,30 +2,24 @@ - + - - - + - - \ No newline at end of file + diff --git a/EarlyBlue/global/reader/RM-Delete-24x24.svg b/EarlyBlue/global/reader/RM-Delete-24x24.svg index 6010fbe7..0ed39830 100644 --- a/EarlyBlue/global/reader/RM-Delete-24x24.svg +++ b/EarlyBlue/global/reader/RM-Delete-24x24.svg @@ -1,6 +1,7 @@ - - + + + diff --git a/EarlyBlue/global/reader/RM-Minus-24x24.svg b/EarlyBlue/global/reader/RM-Minus-24x24.svg index 9da7e03b..e85a3976 100644 --- a/EarlyBlue/global/reader/RM-Minus-24x24.svg +++ b/EarlyBlue/global/reader/RM-Minus-24x24.svg @@ -1,39 +1,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/EarlyBlue/global/reader/RM-Plus-24x24.svg b/EarlyBlue/global/reader/RM-Plus-24x24.svg index 249912a1..f3a98ddb 100644 --- a/EarlyBlue/global/reader/RM-Plus-24x24.svg +++ b/EarlyBlue/global/reader/RM-Plus-24x24.svg @@ -1,39 +1,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/EarlyBlue/global/reader/RM-Reading-List-24x24.svg b/EarlyBlue/global/reader/RM-Reading-List-24x24.svg index 1f21efd5..b43a8b89 100644 --- a/EarlyBlue/global/reader/RM-Reading-List-24x24.svg +++ b/EarlyBlue/global/reader/RM-Reading-List-24x24.svg @@ -1,46 +1,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/EarlyBlue/global/reader/RM-Type-Controls-24x24.svg b/EarlyBlue/global/reader/RM-Type-Controls-24x24.svg index a25429ad..8a5a2125 100644 --- a/EarlyBlue/global/reader/RM-Type-Controls-24x24.svg +++ b/EarlyBlue/global/reader/RM-Type-Controls-24x24.svg @@ -1,23 +1,8 @@ - - - - - + + + + diff --git a/EarlyBlue/global/reader/RM-Type-Controls-Arrow.svg b/EarlyBlue/global/reader/RM-Type-Controls-Arrow.svg index 9094d8a3..837392ff 100644 --- a/EarlyBlue/global/reader/RM-Type-Controls-Arrow.svg +++ b/EarlyBlue/global/reader/RM-Type-Controls-Arrow.svg @@ -1,42 +1,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/EarlyBlue/global/reader/pocket.svg b/EarlyBlue/global/reader/pocket.svg index 63b22fa6..d93fd6a1 100644 --- a/EarlyBlue/global/reader/pocket.svg +++ b/EarlyBlue/global/reader/pocket.svg @@ -1,7 +1,8 @@ - + + - - + + diff --git a/EarlyBlue/mozapps/extensions/extensions.css b/EarlyBlue/mozapps/extensions/extensions.css index 87f8306d..bf975b93 100644 --- a/EarlyBlue/mozapps/extensions/extensions.css +++ b/EarlyBlue/mozapps/extensions/extensions.css @@ -368,7 +368,7 @@ .list { margin: 0; - border: none; + border-width: 0 !important; background-color: transparent; } diff --git a/EarlyBlue/mozapps/extensions/utilities.svg b/EarlyBlue/mozapps/extensions/utilities.svg index 29c5be1b..9cac8680 100644 --- a/EarlyBlue/mozapps/extensions/utilities.svg +++ b/EarlyBlue/mozapps/extensions/utilities.svg @@ -1,11 +1,8 @@ - + + - + diff --git a/EarlyBlue/mozapps/places/defaultFavicon@2x.png b/EarlyBlue/mozapps/places/defaultFavicon@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..113d12f8138f1af897051c05918eb5a6690afd0a GIT binary patch literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@o&cW^S5x)(X=!Kv{re9DPrOzX z0>v3ig8YIR9G=}s196hP-CY tr:last-child > td:last-child { border-bottom-right-radius: 9px; } -thead th { - text-align: center; -} - -th { - text-align: start; - background-color: #008484; - color: #FFCF00; -} - th.column { white-space: nowrap; width: 0px; @@ -113,7 +121,7 @@ tr:not(:first-child) > td, tr:not(:first-child) > th, tbody:not(:first-child) > tr > td, tbody:not(:first-child) > tr > th { - border-top: 1px dotted #9C9FFF; + border-top: 1px dotted var(--in-content-table-border-dark-color); } td { @@ -138,9 +146,9 @@ td { } #action-box { - background-color: #000000; - border: 1px solid #9C9CFF; - color: #FF9F00; + background-color: var(--aboutSupport-table-background); + border: 1px solid var(--in-content-border-color); + color: var(--in-content-text-color); float: right; margin-top: 2em; margin-bottom: 20px; diff --git a/LCARStrek/global/arrow/panelarrow-horizontal.svg b/LCARStrek/global/arrow/panelarrow-horizontal.svg index d53a9a06..abbf94fb 100644 --- a/LCARStrek/global/arrow/panelarrow-horizontal.svg +++ b/LCARStrek/global/arrow/panelarrow-horizontal.svg @@ -2,12 +2,7 @@ - - - - + + + diff --git a/LCARStrek/global/arrow/panelarrow-vertical.svg b/LCARStrek/global/arrow/panelarrow-vertical.svg index 082bd207..c116521d 100644 --- a/LCARStrek/global/arrow/panelarrow-vertical.svg +++ b/LCARStrek/global/arrow/panelarrow-vertical.svg @@ -2,12 +2,7 @@ - - - - + + + diff --git a/LCARStrek/global/icons/autocomplete-search.svg b/LCARStrek/global/icons/autocomplete-search.svg index fdd54a3b..096c1959 100644 --- a/LCARStrek/global/icons/autocomplete-search.svg +++ b/LCARStrek/global/icons/autocomplete-search.svg @@ -2,32 +2,21 @@ - - - - - - - + + + + + + + diff --git a/LCARStrek/global/in-content/common.css b/LCARStrek/global/in-content/common.css index d16a367b..9a2975f6 100644 --- a/LCARStrek/global/in-content/common.css +++ b/LCARStrek/global/in-content/common.css @@ -7,13 +7,54 @@ @namespace html "http://www.w3.org/1999/xhtml"; @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; +*|*:root { + --in-content-page-color: #FF9F00; + --in-content-page-background: #000000; + --in-content-text-color: #FF9F00; + --in-content-selected-text: #000000; + ---in-content-header-border-color: #c8c8c8; + --in-content-button-background: #C09070; + --in-content-box-background: #000000; + ---in-content-box-background-odd: #f3f6fa; + --in-content-box-background-hover: #FFCF00; + --in-content-box-background-active: #FF9F00; + --in-content-box-background-disabled: #402858; + --in-content-box-border-color: #FF9F00; + ---in-content-item-hover: rgba(0,149,221,0.25); + ---in-content-item-selected: #0095dd; + ---in-content-border-highlight: #33FF33; + --in-content-border-focus: #FFCF00; + --in-content-border-color: #9C9CFF; + --in-content-border-disabled: #8050B0; + --in-content-category-text: #FFCF00; + --in-content-category-border-focus: 1px dotted #000000; + --in-content-category-text-selected: #000000; + --in-content-categorylist-background: #A09090; + --in-content-category-background: #000000; + --in-content-category-background-hover: #FFCF00; + --in-content-category-background-active: #008484; + ---in-content-tab-color: #424f5a; + --in-content-link-color: #3333FF; + --in-content-link-color-hover: #FFCF00; + --in-content-link-color-active: #FF9F00; + --in-content-link-color-visited: #6000CF; + --in-content-primary-button-background: #A06060; + --in-content-primary-button-background-hover: #FFCF00; + --in-content-primary-button-background-active: #FF9F00; + --in-content-table-border-dark-color: #9C9CFF; + --in-content-table-header-background: #A09090; + ---in-content-help-button-background: #ffcb00; + ---in-content-help-button-background-hover: #f4c200; + ---in-content-help-button-background-active: #eaba00; + --in-content-disabled-text: #8050B0; +} html|body, xul|page, xul|window { font: 11px "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif; -moz-appearance: none; - background-color: #000000; - color: #FF9F00; + background-color: var(--in-content-page-background); + color: var(--in-content-page-color); } html|body { @@ -26,14 +67,14 @@ html|h1 { font-size: 2.5em; font-weight: lighter; line-height: 1.2; - color: #9C9CFF; + color: var(--in-content-text-color); margin: 0; margin-bottom: .5em; } html|hr { border-style: solid none none none; - border-color: #9C9CFF; + border-color: var(--in-content-border-color); } xul|caption { @@ -89,9 +130,9 @@ xul|tabpanels { xul|tabs { margin-bottom: 15px; - border-top: 1px solid #c1c1c1; - border-bottom: 1px solid #c1c1c1; - background-color: #fbfbfb; + border-top: 1px solid var(--in-content-box-border-color); + border-bottom: 1px solid var(--in-content-box-border-color); + background-color: var(--in-content-page-background); } xul|*.tabs-left, @@ -104,20 +145,20 @@ xul|tab { margin-top: 0; padding: 4px 20px; min-height: 44px; - color: #424f5a; - background-color: #fbfbfb; + color: var(--in-content-tab-color); + background-color: var(--in-content-page-background); border-width: 0; transition: background-color 50ms ease 0s; } xul|tab:hover { - background-color: #ebebeb; + background-color: var(--in-content-box-background-hover); } -xul|tab[visuallyselected] { - background-color: #ebebeb; +xul|tab[selected] { + background-color: var(--in-content-box-background-hover); padding-bottom: 0; / compensate the 4px border / - border-bottom: 4px solid #ff9500; + border-bottom: 4px solid var(--in-content-border-highlight); } xul|*.tab-text { @@ -130,8 +171,8 @@ xul|*.tab-text { html|button { border-radius: 300px; border: none; - background-color: #C09070; - color: #000000; + background-color: var(--in-content-button-background); + color: var(--in-content-selected-text); /* override forms.css */ font: inherit; } @@ -143,31 +184,30 @@ xul|colorpicker[type="button"], xul|menulist { -moz-appearance: none; height: 30px; - color: #333; - line-height: 20px; - border: 1px solid #c1c1c1; + color: var(--in-content-text-color); + border: 1px solid var(--in-content-box-border-color); -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; + background-color: var(--in-content-page-background); } */ html|button:enabled:hover, xul|button:not([disabled="true"]):hover, xul|colorpicker[type="button"]:not([disabled="true"]):hover, xul|menulist:not([disabled="true"]):hover { - background-color: #FFCF00; - color: #000000; + background-color: var(--in-content-box-background-hover); + color: var(--in-content-selected-text); } 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"]) { - background-color: #FF9F00; - color: #000000; + background-color: var(--in-content-box-background-active); + color: var(--in-content-selected-text); } html|button:disabled, @@ -175,22 +215,22 @@ xul|button[disabled="true"], xul|colorpicker[type="button"][disabled="true"], xul|menulist[disabled="true"] { cursor: not-allowed; - background-color: #402858; - color: #000000; + background-color: var(--in-content-box-background-disabled); + color: var(--in-content-selected-text); } *|button.primary { - background-color: #A06060; + background-color: var(--in-content-primary-button-background); } html|button.primary:enabled:hover, xul|button.primary:not([disabled="true"]):hover { - background-color: #FFCF00; + background-color: var(--in-content-primary-button-background-hover); } html|button.primary:enabled:hover:active, xul|button.primary:not([disabled="true"]):hover:active { - background-color: #FF9F00; + background-color: var(--in-content-primary-button-background-active); } /* xul|colorpicker[type="button"] { @@ -316,9 +356,9 @@ xul|menulist[disabled="true"]:not([editable="true"]) > xul|*.menulist-dropmarker xul|menulist > xul|menupopup, xul|button[type="menu"] > xul|menupopup { -moz-appearance: none; - border: 1px solid #c1c1c1; + border: 1px solid var(--in-content-box-border-color); border-radius: 2px; - background-color: #fff; + background-color: var(--in-content-box-background); } xul|menulist > xul|menupopup xul|menu, @@ -327,7 +367,7 @@ xul|button[type="menu"] > xul|menupopup xul|menu, xul|button[type="menu"] > xul|menupopup xul|menuitem { -moz-appearance: none; font-size: 1rem; - color: #333; + color: var(--in-content-text-color); padding-top: 0.2em; padding-bottom: 0.2em; -moz-padding-start: 10px; @@ -338,16 +378,16 @@ xul|menulist > xul|menupopup > xul|menu:not([disabled="true"])[_moz-menuactive=" xul|menulist > xul|menupopup > xul|menuitem:not([disabled="true"])[_moz-menuactive="true"], xul|button[type="menu"] > xul|menupopup > xul|menu:not([disabled="true"])[_moz-menuactive="true"], xul|button[type="menu"] > xul|menupopup > xul|menuitem:not([disabled="true"])[_moz-menuactive="true"] { - color: #333; - background-color: rgba(0,149,221,0.25); + color: var(--in-content-text-color); + background-color: var(--in-content-item-hover); } xul|menulist > xul|menupopup > xul|menu:not([disabled="true"])[selected="true"], xul|menulist > xul|menupopup > xul|menuitem:not([disabled="true"])[selected="true"], xul|button[type="menu"] > xul|menupopup > xul|menu:not([disabled="true"])[selected="true"], xul|button[type="menu"] > xul|menupopup > xul|menuitem:not([disabled="true"])[selected="true"] { - color: #fff; - background-color: #0095dd; + color: var(--in-content-selected-text); + background-color: var(--in-content-item-selected); } xul|menulist > xul|menupopup > xul|menu[disabled="true"], @@ -365,7 +405,7 @@ xul|button[type="menu"] > xul|menupopup xul|menuseparator { -moz-appearance: none; margin: 0; padding: 0; - border-top: 1px solid #c1c1c1; + border-top: 1px solid var(--in-content-box-border-color); border-bottom: none; } */ @@ -374,22 +414,22 @@ xul|button[type="menu"] > xul|menupopup xul|menuseparator { *|textbox { -moz-appearance: none; height: 30px; - color: #333; + color: var(--in-content-text-color); line-height: 20px; padding-right: 10px; padding-left: 10px; - border: 1px solid #c1c1c1; + border: 1px solid var(--in-content-box-border-color); -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; + background-color: var(--in-content-box-background); } html|textbox:focus, xul|textbox[focused] { - border-color: #0095dd; + border-color: var(--in-content-border-focus); } html|textbox:disabled, @@ -402,25 +442,25 @@ xul|textbox[disabled="true"] { html|a, .text-link, .inline-link { - color: #3333FF; + color: var(--in-content-link-color); text-decoration: none; } -html|a:visited { - color: #6000CF; -} - html|a:hover, .text-link:hover, .inline-link:hover { - color: #FFCF00; + color: var(--in-content-link-color-hover); text-decoration: underline; } +html|a:visited { + color: var(--in-content-link-color-visited); +} + html|a:hover:active, .text-link:hover:active, .inline-link:hover:active { - color: #FF9F00; + color: var(--in-content-link-color-active); text-decoration: underline; } @@ -452,19 +492,19 @@ html|input[type="checkbox"] + html|label:before { width: 23px; height: 23px; border-radius: 0; - border: 1px solid #FF9F00; + border: 1px solid var(--in-content-box-border-color); -moz-margin-end: 10px; - background-color: #000000; + background-color: var(--in-content-box-background); background-position: center center; background-repeat: no-repeat; } /* xul|checkbox:not([disabled="true"]):hover > xul|*.checkbox-check, */ html|input[type="checkbox"]:not(:disabled) + html|label:hover:before { - border-color: #FFCF00; + border-color: var(--in-content-border-focus); } html|input[type="checkbox"]:not(:disabled) + html|label:hover { - color: #FFCF00; + color: var(--in-content-link-color-hover); } /* xul|*.checkbox-check[checked] { @@ -485,10 +525,10 @@ html|input[type="checkbox"]:not(:disabled) + html|label:hover:before { background-image: url("chrome://global/skin/in-content/check.svg#check-hover"); } html|input[type="checkbox"]:disabled + html|label:before { - border-color: #8050B0; + border-color: var(--in-content-border-disabled); } html|input[type="checkbox"]:disabled + html|label { - color: #8050B0; + color: var(--in-content-disabled-text); } /* xul|*.checkbox-label-box { @@ -508,7 +548,7 @@ xul|*.radio-check { -moz-appearance: none; width: 23px; height: 23px; - border: 1px solid #c1c1c1; + border: 1px solid var(--in-content-box-border-color); border-radius: 50%; -moz-margin-end: 10px; background-color: #f1f1f1; @@ -517,7 +557,7 @@ xul|*.radio-check { } xul|radio:not([disabled="true"]):hover > xul|*.radio-check { - border-color: #0095dd; + border-color: var(--in-content-border-focus); } xul|*.radio-check[selected] { @@ -537,7 +577,7 @@ xul|*.radio-label-box { /* Category List */ xul|*#categories { - background-color: #A09090; + background-color: var(--in-content-categorylist-background); padding-top: 4em; margin: 0; border-radius: 1em 0 0 0; @@ -545,8 +585,8 @@ xul|*#categories { } xul|*.category { - background-color: #000000; - color: #FFCF00; + background-color: var(--in-content-category-background); + color: var(--in-content-category-text); -moz-border-end-width: 0; -moz-padding-start: 15px; -moz-padding-end: 21px; @@ -555,18 +595,18 @@ xul|*.category { } xul|*.category:hover { - background-color: #FFCF00; - color: #000000; + background-color: var(--in-content-category-background-hover); + color: var(--in-content-category-text-selected); } xul|*.category[selected] { - background-color: #008484; - color: #000000; + background-color: var(--in-content-category-background-active); + color: var(--in-content-category-text-selected); } xul|*#categories[keyboard-navigation="true"]:-moz-focusring > xul|*.category[current] { - border-top: 1px dotted #000000; - border-bottom: 1px dotted #000000; + border-top: var(--in-content-category-border-focus); + border-bottom: var(--in-content-category-border-focus); } *|*.category-name { @@ -587,7 +627,7 @@ xul|*#categories[keyboard-navigation="true"]:-moz-focusring > xul|*.category[cur *|*.header { /* -moz-margin-end: 4px; / add the 4px end-margin of other elements / - border-bottom: 1px solid #A09090; + border-bottom: 1px solid var(--in-content-header-border-color); margin-bottom: 15px; padding-bottom: 15px; */ } @@ -650,9 +690,9 @@ xul|richlistbox, xul|listbox { -moz-appearance: none; -moz-margin-start: 0; - background-color: #fff; - border: 1px solid #c1c1c1; - color: #333; + background-color: var(--in-content-box-background); + border: 1px solid var(--in-content-box-border-color); + color: var(--in-content-text-color); } xul|treechildren::-moz-tree-row, @@ -666,13 +706,13 @@ xul|listbox xul|listitem { xul|treechildren::-moz-tree-row(hover), xul|listbox xul|listitem:hover { - background-color: rgba(0,149,221,0.25); + background-color: var(--in-content-item-hover); } xul|treechildren::-moz-tree-row(selected), xul|listbox xul|listitem[selected="true"] { - background-color: #0095dd; - color: #fff; + background-color: var(--in-content-item-selected); + color: var(--in-content-selected-text); } / This is the only way to increase the height of a tree row unfortunately / @@ -694,20 +734,21 @@ xul|treechildren::-moz-tree-cell-text(selected) { xul|tree { -moz-appearance: none; font-size: 1em; - border: 1px solid #c1c1c1; + border: 1px solid var(--in-content-box-border-color); + background-color: var(--in-content-box-background); margin: 0; } xul|tree:-moz-focusring, xul|richlistbox:-moz-focusring { - border: 1px dotted #0095dd; + border: 1px dotted var(--in-content-border-focus); } xul|listheader, xul|treecols { -moz-appearance: none; border: none; - border-bottom: 1px solid #c1c1c1; + border-bottom: 1px solid var(--in-content-border-color); padding: 0; } @@ -715,15 +756,15 @@ xul|treecol:not([hideheader="true"]), xul|treecolpicker { -moz-appearance: none; border: none; - background-color: #ebebeb; + background-color: var(--in-content-box-background-hover); color: #808080; padding: 5px 10px; } xul|treecol:not([hideheader="true"]):not([sortable="false"]):hover, xul|treecolpicker:hover { - background-color: #dadada; - color: #333; + background-color: var(--in-content-box-background-active); + color: var(--in-content-text-color); } xul|treecol:not([hideheader="true"]):not(:first-child), @@ -742,6 +783,20 @@ xul|treecol:not([hideheader="true"]) > xul|*.treecol-sortdirection[sortDirection xul|treecol:not([hideheader="true"]) > xul|*.treecol-sortdirection[sortDirection="ascending"] { transform: scaleY(-1); } + +/ This is the only way to increase the height of a tree row unfortunately / +xul|treechildren::-moz-tree-row { + min-height: 2em; +} + +/ Color needs to be set on tree cell in order to be applied / +xul|treechildren::-moz-tree-cell-text { + color: var(--in-content-text-color); +} + +xul|treechildren::-moz-tree-cell-text(selected) { + color: var(--in-content-selected-text); +} */ /* === END common.inc.css === */ /* diff --git a/LCARStrek/global/in-content/help-glyph.svg b/LCARStrek/global/in-content/help-glyph.svg index 738f1d73..1645bd9a 100644 --- a/LCARStrek/global/in-content/help-glyph.svg +++ b/LCARStrek/global/in-content/help-glyph.svg @@ -1,8 +1,7 @@ - - + + + diff --git a/LCARStrek/global/in-content/info-pages.css b/LCARStrek/global/in-content/info-pages.css index 9bcb30ab..902b1f87 100644 --- a/LCARStrek/global/in-content/info-pages.css +++ b/LCARStrek/global/in-content/info-pages.css @@ -1,106 +1,109 @@ -@import url("chrome://global/skin/in-content/common.css"); -/* Body and container */ -body { - display: flex; - flex-direction: column; - box-sizing: padding-box; - min-height: 100vh; - padding-top: 0; - padding-bottom: 0; - -moz-padding-start: calc(48px + 4.6em); - -moz-padding-end: 48px; - align-items: center; - justify-content: center; -} - -.container { - min-width: 13em; - max-width: 52em; -} - -.container.flex, -.container.restore-chosen { - display: flex; - flex-direction: column; - flex-grow: 1; - margin: 10vh 0; -} - -/* Typography */ -.title { - background-image: url("chrome://browser/skin/aboutNetError_info.svg"); - background-position: left 0; - background-repeat: no-repeat; - background-size: 1.6em; - -moz-margin-start: -2.3em; - -moz-padding-start: 2.3em; - font-size: 2.5em; -} - -.title:-moz-dir(rtl) { - background-position: right 0; -} - -.title-text { - border-bottom: 1px solid #A09090; - font-size: inherit; - padding-bottom: 0.4em; -} - -@media (max-width: 675px) { - body { - padding: 0 48px; - } - - .title { - background-image: none !important; - -moz-padding-start: 0; - -moz-margin-start: 0; - } - - .title-text { - padding-top: 0; - } -} - -ul, ol { - margin: 0; - padding: 0; - -moz-margin-start: 1em; -} - -ul > li, ol > li { - margin-bottom: .5em; -} - -ul { - list-style: disc; -} - -/* Buttons */ -.button-container { - margin-top: 1.2em; -} - -.button-container > button { - min-width: 150px; -} - -.button-container > button:first-child { - -moz-margin-start: 0; -} - -/* Trees */ -.tree-container { - margin-top: 1.2em; - flex-grow: 1; - min-height: 12em; -} - -.tree-container > tree { - height: 100%; -} - -tree { - width: 100%; -} +/* 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/. */ + +@import url("chrome://global/skin/in-content/common.css"); +/* Body and container */ +body { + display: flex; + flex-direction: column; + box-sizing: border-box; + min-height: 100vh; + padding-top: 0; + padding-bottom: 0; + -moz-padding-start: calc(48px + 4.6em); + -moz-padding-end: 48px; + align-items: center; + justify-content: center; +} + +.container { + min-width: 13em; + max-width: 52em; +} + +.container.restore-chosen { + display: flex; + flex-direction: column; + flex-grow: 1; + margin: 10vh 0; +} + +/* Typography */ +.title { + background-image: url("chrome://browser/skin/aboutNetError_info.svg"); + background-position: left 0; + background-repeat: no-repeat; + background-size: 1.6em; + -moz-margin-start: -2.3em; + -moz-padding-start: 2.3em; + font-size: 2.5em; +} + +.title:-moz-dir(rtl) { + background-position: right 0; +} + +.title-text { + border-bottom: 1px solid #A09090; + font-size: inherit; + padding-bottom: 0.4em; +} + +@media (max-width: 675px) { + body { + padding: 0 48px; + } + + .title { + background-image: none !important; + -moz-padding-start: 0; + -moz-margin-start: 0; + } + + .title-text { + padding-top: 0; + } +} + +ul, ol { + margin: 0; + padding: 0; + -moz-margin-start: 1em; +} + +ul > li, ol > li { + margin-bottom: .5em; +} + +ul { + list-style: disc; +} + +/* Buttons */ +.button-container { + margin-top: 1.2em; +} + +.button-container > button { + min-width: 150px; +} + +.button-container > button:first-child { + -moz-margin-start: 0; +} + +/* Trees */ +.tree-container { + margin-top: 1.2em; + flex-grow: 1; + min-height: 12em; +} + +.tree-container > tree { + height: 100%; +} + +tree { + width: 100%; +} diff --git a/LCARStrek/global/inContentUI.css b/LCARStrek/global/inContentUI.css index 78940c0b..0e5971d0 100644 --- a/LCARStrek/global/inContentUI.css +++ b/LCARStrek/global/inContentUI.css @@ -2,6 +2,9 @@ * 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/. */ +/* THIS FILE HAS BEEN DELETED IN THE ORIGINAL THEME. + * We keep it only as long as some LCARStrek stuff still refers to it. */ + /* * The default namespace for this file is XUL. Be sure to prefix rules that * are applicable to both XUL and HTML with '*|'. diff --git a/LCARStrek/global/media/videoClickToPlayButton.svg b/LCARStrek/global/media/videoClickToPlayButton.svg index 62ee0448..13727998 100644 --- a/LCARStrek/global/media/videoClickToPlayButton.svg +++ b/LCARStrek/global/media/videoClickToPlayButton.svg @@ -1,79 +1,30 @@ - - + - - - - + + + + - + - - + + - - + + - - + + - - - - - + + + + + diff --git a/LCARStrek/global/menu.css b/LCARStrek/global/menu.css index dafa9ea2..269d8d60 100644 --- a/LCARStrek/global/menu.css +++ b/LCARStrek/global/menu.css @@ -12,6 +12,7 @@ menu, menuitem, +menucaption, .splitmenu-menuitem { -moz-box-align: center; max-width: 42em; @@ -77,13 +78,15 @@ menuitem.spell-suggestion { menupopup > menu, popup > menu, menupopup > menuitem, -popup > menuitem { +popup > menuitem, +menupopup > menucaption { padding: 2px; } /* ::::: menu/menuitems in menulist popups ::::: */ menulist > menupopup > menuitem, +menulist > menupopup > menucaption, menulist > menupopup > menu { padding: 1px 5px; max-width: none; @@ -110,6 +113,12 @@ menulist > menupopup > menu { font-weight: inherit; } +menucaption > .menu-text, +menucaption > .menu-iconic-text { + font-weight: bold; + -moz-padding-start: 0 !important; +} + .menu-description { font-style: italic; color: #9C9CFF; @@ -181,6 +190,7 @@ menulist > menupopup > menu { } menulist > menupopup > menuitem > .menu-iconic-left, +menulist > menupopup > menucaption > .menu-iconic-left, menulist > menupopup > menu > .menu-iconic-left { display: none; } diff --git a/LCARStrek/global/popup.css b/LCARStrek/global/popup.css index 00661adf..1e5968e7 100644 --- a/LCARStrek/global/popup.css +++ b/LCARStrek/global/popup.css @@ -10,6 +10,7 @@ /* ::::: Variables ::::: */ .panel-arrowcontent { + --panel-arrowcontent-padding: 6px; --panel-arrowcontent-background: #000000; --panel-arrowcontent-color: #FF9F00; --panel-arrowcontent-border: 1px solid #FF9F00; @@ -52,7 +53,7 @@ panel[type="arrow"][side="right"] { .panel-arrowcontent { border-radius: 6px; - padding: 6px; + padding: var(--panel-arrowcontent-padding); color: var(--panel-arrowcontent-color); background: var(--panel-arrowcontent-background); background-clip: padding-box; diff --git a/LCARStrek/global/reader/RM-Add-24x24.svg b/LCARStrek/global/reader/RM-Add-24x24.svg index 66551ef1..20713815 100644 --- a/LCARStrek/global/reader/RM-Add-24x24.svg +++ b/LCARStrek/global/reader/RM-Add-24x24.svg @@ -1,6 +1,7 @@ - - + + + diff --git a/LCARStrek/global/reader/RM-Close-24x24.svg b/LCARStrek/global/reader/RM-Close-24x24.svg index b0674b2d..e57a475b 100644 --- a/LCARStrek/global/reader/RM-Close-24x24.svg +++ b/LCARStrek/global/reader/RM-Close-24x24.svg @@ -2,30 +2,24 @@ - + - - - + - - \ No newline at end of file + diff --git a/LCARStrek/global/reader/RM-Delete-24x24.svg b/LCARStrek/global/reader/RM-Delete-24x24.svg index 6010fbe7..0ed39830 100644 --- a/LCARStrek/global/reader/RM-Delete-24x24.svg +++ b/LCARStrek/global/reader/RM-Delete-24x24.svg @@ -1,6 +1,7 @@ - - + + + diff --git a/LCARStrek/global/reader/RM-Minus-24x24.svg b/LCARStrek/global/reader/RM-Minus-24x24.svg index 9da7e03b..e85a3976 100644 --- a/LCARStrek/global/reader/RM-Minus-24x24.svg +++ b/LCARStrek/global/reader/RM-Minus-24x24.svg @@ -1,39 +1,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/LCARStrek/global/reader/RM-Plus-24x24.svg b/LCARStrek/global/reader/RM-Plus-24x24.svg index 249912a1..f3a98ddb 100644 --- a/LCARStrek/global/reader/RM-Plus-24x24.svg +++ b/LCARStrek/global/reader/RM-Plus-24x24.svg @@ -1,39 +1,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/LCARStrek/global/reader/RM-Reading-List-24x24.svg b/LCARStrek/global/reader/RM-Reading-List-24x24.svg index 1f21efd5..b43a8b89 100644 --- a/LCARStrek/global/reader/RM-Reading-List-24x24.svg +++ b/LCARStrek/global/reader/RM-Reading-List-24x24.svg @@ -1,46 +1,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/LCARStrek/global/reader/RM-Type-Controls-24x24.svg b/LCARStrek/global/reader/RM-Type-Controls-24x24.svg index a25429ad..8a5a2125 100644 --- a/LCARStrek/global/reader/RM-Type-Controls-24x24.svg +++ b/LCARStrek/global/reader/RM-Type-Controls-24x24.svg @@ -1,23 +1,8 @@ - - - - - + + + + diff --git a/LCARStrek/global/reader/RM-Type-Controls-Arrow.svg b/LCARStrek/global/reader/RM-Type-Controls-Arrow.svg index 9094d8a3..837392ff 100644 --- a/LCARStrek/global/reader/RM-Type-Controls-Arrow.svg +++ b/LCARStrek/global/reader/RM-Type-Controls-Arrow.svg @@ -1,42 +1,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/LCARStrek/global/reader/pocket.svg b/LCARStrek/global/reader/pocket.svg index 63b22fa6..d93fd6a1 100644 --- a/LCARStrek/global/reader/pocket.svg +++ b/LCARStrek/global/reader/pocket.svg @@ -1,7 +1,8 @@ - + + - - + + diff --git a/LCARStrek/mozapps/extensions/extensions.css b/LCARStrek/mozapps/extensions/extensions.css index 0599cb83..1253434a 100644 --- a/LCARStrek/mozapps/extensions/extensions.css +++ b/LCARStrek/mozapps/extensions/extensions.css @@ -409,10 +409,18 @@ .list { margin: 0; - border-color: transparent; + border-width: 0 !important; background-color: transparent; } +.list > scrollbox > .scrollbox-innerbox { + border: 1px dotted transparent; +} + +.list:-moz-focusring > scrollbox > .scrollbox-innerbox { + border-color: #008484; +} + .addon { border-bottom: 1px solid #9C9CFF; padding: 5px; diff --git a/LCARStrek/mozapps/extensions/utilities.svg b/LCARStrek/mozapps/extensions/utilities.svg index 250f4c3c..cc55099a 100644 --- a/LCARStrek/mozapps/extensions/utilities.svg +++ b/LCARStrek/mozapps/extensions/utilities.svg @@ -1,11 +1,8 @@ - + + - + diff --git a/LCARStrek/mozapps/places/defaultFavicon.png b/LCARStrek/mozapps/places/defaultFavicon.png index 9daec6a05cbead960c12a3101ab0d68e53cc4409..c3b62f6b9e02e4233c23009e7e2c6b41928218e8 100644 GIT binary patch delta 89 zcmV-f0H*)90jdFzBo78qOjJdGnt%VF0Kd2^n2|s@Ki>)v77z?>%F5gT0013HL_t&t v*JEH{V35vXaA06?U}9ik!pAVX0aObBP{sqMJ*8s%00000NkvXXu0mjf!v-K} delta 102 zcmZ3*xSer=iVS0Mkh>GZx^prw85kJY0(?STf%O0R3~$w>zfUx_u)odC&cMq$``uAB zpt!83i(?4K_2h(v1cTFw1qn=w3Jt~+ZVIpkNHQ}s1YBYcZ9nv-9;lGP)78&qol`;+ E07?xXi2wiq diff --git a/LCARStrek/mozapps/places/defaultFavicon@2x.png b/LCARStrek/mozapps/places/defaultFavicon@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..dba16a0b8568059a250aaf1b73214db9a37ad15c GIT binary patch literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnL3?x0byx0z;*aCb)TwSf}|IcR#m)lti6k#k0 z@(X5gcy=QV#7XjYcVXyYmGuB}I14-?iy0WWg+Z8+Vb&Z8pdfpRr>`sfeJ%kpeyMPm zLZBRjY-UJAiF1B#Zfaf$kjuc}T$GwvlA5AWo>`Ki;O^-gkfN8$4is1Lba4#fxSpKQ v!2GRpD!&4YgoJ^?hXukM4#JTp;tdQ8D;{$1WZy8m4`hg^tDnm{r-UW|s%