Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nuxt-modules/tailwindcss
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.0.0
Choose a base ref
...
head repository: nuxt-modules/tailwindcss
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3.0.1
Choose a head ref
  • 10 commits
  • 14 files changed
  • 6 contributors

Commits on Aug 5, 2020

  1. docs: add video

    atinux committed Aug 5, 2020
    Copy the full SHA
    f4096e0 View commit details

Commits on Aug 6, 2020

  1. chore(deps): update all non-major dependencies (#134)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Aug 6, 2020
    Copy the full SHA
    430ed33 View commit details
  2. Copy the full SHA
    0acb8a5 View commit details
  3. chore(deps): update dependency @nuxt/content-theme-docs to ^0.4.1 (#138)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Aug 6, 2020
    Copy the full SHA
    71783a0 View commit details

Commits on Aug 23, 2020

  1. Update options.md (#150)

    Just a wrong quote
    enzonotario authored Aug 23, 2020
    Copy the full SHA
    4347f30 View commit details
  2. docs: update setup

    atinux authored Aug 23, 2020
    Copy the full SHA
    5c58f5c View commit details

Commits on Aug 24, 2020

  1. chore(deps): update devdependency standard-version to v9 (#146)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Aug 24, 2020
    Copy the full SHA
    2103a13 View commit details
  2. chore(deps): update all non-major dependencies (#145)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Aug 24, 2020
    Copy the full SHA
    430c581 View commit details
  3. docs: add upgrading section

    atinux committed Aug 24, 2020
    Copy the full SHA
    c3839f2 View commit details
  4. chore(release): 3.0.1

    atinux committed Aug 24, 2020
    Copy the full SHA
    d57cf78 View commit details
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -2,6 +2,8 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

### [3.0.1](https://github.com/nuxt-community/tailwindcss-module/compare/v3.0.0...v3.0.1) (2020-08-24)

## [3.0.0](https://github.com/nuxt-community/tailwindcss-module/compare/v2.1.1...v3.0.0) (2020-08-05)


File renamed without changes.
File renamed without changes.
File renamed without changes.
9 changes: 8 additions & 1 deletion docs/content/en/index.md
Original file line number Diff line number Diff line change
@@ -2,7 +2,6 @@
title: Introduction
description: 'Add Tailwind CSS to your Nuxt application in seconds.'
position: 1
fullscreen: true
category: ''
categoryPosition: 1
features:
@@ -23,3 +22,11 @@ Add [Tailwind CSS](https://tailwindcss.com) to your [Nuxt](https://nuxtjs.org) a
<list :items="features"></list>

<p class="flex items-center">Enjoy a documentation with light and dark mode:&nbsp;<app-color-switcher class="p-2"></app-color-switcher></p>

## Video

<video poster="https://res.cloudinary.com/nuxt/video/upload/v1596625297/nuxt-tailwindcss_ipv0ta.jpg" loop playsinline controls>
<source src="https://res.cloudinary.com/nuxt/video/upload/q_auto/v1596625297/nuxt-tailwindcss_ipv0ta.webm" type="video/webm" />
<source src="https://res.cloudinary.com/nuxt/video/upload/q_auto/v1596625297/nuxt-tailwindcss_ipv0ta.mp4" type="video/mp4" />
<source src="https://res.cloudinary.com/nuxt/video/upload/q_auto/v1596625297/nuxt-tailwindcss_ipv0ta.ogv" type="video/ogg" />
</video>
2 changes: 1 addition & 1 deletion docs/content/en/options.md
Original file line number Diff line number Diff line change
@@ -59,7 +59,7 @@ Example of overwriting the location of the config path:
```js{}[nuxt.config.js]
export default {
tailwindcss: {
configPath: '~/config/tailwind.js`
configPath: '~/config/tailwind.js'
}
}
```
24 changes: 23 additions & 1 deletion docs/content/en/setup.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: Setup
description: ''
description: 'Using TailwindCSS in your Nuxt project is only one command away'
position: 2
category: Guide
---
@@ -70,3 +70,25 @@ export default {
```

See the [module options](/options).

## Upgrading Tailwind

When a new version of Tailwind CSS is released, you don't need to wait for this module to upgrade, you can directly upgrade your dependencies.


<code-group>
<code-block label="Yarn" active>

```bash
yarn upgrade
```

</code-block>
<code-block label="NPM">

```bash
npm update
```

</code-block>
</code-group>
8 changes: 4 additions & 4 deletions docs/content/en/tailwind-config.md
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@ You can extend the default configuration:
- using the [config option](#config-option)
- with the `tailwindcss:config` Nuxt hook

<alert>
<alert type="warning">

The `tailwind.config.js` and `config` options are subject to the [merging strategy](#merging-strategy).

@@ -71,7 +71,7 @@ module.exports = {
```

Learn more about the [Tailwind config](https://tailwindcss.com/docs/configuration) on their docs.

### `config` option

You can also use your `nuxt.config.js` to set your Tailwind Config with the `tailwindcss.config` property:
@@ -97,7 +97,7 @@ This config has less priority over the [tailwind.config.js](#tailwindconfigjs) f

### `tailwindcss:config` hook

<alert>
<alert type="warning">

This is advanced usage and mostly used for Nuxt modules authors.

@@ -207,7 +207,7 @@ import tailwindConfig from '~tailwind.config'
import { theme } from '~tailwind.config'
```

<alert>
<alert type="warning">

Please be aware this adds `~19.5KB` (`~3.5KB`) to the client bundle size.

6 changes: 3 additions & 3 deletions docs/nuxt.config.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import theme from '@nuxt/content-theme-docs'

export default theme({
generate: {
routes: ['/'],
fallback: '404.html'
env: {
GITHUB_TOKEN: process.env.GITHUB_TOKEN
},
loading: { color: '#38b2ac' },
buildModules: [
// https://github.com/bdrtsky/nuxt-ackee
'nuxt-ackee'
4 changes: 2 additions & 2 deletions docs/package.json
Original file line number Diff line number Diff line change
@@ -11,8 +11,8 @@
"license": "MIT",
"homepage": "https://tailwindcss.nuxtjs.org",
"dependencies": {
"@nuxt/content-theme-docs": "^0.3.1",
"nuxt": "^2.14.0"
"@nuxt/content-theme-docs": "^0.5.2",
"nuxt": "^2.14.3"
},
"devDependencies": {
"nuxt-ackee": "^1.0.1"
19 changes: 19 additions & 0 deletions docs/tailwind.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
module.exports = {
theme: {
extend: {
colors: {
primary: {
100: '#e6fffa',
200: '#b2f5ea',
300: '#81e6d9',
400: '#4fd1c5',
500: '#38b2ac',
600: '#319795',
700: '#2c7a7b',
800: '#285e61',
900: '#234e52'
}
}
}
}
}
814 changes: 538 additions & 276 deletions docs/yarn.lock

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nuxtjs/tailwindcss",
"version": "3.0.0",
"version": "3.0.1",
"description": "TailwindCSS module for Nuxt.js",
"license": "MIT",
"contributors": [
@@ -24,22 +24,22 @@
"lib"
],
"dependencies": {
"consola": "^2.14.0",
"consola": "^2.15.0",
"defu": "^3.1.0",
"fs-extra": "^9.0.1",
"tailwindcss": "^1.6.2"
"tailwindcss": "^1.7.3"
},
"devDependencies": {
"@babel/core": "^7.11.1",
"@babel/core": "^7.11.4",
"@babel/preset-env": "^7.11.0",
"@commitlint/cli": "^9.1.1",
"@commitlint/config-conventional": "^9.1.1",
"@commitlint/cli": "^9.1.2",
"@commitlint/config-conventional": "^9.1.2",
"@nuxtjs/eslint-config": "^3.1.0",
"@nuxtjs/module-test-utils": "^1.6.3",
"babel-eslint": "^10.1.0",
"babel-jest": "^25.5.1",
"codecov": "^3.7.2",
"eslint": "^7.6.0",
"eslint": "^7.7.0",
"eslint-config-standard": "^14.1.1",
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-jest": "^23.20.0",
@@ -49,8 +49,8 @@
"eslint-plugin-vue": "^6.2.2",
"husky": "^4.2.5",
"jest": "^25.5.4",
"nuxt": "^2.14.1",
"nuxt": "^2.14.3",
"request": "^2.88.2",
"standard-version": "^8.0.2"
"standard-version": "^9.0.0"
}
}
615 changes: 348 additions & 267 deletions yarn.lock

Large diffs are not rendered by default.