Resolve "Editor icons"

3 files changed, 22 insertions, 22 deletions

diff --git a/app/assets/javascripts/vue_shared/components/markdown/field.vue b/app/assets/javascripts/vue_shared/components/markdown/field.vue
index 8c0d9b9cda8..6511828e982 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/field.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/field.vue
@@ -3,6 +3,7 @@
   import GLForm from '../../../gl_form';
   import markdownHeader from './header.vue';
   import markdownToolbar from './toolbar.vue';
+  import icon from '../icon.vue';
 
   export default {
     props: {
@@ -37,6 +38,7 @@
     components: {
       markdownHeader,
       markdownToolbar,
+      icon,
     },
     computed: {
       shouldShowReferencedUsers() {
@@ -114,10 +116,10 @@
           class="zen-control zen-control-leave js-zen-leave"
           href="#"
           aria-label="Enter zen mode">
-          <i
-            class="fa fa-compress"
-            aria-hidden="true">
-          </i>
+          <icon
+            name="screen-normal"
+            :size="32">
+          </icon>
         </a>
         <markdown-toolbar
           :markdown-docs-path="markdownDocsPath"
diff --git a/app/assets/javascripts/vue_shared/components/markdown/header.vue b/app/assets/javascripts/vue_shared/components/markdown/header.vue
index 5bf2a90cc3b..7541731083b 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/header.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/header.vue
@@ -1,6 +1,7 @@
 <script>
   import tooltip from '../../directives/tooltip';
   import toolbarButton from './toolbar_button.vue';
+  import icon from '../icon.vue';
 
   export default {
     props: {
@@ -14,6 +15,7 @@
     },
     components: {
       toolbarButton,
+      icon,
     },
     methods: {
       toggleMarkdownPreview(e, form) {
@@ -70,7 +72,7 @@
             tag="> "
             :prepend="true"
             button-title="Insert a quote"
-            icon="quote-right" />
+            icon="quote" />
           <toolbar-button
             tag="`"
             tag-block="```"
@@ -80,17 +82,17 @@
             tag="* "
             :prepend="true"
             button-title="Add a bullet list"
-            icon="list-ul" />
+            icon="list-bulleted" />
           <toolbar-button
             tag="1. "
             :prepend="true"
             button-title="Add a numbered list"
-            icon="list-ol" />
+            icon="list-numbered" />
           <toolbar-button
             tag="* [ ] "
             :prepend="true"
             button-title="Add a task list"
-            icon="check-square-o" />
+            icon="task-done" />
         </div>
         <div class="toolbar-group">
           <button
@@ -101,10 +103,9 @@
             tabindex="-1"
             title="Go full screen"
             type="button">
-            <i
-              aria-hidden="true"
-              class="fa fa-arrows-alt fa-fw">
-            </i>
+            <icon
+              name="screen-full">
+            </icon>
           </button>
         </div>
       </li>
diff --git a/app/assets/javascripts/vue_shared/components/markdown/toolbar_button.vue b/app/assets/javascripts/vue_shared/components/markdown/toolbar_button.vue
index f7da7ebfcfe..b930fb116a3 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/toolbar_button.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/toolbar_button.vue
@@ -1,5 +1,6 @@
 <script>
   import tooltip from '../../directives/tooltip';
+  import icon from '../icon.vue';
 
   export default {
     props: {
@@ -26,14 +27,12 @@
         default: false,
       },
     },
+    components: {
+      icon,
+    },
     directives: {
       tooltip,
     },
-    computed: {
-      iconClass() {
-        return `fa-${this.icon}`;
-      },
-    },
   };
 </script>
 
@@ -49,10 +48,8 @@
     :data-md-prepend="prepend"
     :title="buttonTitle"
     :aria-label="buttonTitle">
-    <i
-      aria-hidden="true"
-      class="fa fa-fw"
-      :class="iconClass">
-    </i>
+    <icon
+      :name="icon">
+    </icon>
   </button>
 </template>