Skip to content

Commit 811db28

Browse files
author
Serhii Pashchenko
committed
Merge latest Master from upstream
2 parents 4a15678 + 5e94050 commit 811db28

File tree

5 files changed

+487
-487
lines changed

5 files changed

+487
-487
lines changed

__tests__/fixtures/tailwind-output-important.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,7 @@ h3,
384384
h4,
385385
h5,
386386
h6,
387+
hr,
387388
figure,
388389
p,
389390
pre {
@@ -461,7 +462,7 @@ html {
461462
*/
462463

463464
hr {
464-
border-width: 1px;
465+
border-top-width: 1px;
465466
}
466467

467468
/**

__tests__/fixtures/tailwind-output.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,7 @@ h3,
384384
h4,
385385
h5,
386386
h6,
387+
hr,
387388
figure,
388389
p,
389390
pre {
@@ -461,7 +462,7 @@ html {
461462
*/
462463

463464
hr {
464-
border-width: 1px;
465+
border-top-width: 1px;
465466
}
466467

467468
/**

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "tailwindcss",
3-
"version": "1.1.1",
3+
"version": "1.1.2",
44
"description": "A utility-first CSS framework for rapidly building custom user interfaces.",
55
"license": "MIT",
66
"main": "lib/index.js",
@@ -36,7 +36,7 @@
3636
"eslint-plugin-prettier": "^3.0.1",
3737
"jest": "^24.3.1",
3838
"prettier": "^1.7.4",
39-
"rimraf": "^2.6.3"
39+
"rimraf": "^3.0.0"
4040
},
4141
"dependencies": {
4242
"autoprefixer": "^9.4.5",

src/plugins/css/preflight.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ h3,
3434
h4,
3535
h5,
3636
h6,
37+
hr,
3738
figure,
3839
p,
3940
pre {
@@ -109,7 +110,7 @@ html {
109110
* Ensure horizontal rules are visible by default
110111
*/
111112
hr {
112-
border-width: 1px;
113+
border-top-width: 1px;
113114
}
114115

115116
/**

0 commit comments

Comments
 (0)