From 2d7496ce806fdc802c20447564343003e47dfbd3 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Wed, 19 Dec 2018 20:14:43 +0000
Subject: [PATCH] Remove link component, use @apply

---
 assets/js/components/Navbar.vue      | 2 +-
 assets/sass/app.sass                 | 1 -
 assets/sass/base/base.sass           | 9 ++++-----
 assets/sass/components/link.sass     | 2 --
 assets/sass/components/markdown.sass | 3 ---
 5 files changed, 5 insertions(+), 12 deletions(-)
 delete mode 100644 assets/sass/components/link.sass

diff --git a/assets/js/components/Navbar.vue b/assets/js/components/Navbar.vue
index 6571e3e38..6762f83a8 100644
--- a/assets/js/components/Navbar.vue
+++ b/assets/js/components/Navbar.vue
@@ -20,7 +20,7 @@
         <a
           v-for="item in navItems"
           :href="item.href"
-          class="block p-4 border-l-3 sm:border-l-0 sm:border-b-3 border-transparent hover:border-grey-light sm:ml-4 sm:mr-0 sm:p-0 hover:no-underline"
+          class="block text-black p-4 border-l-3 sm:border-l-0 sm:border-b-3 border-transparent hover:border-grey-light sm:ml-4 sm:mr-0 sm:p-0 hover:no-underline"
           :class="{
           'border-blue hover:border-blue': pageUrl.match(new RegExp(item.pattern)),
           }"
diff --git a/assets/sass/app.sass b/assets/sass/app.sass
index c86698dc7..8708d6d92 100644
--- a/assets/sass/app.sass
+++ b/assets/sass/app.sass
@@ -10,7 +10,6 @@
 
 @import 'components/blockquote'
 @import 'components/button'
-@import 'components/link'
 @import 'components/listing'
 @import 'components/markdown'
 @import 'components/note'
diff --git a/assets/sass/base/base.sass b/assets/sass/base/base.sass
index 46371515b..f26cd2b5a 100644
--- a/assets/sass/base/base.sass
+++ b/assets/sass/base/base.sass
@@ -1,17 +1,16 @@
 a
-  color: inherit
-  text-decoration: none
+  @apply text-blue no-underline
 
   &:focus,
   &:hover
-    text-decoration: underline
+    @apply underline
 
 main a
-  text-decoration: underline
+  @apply underline
 
   &:focus,
   &:hover
-    text-decoration: none
+    @apply no-underline
 
 h1, h2, h3
   @apply mb-2
diff --git a/assets/sass/components/link.sass b/assets/sass/components/link.sass
deleted file mode 100644
index 5090ca453..000000000
--- a/assets/sass/components/link.sass
+++ /dev/null
@@ -1,2 +0,0 @@
-.link
-  @apply text-blue
diff --git a/assets/sass/components/markdown.sass b/assets/sass/components/markdown.sass
index 28db47f2e..1f6fdf77c 100644
--- a/assets/sass/components/markdown.sass
+++ b/assets/sass/components/markdown.sass
@@ -7,9 +7,6 @@
 
   p,
   li
-    a
-      @apply link
-
     code
       @apply bg-grey-lighter inline-block font-mono text-sm px-1 py-px border border-grey-light