Bug 1397325 - Fix broken font size for in-content pages r=dao

MozReview-Commit-ID: ASbgxVQJA82

--HG--
extra : rebase_source : 5a8d3709d142de6c45413e834a22b288d49ab70e
This commit is contained in:
Ricky Chien 2017-09-07 14:51:32 +08:00
parent a5d757bfb2
commit f5b6eea3e0
11 changed files with 58 additions and 63 deletions

View File

@ -9,7 +9,7 @@ textbox,
description,
.tab-text,
caption > label {
font-size: 1.2rem;
font-size: 1.11rem;
}
/* Create a separate rule to unset these styles on .tree-input instead of

View File

@ -4,6 +4,24 @@
%include ../../../shared/incontentprefs/preferences.inc.css
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
@namespace html url("http://www.w3.org/1999/xhtml");
html|html *,
page *,
window * {
font-size: 1.11rem;
}
xul|caption > xul|label:not(.dialogTitle) {
font-size: 1.27rem;
}
.tip-caption,
.help-button {
font-size: 1rem;
}
.treecol-sortdirection {
/* override the Linux only toolkit rule */
-moz-appearance: none;

View File

@ -14,7 +14,7 @@ textbox,
description,
.tab-text,
caption > label {
font-size: 1.3rem;
font-size: 1.36rem;
}
/* Create a separate rule to unset these styles on .tree-input instead of

View File

@ -4,6 +4,24 @@
%include ../../../shared/incontentprefs/preferences.inc.css
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
@namespace html url("http://www.w3.org/1999/xhtml");
html|html *,
page *,
window * {
font-size: 1.36rem;
}
caption > label:not(.dialogTitle) {
font-size: 1.55rem;
}
.tip-caption,
.help-button {
font-size: 1.18rem;
}
.actionsMenu > .menulist-label-box > .menulist-icon {
margin-top: 2px;
margin-inline-start: 2px;

View File

@ -7,9 +7,6 @@
%include ../../../../toolkit/themes/osx/global/shared.inc
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
@namespace html url("http://www.w3.org/1999/xhtml");
.windowDialog {
padding: 12px;
font: -moz-dialog;
@ -17,9 +14,6 @@
/* ----- APPLICATIONS PREFPANE ----- */
description {
font: small-caption;
font-weight: normal;
line-height: 1.3em;
margin-bottom: 4px !important;
}

View File

@ -9,7 +9,7 @@ textbox,
description,
.tab-text,
caption > label {
font-size: 1.2rem;
font-size: 1.25rem;
}
/* Create a separate rule to unset these styles on .tree-input instead of

View File

@ -4,6 +4,24 @@
%include ../../../shared/incontentprefs/preferences.inc.css
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
@namespace html url("http://www.w3.org/1999/xhtml");
html|html *,
page *,
window * {
font-size: 1.25rem;
}
xul|caption > xul|label:not(.dialogTitle) {
font-size: 1.42rem;
}
.tip-caption,
.help-button {
font-size: 1.08rem;
}
.actionsMenu > .menulist-label-box > .menulist-icon {
margin-inline-end: 9px;
}

View File

@ -117,12 +117,6 @@ xul|treechildren::-moz-tree-row(selected) {
background-color: var(--in-content-item-selected);
}
html|html *,
xul|page *,
xul|window * {
font-size: 1.11rem;
}
*|*.header-name {
font-size: 1.64rem;
}
@ -130,12 +124,3 @@ xul|window * {
*|*.category-name {
font-size: 1.19rem;
}
xul|caption > xul|label:not(.dialogTitle) {
font-size: 1.27rem;
}
.tip-caption,
.help-button {
font-size: 1rem;
}

View File

@ -14,13 +14,6 @@ xul|tab[visuallyselected] {
text-shadow: none;
}
xul|button,
html|button,
xul|colorpicker[type="button"],
xul|menulist {
margin-top: 3px;
}
xul|button,
html|button {
/* use the same margin of other elements for the alignment */
@ -77,6 +70,7 @@ xul|*.numberbox-input-box {
}
xul|description {
font-size: 1.25rem;
line-height: 22px;
}
@ -129,12 +123,6 @@ xul|textbox[type="search"]:not([searchbutton]) > .textbox-input-box > .textbox-s
margin-inline-end: 5px;
}
html|html *,
xul|page *,
xul|window * {
font-size: 1.36rem;
}
*|*.header-name {
font-size: 2rem;
}
@ -142,12 +130,3 @@ xul|window * {
*|*.category-name {
font-size: 1.45rem;
}
xul|caption > xul|label:not(.dialogTitle) {
font-size: 1.55rem;
}
.tip-caption,
.help-button {
font-size: 1.18rem;
}

View File

@ -174,8 +174,6 @@ xul|*.tab-text {
html|button {
padding: 3px;
/* override forms.css */
font: inherit;
}
/* xul buttons and menulists */

View File

@ -78,12 +78,6 @@ html|input[type="checkbox"]:-moz-focusring + html|label:before {
}
}
html|html *,
xul|page *,
xul|window * {
font-size: 1.25rem;
}
*|*.header-name {
font-size: 1.83rem;
}
@ -91,12 +85,3 @@ xul|window * {
*|*.category-name {
font-size: 1.33rem;
}
xul|caption > xul|label:not(.dialogTitle) {
font-size: 1.42rem;
}
.tip-caption,
.help-button {
font-size: 1.08rem;
}