FEATURE: Upgrade to Font Awesome 5 (#113)

* FEATURE: Upgrade to Font Awesome 5 * Adjust buttons CSS
discourse · Mar 30, 2020 · 0d43644 · 0d43644
1 parent fcf27cd
commit 0d43644
Show file tree

Hide file tree

Showing 25 changed files with 1,639 additions and 2,001 deletions.
diff --git a/assets/fonts/FontAwesome.otf b/assets/fonts/FontAwesome.otf
diff --git a/assets/fonts/fontawesome-webfont.eot b/assets/fonts/fontawesome-webfont.eot
diff --git a/assets/fonts/fontawesome-webfont.svg b/assets/fonts/fontawesome-webfont.svg
diff --git a/assets/fonts/fontawesome-webfont.ttf b/assets/fonts/fontawesome-webfont.ttf
diff --git a/assets/fonts/fontawesome-webfont.woff b/assets/fonts/fontawesome-webfont.woff
diff --git a/assets/fonts/fontawesome-webfont.woff2 b/assets/fonts/fontawesome-webfont.woff2
diff --git a/assets/javascript/client-app.js b/assets/javascript/client-app.js
diff --git a/assets/javascript/vendor.js b/assets/javascript/vendor.js
diff --git a/assets/stylesheets/client-app.css b/assets/stylesheets/client-app.css
diff --git a/assets/stylesheets/vendor.css b/assets/stylesheets/vendor.css
diff --git a/client-app/app/components/message-info.js b/client-app/app/components/message-info.js
@@ -9,13 +9,15 @@ export default Component.extend({
   buttons: computed("currentMessage.protected", "showSolveButton", function() {
     const protect = this.get("currentMessage.protected");
     const buttons = [];
+    const prefix = "fas";
 
     if (!protect && this.showSolveButton) {
       buttons.push({
         klass: "solve",
         action: "solve",
-        icon: "check-square-o",
+        icon: "check-square",
         label: "Solve",
+        prefix: "far",
         danger: true
       });
     }
@@ -24,8 +26,9 @@ export default Component.extend({
       buttons.push({
         klass: "solve-all",
         action: "solveAll",
-        icon: "check-square-o",
+        icon: "check-square",
         label: "Solve All",
+        prefix: "far",
         danger: true
       });
     }
@@ -35,14 +38,16 @@ export default Component.extend({
         {
           klass: "remove",
           action: "remove",
-          icon: "trash-o",
+          icon: "trash-alt",
           label: "Remove",
+          prefix: "far",
           danger: true
         },
         {
           klass: "protect",
           action: "protect",
           icon: "lock",
+          prefix,
           label: "Protect"
         }
       );
@@ -51,14 +56,16 @@ export default Component.extend({
         klass: "unprotect",
         action: "unprotect",
         icon: "unlock",
+        prefix,
         label: "Unprotect"
       });
     }
 
     buttons.push({
       klass: "copy",
       action: "copyAction",
-      icon: "clipboard",
+      icon: "copy",
+      prefix: "far",
       label: "Copy"
     });
     return buttons;

diff --git a/client-app/app/models/group.js b/client-app/app/models/group.js
@@ -16,7 +16,11 @@ export default EmberObject.extend({
   },
 
   glyph: computed(function() {
-    return "<i class='fa fa-clone group'></i>";
+    return "clone";
+  }),
+
+  prefix: computed(function() {
+    return "far";
   }),
 
   solveAll() {

diff --git a/client-app/app/models/message.js b/client-app/app/models/message.js
@@ -87,19 +87,40 @@ export default Em.Object.extend({
   }),
 
   glyph: computed("severity", function() {
-    switch (this.get("severity")) {
+    switch (this.severity) {
       case 0:
         return "";
       case 1:
         return "";
       case 2:
-        return "<i class='fa fa-exclamation-circle warning'></i>";
+        return "exclamation-circle";
       case 3:
-        return "<i class='fa fa-times-circle error'></i>";
+        return "times-circle";
       case 4:
-        return "<i class='fa fa-times-circle fatal'></i>";
+        return "times-circle";
       default:
-        return "<i class='fa fa-question-circle unknown'></i>";
+        return "question-circle";
+    }
+  }),
+
+  prefix: computed(function() {
+    return "fas";
+  }),
+
+  klass: computed("severity", function() {
+    switch (this.severity) {
+      case 0:
+        return "";
+      case 1:
+        return "";
+      case 2:
+        return "warning";
+      case 3:
+        return "error";
+      case 4:
+        return "fatal";
+      default:
+        return "unknown";
     }
   })
 });