#101 - merge develop

This commit is contained in:
jared 2019-04-05 14:08:13 -04:00
commit 093f0b23f7
12 changed files with 31 additions and 22 deletions

View file

@ -229,11 +229,11 @@ body {
}
@font-face {
font-family: 'fontello';
src: url('./font/fontello.eot?40419282');
src: url('./font/fontello.eot?40419282#iefix') format('embedded-opentype'),
url('./font/fontello.woff?40419282') format('woff'),
url('./font/fontello.ttf?40419282') format('truetype'),
url('./font/fontello.svg?40419282#fontello') format('svg');
src: url('./font/fontello.eot?93986776');
src: url('./font/fontello.eot?93986776#iefix') format('embedded-opentype'),
url('./font/fontello.woff?93986776') format('woff'),
url('./font/fontello.ttf?93986776') format('truetype'),
url('./font/fontello.svg?93986776#fontello') format('svg');
font-weight: normal;
font-style: normal;
}