From 50ece68f350a8a0dd16ea850571162f52c9c9e78 Mon Sep 17 00:00:00 2001
From: Anthony Lapenna <lapenna.anthony@gmail.com>
Date: Wed, 14 Mar 2018 15:32:14 +1000
Subject: [PATCH] style(app): update icon style (#1727)

---
 .../datatables/configs-datatable/configsDatatable.html      | 2 +-
 .../containers-datatable/containersDatatable.html           | 2 +-
 .../datatables/nodes-datatable/nodesDatatable.html          | 2 +-
 .../datatables/services-datatable/servicesDatatable.html    | 2 +-
 .../datatables/tasks-datatable/tasksDatatable.html          | 2 +-
 .../dockerSidebarContent/dockerSidebarContent.html          | 2 +-
 app/docker/views/containers/edit/container.html             | 6 +++---
 app/docker/views/containers/inspect/containerinspect.html   | 2 +-
 app/docker/views/images/build/buildimage.html               | 2 +-
 app/docker/views/images/edit/image.html                     | 4 ++--
 app/docker/views/services/edit/service.html                 | 2 +-
 app/docker/views/stacks/create/createstack.html             | 2 +-
 app/docker/views/tasks/edit/task.html                       | 2 +-
 .../datatables/users-datatable/usersDatatable.html          | 2 +-
 app/portainer/components/header-title.js                    | 2 +-
 app/portainer/views/about/about.html                        | 4 ++--
 vendor.yml                                                  | 1 -
 17 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/app/docker/components/datatables/configs-datatable/configsDatatable.html b/app/docker/components/datatables/configs-datatable/configsDatatable.html
index 9ca9d1adc..f41830f44 100644
--- a/app/docker/components/datatables/configs-datatable/configsDatatable.html
+++ b/app/docker/components/datatables/configs-datatable/configsDatatable.html
@@ -3,7 +3,7 @@
     <rd-widget-body classes="no-padding">
       <div class="toolBar">
         <div class="toolBarTitle">
-          <i class="far" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.title }}
+          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.title }}
         </div>
         <div class="settings">
           <span class="setting" ng-class="{ 'setting-active': $ctrl.state.displayTextFilter }" ng-click="$ctrl.updateDisplayTextFilter()" ng-if="$ctrl.showTextFilter">
diff --git a/app/docker/components/datatables/containers-datatable/containersDatatable.html b/app/docker/components/datatables/containers-datatable/containersDatatable.html
index 15421a656..973c1c5e6 100644
--- a/app/docker/components/datatables/containers-datatable/containersDatatable.html
+++ b/app/docker/components/datatables/containers-datatable/containersDatatable.html
@@ -196,7 +196,7 @@
               <td ng-if="$ctrl.settings.showQuickActionStats || $ctrl.settings.showQuickActionLogs || $ctrl.settings.showQuickActionConsole || $ctrl.settings.showQuickActionInspect">
                 <div class="btn-group btn-group-xs" role="group" aria-label="..." style="display:inline-flex;">
                   <a ng-if="$ctrl.settings.showQuickActionStats" style="margin: 0 2.5px;" ui-sref="docker.containers.container.stats({id: item.Id})" title="Stats"><i class="fa fa-chart-area space-right" aria-hidden="true"></i></a>
-                  <a ng-if="$ctrl.settings.showQuickActionLogs" style="margin: 0 2.5px;" ui-sref="docker.containers.container.logs({id: item.Id})" title="Logs"><i class="far fa-file-alt space-right" aria-hidden="true"></i></a>
+                  <a ng-if="$ctrl.settings.showQuickActionLogs" style="margin: 0 2.5px;" ui-sref="docker.containers.container.logs({id: item.Id})" title="Logs"><i class="fa fa-file-alt space-right" aria-hidden="true"></i></a>
                   <a ng-if="$ctrl.settings.showQuickActionConsole" style="margin: 0 2.5px;" ui-sref="docker.containers.container.console({id: item.Id})" title="Console"><i class="fa fa-terminal space-right" aria-hidden="true"></i></a>
                   <a ng-if="$ctrl.settings.showQuickActionInspect" style="margin: 0 2.5px;" ui-sref="docker.containers.container.inspect({id: item.Id})" title="Inspect"><i class="fa fa-info-circle space-right" aria-hidden="true"></i></a>
                 </div>
