From 3832d7972d1031b49db347a072af765a4fc680d4 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Fri, 12 Mar 2021 17:30:25 +0000
Subject: [PATCH] Use `extends` for extending variants

---
 web/themes/custom/opdavies/tailwind.config.js | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/web/themes/custom/opdavies/tailwind.config.js b/web/themes/custom/opdavies/tailwind.config.js
index 91288c2..fa13f52 100644
--- a/web/themes/custom/opdavies/tailwind.config.js
+++ b/web/themes/custom/opdavies/tailwind.config.js
@@ -1,12 +1,10 @@
 const aspectRatio = require('@tailwindcss/aspect-ratio')
 const colors = require('./tailwind-colours')
-const defaultConfig = require('tailwindcss/defaultConfig')
 const defaultTheme = require('tailwindcss/defaultTheme')
 const focusVisible = require('./tailwind-plugin-focus-visible')
 const forms = require('@tailwindcss/forms')
 const typography = require('@tailwindcss/typography')
 const { fontFamily } = defaultTheme
-const { variants } = defaultConfig
 
 module.exports = {
   darkMode: 'media',
@@ -99,13 +97,12 @@ module.exports = {
     typography
   ],
   variants: {
-    borderColor: [...variants.borderColor, 'focus-visible'],
-    borderStyle: [...variants.borderStyle, 'hover', 'focus'],
-    borderWidth: [...variants.borderWidth, 'hover', 'focus'],
-    margin: [...variants.margin, 'first', 'last', 'odd', 'even'],
-    typography: ['responsive'],
     extend: {
-      typography: ['dark']
+      borderColor: ['focus-visible'],
+      borderStyle: ['hover', 'focus'],
+      borderWidth: ['hover', 'focus'],
+      margin: ['first', 'last', 'odd', 'even'],
+      typography: ['responsive', 'dark']
     }
   }
 }