Bug 1164279 - Re-enable ruby variant on Windows. r?jfkthame
MozReview-Commit-ID: 74lyLA26aZp
--- a/layout/style/jar.mn
+++ b/layout/style/jar.mn
@@ -1,15 +1,15 @@
# 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/.
toolkit.jar:
* res/ua.css (res/ua.css)
-* res/html.css (res/html.css)
+ res/html.css (res/html.css)
res/quirk.css (res/quirk.css)
res/plaintext.css (res/plaintext.css)
res/viewsource.css (res/viewsource.css)
res/counterstyles.css (res/counterstyles.css)
res/noscript.css (res/noscript.css)
res/noframes.css (res/noframes.css)
* res/forms.css (res/forms.css)
res/number-control.css (res/number-control.css)
--- a/layout/style/res/html.css
+++ b/layout/style/res/html.css
@@ -826,22 +826,17 @@ rt {
rtc {
display: ruby-text-container;
}
rtc, rt {
white-space: nowrap;
font-size: 50%;
-moz-min-font-size-ratio: 50%;
line-height: 1;
-%ifndef XP_WIN
- /* The widely-used Windows font Meiryo doesn't work fine with this
- * setting, so disable this on Windows. We should re-enable it once
- * Microsoft fixes this issue. See bug 1164279. */
font-variant-east-asian: ruby;
-%endif
}
rtc, rt {
text-emphasis: none;
}
rtc:lang(zh), rt:lang(zh) {
ruby-align: center;
}
rtc:lang(zh-TW), rt:lang(zh-TW) {