8000 Fix conflicts · r00k/tailwindcss@fd95c5d · GitHub
Skip to content

Commit fd95c5d

Browse files
adamwathanadamwathan
committed
Fix conflicts
2 parents e3f93f9 + dc5d85f commit fd95c5d

File tree

98 files changed

+4057
-5004
lines changed

Some content is hidden

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

98 files changed

+4057
-5004
lines changed

‎.github/CODE_OF_CONDUCT.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Tailwind CSS Community Guidelines
2+
3+
The following community guidelines are based on [The Ruby Community Conduct Guidelines](https://www.ruby-lang.org/en/conduct/).
4+
5+
This document provides community guidelines for a respectful, productive, and collaborative place for any person who is willing to contribute to the Tailwind CSS project. It applies to all “collaborative space”, which is defined as community communications channels (such as mailing lists, submitted patches, commit comments, etc.).
6+
7+
- Participants will be tolerant of opposing views.
8+
- Participants must ensure that their language and actions are free of personal attacks and disparaging personal remarks.
9+
- When interpreting the words and actions of others, participants should always assume good intentions.
10+
- Behaviour which can be reasonably considered harassment will not be tolerated.

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<!--
2+
3+
👋 Hey, thanks for your interest in contributing to Tailwind!
4+
5+
**Please ask first before starting work on any significant new features.**
6+
7+
It's never a fun experience to have your pull request declined after investing a lot of time and effort into a new feature. To avoid this from happening, we request that contributors create an issue to first discuss any significant new features. This includes things like adding new utilities, creating new at-rules, or adding new component examples to the documentation.
8+
9+
https://github.com/tailwindcss/tailwindcss/blob/master/.github/CONTRIBUTING.md
10+
11+
-->

‎.npmignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
/__tests__/
22
/docs/
33
/src/
4+
yarn-error.log

‎.travis.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
language: php
2+
php:
3+
- '7.1'
4+
5+
cache:
6+
directories:
7+
- $HOME/.composer/cache
8+
- $HOME/.cache/yarn
9+
10+
script:
11+
- yarn
12+
- yarn run test
13+
- cd $TRAVIS_BUILD_DIR/docs && composer self-update
14+
- cd $TRAVIS_BUILD_DIR/docs && composer install --prefer-dist --no-interaction
15+
- cd $TRAVIS_BUILD_DIR/docs && yarn
16+
- cd $TRAVIS_BUILD_DIR/docs && yarn run dev

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
</p>
55

66
<p align="center">
7-
<a href="https://app.codeship.com/projects/254859"><img src="https://img.shields.io/codeship/cdd4ad20-a319-0135-c87c-02251d502cd2.svg" alt="Codeship Status"></a>
7+
<a href="https://travis-ci.org/tailwindcss/tailwindcss"><img src="https://img.shields.io/travis/tailwindcss/tailwindcss/master.svg" alt="Build Status"></a>
88
<a href="https://www.npmjs.com/package/tailwindcss"><img src="https://img.shields.io/npm/dt/tailwindcss.svg" alt="Total Downloads"></a>
99
<a href="https://github.com/tailwindcss/tailwindcss/releases"><img src="https://img.shields.io/npm/v/tailwindcss.svg" alt="Latest Release"></a>
1010
<a href="https://github.com/tailwindcss/tailwindcss/blob/master/LICENSE"><img src="https://img.shields.io/npm/l/tailwindcss.svg" alt="License"></a>

‎__tests__/fixtures/tailwind-input-with-explicit-screen-utilities.css‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
@responsive {
2+
.example {
3+
color: red;
4+
}
5+
}
6+
7+
@tailwind screens;
8+
9+
.john {
10+
content: "wick";
11+
}

‎__tests__/fixtures/tailwind-output-with-explicit-screen-utilities.css‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
.example {
2+
color: red;
3+
}
4+
5+
@media (min-width: 576px) {
6+
.sm\:example {
7+
color: red;
8+
}
9+
}
10+
11+
@media (min-width: 768px) {
12+
.md\:example {
13+
color: red;
14+
}
15+
}
16+
17+
@media (min-width: 992px) {
18+
.lg\:example {
19+
color: red;
20+
}
21+
}
22+
23+
@media (min-width: 1200px) {
24+
.xl\:example {
25+
color: red;
26+
}
27+
}
28+
29+
.john {
30+
content: "wick";
31+
}

‎__tests__/fixtures/tailwind-output.css‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3537,6 +3537,10 @@ button,
35373537
cursor: auto;
35383538
}
35393539

3540+
.cursor-default {
3541+
cursor: default;
3542+
}
3543+
35403544
.cursor-pointer {
35413545
cursor: pointer;
35423546
}
@@ -6493,6 +6497,10 @@ button,
64936497
cursor: auto;
64946498
}
64956499

6500+
.sm\:cursor-default {
6501+
cursor: default;
6502+
}
6503+
64966504
.sm\:cursor-pointer {
64976505
cursor: pointer;
64986506
}
@@ -9450,6 +9458,10 @@ button,
94509458
cursor: auto;
94519459
}
94529460

9461+
.md\:cursor-default {
9462+
cursor: default;
9463+
}
9464+
94539465
.md\:cursor-pointer {
94549466
cursor: pointer;
94559467
}
@@ -12407,6 +12419,10 @@ button,
1240712419
cursor: auto;
1240812420
}
1240912421

12422+
.lg\:cursor-default {
12423+
cursor: default;
12424+
}
12425+
1241012426
.lg\:cursor-pointer {
1241112427
cursor: pointer;
1241212428
}
@@ -15364,6 +15380,10 @@ button,
1536415380
cursor: auto;
1536515381
}
1536615382

15383+
.xl\:cursor-default {
15384+
cursor: default;
15385+
}
15386+
1536715387
.xl\:cursor-pointer {
1536815388
cursor: pointer;
1536915389
}

‎__tests__/sanity.test.js‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,21 @@ it('does not add any CSS if no Tailwind features are used', () => {
2828
expect(result.css).toBe('')
2929
})
3030
})
31+
32+
it('generates the right CSS with implicit screen utilities', () => {
33+
const input = fs.readFileSync(
34+
path.resolve(`${__dirname}/fixtures/tailwind-input-with-explicit-screen-utilities.css`),
35+
'utf8'
36+
)
37+
38+
return postcss([tailwind()])
39+
.process(input)
40+
.then(result => {
41+
const expected = fs.readFileSync(
42+
path.resolve(`${__dirname}/fixtures/tailwind-output-with-explicit-screen-utilities.css`),
43+
'utf8'
44+
)
45+
46+
expect(result.css).toBe(expected)
47+
})
48+
})

‎dist/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
*
22
!.gitignore
3+
!.npmignore

0 commit comments

Comments
 (0)