Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/kakawait/hugo-tranquilpeak-theme.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThibaud LeprĂȘtre <thibaud.lepretre@gmail.com>2017-04-15 12:33:19 +0300
committerThibaud LeprĂȘtre <thibaud.lepretre@gmail.com>2017-04-15 12:33:19 +0300
commitc6bd8a01315733b02c98211bd7307a4d71fa6ea9 (patch)
tree3a2baa32fc7269ff4575eca3c2e9727763461583 /src
parentf78c6d3395e46927ee15e6b8a725bbb108bb6e92 (diff)
Upgrade Merriweather font to support any lang
fixes #142 and fixes #129
Diffstat (limited to 'src')
-rwxr-xr-xsrc/scss/utils/_fonts.scss35
1 files changed, 1 insertions, 34 deletions
diff --git a/src/scss/utils/_fonts.scss b/src/scss/utils/_fonts.scss
index 9047a9e..6ae113f 100755
--- a/src/scss/utils/_fonts.scss
+++ b/src/scss/utils/_fonts.scss
@@ -12,37 +12,4 @@
src: local('Open Sans Bold'), local('OpenSans-Bold'), url(https://fonts.gstatic.com/s/opensans/v10/k3k702ZOKiLJc3WVjuplzJS3E-kSBmtLoNJPDtbj2Pk.ttf) format('truetype');
}
-@font-face {
- font-family: 'Merriweather';
- font-style: normal;
- font-weight: 300;
- src: local('Merriweather Light'), local('Merriweather-Light'), url(https://fonts.gstatic.com/s/merriweather/v8/ZvcMqxEwPfh2qDWBPxn6nk7nEl83IKQRaQwpv_tz1Eg.ttf) format('truetype');
-}
-
-@font-face {
- font-family: 'Merriweather';
- font-style: normal;
- font-weight: 400;
- src: local('Merriweather'), url(https://fonts.gstatic.com/s/merriweather/v8/RFda8w1V0eDZheqfcyQ4EJS3E-kSBmtLoNJPDtbj2Pk.ttf) format('truetype');
-}
-
-@font-face {
- font-family: 'Merriweather';
- font-style: normal;
- font-weight: 700;
- src: local('Merriweather Bold'), local('Merriweather-Bold'), url(https://fonts.gstatic.com/s/merriweather/v8/ZvcMqxEwPfh2qDWBPxn6nv83cGrqhiQgWmjXfohD0fc.ttf) format('truetype');
-}
-
-@font-face {
- font-family: 'Merriweather';
- font-style: italic;
- font-weight: 300;
- src: local('Merriweather Light Italic'), local('Merriweather-LightItalic'), url(https://fonts.gstatic.com/s/merriweather/v8/EYh7Vl4ywhowqULgRdYwIGrKw6K5wsYdxr6rUL2ZGaM.ttf) format('truetype');
-}
-
-@font-face {
- font-family: 'Merriweather';
- font-style: italic;
- font-weight: 700;
- src: local('Merriweather Bold Italic'), local('Merriweather-BoldItalic'), url(https://fonts.gstatic.com/s/merriweather/v8/EYh7Vl4ywhowqULgRdYwII1kRdeHIFWYEsp6A2f99b0.ttf) format('truetype');
-} \ No newline at end of file
+@import url('https://fonts.googleapis.com/css?family=Merriweather:300,300i,400,700,700i&subset=cyrillic,cyrillic-ext,latin-ext'); \ No newline at end of file