diff options
| author | tsergeant <tsergeant@chromium.org> | 2015-05-19 20:34:42 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-20 03:34:39 +0000 |
| commit | 52eb6dd02c535873dda638dcd5e08e1fc7af5538 (patch) | |
| tree | 84934751a5f49552174aed5cab308ec9578f058a /components | |
| parent | 3e89893025e6eed6a6ddd3518901e5d7503105e8 (diff) | |
| download | chromium_src-52eb6dd02c535873dda638dcd5e08e1fc7af5538.zip chromium_src-52eb6dd02c535873dda638dcd5e08e1fc7af5538.tar.gz chromium_src-52eb6dd02c535873dda638dcd5e08e1fc7af5538.tar.bz2 | |
Add Roboto-Medium webfont and factor out common Roboto WebUI CSS file.
The common file prevents duplication of the same @font-face definitions,
and allows additional font weights and character sets added by one
project to be automatically available for all other Roboto users.
This CL also updates the Roboto font files from Google Fonts and removes
the .woff file, since Chrome has complete support for woff2.
BUG=439114
TEST=Locally tested chrome://md-settings, chrome://proximity-auth and a
PDF file on desktop, and chrome://contextual-search-promo/promo.html
on Android.
Review URL: https://codereview.chromium.org/1142893002
Cr-Commit-Position: refs/heads/master@{#330689}
Diffstat (limited to 'components')
| -rw-r--r-- | components/proximity_auth/webui/resources/proximity_auth.css | 10 | ||||
| -rw-r--r-- | components/proximity_auth/webui/resources/proximity_auth.html | 1 |
2 files changed, 2 insertions, 9 deletions
diff --git a/components/proximity_auth/webui/resources/proximity_auth.css b/components/proximity_auth/webui/resources/proximity_auth.css index f54eed9..d63da59 100644 --- a/components/proximity_auth/webui/resources/proximity_auth.css +++ b/components/proximity_auth/webui/resources/proximity_auth.css @@ -3,21 +3,13 @@ * found in the LICENSE file. */ -@font-face { - font-family: "Roboto2"; - font-weight: 400; - src: local("Roboto"), local("Roboto2-Regular"), - url(chrome://resources/roboto/roboto.woff2) format("woff2"), - url(chrome://resources/roboto/roboto.woff) format("woff"); -} - html, body { width: 100%; height: 100%; margin: 0; padding: 0; overflow: hidden; - font-family: "Roboto2", sans-serif; + font-family: "Roboto", sans-serif; } #logs { diff --git a/components/proximity_auth/webui/resources/proximity_auth.html b/components/proximity_auth/webui/resources/proximity_auth.html index 6ccc382..05f05a7 100644 --- a/components/proximity_auth/webui/resources/proximity_auth.html +++ b/components/proximity_auth/webui/resources/proximity_auth.html @@ -6,6 +6,7 @@ <meta name="viewport" content="width=device-width, initial-scale=1"> <link rel="stylesheet" href="proximity_auth.css"> + <link rel="stylesheet" href="chrome://resources/css/roboto.css"> <link rel="import" href="content-panel.html"> <link rel="import" href="log-panel.html"> </head> |