Skip to content

Commit

Permalink
Change font to Roboto to support more charsets (#9803)
Browse files Browse the repository at this point in the history
  • Loading branch information
lafriks authored Jan 25, 2020
1 parent 1703a63 commit 59510d6
Show file tree
Hide file tree
Showing 33 changed files with 50 additions and 1,848 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,7 @@ fomantic: node-check $(FOMANTIC_DEST_DIR)

$(FOMANTIC_DEST_DIR): semantic.json web_src/fomantic/theme.config.less | node_modules
cp web_src/fomantic/theme.config.less node_modules/fomantic-ui/src/theme.config
cp web_src/fomantic/_site/globals/* node_modules/fomantic-ui/src/_site/globals/
npx gulp -f node_modules/fomantic-ui/gulpfile.js build

.PHONY: css
Expand Down
Binary file not shown.
438 changes: 0 additions & 438 deletions public/vendor/assets/lato-fonts/lato-v16-latin-700.svg

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
451 changes: 0 additions & 451 deletions public/vendor/assets/lato-fonts/lato-v16-latin-700italic.svg

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
450 changes: 0 additions & 450 deletions public/vendor/assets/lato-fonts/lato-v16-latin-italic.svg

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
435 changes: 0 additions & 435 deletions public/vendor/assets/lato-fonts/lato-v16-latin-regular.svg

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
6 changes: 3 additions & 3 deletions public/vendor/librejs.html
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,9 @@
<td><a href="http://fontawesome.io/assets/font-awesome-4.6.0.zip">font-awesome-4.6.0.zip</a></td>
</tr>
<tr>
<td><a href="./assets/lato-fonts/">lato-fonts</a></td>
<td><a href="https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL">SIL Open Font License, 1.1</a></td>
<td><a href="https://google-webfonts-helper.herokuapp.com/api/fonts/lato?download=zip&subsets=latin&variants=700,regular,italic,700italic">lato-v14-latin.zip</a></td>
<td><a href="./assets/roboto-fonts/">roboto-fonts</a></td>
<td><a href="https://github.com/google/roboto/blob/master/LICENSE">Apache-2.0</a></td>
<td><a href="https://google-webfonts-helper.herokuapp.com/api/fonts/roboto?download=zip&subsets=latin-ext,cyrillic-ext,latin,greek,vietnamese,cyrillic,greek-ext&variants=700,regular,italic,700italic">roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext.zip</a></td>
</tr>
<tr>
<td><a href="./assets/font-awesome/css/">font-awesome - code</a></td>
Expand Down
6 changes: 4 additions & 2 deletions templates/pwa/serviceworker_js.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,10 @@ var urlsToCache = [
// fonts
'{{StaticUrlPrefix}}/fomantic/themes/default/assets/fonts/icons.woff2',
'{{StaticUrlPrefix}}/vendor/assets/octicons/octicons.woff2?ef21c39f0ca9b1b5116e5eb7ac5eabe6',
'{{StaticUrlPrefix}}/vendor/assets/lato-fonts/lato-v16-latin-regular.woff2',
'{{StaticUrlPrefix}}/vendor/assets/lato-fonts/lato-v16-latin-700.woff2'
'{{StaticUrlPrefix}}/vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-regular.woff2',
'{{StaticUrlPrefix}}/vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-italic.woff2',
'{{StaticUrlPrefix}}/vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-700.woff2',
'{{StaticUrlPrefix}}/vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-700italic.woff2'
];

self.addEventListener('install', function (event) {
Expand Down
1 change: 1 addition & 0 deletions web_src/fomantic/_site/globals/site.variables
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@fontName : 'Roboto';
110 changes: 41 additions & 69 deletions web_src/less/_base.less
Original file line number Diff line number Diff line change
@@ -1,85 +1,57 @@
/* lato-regular - latin */
/* roboto-regular - latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext */
@font-face {
font-family: 'Lato';
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
src: url('../vendor/assets/lato-fonts/lato-v16-latin-regular.eot'); /* IE9 Compat Modes */
src:
local('Lato Regular'),
local('Lato-Regular'),
/* IE6-IE8 */
url('../vendor/assets/lato-fonts/lato-v16-latin-regular.eot?#iefix') format('embedded-opentype'),
/* Super Modern Browsers */
url('../vendor/assets/lato-fonts/lato-v16-latin-regular.woff2') format('woff2'),
/* Modern Browsers */
url('../vendor/assets/lato-fonts/lato-v16-latin-regular.woff') format('woff'),
/* Safari, Android, iOS */
url('../vendor/assets/lato-fonts/lato-v16-latin-regular.ttf') format('truetype'),
/* Legacy iOS */
url('../vendor/assets/lato-fonts/lato-v16-latin-regular.svg#Lato') format('svg');
}

/* lato-italic - latin */
local('Roboto'),
local('Roboto-Regular'),
/* Chrome 26+, Opera 23+, Firefox 39+ */
url('../vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-regular.woff2') format('woff2'),
/* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
url('../vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-regular.woff') format('woff');
}

/* roboto-italic - latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext */
@font-face {
font-family: 'Lato';
font-family: 'Roboto';
font-style: italic;
font-weight: 400;
src: url('../vendor/assets/lato-fonts/lato-v16-latin-italic.eot'); /* IE9 Compat Modes */
src:
local('Lato Italic'),
local('Lato-Italic'),
/* IE6-IE8 */
url('../vendor/assets/lato-fonts/lato-v16-latin-italic.eot?#iefix') format('embedded-opentype'),
/* Super Modern Browsers */
url('../vendor/assets/lato-fonts/lato-v16-latin-italic.woff2') format('woff2'),
/* Modern Browsers */
url('../vendor/assets/lato-fonts/lato-v16-latin-italic.woff') format('woff'),
/* Safari, Android, iOS */
url('../vendor/assets/lato-fonts/lato-v16-latin-italic.ttf') format('truetype'),
/* Legacy iOS */
url('../vendor/assets/lato-fonts/lato-v16-latin-italic.svg#Lato') format('svg');
}

/* lato-700 - latin */
local('Roboto Italic'),
local('Roboto-Italic'),
/* Chrome 26+, Opera 23+, Firefox 39+ */
url('../vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-italic.woff2') format('woff2'),
/* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
url('../vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-italic.woff') format('woff');
}

/* roboto-700 - latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext */
@font-face {
font-family: 'Lato';
font-family: 'Roboto';
font-style: normal;
font-weight: 700;
src: url('../vendor/assets/lato-fonts/lato-v16-latin-700.eot'); /* IE9 Compat Modes */
src:
local('Lato Bold'),
local('Lato-Bold'),
/* IE6-IE8 */
url('../vendor/assets/lato-fonts/lato-v16-latin-700.eot?#iefix') format('embedded-opentype'),
/* Super Modern Browsers */
url('../vendor/assets/lato-fonts/lato-v16-latin-700.woff2') format('woff2'),
/* Modern Browsers */
url('../vendor/assets/lato-fonts/lato-v16-latin-700.woff') format('woff'),
/* Safari, Android, iOS */
url('../vendor/assets/lato-fonts/lato-v16-latin-700.ttf') format('truetype'),
/* Legacy iOS */
url('../vendor/assets/lato-fonts/lato-v16-latin-700.svg#Lato') format('svg');
}

/* lato-700italic - latin */
local('Roboto Bold'),
local('Roboto-Bold'),
/* Chrome 26+, Opera 23+, Firefox 39+ */
url('../vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-700.woff2') format('woff2'),
/* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
url('../vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-700.woff') format('woff');
}

/* roboto-700italic - latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext */
@font-face {
font-family: 'Lato';
font-family: 'Roboto';
font-style: italic;
font-weight: 700;
src: url('../vendor/assets/lato-fonts/lato-v16-latin-700italic.eot'); /* IE9 Compat Modes */
src:
local('Lato Bold Italic'),
local('Lato-BoldItalic'),
/* IE6-IE8 */
url('../vendor/assets/lato-fonts/lato-v16-latin-700italic.eot?#iefix') format('embedded-opentype'),
/* Super Modern Browsers */
url('../vendor/assets/lato-fonts/lato-v16-latin-700italic.woff2') format('woff2'),
/* Modern Browsers */
url('../vendor/assets/lato-fonts/lato-v16-latin-700italic.woff') format('woff'),
/* Safari, Android, iOS */
url('../vendor/assets/lato-fonts/lato-v16-latin-700italic.ttf') format('truetype'),
/* Legacy iOS */
url('../vendor/assets/lato-fonts/lato-v16-latin-700italic.svg#Lato') format('svg');
local('Roboto Bold Italic'),
local('Roboto-BoldItalic'),
/* Chrome 26+, Opera 23+, Firefox 39+ */
url('../vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-700italic.woff2') format('woff2'),
/* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
url('../vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-700italic.woff') format('woff');
}

@font-face {
Expand Down Expand Up @@ -112,12 +84,12 @@
h3,
h4,
h5 {
font-family: Lato, @fonts, sans-serif;
font-family: Roboto, @fonts, sans-serif;
}

.home .hero h1,
.home .hero h2 {
font-family: 'PT Sans Narrow', Lato, @fonts, sans-serif;
font-family: 'PT Sans Narrow', Roboto, @fonts, sans-serif;
}

.ui.accordion .title:not(.ui),
Expand Down Expand Up @@ -156,7 +128,7 @@
.ui.steps .step .title,
.ui.text.container,
.ui.language > .menu > .item& {
font-family: Lato, @fonts, sans-serif;
font-family: Roboto, @fonts, sans-serif;
}
}

Expand Down

0 comments on commit 59510d6

Please sign in to comment.