merge with upstream master
This commit is contained in:
17
helix/static/css/fontello.css
vendored
17
helix/static/css/fontello.css
vendored
@@ -1,11 +1,11 @@
|
||||
@font-face {
|
||||
font-family: 'fontello';
|
||||
src: url('../font/fontello.eot?10976371');
|
||||
src: url('../font/fontello.eot?10976371#iefix') format('embedded-opentype'),
|
||||
url('../font/fontello.woff2?10976371') format('woff2'),
|
||||
url('../font/fontello.woff?10976371') format('woff'),
|
||||
url('../font/fontello.ttf?10976371') format('truetype'),
|
||||
url('../font/fontello.svg?10976371#fontello') format('svg');
|
||||
src: url('../font/fontello.eot?24283821');
|
||||
src: url('../font/fontello.eot?24283821#iefix') format('embedded-opentype'),
|
||||
url('../font/fontello.woff2?24283821') format('woff2'),
|
||||
url('../font/fontello.woff?24283821') format('woff'),
|
||||
url('../font/fontello.ttf?24283821') format('truetype'),
|
||||
url('../font/fontello.svg?24283821#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?10976371#fontello') format('svg');
|
||||
src: url('../font/fontello.svg?24283821#fontello') format('svg');
|
||||
}
|
||||
}
|
||||
*/
|
||||
@@ -69,4 +69,5 @@
|
||||
.icon-info:before { content: '\e80b'; } /* '' */
|
||||
.icon-close:before { content: '\e80c'; } /* '' */
|
||||
.icon-sunpower-logo:before { content: '\e80d'; } /* '' */
|
||||
.icon-upload-cloud:before { content: '\e80e'; } /* '' */
|
||||
.icon-upload-cloud:before { content: '\e80e'; } /* '' */
|
||||
.icon-spin6:before { content: '\e839'; } /* '' */
|
||||
Reference in New Issue
Block a user