Horhik/personal-site
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix fonts

Browse source
This commit is contained in:
horhik 2020-05-22 09:13:13 +03:00
parent 0061ddf627
commit f7ac7f14da
3 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
.idea/workspace.xml
View file

@ -11,14 +11,9 @@
</component>
<component name="ChangeListManager">
<list default="true" id="4b1db503-490b-4f06-812d-6b9b94d2764a" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/components/elements/recent-block.jsx" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/reducers/all-reducers.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/reducers/client-reducer.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/reducers/main-page-reducer.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/store.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/css/elements/page-links.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/css/elements/page-links.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/css/basic.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/css/basic.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/css/fonts.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/css/fonts.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/when-module-doesnt-merge-your-pullrequest/figlet.js/Gruntfile.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/when-module-doesnt-merge-your-pullrequest/figlet.js/Gruntfile.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/when-module-doesnt-merge-your-pullrequest/figlet.js/examples/node/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/when-module-doesnt-merge-your-pullrequest/figlet.js/examples/node/app.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/when-module-doesnt-merge-your-pullrequest/figlet.js/examples/node/appSync.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/when-module-doesnt-merge-your-pullrequest/figlet.js/examples/node/appSync.js" afterDir="false" />
@ -114,7 +109,7 @@
<workItem from="1589253283370" duration="5339000" />
<workItem from="1589450996359" duration="6767000" />
<workItem from="1589583447607" duration="5148000" />
<workItem from="1590125952856" duration="1511000" />
<workItem from="1590125952856" duration="1899000" />
</task>
<servers />
</component>

1
src/css/basic.scss
View file

@ -1,4 +1,5 @@
@import "variables";
@import "fonts";
body {

6
src/css/fonts.scss
View file

@ -1,7 +1,7 @@
@font-face {
font-family: 'Mononoki';
src: url('fonts/mononoki-Regular.eot');
src: url('fonts/mononoki-Regular.eot') format('embedded-opentype');
src: url('fonts/mononoki-Regular.eot') format('embedded-opentype'),
url('fonts/mononoki-Regular.ttf') format('truetype'),
url('fonts/mononoki-Regular.woff2') format('woff2'),
url('fonts/mononoki-Regular.woff') format('woff')
@ -10,7 +10,7 @@
@font-face {
font-family: 'Mononoki Bold';
src: url('fonts/mononoki-Bold.eot');
src: url('fonts/mononoki-Bold.eot') format('embedded-opentype');
src: url('fonts/mononoki-Bold.eot') format('embedded-opentype'),
url('fonts/mononoki-Bold.ttf') format('truetype'),
url('fonts/mononoki-Bold.woff2') format('woff2'),
url('fonts/mononoki-Bold.woff') format('woff')
@ -19,7 +19,7 @@ url('fonts/mononoki-Bold.woff') format('woff')
@font-face {
font-family: 'Mononoki';
src: url('fonts/mononoki-Regular.eot');
src: url('fonts/mononoki-Regular.eot') format('embedded-opentype');
src: url('fonts/mononoki-Regular.eot') format('embedded-opentype'),
url('fonts/mononoki-Regular.ttf') format('truetype'),
url('fonts/mononoki-Regular.woff2') format('woff2'),
url('fonts/mononoki-Regular.woff') format('woff')