diff --git a/core/misc/normalize/CHANGELOG.md b/core/misc/normalize/CHANGELOG.md index e8a6349a09ef902f9f5913c802b6c99cf3987ed9..0ca7cdfcf7c5306d3f79fe2e716678b623ed3f08 100644 --- a/core/misc/normalize/CHANGELOG.md +++ b/core/misc/normalize/CHANGELOG.md @@ -1,3 +1,23 @@ +== HEAD + +== 2.1.2 (May 11, 2013) + +* Revert root `color` and `background` normalizations. + +== 2.1.1 (April 8, 2013) + +* Normalize root `color` and `background` to counter the effects of system + color schemes. + +== 2.1.0 (January 21, 2013) + +* Normalize `text-transform` for `button` and `select`. +* Normalize `h1` margin when within HTML5 sectioning elements. +* Normalize `hr` element. +* Remove unnecessary `pre` styles. +* Add `main` element to HTML5 display definitions. +* Fix cursor style for disabled button `input`. + == 2.0.1 (August 20, 2012) * Remove stray IE 6/7 `inline-block` hack from HTML5 display settings. diff --git a/core/misc/normalize/CONTRIBUTING.md b/core/misc/normalize/CONTRIBUTING.md new file mode 100644 index 0000000000000000000000000000000000000000..4c526bb0826f073f1789e0010454fc94627c5f49 --- /dev/null +++ b/core/misc/normalize/CONTRIBUTING.md @@ -0,0 +1,177 @@ +# Contributing to normalize.css + +Please take a moment to review this document in order to make the contribution +process easy and effective for everyone involved. + +Following these guidelines helps to communicate that you respect the time of +the developers managing and developing this open source project. In return, +they should reciprocate that respect in addressing your issue or assessing +patches and features. + + +## Using the issue tracker + +The issue tracker is the preferred channel for [bug reports](#bugs), +[features requests](#features) and [submitting pull +requests](#pull-requests), but please respect the following restrictions: + +* Please **do not** use the issue tracker for personal support requests. + +* Please **do not** derail or troll issues. Keep the discussion on topic and + respect the opinions of others. + + +<a name="bugs"></a> +## Bug reports + +A bug is a _demonstrable problem_ that is caused by the code in the repository. +Good bug reports are extremely helpful - thank you! + +Guidelines for bug reports: + +1. **Use the GitHub issue search** – check if the issue has already been + reported. + +2. **Check if the issue has been fixed** – try to reproduce it using the + latest `master` branch in the repository. + +3. **Isolate the problem** – create a live example (e.g., on + [Codepen](http://codepen.io)) of a [reduced test + case](http://css-tricks.com/6263-reduced-test-cases/). + +A good bug report shouldn't leave others needing to chase you up for more +information. Please try to be as detailed as possible in your report. What is +your environment? What steps will reproduce the issue? What browser(s) and OS +experience the problem? What would you expect to be the outcome? All these +details will help people to fix any potential bugs. + +Example: + +> Short and descriptive example bug report title +> +> A summary of the issue and the browser/OS environment in which it occurs. If +> suitable, include the steps required to reproduce the bug. +> +> 1. This is the first step +> 2. This is the second step +> 3. Further steps, etc. +> +> `<url>` - a link to the reduced test case +> +> Any other information you want to share that is relevant to the issue being +> reported. This might include the lines of code that you have identified as +> causing the bug, and potential solutions (and your opinions on their +> merits). + + +<a name="features"></a> +## Feature requests + +Feature requests are welcome. But take a moment to find out whether your idea +fits with the scope and aims of the project. It's up to *you* to make a strong +case to convince the project's developers of the merits of this feature. Please +provide as much detail and context as possible. + + +<a name="pull-requests"></a> +## Pull requests + +Good pull requests - patches, improvements, new features - are a fantastic +help. They should remain focused in scope and avoid containing unrelated +commits. + +**Please ask first** before embarking on any significant work, otherwise you +risk spending a lot of time working on something that the project's developers +might not want to merge into the project. + +Please adhere to the coding conventions used throughout a project (whitespace, +accurate comments, etc.) and any other requirements (such as test coverage). + +Follow this process if you'd like your work considered for inclusion in the +project: + +1. [Fork](http://help.github.com/fork-a-repo/) the project, clone your fork, + and configure the remotes: + + ```bash + # Clone your fork of the repo into the current directory + git clone https://github.com/<your-username>/normalize.css + # Navigate to the newly cloned directory + cd normalize.css + # Assign the original repo to a remote called "upstream" + git remote add upstream https://github.com/necolas/normalize.css + ``` + +2. If you cloned a while ago, get the latest changes from upstream: + + ```bash + git checkout master + git pull upstream master + ``` + +3. Never work directly on `master`. Create a new topic branch (off the latest + version of `master`) to contain your feature, change, or fix: + + ```bash + git checkout -b <topic-branch-name> + ``` + +4. Commit your changes in logical chunks. Please adhere to these [git commit + message conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) + or your code is unlikely be merged into the main project. Use Git's + [interactive rebase](https://help.github.com/articles/interactive-rebase) + feature to tidy up your commits before making them public. + + Make sure to add a test to the `test.html` file if appropriate, and test + your change in all supported browsers. + +5. Locally rebase the upstream development branch into your topic branch: + + ```bash + git pull --rebase upstream master + ``` + +6. Push your topic branch up to your fork: + + ```bash + git push origin <topic-branch-name> + ``` + +10. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/) + with a clear title and description. + + Please submit a separate pull request for any appropriate changes required + in the `v1` branch for legacy browsers. + +**IMPORTANT**: By submitting a patch, you agree to allow the project owner to +license your work under the same license as that used by the project. + + +<a name="maintainers"></a> +## Maintainers + +If you have commit access, please follow this process for merging patches and +cutting new releases. + +### Accepting patches + +1. Check that a patch is within the scope and philosophy of the project. +2. Check that a patch has any necessary tests and a proper, descriptive commit + message. +3. Test the patch locally. +4. Do not use GitHub's merge button. Apply the patch to `master` locally + (either via `git am` or by checking the whole branch out). Amend minor + problems with the author's original commit if necessary. Then push to GitHub. +5. If a patch should be included in `v1`, cherry-pick the commits or manually + apply if all else fails. + +### Releasing a new version + +1. Include all new functional changes in the CHANGELOG. +2. Use a dedicated commit to increment the version. The version needs to be + added to the CHANGELOG (inc. date), and the `bower.json`, `component.json`, + and `normalize.css` files. +3. The commit message must be of `v0.0.0` format. +4. Create an annotated tag for the version: `git tag -m "v0.0.0" v0.0.0`. +5. Push the changes and tags to GitHub: `git push --tags origin master` +6. Checkout the `gh-pages` branch and follow the instructions in the README. diff --git a/core/misc/normalize/README.md b/core/misc/normalize/README.md index 82f9f5d6392a920cfe7d0551f8692e325977e300..87b60ea559146df3229be1feb9a4818b5b53d559 100644 --- a/core/misc/normalize/README.md +++ b/core/misc/normalize/README.md @@ -1,11 +1,19 @@ -# normalize.css v2.0.1 +# normalize.css v2 Normalize.css is a customisable CSS file that makes browsers render all elements more consistently and in line with modern standards. We researched the differences between default browser styles in order to precisely target only the styles that need normalizing. -[Check out the demo](http://necolas.github.com/normalize.css/2.0.1/test.html) +[Check out the demo](http://necolas.github.io/normalize.css/latest/test.html) + +[Legacy browser support is available in v1](https://github.com/necolas/normalize.css/tree/v1) + +## Install + +Download from the [project page](http://necolas.github.io/normalize.css/). + +Install with [Bower](http://bower.io/): `bower install --save normalize-css` ## What does it do? @@ -33,10 +41,9 @@ override the defaults later in your CSS. ## Contribute -Please read my [issue -guidelines](https://github.com/necolas/issue-guidelines). +Please read the CONTRIBUTING.md ## Acknowledgements -Normalize.css is a project by [Nicolas Gallagher](http://github.com/necolas) -and [Jonathan Neal](http://github.com/jonathantneal). +Normalize.css is a project by [Nicolas Gallagher](https://github.com/necolas), +co-created with [Jonathan Neal](https://github.com/jonathantneal). diff --git a/core/misc/normalize/component.json b/core/misc/normalize/component.json index 393f61ee048fdbfb39d2d4053149b5cbbac72f3c..41e4d0ba0c5bc2195c476e121928e9ad2812d38e 100644 --- a/core/misc/normalize/component.json +++ b/core/misc/normalize/component.json @@ -1,15 +1,6 @@ { "name": "normalize-css", - "version": "2.0.1", - "author": "Nicolas Gallagher", - "homepage": "http://necolas.github.com/normalize.css/", + "version": "2.1.2", "styles": ["normalize.css"], - "repository": { - "type": "git", - "url": "https://github.com/necolas/normalize.css.git" - }, - "licenses": [{ - "type": "MIT", - "url": "http://opensource.org/licenses/MIT" - }] + "author": "Nicolas Gallagher" } diff --git a/core/misc/normalize/normalize.css b/core/misc/normalize/normalize.css index 57b5d2679ae36e5ad5943cbd9741699ed7563d8b..6adf56e7985db2c74a60ecd1b3896eabb7fa048a 100644 --- a/core/misc/normalize/normalize.css +++ b/core/misc/normalize/normalize.css @@ -1,11 +1,11 @@ -/*! normalize.css v2.0.1 | MIT License | git.io/normalize */ +/*! normalize.css v2.1.2 | MIT License | git.io/normalize */ /* ========================================================================== HTML5 display definitions ========================================================================== */ -/* - * Corrects `block` display not defined in IE 8/9. +/** + * Correct `block` display not defined in IE 8/9. */ article, @@ -16,14 +16,15 @@ figure, footer, header, hgroup, +main, nav, section, summary { display: block; } -/* - * Corrects `inline-block` display not defined in IE 8/9. +/** + * Correct `inline-block` display not defined in IE 8/9. */ audio, @@ -32,8 +33,8 @@ video { display: inline-block; } -/* - * Prevents modern browsers from displaying `audio` without controls. +/** + * Prevent modern browsers from displaying `audio` without controls. * Remove excess height in iOS 5 devices. */ @@ -42,8 +43,8 @@ audio:not([controls]) { height: 0; } -/* - * Addresses styling for `hidden` attribute not present in IE 8/9. +/** + * Address styling not present in IE 8/9. */ [hidden] { @@ -54,20 +55,20 @@ audio:not([controls]) { Base ========================================================================== */ -/* - * 1. Sets default font family to sans-serif. - * 2. Prevents iOS text size adjust after orientation change, without disabling +/** + * 1. Set default font family to sans-serif. + * 2. Prevent iOS text size adjust after orientation change, without disabling * user zoom. */ html { font-family: sans-serif; /* 1 */ - -webkit-text-size-adjust: 100%; /* 2 */ -ms-text-size-adjust: 100%; /* 2 */ + -webkit-text-size-adjust: 100%; /* 2 */ } -/* - * Removes default margin. +/** + * Remove default margin. */ body { @@ -78,16 +79,16 @@ body { Links ========================================================================== */ -/* - * Addresses `outline` inconsistency between Chrome and other browsers. +/** + * Address `outline` inconsistency between Chrome and other browsers. */ a:focus { outline: thin dotted; } -/* - * Improves readability when focused and also mouse hovered in all browsers. +/** + * Improve readability when focused and also mouse hovered in all browsers. */ a:active, @@ -99,25 +100,26 @@ a:hover { Typography ========================================================================== */ -/* - * Addresses `h1` font sizes within `section` and `article` in Firefox 4+, - * Safari 5, and Chrome. +/** + * Address variable `h1` font-size and margin within `section` and `article` + * contexts in Firefox 4+, Safari 5, and Chrome. */ h1 { font-size: 2em; + margin: 0.67em 0; } -/* - * Addresses styling not present in IE 8/9, Safari 5, and Chrome. +/** + * Address styling not present in IE 8/9, Safari 5, and Chrome. */ abbr[title] { border-bottom: 1px dotted; } -/* - * Addresses style set to `bolder` in Firefox 4+, Safari 5, and Chrome. +/** + * Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome. */ b, @@ -125,16 +127,26 @@ strong { font-weight: bold; } -/* - * Addresses styling not present in Safari 5 and Chrome. +/** + * Address styling not present in Safari 5 and Chrome. */ dfn { font-style: italic; } -/* - * Addresses styling not present in IE 8/9. +/** + * Address differences between Firefox and other browsers. + */ + +hr { + -moz-box-sizing: content-box; + box-sizing: content-box; + height: 0; +} + +/** + * Address styling not present in IE 8/9. */ mark { @@ -142,9 +154,8 @@ mark { color: #000; } - -/* - * Corrects font family set oddly in Safari 5 and Chrome. +/** + * Correct font family set oddly in Safari 5 and Chrome. */ code, @@ -155,34 +166,32 @@ samp { font-size: 1em; } -/* - * Improves readability of pre-formatted text in all browsers. +/** + * Improve readability of pre-formatted text in all browsers. */ pre { - white-space: pre; white-space: pre-wrap; - word-wrap: break-word; } -/* - * Sets consistent quote types. +/** + * Set consistent quote types. */ q { quotes: "\201C" "\201D" "\2018" "\2019"; } -/* - * Addresses inconsistent and variable font size in all browsers. +/** + * Address inconsistent and variable font size in all browsers. */ small { font-size: 80%; } -/* - * Prevents `sub` and `sup` affecting `line-height` in all browsers. +/** + * Prevent `sub` and `sup` affecting `line-height` in all browsers. */ sub, @@ -205,16 +214,16 @@ sub { Embedded content ========================================================================== */ -/* - * Removes border when inside `a` element in IE 8/9. +/** + * Remove border when inside `a` element in IE 8/9. */ img { border: 0; } -/* - * Corrects overflow displayed oddly in IE 9. +/** + * Correct overflow displayed oddly in IE 9. */ svg:not(:root) { @@ -225,8 +234,8 @@ svg:not(:root) { Figures ========================================================================== */ -/* - * Addresses margin not present in IE 8/9 and Safari 5. +/** + * Address margin not present in IE 8/9 and Safari 5. */ figure { @@ -237,7 +246,7 @@ figure { Forms ========================================================================== */ -/* +/** * Define consistent border, margin, and padding. */ @@ -247,8 +256,8 @@ fieldset { padding: 0.35em 0.625em 0.75em; } -/* - * 1. Corrects color not being inherited in IE 8/9. +/** + * 1. Correct `color` not being inherited in IE 8/9. * 2. Remove padding so people aren't caught out if they zero out fieldsets. */ @@ -257,10 +266,10 @@ legend { padding: 0; /* 2 */ } -/* - * 1. Corrects font family not being inherited in all browsers. - * 2. Corrects font size not being inherited in all browsers. - * 3. Addresses margins set differently in Firefox 4+, Safari 5, and Chrome +/** + * 1. Correct font family not being inherited in all browsers. + * 2. Correct font size not being inherited in all browsers. + * 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome. */ button, @@ -272,8 +281,8 @@ textarea { margin: 0; /* 3 */ } -/* - * Addresses Firefox 4+ setting `line-height` on `input` using `!important` in +/** + * Address Firefox 4+ setting `line-height` on `input` using `!important` in * the UA stylesheet. */ @@ -282,11 +291,23 @@ input { line-height: normal; } -/* +/** + * Address inconsistent `text-transform` inheritance for `button` and `select`. + * All other form control elements do not inherit `text-transform` values. + * Correct `button` style inheritance in Chrome, Safari 5+, and IE 8+. + * Correct `select` style inheritance in Firefox 4+ and Opera. + */ + +button, +select { + text-transform: none; +} + +/** * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` * and `video` controls. - * 2. Corrects inability to style clickable `input` types in iOS. - * 3. Improves usability and consistency of cursor style between image-type + * 2. Correct inability to style clickable `input` types in iOS. + * 3. Improve usability and consistency of cursor style between image-type * `input` and others. */ @@ -298,18 +319,18 @@ input[type="submit"] { cursor: pointer; /* 3 */ } -/* +/** * Re-set default cursor for disabled elements. */ button[disabled], -input[disabled] { +html input[disabled] { cursor: default; } -/* - * 1. Addresses box sizing set to `content-box` in IE 8/9. - * 2. Removes excess padding in IE 8/9. +/** + * 1. Address box sizing set to `content-box` in IE 8/9. + * 2. Remove excess padding in IE 8/9. */ input[type="checkbox"], @@ -318,9 +339,9 @@ input[type="radio"] { padding: 0; /* 2 */ } -/* - * 1. Addresses `appearance` set to `searchfield` in Safari 5 and Chrome. - * 2. Addresses `box-sizing` set to `border-box` in Safari 5 and Chrome +/** + * 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome. + * 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome * (include `-moz` to future-proof). */ @@ -331,8 +352,8 @@ input[type="search"] { box-sizing: content-box; } -/* - * Removes inner padding and search cancel button in Safari 5 and Chrome +/** + * Remove inner padding and search cancel button in Safari 5 and Chrome * on OS X. */ @@ -341,8 +362,8 @@ input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; } -/* - * Removes inner padding and border in Firefox 4+. +/** + * Remove inner padding and border in Firefox 4+. */ button::-moz-focus-inner, @@ -351,9 +372,9 @@ input::-moz-focus-inner { padding: 0; } -/* - * 1. Removes default vertical scrollbar in IE 8/9. - * 2. Improves readability and alignment in all browsers. +/** + * 1. Remove default vertical scrollbar in IE 8/9. + * 2. Improve readability and alignment in all browsers. */ textarea { @@ -365,7 +386,7 @@ textarea { Tables ========================================================================== */ -/* +/** * Remove most spacing between table cells. */ diff --git a/core/modules/system/system.module b/core/modules/system/system.module index c3c6584cceaa6782f709b147bdb3248d022bbd0f..42779167c9ac4f4b6ec56678978d7cd3a0ea97b0 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -1618,7 +1618,7 @@ function system_library_info() { $libraries['normalize'] = array( 'title' => 'normalize.css', 'website' => 'http://git.io/normalize', - 'version' => '2.0.1', + 'version' => '2.1.2', 'css' => array( 'core/misc/normalize/normalize.css' => array( 'every_page' => TRUE,