Skip to content

Commit 4a3425d

Browse files
authored
Merge pull request #515 from ExpressionEngine/feature/7.x/update-tailwindcss
Update Tailwindcss to v3 and include Daisyui
2 parents 57ed50a + fd150f0 commit 4a3425d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+167525
-162740
lines changed

docs/index.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@
1111

1212
Welcome to the official ExpressionEngine Docs! In addition to the documentation, there are a number of resources linked below that will help you learn how to master ExpressionEngine.
1313

14-
<div id="welcome-introduce" class="max-w-full mx-auto p-8 lg:p-10 bg-white rounded-lg shadow-black flex mt-12 flex-wrap lg:flex-nowrap">
14+
<div id="welcome-introduce" class="max-w-full mx-auto p-8 lg:p-10 bg-white rounded-lg shadow-custom-black flex mt-12 flex-wrap lg:flex-nowrap">
1515
<div class="w-64 h-64 mr-10 flex-shrink-0 mb-4 lg:mb-0">
1616
<img src="_images/welcome-image.svg" width="max-w-full mb-0">
1717
</div>
1818
<div class="mb-0">
1919
<span class="text-red font-bold uppercase text-xs mb-4 block tracking-wider">Starter Courses</span>
20-
<h2 class="text-purple-dark mb-4 leading-snug p-0 mt-0 border-none ">Build your first ExpressionEngine site.</h2>
20+
<h2 class="text-purple-dark mb-4 leading-snug p-0 mt-0 border-none text-2">Build your first ExpressionEngine site.</h2>
2121
<p class="text-purple-dark text-base pb-7 mb-0">Walk through step-by-step how to build your own ExpressionEngine site from scratch. Choose from either a video or written course.</p>
2222
<p class="links-wrapper flex mb-0 flex-wrap xl:flex-nowrap">
23-
<a href="https://u.expressionengine.com/course/getting-started-with-expressionengine-video-course" class="inline-flex text-base h-12 leading-none justify-center items-center bg-red mb-4 xl:mb-0 mr-2.5 rounded-5 border border-solid border-red hover:bg-white hover:text-red" target="_BLANK">
23+
<a href="https://u.expressionengine.com/course/getting-started-with-expressionengine-video-course" class="inline-flex text-base h-12 leading-none justify-center items-center bg-red mb-4 xl:mb-0 mr-2.5 rounded-5 border border-solid border-red hover:bg-white hover:text-red text-white" target="_BLANK">
2424
<strong>Video</strong>&nbsp;Course
2525
<i class="fas fa-arrow-right ml-2"></i>
2626
</a>
27-
<a href="https://u.expressionengine.com/course/introduction-to-building-an-expressionengine-site" class="inline-flex text-base h-12 leading-none justify-center items-center bg-red rounded-5 border border-solid border-red hover:bg-white hover:text-red" target="_BLANK">
27+
<a href="https://u.expressionengine.com/course/introduction-to-building-an-expressionengine-site" class="inline-flex text-base h-12 leading-none justify-center items-center bg-red rounded-5 border border-solid border-red hover:bg-white hover:text-red text-white" target="_BLANK">
2828
<strong>Written</strong>&nbsp;Course
2929
<i class="fas fa-arrow-right ml-2"></i>
3030
</a>
@@ -41,7 +41,7 @@ Welcome to the official ExpressionEngine Docs! In addition to the documentation,
4141
<span class="flex items-center justify-center rounded-full bg-purple-new p-4">
4242
<i class="fas fa-star text-4xl text-white text-opacity-50"></i>
4343
</span>
44-
<h3 class="text-purple-dark mt-3 mb-2">Partners</h3>
44+
<h3 class="text-2xl lg:text-2 text-purple-dark mt-3 mb-2">Partners</h3>
4545
<p class="text-base text-brand text-opacity-70 mb-0">Find the best EE developers in the world.</p>
4646
</a>
4747
<a href="https://expressionengine.com/support" class="support rounded-lg flex items-center justify-center flex-col bg-purple-regular text-white mb-0 relative h-56 lg:h-auto pt-5 pb-7 px-7 border-none" target="_BLANK">
@@ -56,7 +56,7 @@ Welcome to the official ExpressionEngine Docs! In addition to the documentation,
5656
<i class="fab fa-slack text-7xl text-white"></i>
5757
</p>
5858
<p class="mb-0 flex flex-wrap w-full items-center">
59-
<span class="title text-white font-semibold block w-full leading-none">Slack</span>
59+
<span class="title text-1.75 text-white font-semibold block w-full leading-none">Slack</span>
6060
<span class="flex text-base text-white text-opacity-70 w-full leading-none items-center">Join the community<i class="fas fa-arrow-right text-base ml-auto"></i></span>
6161
</p>
6262
<a href="https://expressionengine.com/blog/join-us-in-slack" class="absolute w-full h-full inset-0 border-none" target="_BLANK"></a>
@@ -66,7 +66,7 @@ Welcome to the official ExpressionEngine Docs! In addition to the documentation,
6666
<i class="fas fa-comment text-4xl text-white"></i>
6767
</p>
6868
<p class="mb-0 flex flex-wrap w-full items-center">
69-
<span class="title text-brand font-semibold block leading-none w-full">Forum</span>
69+
<span class="title text-1.75 text-brand font-semibold block leading-none w-full">Forum</span>
7070
<span class="flex items-center text-base text-brand text-opacity-70 leading-none w-full">The EE watering hole.<i class="fas fa-arrow-right text-base ml-auto"></i></span>
7171
</p>
7272
<a href="https://expressionengine.com/forums" class="absolute w-full h-full inset-0 border-none" target="_BLANK"></a>

gulpfile.js

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ require('colors')
1212
const path = require('path')
1313
const gulp = require('gulp')
1414
const del = require('del')
15+
const postcss = require('gulp-postcss')
16+
const tailwindcss = require('tailwindcss')
1517

1618
const CONFIG = require('./scripts/config.js')
1719

@@ -83,6 +85,16 @@ function buildJs() {
8385
.pipe(gulp.dest(CONFIG.assetsDir))
8486
}
8587

88+
function useTailwindcss() {
89+
return gulp.src('./node_modules/tailwindcss/tailwind.css')
90+
.pipe(postcss([
91+
tailwindcss(CONFIG.tailwindConfig),
92+
require( 'autoprefixer' )
93+
]))
94+
.pipe(rename({ suffix: '.min' }))
95+
.pipe(gulp.dest(CONFIG.assetsDir))
96+
}
97+
8698
function moveThemeFonts() {
8799
return gulp.src(CONFIG.assetsSourceDir + '/webfonts/**/*')
88100
.pipe(gulp.dest(CONFIG.assetsDir + '/webfonts'))
@@ -93,7 +105,7 @@ function moveThemeImages() {
93105
.pipe(gulp.dest(CONFIG.assetsDir + '/images'))
94106
}
95107

96-
const buildAssets = gulp.series(cleanThemeAssets, buildLess, buildJs, moveThemeImages, moveThemeFonts)
108+
const buildAssets = gulp.series(cleanThemeAssets, buildLess, buildJs, moveThemeImages, moveThemeFonts, useTailwindcss)
97109

98110
exports.buildAssets = buildAssets
99111
exports.watchAssets = () => gulp.watch([CONFIG.assetsSourceDir + '/styles/**/*', CONFIG.assetsSourceDir + '/js/**/*', CONFIG.assetsSourceDir + '/images/**/**', CONFIG.assetsSourceDir + '/webfonts/**/**'], buildAssets)

0 commit comments

Comments
 (0)