diff --git a/Makefile b/Makefile
index 350b7e8d754d2..8f65ba82c5af6 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/public/vendor/assets/lato-fonts/lato-v16-latin-700.eot b/public/vendor/assets/lato-fonts/lato-v16-latin-700.eot
deleted file mode 100644
index 0d9dac2ff7467..0000000000000
Binary files a/public/vendor/assets/lato-fonts/lato-v16-latin-700.eot and /dev/null differ
diff --git a/public/vendor/assets/lato-fonts/lato-v16-latin-700.svg b/public/vendor/assets/lato-fonts/lato-v16-latin-700.svg
deleted file mode 100644
index 077653d202852..0000000000000
--- a/public/vendor/assets/lato-fonts/lato-v16-latin-700.svg
+++ /dev/null
@@ -1,438 +0,0 @@
-
-
-
diff --git a/public/vendor/assets/lato-fonts/lato-v16-latin-700.ttf b/public/vendor/assets/lato-fonts/lato-v16-latin-700.ttf
deleted file mode 100644
index 4f3d84480b5bf..0000000000000
Binary files a/public/vendor/assets/lato-fonts/lato-v16-latin-700.ttf and /dev/null differ
diff --git a/public/vendor/assets/lato-fonts/lato-v16-latin-700.woff b/public/vendor/assets/lato-fonts/lato-v16-latin-700.woff
deleted file mode 100644
index abf0196d8329e..0000000000000
Binary files a/public/vendor/assets/lato-fonts/lato-v16-latin-700.woff and /dev/null differ
diff --git a/public/vendor/assets/lato-fonts/lato-v16-latin-700.woff2 b/public/vendor/assets/lato-fonts/lato-v16-latin-700.woff2
deleted file mode 100644
index f8c37ecde4daf..0000000000000
Binary files a/public/vendor/assets/lato-fonts/lato-v16-latin-700.woff2 and /dev/null differ
diff --git a/public/vendor/assets/lato-fonts/lato-v16-latin-700italic.eot b/public/vendor/assets/lato-fonts/lato-v16-latin-700italic.eot
deleted file mode 100644
index 1ab37ef7ba299..0000000000000
Binary files a/public/vendor/assets/lato-fonts/lato-v16-latin-700italic.eot and /dev/null differ
diff --git a/public/vendor/assets/lato-fonts/lato-v16-latin-700italic.svg b/public/vendor/assets/lato-fonts/lato-v16-latin-700italic.svg
deleted file mode 100644
index 3e9d4409b347c..0000000000000
--- a/public/vendor/assets/lato-fonts/lato-v16-latin-700italic.svg
+++ /dev/null
@@ -1,451 +0,0 @@
-
-
-
diff --git a/public/vendor/assets/lato-fonts/lato-v16-latin-700italic.ttf b/public/vendor/assets/lato-fonts/lato-v16-latin-700italic.ttf
deleted file mode 100644
index 96b4f82347491..0000000000000
Binary files a/public/vendor/assets/lato-fonts/lato-v16-latin-700italic.ttf and /dev/null differ
diff --git a/public/vendor/assets/lato-fonts/lato-v16-latin-700italic.woff b/public/vendor/assets/lato-fonts/lato-v16-latin-700italic.woff
deleted file mode 100644
index cdf0d86aef9e4..0000000000000
Binary files a/public/vendor/assets/lato-fonts/lato-v16-latin-700italic.woff and /dev/null differ
diff --git a/public/vendor/assets/lato-fonts/lato-v16-latin-700italic.woff2 b/public/vendor/assets/lato-fonts/lato-v16-latin-700italic.woff2
deleted file mode 100644
index 5b3f882d813f5..0000000000000
Binary files a/public/vendor/assets/lato-fonts/lato-v16-latin-700italic.woff2 and /dev/null differ
diff --git a/public/vendor/assets/lato-fonts/lato-v16-latin-italic.eot b/public/vendor/assets/lato-fonts/lato-v16-latin-italic.eot
deleted file mode 100644
index 8e32803d7a812..0000000000000
Binary files a/public/vendor/assets/lato-fonts/lato-v16-latin-italic.eot and /dev/null differ
diff --git a/public/vendor/assets/lato-fonts/lato-v16-latin-italic.svg b/public/vendor/assets/lato-fonts/lato-v16-latin-italic.svg
deleted file mode 100644
index e288645b12cec..0000000000000
--- a/public/vendor/assets/lato-fonts/lato-v16-latin-italic.svg
+++ /dev/null
@@ -1,450 +0,0 @@
-
-
-
diff --git a/public/vendor/assets/lato-fonts/lato-v16-latin-italic.ttf b/public/vendor/assets/lato-fonts/lato-v16-latin-italic.ttf
deleted file mode 100644
index cf3da8be2de3e..0000000000000
Binary files a/public/vendor/assets/lato-fonts/lato-v16-latin-italic.ttf and /dev/null differ
diff --git a/public/vendor/assets/lato-fonts/lato-v16-latin-italic.woff b/public/vendor/assets/lato-fonts/lato-v16-latin-italic.woff
deleted file mode 100644
index 95251da0946cd..0000000000000
Binary files a/public/vendor/assets/lato-fonts/lato-v16-latin-italic.woff and /dev/null differ
diff --git a/public/vendor/assets/lato-fonts/lato-v16-latin-italic.woff2 b/public/vendor/assets/lato-fonts/lato-v16-latin-italic.woff2
deleted file mode 100644
index 3246c1286f3cf..0000000000000
Binary files a/public/vendor/assets/lato-fonts/lato-v16-latin-italic.woff2 and /dev/null differ
diff --git a/public/vendor/assets/lato-fonts/lato-v16-latin-regular.eot b/public/vendor/assets/lato-fonts/lato-v16-latin-regular.eot
deleted file mode 100644
index c6413069679e4..0000000000000
Binary files a/public/vendor/assets/lato-fonts/lato-v16-latin-regular.eot and /dev/null differ
diff --git a/public/vendor/assets/lato-fonts/lato-v16-latin-regular.svg b/public/vendor/assets/lato-fonts/lato-v16-latin-regular.svg
deleted file mode 100644
index 55b43fb86a0e9..0000000000000
--- a/public/vendor/assets/lato-fonts/lato-v16-latin-regular.svg
+++ /dev/null
@@ -1,435 +0,0 @@
-
-
-
diff --git a/public/vendor/assets/lato-fonts/lato-v16-latin-regular.ttf b/public/vendor/assets/lato-fonts/lato-v16-latin-regular.ttf
deleted file mode 100644
index 3c2d417ea4069..0000000000000
Binary files a/public/vendor/assets/lato-fonts/lato-v16-latin-regular.ttf and /dev/null differ
diff --git a/public/vendor/assets/lato-fonts/lato-v16-latin-regular.woff b/public/vendor/assets/lato-fonts/lato-v16-latin-regular.woff
deleted file mode 100644
index 189a0feb590a6..0000000000000
Binary files a/public/vendor/assets/lato-fonts/lato-v16-latin-regular.woff and /dev/null differ
diff --git a/public/vendor/assets/lato-fonts/lato-v16-latin-regular.woff2 b/public/vendor/assets/lato-fonts/lato-v16-latin-regular.woff2
deleted file mode 100644
index 6904b6649ffa9..0000000000000
Binary files a/public/vendor/assets/lato-fonts/lato-v16-latin-regular.woff2 and /dev/null differ
diff --git a/public/vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-700.woff b/public/vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-700.woff
new file mode 100644
index 0000000000000..8c9b0241037a5
Binary files /dev/null and b/public/vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-700.woff differ
diff --git a/public/vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-700.woff2 b/public/vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-700.woff2
new file mode 100644
index 0000000000000..3768f0182dd19
Binary files /dev/null and b/public/vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-700.woff2 differ
diff --git a/public/vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-700italic.woff b/public/vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-700italic.woff
new file mode 100644
index 0000000000000..55befb6958a94
Binary files /dev/null and b/public/vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-700italic.woff differ
diff --git a/public/vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-700italic.woff2 b/public/vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-700italic.woff2
new file mode 100644
index 0000000000000..93ee346e51916
Binary files /dev/null and b/public/vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-700italic.woff2 differ
diff --git a/public/vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-italic.woff b/public/vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-italic.woff
new file mode 100644
index 0000000000000..cd91cce9c53e1
Binary files /dev/null and b/public/vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-italic.woff differ
diff --git a/public/vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-italic.woff2 b/public/vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-italic.woff2
new file mode 100644
index 0000000000000..bdeb9f5d7814b
Binary files /dev/null and b/public/vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-italic.woff2 differ
diff --git a/public/vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-regular.woff b/public/vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-regular.woff
new file mode 100644
index 0000000000000..7245f5cae759e
Binary files /dev/null and b/public/vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-regular.woff differ
diff --git a/public/vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-regular.woff2 b/public/vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-regular.woff2
new file mode 100644
index 0000000000000..2e3eefc89790a
Binary files /dev/null and b/public/vendor/assets/roboto-fonts/roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext-regular.woff2 differ
diff --git a/public/vendor/librejs.html b/public/vendor/librejs.html
index 7d29b35c5607f..c7bd062626441 100644
--- a/public/vendor/librejs.html
+++ b/public/vendor/librejs.html
@@ -111,9 +111,9 @@
| font-awesome-4.6.0.zip |
- | lato-fonts |
- SIL Open Font License, 1.1 |
- lato-v14-latin.zip |
+ roboto-fonts |
+ Apache-2.0 |
+ roboto-v20-latin-ext_cyrillic-ext_latin_greek_vietnamese_cyrillic_greek-ext.zip |
| font-awesome - code |
diff --git a/templates/pwa/serviceworker_js.tmpl b/templates/pwa/serviceworker_js.tmpl
index 72edf232bc3ef..d89713eb167ec 100644
--- a/templates/pwa/serviceworker_js.tmpl
+++ b/templates/pwa/serviceworker_js.tmpl
@@ -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) {
diff --git a/web_src/fomantic/_site/globals/site.variables b/web_src/fomantic/_site/globals/site.variables
new file mode 100644
index 0000000000000..5a8b8033fcb22
--- /dev/null
+++ b/web_src/fomantic/_site/globals/site.variables
@@ -0,0 +1 @@
+@fontName : 'Roboto';
diff --git a/web_src/less/_base.less b/web_src/less/_base.less
index be698df3df993..9d7ed0de2c0a9 100644
--- a/web_src/less/_base.less
+++ b/web_src/less/_base.less
@@ -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 {
@@ -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),
@@ -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;
}
}