update to 41.0b2

1 files changed, 129 insertions, 68 deletions

diff --git a/arc-firefox-theme/chrome/global/in-content/common.css b/arc-firefox-theme/chrome/global/in-content/common.css
index 0b02360..dc3d018 100644
--- a/arc-firefox-theme/chrome/global/in-content/common.css
+++ b/arc-firefox-theme/chrome/global/in-content/common.css
@@ -5,13 +5,50 @@
 @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: #424e5a;
+  --in-content-page-background: #fbfbfb;
+  --in-content-text-color: #333;
+  --in-content-selected-text: #fff;
+  --in-content-header-border-color: #c8c8c8;
+  --in-content-box-background: #fff;
+  --in-content-box-background-odd: #f3f6fa;
+  --in-content-box-background-hover: #ebebeb;
+  --in-content-box-background-active: #dadada;
+  --in-content-box-border-color: #c1c1c1;
+  --in-content-item-hover: rgba(0,149,221,0.25);
+  --in-content-item-selected: #0095dd;
+  --in-content-border-highlight: #ff9500;
+  --in-content-border-focus: #0095dd;
+  --in-content-border-color: #c1c1c1;
+  --in-content-category-text: #c1c1c1;
+  --in-content-category-border-focus: 1px dotted #fff;
+  --in-content-category-text-selected: #f2f2f2;
+  --in-content-category-background: #424f5a;
+  --in-content-category-background-hover: #5e6972;
+  --in-content-category-background-active: #343f48;
+  --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: #d1d1d1;
+  --in-content-table-header-background: #0095dd;
+  --in-content-help-button-background: #ffcb00;
+  --in-content-help-button-background-hover: #f4c200;
+  --in-content-help-button-background-active: #eaba00;
+}
+
 html|body,
 xul|page,
 xul|window {
   font: message-box;
   -moz-appearance: none;
-  background-color: #fbfbfb;
-  color: #424e5a;
+  background-color: var(--in-content-page-background);
+  color: var(--in-content-page-color);
 }
 
 html|body {
@@ -24,14 +61,14 @@ html|h1 {
   font-size: 2.5em;
   font-weight: lighter;
   line-height: 1.2;
-  color: #333;
+  color: var(--in-content-text-color);
   margin: 0;
   margin-bottom: .5em;
 }
 
 html|hr {
   border-style: solid none none none;
-  border-color: #c1c1c1;
+  border-color: var(--in-content-border-color);
 }
 
 xul|caption {
@@ -91,9 +128,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,
@@ -106,20 +143,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[selected] {
-  background-color: #ebebeb;
+  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 {
@@ -142,29 +179,28 @@ 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: #ebebeb;
+  background-color: var(--in-content-box-background-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"]) {
-  background-color: #dadada;
+  background-color: var(--in-content-box-background-active);
 }
 
 html|button:disabled,
@@ -176,19 +212,19 @@ xul|menulist[disabled="true"] {
 }
 
 *|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"] {
@@ -222,19 +258,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;
 }
 
@@ -311,9 +347,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,
@@ -322,7 +358,7 @@ xul|button[type="menu"] > xul|menupopup xul|menu,
 xul|button[type="menu"] > xul|menupopup xul|menuitem {
   -moz-appearance: none;
   font-size: 1em;
-  color: #333;
+  color: var(--in-content-text-color);
   padding-top: 0.2em;
   padding-bottom: 0.2em;
   -moz-padding-start: 10px;
@@ -333,16 +369,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"],
@@ -360,7 +396,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;
 }
 
@@ -369,22 +405,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,
@@ -397,25 +433,25 @@ xul|textbox[disabled="true"] {
 html|a,
 .text-link,
 .inline-link {
-  color: #0095dd;
+  color: var(--in-content-link-color);
   text-decoration: none;
 }
 
 html|a:hover,
 .text-link:hover,
 .inline-link:hover {
-  color: #178ce5;
+  color: var(--in-content-link-color-hover);
   text-decoration: underline;
 }
 
 html|a:visited {
-  color: #551a8b;
+  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;
 }
 
@@ -448,7 +484,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 */
@@ -460,7 +496,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] {
@@ -493,7 +529,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;
@@ -502,7 +538,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] {
@@ -523,7 +559,7 @@ xul|*.radio-label-box {
 
 xul|*#categories {
   -moz-appearance: none;
-  background-color: #424f5a;
+  background-color: var(--in-content-category-background);
   padding-top: 39px;
   margin: 0;
   border-width: 0;
@@ -531,7 +567,7 @@ xul|*#categories {
 
 xul|*.category {
   -moz-appearance: none;
-  color: #c1c1c1;
+  color: var(--in-content-category-text);
   -moz-border-end-width: 0;
   -moz-padding-start: 15px;
   -moz-padding-end: 21px;
@@ -540,19 +576,19 @@ xul|*.category {
 }
 
 xul|*.category:hover {
-  background-color: #5e6972;
+  background-color: var(--in-content-category-background-hover);
 }
 
 xul|*.category[selected] {
-  background-color: #343f48;
-  color: #f2f2f2;
+  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 #ff9500;
+  -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 {
@@ -572,7 +608,7 @@ xul|*#categories[keyboard-navigation="true"]:-moz-focusring > xul|*.category[cur
 /* header */
 
 *|*.header {
-  border-bottom: 1px solid #c8c8c8;
+  border-bottom: 1px solid var(--in-content-header-border-color);
   -moz-margin-end: 4px; /* add the 4px end-margin of other elements */
   margin-bottom: 15px;
   padding-bottom: 15px;
@@ -636,9 +672,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,
@@ -652,13 +688,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 */
@@ -666,20 +702,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-border-color);
   padding: 0;
 }
 
@@ -687,15 +724,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),
@@ -722,11 +759,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);
 }
 
 xul|tab[visuallyselected] {
@@ -803,6 +840,13 @@ xul|*.radio-label-box {
   -moz-appearance: none;
 }
 
+/* Override OS-theme-based color to make it visible
+   on dark color themes. */
+xul|radio:not([disabled="true"]):hover,
+xul|checkbox:not([disabled="true"]):hover {
+  color: var(--in-content-text-color);
+}
+
 xul|*.numberbox-input-box {
   -moz-appearance: none;
   border-width: 0;
@@ -816,3 +860,20 @@ xul|*.inline-link:-moz-focusring {
 xul|spinbuttons {
   -moz-appearance: none;
 }
+
+xul|treechildren::-moz-tree-row(multicol, odd) {
+  background-color: var(--in-content-box-background-odd);
+}
+
+/* These rules are duplicated from common.inc.css
+ * because above -moz-tree-row(multicol, odd) rule 
+ * overrides also hover/selected states. 
+ */
+xul|treechildren::-moz-tree-row(hover) {
+  background-color: var(--in-content-item-hover);
+}
+
+xul|treechildren::-moz-tree-row(selected) {
+  background-color: var(--in-content-item-selected);
+}
+