Fixed FontAwesome to avoid collisions and preserve backwards compatibility.

namespaces
Frode Petterson 2013-12-02 14:19:15 +01:00
parent 6bb9c9a9b6
commit 57b1c88435
5 changed files with 6 additions and 8 deletions

0
fonts/fontawesome-webfont.eot Normal file → Executable file
View File

0
fonts/fontawesome-webfont.svg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 197 KiB

After

Width:  |  Height:  |  Size: 197 KiB

0
fonts/fontawesome-webfont.ttf Normal file → Executable file
View File

0
fonts/fontawesome-webfont.woff Normal file → Executable file
View File

View File

@ -1,10 +1,8 @@
/* Font Awesome font licensed under SIL OFL 1.1 · Code licensed under MIT License */
@font-face { @font-face {
font-family: 'FontAwesome'; font-family: 'H5PFontAwesome4'; /* Named so to avoid collisions and preserve backwards compatibility! */
src:url('../fonts/fontawesome-webfont.eot'); src: url('../fonts/fontawesome-webfont.eot?v=4.0.3');
src:url('../fonts/FontAwesome.otf?#iefix') format('embedded-opentype'), src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.0.3') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff?v=4.0.3') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.0.3') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.0.3#fontawesomeregular') format('svg');
url('../fonts/fontawesome-webfont.woff') format('woff'),
url('../fonts/fontawesome-webfont.ttf') format('truetype'),
url('../fonts/fontawesome-webfont.svg') format('svg');
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }
@ -42,7 +40,7 @@ div.h5p-semi-fullscreen {
} }
.h5p-enable-fullscreen:before, .h5p-disable-fullscreen:before { .h5p-enable-fullscreen:before, .h5p-disable-fullscreen:before {
font-family: FontAwesome; font-family: H5PFontAwesome4;
margin-right: 10px; margin-right: 10px;
content: "\f0b2"; content: "\f0b2";
font-size: 1.2em; font-size: 1.2em;
@ -168,4 +166,4 @@ body.h5p-iframe-content div.h5p-content {
} }
body.h5p-iframe-content.h5p-fullscreen div.h5p-content { body.h5p-iframe-content.h5p-fullscreen div.h5p-content {
height: 100%; height: 100%;
} }