Skip to content

Commit d311749

Browse files
committed
Merge pull request necolas#539 from necolas/v4
4.0.0
2 parents aef06ef + 84f39fb commit d311749

File tree

10 files changed

+362
-307
lines changed

10 files changed

+362
-307
lines changed

.editorconfig

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
root = true
2+
3+
[*]
4+
charset = utf-8
5+
end_of_line = lf
6+
indent_size = 2
7+
indent_style = space
8+
insert_final_newline = true
9+
trim_trailing_whitespace = true
10+
11+
[*.md]
12+
trim_trailing_whitespace = false

.stylelintrc

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

CHANGELOG.md

Lines changed: 51 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,50 @@
1-
=== HEAD
2-
3-
* Address inconsistent styling of b and strong.
4-
* Correct `hr` overflow in IE 8/9/10/11 and Edge 12.
5-
* Ensure `mark` long-hand background declaration usage.
6-
* Remove color inheritance from form controls.
7-
* Address inconsistent styling of abbr[title].
8-
* Correct inheritance and scaling of font-size for preformatted text.
9-
* Replace focus style removed in the border reset in Firefox 4+.
1+
# Changes to normalize.css
2+
3+
### 4.0.0 (March 19, 2016)
4+
5+
* Add the correct font weight for `b` and `strong` in Chrome, Edge, and Safari.
6+
* Correct inconsistent `overflow` for `hr` in Edge and IE.
7+
* Correct inconsistent `box-sizing` for `hr` in Firefox.
8+
* Correct inconsistent `text-decoration` and `border-bottom` for `abbr[title]`
9+
in Chrome, Edge, Firefox IE, Opera, and Safari.
10+
* Correct inheritance and scaling of `font-size` for preformatted text.
11+
* Correct `legend` text wrapping not present in Edge and IE.
12+
* Remove unnecessary normalization of `line-height` for `input`.
13+
* Remove unnecessary normalization of `color` for form controls.
14+
* Remove unnecessary `box-sizing` for `input[type="search"]` in Chrome, Edge,
15+
Firefox, IE, and Safari.
1016
* Remove opinionated table resets.
11-
12-
=== 3.0.3 (March 30, 2015)
17+
* Remove opinionated `pre` overflow.
18+
* Remove selector weight from some input selectors.
19+
* Update normalization of `border-style` for `img`.
20+
* Update normalization of `color` inheritance for `legend`.
21+
* Update normalization of `background-color` for `mark`.
22+
* Update normalization of `outline` for `:-moz-focusring` removed by a previous
23+
normalization in Firefox.
24+
* Update opinionated style of `outline-width` for `a:active` and `a:hover`.
25+
* Update comments to identify opinionated styles.
26+
* Update comments to specify browser/versions affected by all changes.
27+
* Update comments to use one voice.
28+
29+
---
30+
31+
### 3.0.3 (March 30, 2015)
1332

1433
* Remove unnecessary vendor prefixes.
1534
* Add `main` property.
1635

17-
=== 3.0.2 (October 4, 2014)
36+
### 3.0.2 (October 4, 2014)
1837

1938
* Only alter `background-color` of links in IE 10.
2039
* Add `menu` element to HTML5 display definitions.
2140

22-
=== 3.0.1 (March 27, 2014)
41+
### 3.0.1 (March 27, 2014)
2342

2443
* Add package.json for npm support.
2544

26-
=== 3.0.0 (January 28, 2014)
45+
### 3.0.0 (January 28, 2014)
2746

28-
=== 3.0.0-rc.1 (January 26, 2014)
47+
### 3.0.0-rc.1 (January 26, 2014)
2948

3049
* Explicit tests for each normalization.
3150
* Fix i18n for `q` element.
@@ -41,21 +60,23 @@
4160
* Set correct display for `progress` in IE 8/9.
4261
* Fix `font` and `color` inheritance for forms.
4362

44-
=== 2.1.3 (August 26, 2013)
63+
---
64+
65+
### 2.1.3 (August 26, 2013)
4566

4667
* Fix component.json.
4768
* Remove the gray background color from active links in IE 10.
4869

49-
=== 2.1.2 (May 11, 2013)
70+
### 2.1.2 (May 11, 2013)
5071

5172
* Revert root `color` and `background` normalizations.
5273

53-
=== 2.1.1 (April 8, 2013)
74+
### 2.1.1 (April 8, 2013)
5475

5576
* Normalize root `color` and `background` to counter the effects of system
5677
color schemes.
5778

58-
=== 2.1.0 (January 21, 2013)
79+
### 2.1.0 (January 21, 2013)
5980

6081
* Normalize `text-transform` for `button` and `select`.
6182
* Normalize `h1` margin when within HTML5 sectioning elements.
@@ -64,11 +85,11 @@
6485
* Add `main` element to HTML5 display definitions.
6586
* Fix cursor style for disabled button `input`.
6687

67-
=== 2.0.1 (August 20, 2012)
88+
### 2.0.1 (August 20, 2012)
6889

6990
* Remove stray IE 6/7 `inline-block` hack from HTML5 display settings.
7091

71-
=== 2.0.0 (August 19, 2012)
92+
### 2.0.0 (August 19, 2012)
7293

