Merge "Move `html` and `body` styles to 'ui.less'"

This commit is contained in:
jenkins-bot 2019-03-06 23:20:33 +00:00 committed by Gerrit Code Review
commit 566178d8ba
3 changed files with 14 additions and 13 deletions

View File

@ -4,7 +4,7 @@
*/ */
@import '../../minerva.less/minerva.mixins'; @import '../../minerva.less/minerva.mixins';
html, body, div, span, div, span,
h1, h2, h3, h4, h5, h6, p, blockquote, pre, h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code, a, abbr, acronym, address, big, cite, code,
del, ins, em, img, del, ins, em, img,
@ -37,10 +37,6 @@ button {
cursor: pointer; cursor: pointer;
} }
body {
line-height: 1;
}
input { input {
line-height: normal; line-height: normal;
} }

View File

@ -9,8 +9,20 @@ body {
height: 100%; height: 100%;
} }
html {
// FIXME: Still from Eric Meyer's reset, that should be better fine-grained.
font-size: 100%;
// Support Safari: Prevent font scaling in landscape
-webkit-text-size-adjust: none;
}
body { body {
background-color: @chromeColor; background-color: @skinContentBgColor;
color: @colorGray2;
// Support All Browsers: Remove `margin` (normalized)
margin: 0;
// FIXME: Still from Eric Meyer's reset, that should be good to go.
line-height: 1;
} }
main { main {

View File

@ -7,19 +7,12 @@
// //
// Styleguide 1. // Styleguide 1.
html {
// prevent font scaling in landscape in Safari
-webkit-text-size-adjust: none;
}
@font-size-body: 100% * @fontScalingFactor; @font-size-body: 100% * @fontScalingFactor;
body { body {
font-family: @fontFamily; font-family: @fontFamily;
font-size: @font-size-body; font-size: @font-size-body;
line-height: 1.4; line-height: 1.4;
color: @colorGray2;
background: #fff;
-webkit-tap-highlight-color: rgba( 0, 0, 0, 0.2 ); -webkit-tap-highlight-color: rgba( 0, 0, 0, 0.2 );
} }