From 57b1c88435a467ff0e869b703179920f1746ee44 Mon Sep 17 00:00:00 2001
From: Frode Petterson <frode.petterson@amendor.com>
Date: Mon, 2 Dec 2013 14:19:15 +0100
Subject: [PATCH] Fixed FontAwesome to avoid collisions and preserve backwards
 compatibility.

---
 fonts/fontawesome-webfont.eot  | Bin
 fonts/fontawesome-webfont.svg  |   0
 fonts/fontawesome-webfont.ttf  | Bin
 fonts/fontawesome-webfont.woff | Bin
 styles/h5p.css                 |  14 ++++++--------
 5 files changed, 6 insertions(+), 8 deletions(-)
 mode change 100644 => 100755 fonts/fontawesome-webfont.eot
 mode change 100644 => 100755 fonts/fontawesome-webfont.svg
 mode change 100644 => 100755 fonts/fontawesome-webfont.ttf
 mode change 100644 => 100755 fonts/fontawesome-webfont.woff

diff --git a/fonts/fontawesome-webfont.eot b/fonts/fontawesome-webfont.eot
old mode 100644
new mode 100755
diff --git a/fonts/fontawesome-webfont.svg b/fonts/fontawesome-webfont.svg
old mode 100644
new mode 100755
diff --git a/fonts/fontawesome-webfont.ttf b/fonts/fontawesome-webfont.ttf
old mode 100644
new mode 100755
diff --git a/fonts/fontawesome-webfont.woff b/fonts/fontawesome-webfont.woff
old mode 100644
new mode 100755
diff --git a/styles/h5p.css b/styles/h5p.css
index 1cbea68..b9874d6 100644
--- a/styles/h5p.css
+++ b/styles/h5p.css
@@ -1,10 +1,8 @@
+/* Font Awesome font licensed under SIL OFL 1.1 · Code licensed under MIT License */
 @font-face {
-  font-family: 'FontAwesome';
-  src:url('../fonts/fontawesome-webfont.eot');
-  src:url('../fonts/FontAwesome.otf?#iefix') format('embedded-opentype'),
-    url('../fonts/fontawesome-webfont.woff') format('woff'),
-    url('../fonts/fontawesome-webfont.ttf') format('truetype'),
-    url('../fonts/fontawesome-webfont.svg') format('svg');
+  font-family: 'H5PFontAwesome4'; /* Named so to avoid collisions and preserve backwards compatibility! */
+  src: url('../fonts/fontawesome-webfont.eot?v=4.0.3');
+  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');
   font-weight: normal;
   font-style: normal;
 }
@@ -42,7 +40,7 @@ div.h5p-semi-fullscreen {
 }
 
 .h5p-enable-fullscreen:before, .h5p-disable-fullscreen:before {
-  font-family: FontAwesome;
+  font-family: H5PFontAwesome4;
   margin-right: 10px;
   content: "\f0b2";
   font-size: 1.2em;
@@ -168,4 +166,4 @@ body.h5p-iframe-content div.h5p-content {
 }
 body.h5p-iframe-content.h5p-fullscreen div.h5p-content {
   height: 100%;
-}
\ No newline at end of file
+}