Merge branch 'stable-2.13'

* stable-2.13:
  PolyGerrit: Change font: to font-size and font-family

Change-Id: I1615b51a4613490bf11db0bb30f176b8cbafaf6d
This commit is contained in:
Paladox 2016-09-19 17:09:22 +01:00
commit 44fe3f633b
1 changed files with 6 additions and 1 deletions

View File

@ -30,6 +30,11 @@ body {
transition: none; /* Override the default Polymer fade-in. */
}
body {
font: 13px -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
/*
* IE has shoddy support for the font shorthand property.
* Work around this using font-size and font-family.
*/
font-size: 13px;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
line-height: 1.4;
}