diff --git a/app/docker/components/datatables/nodes-datatable/nodesDatatable.html b/app/docker/components/datatables/nodes-datatable/nodesDatatable.html
index 987a6bc2e..ab825e5fa 100644
--- a/app/docker/components/datatables/nodes-datatable/nodesDatatable.html
+++ b/app/docker/components/datatables/nodes-datatable/nodesDatatable.html
@@ -3,7 +3,7 @@
     <rd-widget-body classes="no-padding">
       <div class="toolBar">
         <div class="toolBarTitle">
-          <i class="far" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.title }}
+          <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.title }}
         </div>
         <div class="settings">
           <span class="setting" ng-class="{ 'setting-active': $ctrl.state.displayTextFilter }" ng-click="$ctrl.updateDisplayTextFilter()" ng-if="$ctrl.showTextFilter">
diff --git a/app/docker/components/datatables/services-datatable/servicesDatatable.html b/app/docker/components/datatables/services-datatable/servicesDatatable.html
index cfebcf140..04584de28 100644
--- a/app/docker/components/datatables/services-datatable/servicesDatatable.html
+++ b/app/docker/components/datatables/services-datatable/servicesDatatable.html
@@ -110,7 +110,7 @@
                 <span ng-if="item.Mode === 'replicated' && item.Scale">
                   <input class="input-sm" type="number" ng-model="item.Replicas" on-enter-key="$ctrl.scaleAction(item)" />
                   <a class="interactive" ng-click="item.Scale = false;"><i class="fa fa-times"></i></a>
-                  <a class="interactive" ng-click="$ctrl.scaleAction(item)"><i class="far fa-check-square"></i></a>
+                  <a class="interactive" ng-click="$ctrl.scaleAction(item)"><i class="fa fa-check-square"></i></a>
                 </span>
               </td>
               <td>
diff --git a/app/docker/components/datatables/tasks-datatable/tasksDatatable.html b/app/docker/components/datatables/tasks-datatable/tasksDatatable.html
index f596bcd0e..e1ba5886a 100644
--- a/app/docker/components/datatables/tasks-datatable/tasksDatatable.html
+++ b/app/docker/components/datatables/tasks-datatable/tasksDatatable.html
@@ -66,7 +66,7 @@
               <td>{{ item.Updated | getisodate }}</td>
               <td ng-if="$ctrl.showLogsButton">
                 <a ui-sref="docker.tasks.task.logs({id: item.Id})">
-                  <i class="far fa-file-alt" aria-hidden="true"></i> View logs
+                  <i class="fa fa-file-alt" aria-hidden="true"></i> View logs
                 </a>
               </td>
             </tr>
diff --git a/app/docker/components/dockerSidebarContent/dockerSidebarContent.html b/app/docker/components/dockerSidebarContent/dockerSidebarContent.html
index 2cecd1aaf..ba0001c9c 100644
--- a/app/docker/components/dockerSidebarContent/dockerSidebarContent.html
+++ b/app/docker/components/dockerSidebarContent/dockerSidebarContent.html
@@ -26,7 +26,7 @@
   <a ui-sref="docker.volumes" ui-sref-active="active">Volumes <span class="menu-icon fa fa-cubes fa-fw"></span></a>
 </li>
 <li class="sidebar-list" ng-if="$ctrl.endpointApiVersion >= 1.30 && $ctrl.swarmManagement">
-  <a ui-sref="docker.configs" ui-sref-active="active">Configs <span class="menu-icon far fa-file-code fa-fw"></span></a>
+  <a ui-sref="docker.configs" ui-sref-active="active">Configs <span class="menu-icon fa fa-file-code fa-fw"></span></a>
 </li>
 <li class="sidebar-list" ng-if="$ctrl.endpointApiVersion >= 1.25 && $ctrl.swarmManagement">
   <a ui-sref="docker.secrets" ui-sref-active="active">Secrets <span class="menu-icon fa fa-user-secret fa-fw"></span></a>
diff --git a/app/docker/views/containers/edit/container.html b/app/docker/views/containers/edit/container.html
index 37b89df9f..03e9fba83 100644
--- a/app/docker/views/containers/edit/container.html
+++ b/app/docker/views/containers/edit/container.html
@@ -25,7 +25,7 @@
               <span ng-hide="state.recreateContainerInProgress"><i class="fa fa-sync space-right" aria-hidden="true"></i>Recreate</span>
               <span ng-show="state.recreateContainerInProgress">Recreation in progress...</span>
             </button>
