Use Font Standard instead of Font Awesome.

(https://korewanetadesu.com/pages/fontstandard.html)

diff --git a/BUGS.org b/BUGS.org
index 476ad5ce1b86b84c04c45777ca21b1daa544d99e..30d6f2f9a2b85172d08950165d8c0c738fc865e1 100644 (file)
--- a/BUGS.org
+++ b/BUGS.org
@@ -2,7 +2,8 @@
 ** Remove CSS pixel ratio > 1 support in Safari
    Mac OS X Safari has scaling bugs, and iOS Safari has lower
    performance.
-
+** Use standard Unicode codepoints for icon fonts
+   This is done via the [[https://korewanetadesu.com/pages/fontstandard.html][Font Standard]] icon font.
 
 * v1.2
 ** DONE Override the GPU blacklist on GNU/Linux

diff --git a/src/ext/font-awesome.woff b/src/ext/font-awesome.woff
deleted file mode 100644 (file)
index 9eaecb3..0000000
Binary files a/src/ext/font-awesome.woff and /dev/null differ

diff --git a/src/ext/fontstandard.woff b/src/ext/fontstandard.woff
new file mode 100644 (file)
index 0000000..a15f369
Binary files /dev/null and b/src/ext/fontstandard.woff differ

diff --git a/src/index.html b/src/index.html
index 2f3ffff850eb3c5c2fadf0f9a549a5220bd832ed..98adfb61df1792491116680b22d88bb65c780723 100644 (file)
--- a/src/index.html
+++ b/src/index.html
@@ -161,10 +161,6 @@
           Carrois Type Design
           (<a target=_blank href="http://www.carrois.com/en/fira-3-1/">Fira</a>)
         </dd>
-        <dd>
-          Dave Gandy
-          (<a target=_blank href="http://fortawesome.github.io/">Font Awesome</a>)
-        </dd>
         <dt>Special Thanks</dt>
         <dd>Amelia Gorman</dd>
         <dd>Jessicatz Fairymeadow</dd>

diff --git a/src/yuu/data/yuu.css b/src/yuu/data/yuu.css
index 86b933f1fea20b9c4ee4d0467961a5e5e48d0085..4e2eb23cfb32720356173d26a581eb1f206b0113 100644 (file)
--- a/src/yuu/data/yuu.css
+++ b/src/yuu/data/yuu.css
@@ -5,77 +5,77 @@
 */
 
 @font-face {
-  font-family: 'FontAwesome';
-  src: url('../../ext/font-awesome.woff') format('woff');
-  font-weight: normal;
-  font-style: normal;
+    font-family: 'Icons';
+    src: url('../../ext/fontstandard.woff') format('woff');
+    font-weight: normal;
+    font-style: normal;
 }
 
 @font-face {
-    font-family: 'Fira Sans';
+    font-family: 'Sans';
     src: url('../../ext/FiraSans-UltraLight.woff');
     font-weight: 200;
     font-style: normal;
 }
 
 @font-face {
-    font-family: 'Fira Sans';
+    font-family: 'Sans';
     src: url('../../ext/FiraSans-UltraLightItalic.woff');
     font-weight: 200;
     font-style: italic;
 }
 
 @font-face {
-    font-family: 'Fira Sans';
+    font-family: 'Sans';
     src: url('../../ext/FiraSans-Regular.woff');
     font-weight: 400;
     font-style: normal;
 }
 
 @font-face {
-    font-family: 'Fira Sans';
+    font-family: 'Sans';
     src: url('../../ext/FiraSans-Italic.woff');
     font-weight: 400;
     font-style: italic;
 }
 
 @font-face {
-    font-family: 'Fira Sans';
+    font-family: 'Sans';
     src: url('../../ext/FiraSans-Bold.woff');
     font-weight: 700;
     font-style: normal;
 }
 
 @font-face {
-    font-family: 'Fira Sans';
+    font-family: 'Sans';
     src: url('../../ext/FiraSans-BoldItalic.woff');
     font-weight: 700;
     font-style: italic;
 }
 
 @font-face {
-    font-family: 'Fira Mono';
+    font-family: 'Mono';
     src: url('../../ext/FiraMono-Regular.woff');
     font-weight: 400;
     font-style: normal;
 }
 
 @font-face {
-    font-family: 'Fira Mono';
+    font-family: 'Mono';
     src: url('../../ext/FiraMono-Bold.woff');
     font-weight: 700;
     font-style: normal;
 }
 
 pre, tt, code, kbd {
-    font-family: 'Fira Mono', FontAwesome, monospace;
+    font-family: Mono, Icons, monospace;
 }
 
 body {
     overflow: hidden;
     margin: 0;
     padding: 0;
-    font-family: 'Fira Sans', FontAwesome, sans-serif;
+    font-family: Sans, Icons, sans-serif;
 }
 
 #yuu-canvas {
@@ -235,7 +235,7 @@ div[data-yuu-command=dismiss] {
 }
 
 div[data-yuu-command=dismiss]:after {
-    content: "\f00d";
+    content: "\274c";
 }
 
 /* Table layout for options screens. In general, two or three columns,
@@ -279,11 +279,11 @@ input[type=checkbox][data-yuu-command] + label[for]:before {
 }
 
 input[type=checkbox][data-yuu-command] + label[for]:before {
-    content: "\f096";
+    content: "\2610";
 }
 
 input[type=checkbox][data-yuu-command]:checked + label[for]:before {
-    content: "\f046";
+    content: "\2611";
 }
 
 input[type=checkbox][data-yuu-command]:focus + label[for] {
@@ -319,11 +319,11 @@ input[type=range][data-yuu-command]::-moz-range-thumb {
 /* Special-case icons for the mute checkbox. */
 
 input[type=checkbox][data-yuu-command=mute]:checked + label[for]:before {
-    content: "\f026";
+    content: "\1f508";
 }
 
 input[type=checkbox][data-yuu-command=mute] + label[for]:before {
-    content: "\f028";
+    content: "\1f50a";
 }
 
 @-moz-keyframes spin {
@@ -342,7 +342,7 @@ input[type=checkbox][data-yuu-command=mute] + label[for]:before {
 }
 
 .yuu-spinner:after {
-    content: "◔";
+    content: "\1f501";
     -webkit-animation: spin 1s linear infinite;
     -moz-animation: spin 1s linear infinite;
     animation: spin 1s linear infinite;

diff --git a/src/yuu/director.js b/src/yuu/director.js
index e1c0b538b24230cd19e8a00a301d1e64d4ad0dad..cdba62cefb86282a3439a56ab8e12da92195c9bd 100644 (file)
--- a/src/yuu/director.js
+++ b/src/yuu/director.js
@@ -373,7 +373,7 @@
                 yuu.downloadURL(
                     yuu.canvas.toDataURL("image/png"),
                     document.title + " (" + date + ").png");
-                this.toast("\uf030", 0.5, "screenshot");
+                this.toast("📷", 0.5, "screenshot");
             } catch (exc) {
                 var dialog = yuu.showError(exc);
                 if (dialog)
@@ -674,7 +674,7 @@
         yuu.defaultKeybinds.bind("f11", "++fullscreen");
         yuu.defaultKeybinds.bind("f12", "screenshot");
         yuu.defaultKeybinds.bind(
-            "control+s", "++mute && toast \uf026 1 mute || toast \uf028 1 mute");
+            "control+s", "++mute && toast 🔈 1 mute || toast 🔊 1 mute");
 
         var director = yuu.director = new yuu.Director();
             /** The standard director */