Update to Font Awesome 5

Replace FA4 icons with their FA5 equivalents Use official addon in place of ember-font-awesome addon Default to the pro regular style, except for the navigation which is in solid. Default to the solid style icon After group review this is our best icon choice and we can default to it. Fixup tests with bad references to icons Our move to FA5 invalidated these selectors Remove local ember-fontawesome dependency
ilios · Aug 24, 2018 · 6790ea3 · 6790ea3
1 parent becfa13
commit 6790ea3
Show file tree

Hide file tree

Showing 96 changed files with 677 additions and 360 deletions.
diff --git a/.npmrc b/.npmrc
@@ -0,0 +1,2 @@
+@fortawesome:registry=https://npm.fontawesome.com/
+//npm.fontawesome.com/:_authToken=3DCC00F4-5A45-4726-BD5E-8508D7876990
diff --git a/app/components/publication-status.js b/app/components/publication-status.js
@@ -35,13 +35,13 @@ export default Component.extend({
     const isPublished = this.get('isPublished');
     const isScheduled = this.get('isScheduled');
     if (isScheduled) {
-      return 'clock-o';
+      return 'clock';
     }
     if (isPublished) {
       return 'star';
     }
 
-    return 'star-half-full';
+    return 'star-half-alt';
   }),
   publicationStatus: computed('isPublished', 'isScheduled', function(){
     const isPublished = this.get('isPublished');

diff --git a/app/components/sortable-heading.js b/app/components/sortable-heading.js
@@ -17,9 +17,9 @@ export default Component.extend({
 
     if(sortedBy){
       if(sortedAscending){
-        return sortType === 'numeric'?'sort-numeric-asc':'sort-alpha-asc';
+        return sortType === 'numeric'?'sort-numeric-up':'sort-alpha-up';
       } else {
-        return sortType === 'numeric'?'sort-numeric-desc':'sort-alpha-desc';
+        return sortType === 'numeric'?'sort-numeric-down':'sort-alpha-down';
       }
     } else {
       return 'sort';

diff --git a/app/components/sortable-th.js b/app/components/sortable-th.js
@@ -17,9 +17,9 @@ export default Component.extend({
 
     if(sortedBy){
       if(sortedAscending){
-        return sortType === 'numeric'?'sort-numeric-asc':'sort-alpha-asc';
+        return sortType === 'numeric'?'sort-numeric-up':'sort-alpha-up';
       } else {
-        return sortType === 'numeric'?'sort-numeric-desc':'sort-alpha-desc';
+        return sortType === 'numeric'?'sort-numeric-down':'sort-alpha-down';
       }
     } else {
       return 'sort';

diff --git a/app/mixins/publishable.js b/app/mixins/publishable.js
@@ -23,7 +23,7 @@ export default Mixin.create({
   }),
   menuIcon: computed('publishTarget.isPublished', 'publishTarget.publishedAsTbd', function(){
     if(this.get('publishTarget.publishedAsTbd')){
-      return 'clock-o';
+      return 'clock';
     }
     if(this.get('publishTarget.isPublished')){
       return 'star';

diff --git a/app/routes/user.js b/app/routes/user.js
@@ -9,7 +9,7 @@ export default Route.extend(AuthenticatedRouteMixin, {
   permissionChecker: service(),
   titleToken: 'general.admin',
   canUpdate: false,
-  canCreat: false,
+  canCreate: false,
   /**
   * Prefetch user relationship data to smooth loading
   **/

diff --git a/app/styles/components/course-details.scss b/app/styles/components/course-details.scss
@@ -21,10 +21,6 @@
       color: $white;
       cursor: pointer;
       padding: .25rem 4rem;
-
-      > i {
-        padding-left: 1rem;
-      }
     }
   }
 

diff --git a/app/styles/components/visualizer-course-objectives.scss b/app/styles/components/visualizer-course-objectives.scss
@@ -9,19 +9,19 @@
     }
 
     @media phone {
-      .meh-o {
+      .meh {
         font-size: 15rem;
       }
     }
 
     @include for-tablet-and-up {
-      .meh-o {
+      .meh {
         font-size: 25rem;
       }
     }
 
     @include for-laptop-and-up {
-      .meh-o {
+      .meh {
         font-size: 30rem;
       }
     }

diff --git a/app/templates/components/course-director-manager.hbs b/app/templates/components/course-director-manager.hbs
@@ -11,7 +11,7 @@
   <ul>
     {{#each (sort-by "lastName" directors) as |user|}}
       <li {{action "removeDirector" user}}>
-        {{user.fullName}} {{fa-icon "remove" class="remove"}}
+        {{user.fullName}} {{fa-icon "times" class="remove"}}
       </li>
     {{/each}}
   </ul>

diff --git a/app/templates/components/course-overview.hbs b/app/templates/components/course-overview.hbs
@@ -24,7 +24,7 @@
       course
       title=(t "general.courseVisualizations")
     }}
-      {{fa-icon "bar-chart"}}
+      {{fa-icon "chart-bar"}}
     {{/link-to}}
   </div>
 </div>

diff --git a/app/templates/components/course-sessions.hbs b/app/templates/components/course-sessions.hbs
@@ -29,7 +29,7 @@
 {{#if saveSession.lastSuccessful.value}}
   <div class="save-result" data-test-new-saved-session>
     {{#link-to "session.index" course saveSession.lastSuccessful.value}}
-      {{fa-icon "external-link-square"}} {{get saveSession.lastSuccessful.value "title"}}
+      {{fa-icon "external-link-square-alt"}} {{get saveSession.lastSuccessful.value "title"}}
     {{/link-to}}
     {{t "general.savedSuccessfully"}}
   </div>

diff --git a/app/templates/components/curriculum-inventory-sequence-block-list.hbs b/app/templates/components/curriculum-inventory-sequence-block-list.hbs
@@ -22,7 +22,7 @@
     {{#if saved}}
       <div class="saved-result">
         {{#link-to "curriculumInventorySequenceBlock" savedBlock}}
-          {{fa-icon "external-link-square"}} {{savedBlock.title}}
+          {{fa-icon "external-link-square-alt"}} {{savedBlock.title}}
         {{/link-to}}
         {{t "general.savedSuccessfully"}}
       </div>

diff --git a/app/templates/components/dashboard-mycourses.hbs b/app/templates/components/dashboard-mycourses.hbs
@@ -10,7 +10,7 @@
           {{#each (await listOfCourses) as |course|}}
             {{#if (await canEditCourses)}}
               <tr class="clickable">
-                <td>{{#link-to "course" course}}{{fa-icon "external-link-square"}} {{course.academicYear}}{{/link-to}}</td>
+                <td>{{#link-to "course" course}}{{fa-icon "external-link-square-alt"}} {{course.academicYear}}{{/link-to}}</td>
                 <td>
                   {{#link-to "course" course}}
                     {{course.title}}

diff --git a/app/templates/components/detail-cohort-manager.hbs b/app/templates/components/detail-cohort-manager.hbs
@@ -3,7 +3,7 @@
     <li {{action "remove" cohort}}>
       {{cohort.programYear.program.school.title}} |
       {{cohort.programYear.program.title}} |
-      {{cohort.title}} | {{fa-icon "remove" class="remove"}}
+      {{cohort.title}} | {{fa-icon "times" class="remove"}}
     </li>
   {{/each}}
 </ul>

diff --git a/app/templates/components/detail-learnergroups-list.hbs b/app/templates/components/detail-learnergroups-list.hbs
@@ -32,7 +32,7 @@
               >
                 {{learnerGroup.title}} ({{count-related learnerGroup "users"}})
                 {{#if isManaging}}
-                  {{fa-icon "remove" class="remove"}}
+                  {{fa-icon "times" class="remove"}}
                 {{/if}}
               </li>
             {{/each}}

diff --git a/app/templates/components/detail-terms-list-item.hbs b/app/templates/components/detail-terms-list-item.hbs
@@ -15,5 +15,5 @@
   <span class="inactive">({{t "general.inactive"}})</span>
 {{/if}}
 {{#if canEdit}}
-  {{fa-icon "remove" class="remove"}}
+  {{fa-icon "times" class="remove"}}
 {{/if}}
diff --git a/app/templates/components/error-display.hbs b/app/templates/components/error-display.hbs
@@ -2,7 +2,7 @@
 <div class="error-main">
   {{#if isOffline}}
     <h2>{{t "general.connectionLost"}}</h2>
-    <p class="clear-errors"><button {{action "refresh"}}>{{fa-icon "refresh"}} {{t "general.reconnectNow"}}</button></p>
+    <p class="clear-errors"><button {{action "refresh"}}>{{fa-icon "sync-alt"}} {{t "general.reconnectNow"}}</button></p>
   {{else if is404}}
     {{not-found}}
   {{else}}

diff --git a/app/templates/components/ilios-navigation.hbs b/app/templates/components/ilios-navigation.hbs
@@ -9,7 +9,7 @@
     <li>{{#link-to "dashboard"}}{{fa-icon "home" fixedWidth=true title=(t "general.dashboard")}}<span class="text">{{t "general.dashboard"}}</span>{{/link-to}}</li>
     {{#if currentUser.performsNonLearnerFunction}}
       <li>{{#link-to "courses" title=(t "general.coursesAndSessions")}}{{fa-icon "book" fixedWidth=true}}<span class="text">{{t "general.coursesAndSessions"}}</span>{{/link-to}}</li>
-      <li>{{#link-to "learnerGroups" title=(t "general.learnerGroups")}}{{fa-icon "mortar-board" fixedWidth=true}}<span class="text">{{t "general.learnerGroups"}}</span>{{/link-to}}</li>
+      <li>{{#link-to "learnerGroups" title=(t "general.learnerGroups")}}{{fa-icon "graduation-cap" fixedWidth=true}}<span class="text">{{t "general.learnerGroups"}}</span>{{/link-to}}</li>
       <li>{{#link-to "instructorGroups" title=(t "general.instructorGroups")}}{{fa-icon "user-md" fixedWidth=true}}<span class="text">{{t "general.instructorGroups"}}</span>{{/link-to}}</li>
       <li>{{#link-to "schools" title=(t "general.schools")}}{{fa-icon "university" fixedWidth=true}}<span class="text">{{t "general.schools"}}</span>{{/link-to}}</li>
       <li>{{#link-to "programs" title=(t "general.programs")}}{{fa-icon "list-alt" fixedWidth=true}}<span class="text">{{t "general.programs"}}</span>{{/link-to}}</li>
@@ -23,7 +23,7 @@
           "curriculumInventoryReports"
           title=(t "general.curriculumInventory")
         }}
-          {{fa-icon "bar-chart" fixedWidth=true}}
+          {{fa-icon "chart-bar" fixedWidth=true}}
           <span class="text">{{t "general.curriculumInventory"}}</span>
         {{/link-to}}
       </li>

diff --git a/app/templates/components/instructor-selection-manager.hbs b/app/templates/components/instructor-selection-manager.hbs
@@ -3,7 +3,7 @@
   <ul data-test-instructor-groups>
     {{#each (sort-by "title" (await instructorGroups)) as |instructorGroup|}}
       <li {{action "removeInstructorGroup" instructorGroup}}>
-        {{fa-icon "group"}} {{instructorGroup.title}} {{fa-icon "times" class="remove"}}
+        {{fa-icon "users"}} {{instructorGroup.title}} {{fa-icon "times" class="remove"}}
       </li>
     {{/each}}
   </ul>

diff --git a/app/templates/components/instructorgroup-details.hbs b/app/templates/components/instructorgroup-details.hbs
@@ -15,7 +15,7 @@
           as |user|
         }}
           {{#if canUpdate}}
-            <li class="clickable" {{action "removeUser" user}}>{{user.fullName}}{{fa-icon "remove" class="remove"}}</li>
+            <li class="clickable" {{action "removeUser" user}}>{{user.fullName}}{{fa-icon "times" class="remove"}}</li>
           {{else}}
             <li>{{user.fullName}}</li>
           {{/if}}
@@ -38,7 +38,7 @@
     {{#if (is-fulfilled instructorGroup.courses)}}
       <ul>
         {{#each (sort-by "title" (await instructorGroup.courses)) as |course|}}
-          <li>{{#link-to "course" course}}{{fa-icon "external-link-square"}} {{course.title}}{{/link-to}}</li>
+          <li>{{#link-to "course" course}}{{fa-icon "external-link-square-alt"}} {{course.title}}{{/link-to}}</li>
         {{else}}
           {{t "general.none"}}
         {{/each}}

diff --git a/app/templates/components/leadership-manager.hbs b/app/templates/components/leadership-manager.hbs
@@ -12,7 +12,7 @@
           <ul>
             {{#each (sort-by "lastName" "firstName" directors) as |user|}}
               <li>
-                {{fa-icon "remove" class="clickable remove" click=(action removeDirector user)}}
+                {{fa-icon "times" class="clickable remove" click=(action removeDirector user)}}
                 {{#unless user.enabled}}
                   {{fa-icon "user-times" title=(t "general.disabled") class="disabled-user"}}
                 {{/unless}}
@@ -30,7 +30,7 @@
             {{#each (sort-by "lastName" "firstName" administrators) as |user|}}
               <li>
                 {{fa-icon
-                  "remove"
+                  "times"
                   class="clickable remove"
                   click=(action removeAdministrator user)
                 }}

diff --git a/app/templates/components/learnergroup-instructor-manager.hbs b/app/templates/components/learnergroup-instructor-manager.hbs
@@ -11,12 +11,12 @@
   <ul class="removable-list tag-list">
     {{#each (sort-by "lastName" instructors) as |user|}}
       <li {{action "removeInstructor" user}}>
-        {{user.fullName}} | {{fa-icon "remove"}}
+        {{user.fullName}} | {{fa-icon "times"}}
       </li>
     {{/each}}
     {{#each (sort-by "title" instructorGroups) as |instructorGroup|}}
       <li {{action "removeInstructorGroup" instructorGroup}}>
-        {{instructorGroup.title}} | {{fa-icon "remove"}}
+        {{instructorGroup.title}} | {{fa-icon "times"}}
       </li>
     {{/each}}
   </ul>

diff --git a/app/templates/components/learnergroup-subgroup-list.hbs b/app/templates/components/learnergroup-subgroup-list.hbs
@@ -35,7 +35,7 @@
   {{#if saved}}
     <div class="saved-result">
       {{#link-to "learnerGroup" savedGroup}}
-        {{fa-icon "external-link-square"}} {{savedGroup.title}}
+        {{fa-icon "external-link-square-alt"}} {{savedGroup.title}}
       {{/link-to}}
       {{t "general.savedSuccessfully"}}
     </div>

diff --git a/app/templates/components/learning-material-table-status.hbs b/app/templates/components/learning-material-table-status.hbs
@@ -1,4 +1,4 @@
 {{value}}
 {{#if (or row.startDate row.endDate)}}
-  {{fa-icon "clock-o" title=(t "general.timedRelease")}}
+  {{fa-icon "clock" title=(t "general.timedRelease")}}
 {{/if}}
diff --git a/app/templates/components/learning-materials-sort-manager.hbs b/app/templates/components/learning-materials-sort-manager.hbs
@@ -16,7 +16,7 @@
           isSortable=true
           sortingScope="sortingGroup"
         }}
-          {{fa-icon "arrows"}}
+          {{fa-icon "arrows-alt"}}
           <span class="draggable-object-content">
             <span class="title">
               {{lm-type-icon
@@ -35,4 +35,4 @@
       {{/each}}
     {{/sortable-objects}}
   </div>
-{{/unless}}
+{{/unless}}
diff --git a/app/templates/components/mesh-manager.hbs b/app/templates/components/mesh-manager.hbs
@@ -16,7 +16,7 @@
         {{/if}}
       </span>
       {{#if editable}}
-        {{fa-icon "remove" class="remove"}}
+        {{fa-icon "times" class="remove"}}
       {{/if}}
     </li>
   {{/each}}

diff --git a/app/templates/components/my-materials.hbs b/app/templates/components/my-materials.hbs
@@ -71,7 +71,7 @@
             <td colspan="3">{{lmObject.courseTitle}}</td>
             <td colspan="3">
               {{#if lmObject.isBlanked}}
-                <span class="lm-type-icon">{{fa-icon "clock-o" title=(t "general.timedRelease")}}</span>
+                <span class="lm-type-icon">{{fa-icon "clock" title=(t "general.timedRelease")}}</span>
                 {{lmObject.title}}
                 <span class="timed-release-info">
                   ({{timed-release-schedule startDate=lmObject.startDate endDate=lmObject.endDate}})

diff --git a/app/templates/components/myreports-list-item.hbs b/app/templates/components/myreports-list-item.hbs
@@ -1,10 +1,10 @@
 {{#unless loadTitle.isRunning}}
   {{#if reporttitle}}
     <span {{action "selectReport" report}} class="link clickable">
-      {{fa-icon "external-link-square"}}
+      {{fa-icon "external-link-square-alt"}}
       {{reporttitle}}
     </span>
   {{else}}
     <span>{{t "general.thisReportIsNoLongerAvailable"}}</span>
   {{/if}}
-{{/unless}}
+{{/unless}}
diff --git a/app/templates/components/new-directory-user.hbs b/app/templates/components/new-directory-user.hbs
@@ -171,7 +171,7 @@
                     <td class="text-right" colspan="1">
                       {{#if user.user}}
                         {{fa-icon
-                          "sun-o"
+                          "sun"
                           class="warning clickable"
                           click=(action attrs.transitionToUser user.user)
                           title=(t "general.goToUser")

diff --git a/app/templates/components/new-myreport.hbs b/app/templates/components/new-myreport.hbs
@@ -90,7 +90,7 @@
       {{#if (is-equal currentPrepositionalObject "instructor")}}
         {{#if selectedUser}}
           <ul class="removable-list tag-list">
-            <li {{action "changePrepositionalObjectId" null}}>{{selectedUser.fullName}} {{fa-icon "remove"}}</li>
+            <li {{action "changePrepositionalObjectId" null}}>{{selectedUser.fullName}} {{fa-icon "times"}}</li>
           </ul>
         {{else}}
           {{user-search
@@ -110,7 +110,7 @@
                   {{/if}}
                 </span>
               </div>
-              {{fa-icon "remove"}}
+              {{fa-icon "times"}}
             </li>
           </ul>
         {{else}}

diff --git a/app/templates/components/objective-sort-manager.hbs b/app/templates/components/objective-sort-manager.hbs
@@ -16,12 +16,12 @@
           isSortable=true
           sortingScope="sortingGroup"
         }}
-          {{fa-icon "arrows"}}
+          {{fa-icon "arrows-alt"}}
           <span class="draggable-object-content">
             <span>{{big-text text=item.title}}</span>
           </span>
         {{/draggable-object}}
       {{/each}}
     {{/sortable-objects}}
   </div>
-{{/unless}}
+{{/unless}}
diff --git a/app/templates/components/offering-manager.hbs b/app/templates/components/offering-manager.hbs
@@ -26,7 +26,7 @@
           {{/if}}
         </li>
       {{else}}
-        <li>{{fa-icon "group"}}</li>
+        <li>{{fa-icon "users"}}</li>
       {{/each}}
     </ul>
   </div>

diff --git a/app/templates/components/pending-updates-summary.hbs b/app/templates/components/pending-updates-summary.hbs
@@ -1,6 +1,6 @@
 <h3>
   {{#if (gt (get (await updates) "length") 1)}}
-    {{fa-icon "warning"  class="no"}}
+    {{fa-icon "exclamation-triangle"  class="no"}}
   {{/if}}
   {{t "general.pendingUpdatesSummaryTitle"}}
 </h3>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		@fortawesome:registry=https://npm.fontawesome.com/
		//npm.fontawesome.com/:_authToken=3DCC00F4-5A45-4726-BD5E-8508D7876990