-            <button class="btn btn-primary btn-sm" ng-click="duplicate()" ng-if="!container.Config.Labels['com.docker.swarm.service.id']"><i class="far fa-copy space-right" aria-hidden="true"></i>Duplicate/Edit</button>
+            <button class="btn btn-primary btn-sm" ng-click="duplicate()" ng-if="!container.Config.Labels['com.docker.swarm.service.id']"><i class="fa fa-copy space-right" aria-hidden="true"></i>Duplicate/Edit</button>
           </div>
         </rd-widget-body>
       </rd-widget>
@@ -53,7 +53,7 @@
                   <form ng-submit="renameContainer()">
                     <input type="text" class="containerNameInput" ng-model="container.newContainerName">
                     <a href="" ng-click="container.edit = false;"><i class="fa fa-times"></i></a>
-                    <a href="" ng-click="renameContainer()"><i class="far fa-check-square"></i></a>
+                    <a href="" ng-click="renameContainer()"><i class="fa fa-check-square"></i></a>
                   </form>
                 </td>
               </tr>
@@ -85,7 +85,7 @@
                 <td colspan="2">
                   <div class="btn-group" role="group" aria-label="...">
                     <a class="btn" type="button" ui-sref="docker.containers.container.stats({id: container.Id})"><i class="fa fa-chart-area space-right" aria-hidden="true"></i>Stats</a>
-                    <a class="btn" type="button" ui-sref="docker.containers.container.logs({id: container.Id})"><i class="far fa-file-alt space-right" aria-hidden="true"></i>Logs</a>
+                    <a class="btn" type="button" ui-sref="docker.containers.container.logs({id: container.Id})"><i class="fa fa-file-alt space-right" aria-hidden="true"></i>Logs</a>
                     <a class="btn" type="button" ui-sref="docker.containers.container.console({id: container.Id})"><i class="fa fa-terminal space-right" aria-hidden="true"></i>Console</a>
                     <a class="btn" type="button" ui-sref="docker.containers.container.inspect({id: container.Id})"><i class="fa fa-info-circle space-right" aria-hidden="true"></i>Inspect</a>
                   </div>
diff --git a/app/docker/views/containers/inspect/containerinspect.html b/app/docker/views/containers/inspect/containerinspect.html
index 16cdd503a..2289eeb4a 100644
--- a/app/docker/views/containers/inspect/containerinspect.html
+++ b/app/docker/views/containers/inspect/containerinspect.html
@@ -12,7 +12,7 @@
       <rd-widget-header icon="fa-icon-circle" title="Inspect">
         <span class="btn-group btn-group-sm">
           <label class="btn btn-primary" ng-model="state.DisplayTextView" uib-btn-radio="false"><i class="fa fa-code space-right" aria-hidden="true"></i>Tree</label>
-          <label class="btn btn-primary" ng-model="state.DisplayTextView" uib-btn-radio="true"><i class="far fa-file-alt space-right" aria-hidden="true"></i>Text</label>
+          <label class="btn btn-primary" ng-model="state.DisplayTextView" uib-btn-radio="true"><i class="fa fa-file-alt space-right" aria-hidden="true"></i>Text</label>
         </span>
       </rd-widget-header>
       <rd-widget-body>
diff --git a/app/docker/views/images/build/buildimage.html b/app/docker/views/images/build/buildimage.html
index 73428599e..53e00acd9 100644
--- a/app/docker/views/images/build/buildimage.html
+++ b/app/docker/views/images/build/buildimage.html
@@ -217,7 +217,7 @@
           </uib-tab>
           <uib-tab index="1" disable="!buildLogs">
             <uib-tab-heading>
-              <i class="far fa-file-alt space-right" aria-hidden="true"></i> Output
+              <i class="fa fa-file-alt space-right" aria-hidden="true"></i> Output
             </uib-tab-heading>
             <pre class="log_viewer">
               <div ng-repeat="line in buildLogs track by $index" class="line"><p class="inner_line" ng-click="active=!active" ng-class="{'line_selected': active}">{{ line }}</p></div>
diff --git a/app/docker/views/images/edit/image.html b/app/docker/views/images/edit/image.html
index f07275216..1cc50a61b 100644
--- a/app/docker/views/images/edit/image.html
+++ b/app/docker/views/images/edit/image.html
@@ -24,7 +24,7 @@
                       <span class="fa fa-download white-icon" aria-hidden="true"></span>
                     </a>
                     <a data-toggle="tooltip" class="btn btn-primary interactive" title="Remove tag" ng-click="removeTag(tag)">
