Skip to content

Commit 6070ba7

Browse files
adamwathanadamwathan
authored
Merge branch 'master' into patch-2
2 parents 2e7518a + a7c4106 commit 6070ba7

File tree

93 files changed

+253704
-33091
lines changed

Some content is hidden

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

93 files changed

+253704
-33091
lines changed

‎.eslintrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
"extends": ["eslint-config-postcss", "prettier"],
1010
"plugins": ["prettier"],
1111
"rules": {
12-
"no-unused-vars": [2, {"args": "all", "argsIgnorePattern": "^_"}],
12+
"no-unused-vars": [2, { "args": "all", "argsIgnorePattern": "^_" }],
13+
"no-warning-comments": 0,
1314
"prettier/prettier": [
1415
"error",
1516
{

‎.github/CONTRIBUTING.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ npm run style
1919
To automatically fix any style violations in your code, you can run:
2020

2121
```sh
22-
npm run style --fix
22+
npm run style -- --fix
2323
```
2424

2525
## Running tests
@@ -43,19 +43,19 @@ npm run prepare
4343
This will create new CSS files in the `/dist` folder which you can reference in your own test HTML file. We often test our own changes by creating an `index.html` file in the root of the Tailwind project itself that pulls in the `/dist/tailwind.css` stylesheet:
4444

4545
```html
46-
<!doctype html>
46+
<!DOCTYPE html>
4747
<html lang="en">
4848
<head>
49-
<meta charset="utf-8">
50-
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
51-
<link rel="stylesheet" href="/dist/tailwind.css">
49+
<meta charset="utf-8" />
50+
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
51+
<link rel="stylesheet" href="/dist/tailwind.css" />
5252
<title>Hello, world!</title>
5353
</head>
5454
<body>
5555
<h1 class="text-2xl font-bold text-center">Hello world!</h1>
5656
</body>
5757
</html>
58-
````
58+
```
5959

6060
You can then use a tool like [live-server](https://www.npmjs.com/package/live-server) to preview it in the browser:
6161

‎.github/ISSUE_TEMPLATE.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
33
👋 Hey, thanks for taking an interest in Tailwind!
44
5-
Please only open an issue here if you have a bug to report or a feature proposal you'd like to discuss.
5+
We don't accept issues that don't use our issue template.
66
7-
If you need help, have questions about best practices, or want to start a discussion about anything else related to Tailwind, open an issue on the `tailwindcss/discuss` repo instead:
7+
Please use this link to create your issue:
88
9-
https://github.com/tailwindcss/discuss/issues
9+
https://github.com/tailwindcss/tailwindcss/issues/new/choose
10+
11+
Issues that don't follow our issue template will be closed, as it's just impossible to triage and resolve issues without some sort of system with the small team we have.
1012
1113
-->

‎.github/ISSUE_TEMPLATE/bug-report.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
---
2+
name: 'Bug Report'
3+
about: 'Report a reproducible bug in the framework.'
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
---
8+
9+
### Describe the problem:
10+
11+
<!--
12+
13+
Explain the behavior you're seeing that you think is a bug, and explain how you
14+
think things should behave instead.
15+
16+
-->
17+
18+
### Link to a minimal reproduction:
19+
20+
<!--
21+
22+
Please provide a link to a GitHub repository that reliably reproduces the issue
23+
with the least amount of extraneous code possible.
24+
25+
-->

‎.github/ISSUE_TEMPLATE/config.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Feature Request
4+
url: https://github.com/tailwindcss/tailwindcss/discussions/new?category_id=65335
5+
about: 'Suggest any ideas you have using our discussion forums.'
6+
- name: Help
7+
url: https://github.com/tailwindcss/tailwindcss/discussions/new?category_id=65334
8+
about: 'If you have a question or need help, ask a question on the discussion forums.'
9+
- name: Documentation Issue
10+
url: https://github.com/tailwindcss/docs
11+
about: 'For documentation issues, suggest changes on our documentation repository.'

‎.github/workflows/nodejs.yml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,26 @@ name: Node.js CI
55

66
on:
77
push:
8-
branches: [ master ]
8+
branches: [master]
99
pull_request:
10-
branches: [ master ]
10+
branches: [master]
1111

1212
jobs:
1313
build:
14-
1514
runs-on: ubuntu-latest
1615

1716
strategy:
1817
matrix:
19-
node-version: [10.x, 12.x]
18+
node-version: [8.x, 10.x, 12.x]
2019

2120
steps:
22-
- uses: actions/checkout@v2
23-
- name: Use Node.js ${{ matrix.node-version }}
24-
uses: actions/setup-node@v1
25-
with:
26-
node-version: ${{ matrix.node-version }}
27-
- run: npm install
28-
- run: npm run prepare
29-
- run: npm test
30-
env:
31-
CI: true
21+
- uses: actions/checkout@v2
22+
- name: Use Node.js ${{ matrix.node-version }}
23+
uses: actions/setup-node@v1
24+
with:
25+
node-version: ${{ matrix.node-version }}
26+
- run: npm install
27+
- run: npm run prepare
28+
- run: npm test
29+
env:
30+
CI: true

‎.npmignore

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
<p align="center">
2-
<a href="https://tailwindcss.com/" target="_blank"><img width="200" src="https://tailwindcss.com/img/tailwind.svg"></a><br>
1+
<p>
2+
<a href="https://tailwindcss.com/" target="_blank">
3+
<img alt="Tailwind CSS" width="350" src="https://refactoringui.nyc3.cdn.digitaloceanspaces.com/tailwind-logo.svg">
4+
</a><br>
35
A utility-first CSS framework for rapidly building custom user interfaces.
46
</p>
57

6-
<p align="center">
8+
<p>
79
<a href="https://travis-ci.org/tailwindcss/tailwindcss"><img src="https://img.shields.io/travis/tailwindcss/tailwindcss/master.svg" alt="Build Status"></a>
810
<a href="https://www.npmjs.com/package/tailwindcss"><img src="https://img.shields.io/npm/dt/tailwindcss.svg" alt="Total Downloads"></a>
911
<a href="https://github.com/tailwindcss/tailwindcss/releases"><img src="https://img.shields.io/npm/v/tailwindcss.svg" alt="Latest Release"></a>
@@ -20,7 +22,7 @@ For full documentation, visit [tailwindcss.com](https://tailwindcss.com/).
2022

2123
For help, discussion about best practices, or any other conversation that would benefit from being searchable:
2224

23-
[Discuss Tailwind CSS on GitHub](https://github.com/tailwindcss/discuss/issues?q=is%3Aissue+sort%3Aupdated-desc)
25+
[Discuss Tailwind CSS on GitHub](https://github.com/tailwindcss/tailwindcss/discussions)
2426

2527
For casual chit-chat with others using the framework:
2628

‎__tests__/cli.test.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,20 @@ describe('cli', () => {
4343
})
4444

4545
describe('build', () => {
46-
it('compiles CSS file', () => {
46+
it('compiles CSS file using an input css file', () => {
4747
return cli(['build', inputCssPath]).then(() => {
4848
expect(process.stdout.write.mock.calls[0][0]).toContain('.example')
4949
})
5050
})
5151

52+
it('compiles CSS file without an input css file', () => {
53+
return cli(['build']).then(() => {
54+
expect(process.stdout.write.mock.calls[0][0]).toContain('normalize.css') // base
55+
expect(process.stdout.write.mock.calls[0][0]).toContain('.container') // components
56+
expect(process.stdout.write.mock.calls[0][0]).toContain('.mx-auto') // utilities
57+
})
58+
})
59+
5260
it('compiles CSS file using custom configuration', () => {
5361
return cli(['build', inputCssPath, '--config', customConfigPath]).then(() => {
5462
expect(process.stdout.write.mock.calls[0][0]).toContain('400px')

0 commit comments

Comments
 (0)