mirror of
https://github.com/naturalcrit/homebrewery.git
synced 2026-06-22 04:58:40 +00:00
Merge pull request #4780 from Gazook89/Open-Sans---Installed-vs-Google-Fonts
Open Sans: Replace Google Fonts with Installed Fonts
This commit is contained in:
@@ -29,7 +29,6 @@ const TOOLBAR_STATE_KEY = 'HB_renderer_toolbarState';
|
|||||||
|
|
||||||
const INITIAL_CONTENT = dedent`
|
const INITIAL_CONTENT = dedent`
|
||||||
<!DOCTYPE html><html><head>
|
<!DOCTYPE html><html><head>
|
||||||
<link href="//fonts.googleapis.com/css?family=Open+Sans:400,300,600,700" rel="stylesheet" type="text/css" />
|
|
||||||
<link href='/homebrew/bundle.css' type="text/css" rel='stylesheet' />
|
<link href='/homebrew/bundle.css' type="text/css" rel='stylesheet' />
|
||||||
<link href="${brewRendererStylesUrl}" rel="stylesheet" />
|
<link href="${brewRendererStylesUrl}" rel="stylesheet" />
|
||||||
<link href="${headerNavStylesUrl}" rel="stylesheet" />
|
<link href="${headerNavStylesUrl}" rel="stylesheet" />
|
||||||
|
|||||||
@@ -5,10 +5,6 @@
|
|||||||
<meta
|
<meta
|
||||||
name="viewport"
|
name="viewport"
|
||||||
content="width=device-width, initial-scale=1, height=device-height, interactive-widget=resizes-visual" />
|
content="width=device-width, initial-scale=1, height=device-height, interactive-widget=resizes-visual" />
|
||||||
<link
|
|
||||||
href="//fonts.googleapis.com/css?family=Open+Sans:400,300,600,700"
|
|
||||||
rel="stylesheet"
|
|
||||||
type="text/css" />
|
|
||||||
<link rel="icon" href="/assets/favicon.ico" type="image/x-icon" />
|
<link rel="icon" href="/assets/favicon.ico" type="image/x-icon" />
|
||||||
|
|
||||||
<meta name="twitter:card" content="summary" />
|
<meta name="twitter:card" content="summary" />
|
||||||
|
|||||||
@@ -4,14 +4,7 @@
|
|||||||
@import './animations.less';
|
@import './animations.less';
|
||||||
@import './colors.less';
|
@import './colors.less';
|
||||||
@import './tooltip.less';
|
@import './tooltip.less';
|
||||||
@font-face {
|
@import './fonts/fonts.css';
|
||||||
font-family : 'CodeLight';
|
|
||||||
src : url('./CODE Light.otf') format('opentype');
|
|
||||||
}
|
|
||||||
@font-face {
|
|
||||||
font-family : 'CodeBold';
|
|
||||||
src : url('./CODE Bold.otf') format('opentype');
|
|
||||||
}
|
|
||||||
html,body, #reactRoot {
|
html,body, #reactRoot {
|
||||||
height : 100vh;
|
height : 100vh;
|
||||||
min-height : 100vh;
|
min-height : 100vh;
|
||||||
|
|||||||
@@ -0,0 +1,38 @@
|
|||||||
|
/* open-sans-latin-wght-normal */
|
||||||
|
|
||||||
|
@font-face {
|
||||||
|
font-family : 'Open Sans';
|
||||||
|
font-style : normal;
|
||||||
|
font-weight : normal;
|
||||||
|
src : url('open-sans-latin-400-normal.woff2') format('woff2');
|
||||||
|
font-display : swap;
|
||||||
|
unicode-range : U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0304,U+0308,U+0329,U+2000-206F,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Nowhere is font-weight: 700 actually used with Open Sans, everything is set to 800.
|
||||||
|
* But, 800 *is* too bold. And since we don't have an 800 font file, it's just using the
|
||||||
|
* 700 font file and it looks fine. Not sure it's worth changing everything to 700?
|
||||||
|
*/
|
||||||
|
@font-face {
|
||||||
|
font-family : 'Open Sans';
|
||||||
|
font-style : normal;
|
||||||
|
font-weight : bold;
|
||||||
|
src : url('open-sans-latin-700-normal.woff2') format('woff2');
|
||||||
|
font-display : swap;
|
||||||
|
unicode-range : U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0304,U+0308,U+0329,U+2000-206F,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD;
|
||||||
|
}
|
||||||
|
|
||||||
|
@font-face {
|
||||||
|
font-family : 'CodeLight';
|
||||||
|
font-style : normal;
|
||||||
|
src : url('./CODE Light.otf') format('opentype');
|
||||||
|
font-display : block;
|
||||||
|
}
|
||||||
|
|
||||||
|
@font-face {
|
||||||
|
font-family : 'CodeBold';
|
||||||
|
font-style : normal;
|
||||||
|
src : url('./CODE Bold.otf') format('opentype');
|
||||||
|
font-display : block;
|
||||||
|
}
|
||||||
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user