-                      <span class="far fa-trash-alt white-icon" aria-hidden="true"></span>
+                      <span class="fa fa-trash-alt white-icon" aria-hidden="true"></span>
                     </a>
                   </span>
                 </div>
@@ -36,7 +36,7 @@
               <span class="small text-muted">
                 Note: you can click on the upload icon <span class="fa fa-upload" aria-hidden="true"></span> to push an image
                 or on the download icon <span class="fa fa-download" aria-hidden="true"></span> to pull an image
-                or on the trash icon <span class="far fa-trash-alt" aria-hidden="true"></span> to delete a tag.
+                or on the trash icon <span class="fa fa-trash-alt" aria-hidden="true"></span> to delete a tag.
               </span>
             </div>
             <div class="col-sm-12">
diff --git a/app/docker/views/services/edit/service.html b/app/docker/views/services/edit/service.html
index 0d7e8a1b8..6669f53a4 100644
--- a/app/docker/views/services/edit/service.html
+++ b/app/docker/views/services/edit/service.html
@@ -73,7 +73,7 @@
             </tr>
             <tr>
               <td colspan="2">
-                <a ng-if="applicationState.endpoint.apiVersion >= 1.30" class="btn btn-primary btn-sm" type="button" ui-sref="docker.services.service.logs({id: service.Id})"><i class="far fa-file-alt space-right" aria-hidden="true"></i>Service logs</a>
+                <a ng-if="applicationState.endpoint.apiVersion >= 1.30" class="btn btn-primary btn-sm" type="button" ui-sref="docker.services.service.logs({id: service.Id})"><i class="fa fa-file-alt space-right" aria-hidden="true"></i>Service logs</a>
                 <button type="button" class="btn btn-primary btn-sm" ng-disabled="state.updateInProgress || isUpdating" ng-click="forceUpdateService(service)" button-spinner="state.updateInProgress" ng-if="applicationState.endpoint.apiVersion >= 1.25">
                   <span ng-hide="state.updateInProgress"><i class="fa fa-sync space-right" aria-hidden="true"></i>Update the service</span>
                   <span ng-show="state.updateInProgress">Update in progress...</span>
diff --git a/app/docker/views/stacks/create/createstack.html b/app/docker/views/stacks/create/createstack.html
index 927255b23..943277edc 100644
--- a/app/docker/views/stacks/create/createstack.html
+++ b/app/docker/views/stacks/create/createstack.html
@@ -54,7 +54,7 @@
                 <input type="radio" id="method_repository" ng-model="state.Method" value="repository">
                 <label for="method_repository">
                   <div class="boxselector_header">
-                    <i class="fa fa-git" aria-hidden="true" style="margin-right: 2px;"></i>
+                    <i class="fab fa-git" aria-hidden="true" style="margin-right: 2px;"></i>
                     Repository
                   </div>
                   <p>Use a git repository</p>
diff --git a/app/docker/views/tasks/edit/task.html b/app/docker/views/tasks/edit/task.html
index 997c177f2..e61bc62dd 100644
--- a/app/docker/views/tasks/edit/task.html
+++ b/app/docker/views/tasks/edit/task.html
@@ -45,7 +45,7 @@
               <td>{{ task.Status.ContainerStatus.ContainerID }}</td>
             </tr>
             <tr ng-if="applicationState.endpoint.apiVersion >= 1.30" >
-              <td colspan="2"><a class="btn btn-primary btn-sm" type="button" ui-sref="docker.tasks.task.logs({id: task.Id})"><i class="far fa-file-alt space-right" aria-hidden="true"></i>Task logs</a></td>
+              <td colspan="2"><a class="btn btn-primary btn-sm" type="button" ui-sref="docker.tasks.task.logs({id: task.Id})"><i class="fa fa-file-alt space-right" aria-hidden="true"></i>Task logs</a></td>
             </tr>
           </tbody>
         </table>
diff --git a/app/portainer/components/datatables/users-datatable/usersDatatable.html b/app/portainer/components/datatables/users-datatable/usersDatatable.html
index 5db9e58d1..605d6380c 100644
--- a/app/portainer/components/datatables/users-datatable/usersDatatable.html
+++ b/app/portainer/components/datatables/users-datatable/usersDatatable.html
@@ -63,7 +63,7 @@
               </td>
               <td>
                 <span>
