merge develop, add mobile nav component

This commit is contained in:
shpuld 2019-03-12 23:50:54 +02:00
commit 7ce8fe9214
67 changed files with 2219 additions and 697 deletions

14
static/font/css/fontello.css vendored Normal file → Executable file
View file

@ -1,11 +1,11 @@
@font-face {
font-family: 'fontello';
src: url('../font/fontello.eot?40976680');
src: url('../font/fontello.eot?40976680#iefix') format('embedded-opentype'),
url('../font/fontello.woff2?40976680') format('woff2'),
url('../font/fontello.woff?40976680') format('woff'),
url('../font/fontello.ttf?40976680') format('truetype'),
url('../font/fontello.svg?40976680#fontello') format('svg');
src: url('../font/fontello.eot?72648396');
src: url('../font/fontello.eot?72648396#iefix') format('embedded-opentype'),
url('../font/fontello.woff2?72648396') format('woff2'),
url('../font/fontello.woff?72648396') format('woff'),
url('../font/fontello.ttf?72648396') format('truetype'),
url('../font/fontello.svg?72648396#fontello') format('svg');
font-weight: normal;
font-style: normal;
}
@ -15,7 +15,7 @@
@media screen and (-webkit-min-device-pixel-ratio:0) {
@font-face {
font-family: 'fontello';
src: url('../font/fontello.svg?40976680#fontello') format('svg');
src: url('../font/fontello.svg?72648396#fontello') format('svg');
}
}
*/