Skip to content

Commit

Permalink
fix: conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
ineshbose committed Oct 25, 2023
2 parents 7ca5539 + c7a379f commit b75804e
Show file tree
Hide file tree
Showing 14 changed files with 5,908 additions and 2,897 deletions.
48 changes: 48 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,54 @@

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.

## v6.8.1

[compare changes](https://github.com/nuxt-modules/tailwindcss/compare/v6.8.0...v6.8.1)

### 🩹 Fixes

- Typeof import default in dts ([4334ea3](https://github.com/nuxt-modules/tailwindcss/commit/4334ea3))
- Not require bridge ([c488680](https://github.com/nuxt-modules/tailwindcss/commit/c488680))
- **docs:** Closes #705 ([#705](https://github.com/nuxt-modules/tailwindcss/issues/705))
- **ci:** Attempt to fix test ([23233be](https://github.com/nuxt-modules/tailwindcss/commit/23233be))
- **ci:** Attempt to fix test ([6eb2b07](https://github.com/nuxt-modules/tailwindcss/commit/6eb2b07))
- Add types to package.json exports map ([#724](https://github.com/nuxt-modules/tailwindcss/pull/724))
- **ci:** Lock vitest version ([#738](https://github.com/nuxt-modules/tailwindcss/pull/738))
- Resolve tailwindcss/tailwind.css with pnpm and no shamefully hoist ([#740](https://github.com/nuxt-modules/tailwindcss/pull/740))

### 📖 Documentation

- Update dark mode ([a1b8fa2](https://github.com/nuxt-modules/tailwindcss/commit/a1b8fa2))
- Improve homepage ([c801b82](https://github.com/nuxt-modules/tailwindcss/commit/c801b82))
- Update og image ([1825f44](https://github.com/nuxt-modules/tailwindcss/commit/1825f44))
- Full url for ogImage ([f00a1c6](https://github.com/nuxt-modules/tailwindcss/commit/f00a1c6))
- Update design ([8763358](https://github.com/nuxt-modules/tailwindcss/commit/8763358))
- Add command to create tailwind.config file ([0458188](https://github.com/nuxt-modules/tailwindcss/commit/0458188))
- Fix typo ([#720](https://github.com/nuxt-modules/tailwindcss/pull/720))
- Rename `NuxtLabs UI` to `Nuxt UI` ([#723](https://github.com/nuxt-modules/tailwindcss/pull/723))
- Update SB embed ([8ec24ca](https://github.com/nuxt-modules/tailwindcss/commit/8ec24ca))

### 🏡 Chore

- Using nuxt convention for indexing type ([da4f9d3](https://github.com/nuxt-modules/tailwindcss/commit/da4f9d3))
- Update docs ([20d7922](https://github.com/nuxt-modules/tailwindcss/commit/20d7922))
- Update lock ([80c2718](https://github.com/nuxt-modules/tailwindcss/commit/80c2718))
- Update ci.yml ([fa82937](https://github.com/nuxt-modules/tailwindcss/commit/fa82937))
- Revert change ([43234be](https://github.com/nuxt-modules/tailwindcss/commit/43234be))
- Remove duplicate / on tailwind viewer ([aa75b79](https://github.com/nuxt-modules/tailwindcss/commit/aa75b79))
- Fix vitest version ([b4ac533](https://github.com/nuxt-modules/tailwindcss/commit/b4ac533))
- Ignore vitest in renovate ([1eb0913](https://github.com/nuxt-modules/tailwindcss/commit/1eb0913))
- Update deps ([77958b8](https://github.com/nuxt-modules/tailwindcss/commit/77958b8))
- Revert vitest version ([d189d8f](https://github.com/nuxt-modules/tailwindcss/commit/d189d8f))

### ❤️ Contributors

- Inesh Bose <2504266b@student.gla.ac.uk>
- Sébastien Chopin ([@Atinux](http://github.com/Atinux))
- Stefanprobst <stefanprobst@posteo.de>
- Benjamin Canac ([@benjamincanac](http://github.com/benjamincanac))
- Tech Genius

## v6.8.0

[compare changes](https://undefined/undefined/compare/v6.7.2...v6.8.0)
Expand Down
10 changes: 8 additions & 2 deletions docs/content/1.getting-started/1.setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,19 @@ When running `npm run dev`, this module will look for these files:

If these files don't exist, the module will automatically generate a basic configuration for them, so you don't have to create these files manually.

You can create the `tailwind.config.js` file by running the following command:

```bash
npx tailwindcss init
```

::alert{type="info"}
You can configure the paths in the [module options](/getting-started/options).
::

If you're going to create your own Tailwind CSS file, make sure to add the `@tailwind` directives for each of Tailwind’s layer types (base, components, and utilities).
If you're going to create your own Tailwind CSS file, make sure to add the `@tailwind` directives for each of Tailwind’s layer types (base, components, and utilities).

```css
```css [~/assets/css/tailwind.css]
@tailwind base;
@tailwind components;
@tailwind utilities;
Expand Down
9 changes: 9 additions & 0 deletions docs/content/3.examples/3.nuxt-ui.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
toc: false
---

# Nuxt UI

Live example with [Nuxt UI](https://ui.nuxt.com).

:sandbox{src="https://stackblitz.com/edit/nuxt-nuxtlabs-ui?embed=1&file=pages%2Findex.vue"}
9 changes: 0 additions & 9 deletions docs/content/3.examples/3.nuxtlabs-ui.md

This file was deleted.

6 changes: 3 additions & 3 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"license": "MIT",
"homepage": "https://tailwindcss.nuxtjs.org",
"devDependencies": {
"@nuxt-themes/docus": "^1.14.6",
"@nuxtjs/plausible": "^0.2.1",
"nuxt": "^3.6.5"
"@nuxt-themes/docus": "^1.15.0",
"@nuxtjs/plausible": "^0.2.3",
"nuxt": "^3.8.0"
}
}
Loading

0 comments on commit b75804e

Please sign in to comment.