-                  <i class="far fa-user-circle" aria-hidden="true" style="margin-right: 5px;" ng-if="item.Role === 1 && !item.isTeamLeader"></i>
+                  <i class="fa fa-user-circle" aria-hidden="true" style="margin-right: 5px;" ng-if="item.Role === 1 && !item.isTeamLeader"></i>
                   <i class="fa fa-user-plus" aria-hidden="true" style="margin-right: 5px;" ng-if="item.Role !== 1 && item.isTeamLeader"></i>
                   <i class="fa fa-user" aria-hidden="true" style="margin-right: 5px;" ng-if="item.Role !== 1 && !item.isTeamLeader"></i>
                   {{ item.RoleName }}
diff --git a/app/portainer/components/header-title.js b/app/portainer/components/header-title.js
index 073410de6..92a6e3d4c 100644
--- a/app/portainer/components/header-title.js
+++ b/app/portainer/components/header-title.js
@@ -10,7 +10,7 @@ angular.module('portainer.app')
       scope.displayDonationHeader = StateManager.getState().application.displayDonationHeader;
     },
     transclude: true,
-    template: '<div class="page white-space-normal">{{title}}<span class="header_title_content" ng-transclude></span><span class="pull-right user-box" ng-if="username"><i class="far fa-user-circle" aria-hidden="true"></i> {{username}}</span><a ng-if="displayDonationHeader" ui-sref="portainer.about" class="pull-right" style="font-size:14px;margin-right:15px;margin-top:2px;"><span class="fa fa-heart fa-fw red-icon"></span>  Help support portainer</a></div>',
+    template: '<div class="page white-space-normal">{{title}}<span class="header_title_content" ng-transclude></span><span class="pull-right user-box" ng-if="username"><i class="fa fa-user-circle" aria-hidden="true"></i> {{username}}</span><a ng-if="displayDonationHeader" ui-sref="portainer.about" class="pull-right" style="font-size:14px;margin-right:15px;margin-top:2px;"><span class="fa fa-heart fa-fw red-icon"></span>  Help support portainer</a></div>',
     restrict: 'E'
   };
   return directive;
diff --git a/app/portainer/views/about/about.html b/app/portainer/views/about/about.html
index c200ab24a..b1af972a3 100644
--- a/app/portainer/views/about/about.html
+++ b/app/portainer/views/about/about.html
@@ -28,7 +28,7 @@
         <p>
           <i class="fa fa-chevron-circle-right" aria-hidden="true"></i> <u>Fund our work</u>
           <ul>
-            <li>Become a <a href="https://www.patreon.com/Portainerio" target="_blank"><i class="far fa-money-bill-alt" aria-hidden="true"></i> patron</a></li>
+            <li>Become a <a href="https://www.patreon.com/Portainerio" target="_blank"><i class="fa fa-money-bill-alt" aria-hidden="true"></i> patron</a></li>
             <li>Consider a <a href="https://portainer.io/support.html" target="_blank">paid support plan</a></li>
             <li>Make a <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=YHXZJQNJQ36H6" target="_blank"><i class="fab fa-paypal" aria-hidden="true"></i> donation</a></li>
           </ul>
@@ -77,7 +77,7 @@
             <i class="fa fa-chevron-circle-right" aria-hidden="true"></i> <u>Services</u>
             <ul>
               <li>Find out more about our <a href="https://portainer.io/support.html" target="_blank">consulting and commercial support plans</a></li>
-              <li>We also propose a fund-a-feature plan, reach out to us at <a target="_blank" href="mailto:info@portainer.io"><i class="far fa-envelope" aria-hidden="true"></i> portainer.io</a></li>
+              <li>We also propose a fund-a-feature plan, reach out to us at <a target="_blank" href="mailto:info@portainer.io"><i class="fa fa-envelope" aria-hidden="true"></i> portainer.io</a></li>
             </ul>
           </p>
         </div>
diff --git a/vendor.yml b/vendor.yml
index a8c35ec02..5234104ce 100644
--- a/vendor.yml
+++ b/vendor.yml
@@ -23,7 +23,6 @@ css:
   - 'isteven-angular-multiselect/isteven-multi-select.css'
   - 'ui-select/dist/select.css'
   - '@fortawesome/fontawesome-free-webfonts/css/fa-brands.css'
-  - '@fortawesome/fontawesome-free-webfonts/css/fa-regular.css'
   - '@fortawesome/fontawesome-free-webfonts/css/fa-solid.css'
   - '@fortawesome/fontawesome-free-webfonts/css/fontawesome.css'
   - 'toastr/build/toastr.css'