Merge pull request #520 from ExpressionEngine/feature/7.x/update-tailwindcss_new

fixed config tailwind file to rebuild tailwindcss

Author: ops-andy

gulpfile.js

@@ -85,16 +85,6 @@ function buildJs() {
 		.pipe(gulp.dest(CONFIG.assetsDir))
 }
 
-function useTailwindcss() {
-	return gulp.src('./node_modules/tailwindcss/tailwind.css')
-		.pipe(postcss([
-			tailwindcss(CONFIG.tailwindConfig),
-			require( 'autoprefixer' )
-		]))
-		.pipe(rename({ suffix: '.min' }))
-		.pipe(gulp.dest(CONFIG.assetsDir))
-}
-
 function moveThemeFonts() {
 	return gulp.src(CONFIG.assetsSourceDir + '/webfonts/**/*')
 	.pipe(gulp.dest(CONFIG.assetsDir +  '/webfonts'))
@@ -105,7 +95,7 @@ function moveThemeImages() {
 	.pipe(gulp.dest(CONFIG.assetsDir +  '/images'))
 }
 
-const buildAssets = gulp.series(cleanThemeAssets, buildLess, buildJs, moveThemeImages, moveThemeFonts, useTailwindcss)
+const buildAssets = gulp.series(cleanThemeAssets, buildLess, buildJs, moveThemeImages, moveThemeFonts)
 
 exports.buildAssets = buildAssets
 exports.watchAssets = () => gulp.watch([CONFIG.assetsSourceDir + '/styles/**/*', CONFIG.assetsSourceDir + '/js/**/*', CONFIG.assetsSourceDir + '/images/**/**', CONFIG.assetsSourceDir + '/webfonts/**/**'], buildAssets)

tailwind.config.js

@@ -1,3 +1,4 @@
+/** @type {import('tailwindcss').Config} */
 const colors = require('tailwindcss/colors')
 
 module.exports = {
@@ -8,29 +9,27 @@ module.exports = {
     fontFamily: {
       usual: ['usual', 'system-ui', 'sans-serif'],
     },
-    colors: {
-      teal: colors.teal,
-      cyan: colors.cyan,
-      purple: {
-        dark: '#352670',
-        lighter: '#544E72',
-        light: '#5379DA',
-        lightest: '#E8E8F9',
-        regular: '#787df2',
-        tint: '#D8D5EE',
-        new: '#413185',
-      },
-      red: '#F62958',
-      gray: '#e5e6f0',
-      brand: '#413185',
-    },
-    fontSize: {
-      '1.75': '1.75rem',
-      '2' : '2rem',
-      '21': '1.3125rem',
-      '38': '2.375rem',
-    },
     extend: {
+      colors: {
+        purple: {
+          dark: '#352670',
+          lighter: '#544E72',
+          light: '#5379DA',
+          lightest: '#E8E8F9',
+          regular: '#787df2',
+          tint: '#D8D5EE',
+          new: '#413185',
+        },
+        red: '#F62958',
+        gray: '#e5e6f0',
+        brand: '#413185',
+      },
+      fontSize: {
+        '1.75': '1.75rem',
+        '2' : '2rem',
+        '21': '1.3125rem',
+        '38': '2.375rem',
+      },
       spacing: {
         '15': '3.75rem',
       },