diff --git a/client/stylesheets/base.less b/client/stylesheets/base.less index a12b94f2d88..0d1830fc5a3 100644 --- a/client/stylesheets/base.less +++ b/client/stylesheets/base.less @@ -1,10 +1,10 @@ -@import url(//fonts.googleapis.com/css?family=Roboto:300,400,500,600,700&subset=latin,cyrillic-ext,greek-ext,greek,vietnamese,latin-ext,cyrillic); @import "global/_variables.less"; @import "utils/_lesshat.import.less"; @import "utils/_reset.import.less"; @import "utils/_keyframes.import.less"; @import "utils/_preloader.import.less"; @import "utils/_emojione.import.less"; +@import "utils/_fonts.import.less"; .clearfix { clear: both; &::after { diff --git a/client/stylesheets/utils/_fonts.import.less b/client/stylesheets/utils/_fonts.import.less index 3f49abbfe03..0a9424711e5 100644 --- a/client/stylesheets/utils/_fonts.import.less +++ b/client/stylesheets/utils/_fonts.import.less @@ -1,72 +1,47 @@ @font-face { - font-family: 'Roboto Condensed'; - src: url('/fonts/robotocondensed-light-webfont.eot'); - src: url('/fonts/robotocondensed-light-webfont.eot?#iefix') format('embedded-opentype'), - url('/fonts/robotocondensed-light-webfont.woff2') format('woff2'), - url('/fonts/robotocondensed-light-webfont.woff') format('woff'), - url('/fonts/robotocondensed-light-webfont.ttf') format('truetype'), - url('/fonts/robotocondensed-light-webfont.svg#roboto_condensedlight') format('svg'); - font-weight: 300; - font-style: normal; + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + src: local("Roboto Light"), + local("Roboto-Light"), + url("/fonts/roboto-23d439d23da3eaa8144f02e19043fab2b3f19a33.woff2") format("woff2"), + url("/fonts/roboto-cd565969dd0cf49f8408deff0aed2b9d6008a06d.woff") format("woff"), + url("/fonts/roboto-8fca32cc805ea3e480e6458ae7c3640d41f6c96b.ttf") format("truetype"); } @font-face { - font-family: 'Roboto Condensed'; - src: url('/fonts/robotocondensed-regular-webfont.eot'); - src: url('/fonts/robotocondensed-regular-webfont.eot?#iefix') format('embedded-opentype'), - url('/fonts/robotocondensed-regular-webfont.woff2') format('woff2'), - url('/fonts/robotocondensed-regular-webfont.woff') format('woff'), - url('/fonts/robotocondensed-regular-webfont.ttf') format('truetype'), - url('/fonts/robotocondensed-regular-webfont.svg#roboto_condensedregular') format('svg'); - font-weight: 400; - font-style: normal; - -} - -@font-face { - font-family: 'Roboto'; - src: url('/fonts/Roboto-Light-webfont.eot'); - src: url('/fonts/Roboto-Light-webfont.svg#robotothin') format('svg'), - url('/fonts/Roboto-Light-webfont.eot?#iefix') format('embedded-opentype'), - url('/fonts/Roboto-Light-webfont.woff') format('woff'), - url('/fonts/Roboto-Light-webfont.ttf') format('truetype'), - ; - font-weight: 300; - font-style: normal; + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + /* IE6-8 compat */ + src: url("/fonts/roboto-c8755b34719e3012d4ae9455615b1549fec1ca3f.eot"); + src: local("Roboto"), + local("Roboto-Regular"), + url("/fonts/roboto-5cdbe0a3b2ecefc9c25ccefa511cf8a781c78799.woff2") format("woff2"), + url("/fonts/roboto-9e2b4436ba4c5c9b33f4fca42b43d99a703467f0.woff") format("woff"), + url("/fonts/roboto-148fe3b2ffcb825efff40a8378f22125ccf88cb0.svg#Roboto") format("svg"), + url("/fonts/roboto-c8755b34719e3012d4ae9455615b1549fec1ca3f.eot") format("embedded-opentype"), + url("/fonts/roboto-b376a31e25af67e36a420aa2348874c5a8b5c9a5.ttf") format("truetype"); } @font-face { - font-family: 'Roboto'; - src: url('/fonts/roboto-regular-webfont.eot'); - src: url('/fonts/roboto-regular-webfont.eot?#iefix') format('embedded-opentype'), - url('/fonts/roboto-regular-webfont.woff2') format('woff2'), - url('/fonts/roboto-regular-webfont.woff') format('woff'), - url('/fonts/roboto-regular-webfont.ttf') format('truetype'), - url('/fonts/roboto-regular-webfont.svg#robotoregular') format('svg'); - font-weight: 400; - font-style: normal; + font-family: 'Roboto'; + font-style: normal; + font-weight: 500; + src: local("Roboto Medium"), + local("Roboto-Medium"), + url("/fonts/roboto-5cb23c2ac98be5b4e0fb8a97e28dda99ae76b8c7.woff2") format("woff2"), + url("/fonts/roboto-d561d8824866e60a2a2d327c6b6219939b259b57.woff") format("woff"), + url("/fonts/roboto-15d4ddc447af43a160ea7249c8a3b8db63b90c43.ttf") format("truetype"); } @font-face { - font-family: 'Roboto'; - src: url('/fonts/roboto-medium-webfont.eot'); - src: url('/fonts/roboto-medium-webfont.eot?#iefix') format('embedded-opentype'), - url('/fonts/roboto-medium-webfont.woff2') format('woff2'), - url('/fonts/roboto-medium-webfont.woff') format('woff'), - url('/fonts/roboto-medium-webfont.ttf') format('truetype'), - url('/fonts/roboto-medium-webfont.svg#robotomedium') format('svg'); - font-weight: 500; - font-style: normal; -} - -@font-face { - font-family: 'Roboto'; - src: url('/fonts/roboto-bold-webfont.eot'); - src: url('/fonts/roboto-bold-webfont.eot?#iefix') format('embedded-opentype'), - url('/fonts/roboto-bold-webfont.woff2') format('woff2'), - url('/fonts/roboto-bold-webfont.woff') format('woff'), - url('/fonts/roboto-bold-webfont.ttf') format('truetype'), - url('/fonts/roboto-bold-webfont.svg#robotobold') format('svg'); - font-weight: 600; - font-style: normal; -} + font-family: 'Roboto'; + font-style: normal; + font-weight: 700; + src: local("Roboto Bold"), + local("Roboto-Bold"), + url("/fonts/roboto-0346683d1de814a4d109387bb90bb82e0bb8aeb1.woff2") format("woff2"), + url("/fonts/roboto-922ef2c34858a412764dfd5efadf3e387c8d7402.woff") format("woff"), + url("/fonts/roboto-d9a17a54541b34b38ef67cf919f1ac63b44a7454.ttf") format("truetype"); +} \ No newline at end of file diff --git a/public/fonts/roboto-0346683d1de814a4d109387bb90bb82e0bb8aeb1.woff2 b/public/fonts/roboto-0346683d1de814a4d109387bb90bb82e0bb8aeb1.woff2 new file mode 100644 index 00000000000..45901ee1a5c Binary files /dev/null and b/public/fonts/roboto-0346683d1de814a4d109387bb90bb82e0bb8aeb1.woff2 differ diff --git a/public/fonts/roboto-148fe3b2ffcb825efff40a8378f22125ccf88cb0.svg b/public/fonts/roboto-148fe3b2ffcb825efff40a8378f22125ccf88cb0.svg new file mode 100644 index 00000000000..ed55c105d7a --- /dev/null +++ b/public/fonts/roboto-148fe3b2ffcb825efff40a8378f22125ccf88cb0.svg @@ -0,0 +1,308 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/fonts/roboto-15d4ddc447af43a160ea7249c8a3b8db63b90c43.ttf b/public/fonts/roboto-15d4ddc447af43a160ea7249c8a3b8db63b90c43.ttf new file mode 100644 index 00000000000..c114ddd1829 Binary files /dev/null and b/public/fonts/roboto-15d4ddc447af43a160ea7249c8a3b8db63b90c43.ttf differ diff --git a/public/fonts/roboto-23d439d23da3eaa8144f02e19043fab2b3f19a33.woff2 b/public/fonts/roboto-23d439d23da3eaa8144f02e19043fab2b3f19a33.woff2 new file mode 100644 index 00000000000..7e198edea70 Binary files /dev/null and b/public/fonts/roboto-23d439d23da3eaa8144f02e19043fab2b3f19a33.woff2 differ diff --git a/public/fonts/roboto-5cb23c2ac98be5b4e0fb8a97e28dda99ae76b8c7.woff2 b/public/fonts/roboto-5cb23c2ac98be5b4e0fb8a97e28dda99ae76b8c7.woff2 new file mode 100644 index 00000000000..2a2edf6d02c Binary files /dev/null and b/public/fonts/roboto-5cb23c2ac98be5b4e0fb8a97e28dda99ae76b8c7.woff2 differ diff --git a/public/fonts/roboto-5cdbe0a3b2ecefc9c25ccefa511cf8a781c78799.woff2 b/public/fonts/roboto-5cdbe0a3b2ecefc9c25ccefa511cf8a781c78799.woff2 new file mode 100644 index 00000000000..45e0bcd1ab1 Binary files /dev/null and b/public/fonts/roboto-5cdbe0a3b2ecefc9c25ccefa511cf8a781c78799.woff2 differ diff --git a/public/fonts/roboto-8fca32cc805ea3e480e6458ae7c3640d41f6c96b.ttf b/public/fonts/roboto-8fca32cc805ea3e480e6458ae7c3640d41f6c96b.ttf new file mode 100644 index 00000000000..74d598d36fd Binary files /dev/null and b/public/fonts/roboto-8fca32cc805ea3e480e6458ae7c3640d41f6c96b.ttf differ diff --git a/public/fonts/roboto-922ef2c34858a412764dfd5efadf3e387c8d7402.woff b/public/fonts/roboto-922ef2c34858a412764dfd5efadf3e387c8d7402.woff new file mode 100644 index 00000000000..562fe18a08f Binary files /dev/null and b/public/fonts/roboto-922ef2c34858a412764dfd5efadf3e387c8d7402.woff differ diff --git a/public/fonts/roboto-9e2b4436ba4c5c9b33f4fca42b43d99a703467f0.woff b/public/fonts/roboto-9e2b4436ba4c5c9b33f4fca42b43d99a703467f0.woff new file mode 100644 index 00000000000..2e069a916b0 Binary files /dev/null and b/public/fonts/roboto-9e2b4436ba4c5c9b33f4fca42b43d99a703467f0.woff differ diff --git a/public/fonts/roboto-b376a31e25af67e36a420aa2348874c5a8b5c9a5.ttf b/public/fonts/roboto-b376a31e25af67e36a420aa2348874c5a8b5c9a5.ttf new file mode 100644 index 00000000000..5bea9f0e79e Binary files /dev/null and b/public/fonts/roboto-b376a31e25af67e36a420aa2348874c5a8b5c9a5.ttf differ diff --git a/public/fonts/roboto-c8755b34719e3012d4ae9455615b1549fec1ca3f.eot b/public/fonts/roboto-c8755b34719e3012d4ae9455615b1549fec1ca3f.eot new file mode 100644 index 00000000000..5598f9ef406 Binary files /dev/null and b/public/fonts/roboto-c8755b34719e3012d4ae9455615b1549fec1ca3f.eot differ diff --git a/public/fonts/roboto-cd565969dd0cf49f8408deff0aed2b9d6008a06d.woff b/public/fonts/roboto-cd565969dd0cf49f8408deff0aed2b9d6008a06d.woff new file mode 100644 index 00000000000..380c65bd763 Binary files /dev/null and b/public/fonts/roboto-cd565969dd0cf49f8408deff0aed2b9d6008a06d.woff differ diff --git a/public/fonts/roboto-d561d8824866e60a2a2d327c6b6219939b259b57.woff b/public/fonts/roboto-d561d8824866e60a2a2d327c6b6219939b259b57.woff new file mode 100644 index 00000000000..b24493e50ee Binary files /dev/null and b/public/fonts/roboto-d561d8824866e60a2a2d327c6b6219939b259b57.woff differ diff --git a/public/fonts/roboto-d9a17a54541b34b38ef67cf919f1ac63b44a7454.ttf b/public/fonts/roboto-d9a17a54541b34b38ef67cf919f1ac63b44a7454.ttf new file mode 100644 index 00000000000..cc5227cd2ca Binary files /dev/null and b/public/fonts/roboto-d9a17a54541b34b38ef67cf919f1ac63b44a7454.ttf differ