7394
* Remove legacy browser form normalizations.
7495
* Remove all list normalizations.
@@ -77,19 +98,21 @@
7798
* Form elements automatically inherit `font-family` from ancestor.
7899
* Drop support for IE 6/7, Firefox < 4, and Safari < 5.
79100

80-
=== 1.0.1 (August 19, 2012)
101+
---
102+
103+
### 1.0.1 (August 19, 2012)
81104

82105
* Adjust `small` font size normalization.
83106

84-
=== 1.0.0 (August 14, 2012)
107+
### 1.0.0 (August 14, 2012)
85108

86109
(Only the notable changes since public release)
87110

88111
* Add MIT License.
89-
* Hide `audio` elements without controls in iOS 5 (#69).
112+
* Hide `audio` elements without controls in iOS 5.
90113
* Normalize heading margins and font size.
91-
* Move font-family normalization from `body` to `html` (#62).
92-
* Remove scrollbar normalization (#64 #65).
93-
* Remove excess padding from checkbox and radio inputs in IE 7 (#42).
94-
* Add IE9 correction for SVG overflow (#16).
114+
* Move font-family normalization from `body` to `html`.
115+
* Remove scrollbar normalization.
116+
* Remove excess padding from checkbox and radio inputs in IE 7.
117+
* Add IE9 correction for SVG overflow.
95118
* Add fix for legend not inheriting color in IE 6/7/8/9.

CONTRIBUTING.md

Lines changed: 40 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ requests](#pull-requests), but please respect the following restrictions:
2121
respect the opinions of others.
2222

2323

24-
<a name="bugs"></a>
2524
## Bug reports
2625

2726
A bug is a _demonstrable problem_ that is caused by the code in the repository.
@@ -64,7 +63,6 @@ Example:
6463
> merits).
6564
6665

67-
<a name="features"></a>
6866
## Feature requests
6967

7068
Feature requests are welcome. But take a moment to find out whether your idea
@@ -73,7 +71,6 @@ case to convince the project's developers of the merits of this feature. Please
7371
provide as much detail and context as possible.
7472

7573

76-
<a name="pull-requests"></a>
7774
## Pull requests
7875

7976
Good pull requests - patches, improvements, new features - are a fantastic
@@ -90,7 +87,7 @@ accurate comments, etc.) and any other requirements (such as test coverage).
9087
Follow this process if you'd like your work considered for inclusion in the
9188
project:
9289

93-
1. [Fork](http://help.github.com/fork-a-repo/) the project, clone your fork,
90+
1. [Fork](https://help.github.com/articles/fork-a-repo/) the project, clone your fork,
9491
and configure the remotes:
9592

9693
```bash
@@ -122,9 +119,19 @@ project:
122119
[interactive rebase](https://help.github.com/articles/interactive-rebase)
123120
feature to tidy up your commits before making them public.
124121

125-
Make sure to add a test to the `test.html` file if appropriate, and test
122+
Be sure to test the `normalize.css` file for style conformance.
123+
124+
```bash
125+
npm test
126+
```
127+
128+
Be sure to add a test to the `test.html` file if appropriate, and test
126129
your change in all supported browsers.
127130

131+
```bash
132+
git pull --rebase upstream master
133+
```
134+
128135
5. Locally rebase the upstream development branch into your topic branch:
129136

130137
```bash
@@ -146,8 +153,24 @@ project:
146153
**IMPORTANT**: By submitting a patch, you agree to allow the project owner to
147154
license your work under the same license as that used by the project.
148155

156+
### CSS Conventions
157+
158+
Keep the CSS file as readable as possible by following these guidelines:
159+
160+
- Comments are short and to the point.
161+
- Comments without a number reference the entire rule.
162+
- Comments describe the selector when the selector does not make the
163+
normalization obvious.
164+
- Comments begin with “Correct the...” when they deal with less obvious side
165+
effects.
166+
- Rules are sorted by cascade, specificity, and then alphabetic order.
167+
- Selectors are sorted by specificity and then alphabetic order.
168+
- `in browser` applies to all versions.
169+
- `in browser v-` applies to all versions up to and including the version.
170+
- `in browser v+` applies to all versions after and including the version.
171+
- `in browser v-v` applies to all versions including and between the versions.
172+
149173

150-
<a name="maintainers"></a>
151174
## Maintainers
152175

153176
If you have commit access, please follow this process for merging patches and
@@ -175,3 +198,14 @@ cutting new releases.
175198
4. Create an annotated tag for the version: `git tag -m "v0.0.0" 0.0.0`.
176199
5. Push the changes and tags to GitHub: `git push --tags origin master`
177200
6. Checkout the `gh-pages` branch and follow the instructions in the README.
201+
202+
### Semver strategy
203+
204+
[Semver](http://semver.org/) is a widely accepted method for deciding how
205+
version numbers are incremented in a project. Versions are written as
206+
MAJOR.MINOR.PATCH.
207+
208+
Changes limited to fallback declarations for browsers which do not support
209+
newer features produce a PATCH release.
210+
211+
Changes limited to normalizations for older browsers produce a MINOR release.

LICENSE.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
Copyright (c) Nicolas Gallagher and Jonathan Neal
1+
# The MIT License (MIT)
2+
3+
Copyright © Nicolas Gallagher and Jonathan Neal
24

35
Permission is hereby granted, free of charge, to any person obtaining a copy of
46
this software and associated documentation files (the "Software"), to deal in

0 commit comments

Comments
 (0)