opendev/gerrit
Code Issues Proposed changes

Merge "Update Roboto to Roboto-Regular"

Browse Source
This commit is contained in:
Kasper Nilsson
2017-09-06 22:22:38 +00:00
committed by Gerrit Code Review
parent 8bc3409bc7 2df9a75899
commit 59bcba1d96
6 changed files with 48 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-httpd/src/main/resources/com/google/gerrit/httpd/raw/PolyGerritIndexHtml.soy
View File

@@ -41,8 +41,8 @@
// @see https://github.com/w3c/preload/issues/32 regarding crossorigin
<link rel="preload" href="{$staticResourcePath}/fonts/RobotoMono-Regular.woff2" as="font" type="font/woff2" crossorigin>{\n}
<link rel="preload" href="{$staticResourcePath}/fonts/RobotoMono-Regular.woff" as="font" type="font/woff" crossorigin>{\n}
<link rel="preload" href="{$staticResourcePath}/fonts/Roboto.woff2" as="font" type="font/woff2" crossorigin>{\n}
<link rel="preload" href="{$staticResourcePath}/fonts/Roboto.woff" as="font" type="font/woff" crossorigin>{\n}
<link rel="preload" href="{$staticResourcePath}/fonts/Roboto-Regular.woff2" as="font" type="font/woff2" crossorigin>{\n}
<link rel="preload" href="{$staticResourcePath}/fonts/Roboto-Regular.woff" as="font" type="font/woff" crossorigin>{\n}
<link rel="preload" href="{$staticResourcePath}/fonts/Roboto-Medium.woff2" as="font" type="font/woff2" crossorigin>{\n}
<link rel="preload" href="{$staticResourcePath}/fonts/Roboto-Medium.woff" as="font" type="font/woff" crossorigin>{\n}
<link rel="stylesheet" href="{$staticResourcePath}/styles/fonts.css">{\n}

4
lib/fonts/BUILD
View File

@@ -5,10 +5,10 @@ load("//tools/bzl:genrule2.bzl", "genrule2")
filegroup(
name = "robotofonts",
srcs = [
"Roboto.woff",
"Roboto.woff2",
"Roboto-Medium.woff",
"Roboto-Medium.woff2",
"Roboto-Regular.woff",
"Roboto-Regular.woff2",
"RobotoMono-Regular.woff",
"RobotoMono-Regular.woff2",
],

0
lib/fonts/Roboto.woff → lib/fonts/Roboto-Regular.woff
View File

0
lib/fonts/Roboto.woff2 → lib/fonts/Roboto-Regular.woff2
View File

4
polygerrit-ui/app/index.html
View File

@@ -26,8 +26,8 @@ RobotoMono fonts are used in styles/fonts.css
-->
<link rel="preload" href="/fonts/RobotoMono-Regular.woff2" as="font" type="font/woff2" crossorigin>
<link rel="preload" href="/fonts/RobotoMono-Regular.woff" as="font" type="font/woff" crossorigin>
<link rel="preload" href="/fonts/Roboto.woff2" as="font" type="font/woff2" crossorigin>
<link rel="preload" href="/fonts/Roboto.woff" as="font" type="font/woff" crossorigin>
<link rel="preload" href="/fonts/Roboto-Regular.woff2" as="font" type="font/woff2" crossorigin>
<link rel="preload" href="/fonts/Roboto-Regular.woff" as="font" type="font/woff" crossorigin>
<link rel="preload" href="/fonts/Roboto-Medium.woff2" as="font" type="font/woff2" crossorigin>
<link rel="preload" href="/fonts/Roboto-Medium.woff" as="font" type="font/woff" crossorigin>
<link rel="stylesheet" href="/styles/fonts.css">

42
polygerrit-ui/app/styles/fonts.css
View File

@@ -18,3 +18,45 @@
url('../fonts/RobotoMono-Regular.woff') format('woff');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
}
/* latin-ext */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
src: local('Roboto'), local('Roboto-Regular'),
url('../fonts/Roboto-Regular.woff2') format('woff2'),
url('../fonts/Roboto-Regular.woff') format('woff');
unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
}
/* latin */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
src: local('Roboto'), local('RobotoMono-Regular'),
url('../fonts/Roboto-Regular.woff2') format('woff2'),
url('../fonts/Roboto-Regular.woff') format('woff');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
}
/* latin-ext */
@font-face {
font-family: 'Roboto Medium';
font-style: normal;
font-weight: 400;
src: local('Roboto Medium'), local('Roboto-Medium'),
url('../fonts/Roboto-Medium.woff2') format('woff2'),
url('../fonts/Roboto-Medium.woff') format('woff');
unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
}
/* latin */
@font-face {
font-family: 'Roboto Medium';
font-style: normal;
font-weight: 400;
src: local('Roboto Medium'), local('Roboto-Medium'),
url('../fonts/Roboto-Medium.woff2') format('woff2'),
url('../fonts/Roboto-Medium.woff') format('woff');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
}