Merge branch 'master' of mowoe.com:reverend/lostplaces-frontend

This commit is contained in:
reverend 2020-08-04 23:48:00 +02:00
commit cf5e804e50
4 changed files with 5 additions and 5682 deletions

1
.gitignore vendored
View File

@ -10,6 +10,7 @@ npm-debug.log*
yarn-debug.log*
yarn-error.log*
lerna-debug.log*
package-lock.json
# Diagnostic reports (https://nodejs.org/api/report.html)
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json

View File

@ -10,9 +10,9 @@
@font-face {
font-family: Montserrat;
src:
url('fonts/Montserrat/Montserrat-Regular.otf'),
url('fonts/Montserrat/Montserrat-Bold.otf'),
url('fonts/Montserrat/Montserrat-Italic.otf')
url('fonts/Montserrat/Montserrat-Regular.ttf'),
url('fonts/Montserrat/Montserrat-Bold.ttf'),
url('fonts/Montserrat/Montserrat-Italic.ttf')
;
}

5678
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -4,7 +4,7 @@
@font-face {
font-family: Montserrat;
src: url("fonts/Montserrat/Montserrat-Regular.otf"), url("fonts/Montserrat/Montserrat-Bold.otf"), url("fonts/Montserrat/Montserrat-Italic.otf"); }
src: url("fonts/Montserrat/Montserrat-Regular.ttf"), url("fonts/Montserrat/Montserrat-Bold.ttf"), url("fonts/Montserrat/Montserrat-Italic.ttf"); }
html {
height: 100%;