merge develop, add mobile nav component
This commit is contained in:
commit
7ce8fe9214
67 changed files with 2219 additions and 697 deletions
0
static/font/css/animation.css
Normal file → Executable file
0
static/font/css/animation.css
Normal file → Executable file
0
static/font/css/fontello-codes.css
vendored
Normal file → Executable file
0
static/font/css/fontello-codes.css
vendored
Normal file → Executable file
12
static/font/css/fontello-embedded.css
vendored
Normal file → Executable file
12
static/font/css/fontello-embedded.css
vendored
Normal file → Executable file
File diff suppressed because one or more lines are too long
0
static/font/css/fontello-ie7-codes.css
vendored
Normal file → Executable file
0
static/font/css/fontello-ie7-codes.css
vendored
Normal file → Executable file
0
static/font/css/fontello-ie7.css
vendored
Normal file → Executable file
0
static/font/css/fontello-ie7.css
vendored
Normal file → Executable file
14
static/font/css/fontello.css
vendored
Normal file → Executable file
14
static/font/css/fontello.css
vendored
Normal file → Executable 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');
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
|
|
@ -229,11 +229,11 @@ body {
|
|||
}
|
||||
@font-face {
|
||||
font-family: 'fontello';
|
||||
src: url('./font/fontello.eot?96534782');
|
||||
src: url('./font/fontello.eot?96534782#iefix') format('embedded-opentype'),
|
||||
url('./font/fontello.woff?96534782') format('woff'),
|
||||
url('./font/fontello.ttf?96534782') format('truetype'),
|
||||
url('./font/fontello.svg?96534782#fontello') format('svg');
|
||||
src: url('./font/fontello.eot?23081587');
|
||||
src: url('./font/fontello.eot?23081587#iefix') format('embedded-opentype'),
|
||||
url('./font/fontello.woff?23081587') format('woff'),
|
||||
url('./font/fontello.ttf?23081587') format('truetype'),
|
||||
url('./font/fontello.svg?23081587#fontello') format('svg');
|
||||
font-weight: normal;
|
||||
font-style: normal;
|
||||
}
|
||||
|
|
BIN
static/font/font/fontello.eot
Normal file → Executable file
BIN
static/font/font/fontello.eot
Normal file → Executable file
Binary file not shown.
0
static/font/font/fontello.svg
Normal file → Executable file
0
static/font/font/fontello.svg
Normal file → Executable file
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 19 KiB |
BIN
static/font/font/fontello.ttf
Normal file → Executable file
BIN
static/font/font/fontello.ttf
Normal file → Executable file
Binary file not shown.
BIN
static/font/font/fontello.woff
Normal file → Executable file
BIN
static/font/font/fontello.woff
Normal file → Executable file
Binary file not shown.
BIN
static/font/font/fontello.woff2
Normal file → Executable file
BIN
static/font/font/fontello.woff2
Normal file → Executable file
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue