Merge branch 'master' of mowoe.com:reverend/lostplaces-frontend
This commit is contained in:
commit
cf5e804e50
1
.gitignore
vendored
1
.gitignore
vendored
@ -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
|
||||
|
@ -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
5678
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -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%;
|
||||
|
Loading…
Reference in New Issue
Block a user