Bug 1161156 - about:support: Use the new in-content styling. r=MattN

This commit is contained in:
Richard Marti 2015-05-09 13:24:05 +02:00
parent 14898cbbee
commit bf4bdf8030
4 changed files with 126 additions and 86 deletions

View File

@ -18,6 +18,8 @@
<link rel="icon" type="image/png" id="favicon"
href="chrome://branding/content/icon32.png"/>
<link rel="stylesheet" href="chrome://global/skin/in-content/common.css"
type="text/css"/>
<link rel="stylesheet" href="chrome://global/skin/aboutSupport.css"
type="text/css"/>

View File

@ -78,7 +78,7 @@ xul|description {
xul|*.text-link:-moz-focusring,
xul|*.inline-link:-moz-focusring {
color: #ff9500;
color: var(--in-content-link-highlight);
text-decoration: underline;
box-shadow: none;
}

View File

@ -3,15 +3,12 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
html {
background-color: -moz-Field;
color: -moz-FieldText;
font: message-box;
--aboutSupport-table-background: #ebebeb;
background-color: var(--in-content-page-background);
}
body {
width: 90%;
margin-left: 5%;
margin-right: 5%;
margin: 40px 48px;
}
.page-subtitle {
@ -26,19 +23,24 @@ body {
font-weight: bold;
}
button {
-moz-margin-start: 0;
-moz-margin-end: 8px;
}
table {
background-color: -moz-Dialog;
color: -moz-DialogText;
background-color: var(--aboutSupport-table-background);
color: var(--in-content-text-color);
font: message-box;
text-align: start;
width: 100%;
border: 1px solid ThreeDShadow;
border: 1px solid var(--in-content-table-border-color);
border-spacing: 0px;
}
th, td {
border: 1px dotted ThreeDShadow;
padding: 3px;
border: 1px solid var(--in-content-table-border-color);
padding: 4px;
}
thead th {
@ -47,8 +49,8 @@ thead th {
th {
text-align: start;
background-color: Highlight;
color: HighlightText;
background-color: var(--in-content-table-header-background);
color: var(--in-content-selected-text);
}
th.column {
@ -58,7 +60,7 @@ th.column {
td {
text-align: start;
border-top: 1px dotted ThreeDShadow;
border-color: var(--in-content-table-border-dark-color);
}
.prefs-table {
@ -79,9 +81,9 @@ td {
}
#action-box {
background-color: -moz-Dialog;
border: 1px solid ThreeDShadow;
color: -moz-DialogText;
background-color: var(--aboutSupport-table-background);
border: 1px solid var(--in-content-table-border-color);
color: var(--in-content-text-color);
float: right;
margin-top: 2em;
margin-bottom: 20px;

View File

@ -6,13 +6,49 @@
@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-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-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-color: #c1c1c1;
--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 {
@ -25,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-table-border-color);
}
xul|caption {
@ -92,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,
@ -107,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 {
@ -143,29 +179,29 @@ xul|colorpicker[type="button"],
xul|menulist {
-moz-appearance: none;
height: 30px;
color: #333;
color: var(--in-content-text-color);
line-height: 20px;
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: #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,
@ -177,19 +213,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"] {
@ -223,19 +259,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 +348,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 +359,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;
@ -334,16 +370,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"],
@ -361,7 +397,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 +406,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 +434,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;
}
@ -449,7 +485,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 +497,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] {
@ -494,7 +530,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;
@ -503,7 +539,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] {
@ -524,7 +560,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;
@ -532,7 +568,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;
@ -541,19 +577,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 {
@ -573,7 +609,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;
@ -637,9 +673,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,
@ -653,13 +689,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 */
@ -667,19 +703,19 @@ 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);
}
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-table-border-color);
padding: 0;
}
@ -687,22 +723,22 @@ 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),
xul|treecolpicker {
-moz-border-start-width: 1px;
-moz-border-start-style: solid;
border-image: linear-gradient(transparent 0%, transparent 20%, #c1c1c1 20%, #c1c1c1 80%, transparent 80%, transparent 100%) 1 1;
border-image: linear-gradient(transparent 0%, transparent 20%, var(--in-content-table-border-color) 20%, var(--in-content-table-border-color) 80%, transparent 80%, transparent 100%) 1 1;
}
xul|treecol:not([hideheader="true"]) > xul|*.treecol-sortdirection[sortDirection] {
@ -722,9 +758,9 @@ 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);
}