diff --git a/core/misc/normalize/CHANGELOG.md b/core/misc/normalize/CHANGELOG.md new file mode 100644 index 0000000000000000000000000000000000000000..e8a6349a09ef902f9f5913c802b6c99cf3987ed9 --- /dev/null +++ b/core/misc/normalize/CHANGELOG.md @@ -0,0 +1,29 @@ +== 2.0.1 (August 20, 2012) + +* Remove stray IE 6/7 `inline-block` hack from HTML5 display settings. + +== 2.0.0 (August 19, 2012) + +* Remove legacy browser form normalizations. +* Remove all list normalizations. +* Add `quotes` normalizations. +* Remove all heading normalizations except `h1` font size. +* Form elements automatically inherit `font-family` from ancestor. +* Drop support for IE 6/7, Firefox < 4, and Safari < 5. + +== 1.0.1 (August 19, 2012) + +* Adjust `small` font size normalization. + +== 1.0.0 (August 14, 2012) + +(Only the notable changes since public release) + +* Add MIT License. +* Hide `audio` elements without controls in iOS 5 (#69). +* Normalize heading margins and font size. +* Move font-family normalization from `body` to `html` (#62). +* Remove scrollbar normalization (#64 #65). +* Remove excess padding from checkbox and radio inputs in IE 7 (#42). +* Add IE9 correction for SVG overflow (#16). +* Add fix for legend not inheriting color in IE 6/7/8/9. diff --git a/core/misc/normalize/LICENSE.md b/core/misc/normalize/LICENSE.md new file mode 100644 index 0000000000000000000000000000000000000000..c6bcc9bf2d8baa07f640f671796a25a83bcb86ae --- /dev/null +++ b/core/misc/normalize/LICENSE.md @@ -0,0 +1,19 @@ +Copyright (c) Nicolas Gallagher and Jonathan Neal + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/core/misc/normalize/README.md b/core/misc/normalize/README.md new file mode 100644 index 0000000000000000000000000000000000000000..82f9f5d6392a920cfe7d0551f8692e325977e300 --- /dev/null +++ b/core/misc/normalize/README.md @@ -0,0 +1,42 @@ +# normalize.css v2.0.1 + +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) + +## What does it do? + +* Preserves useful defaults, unlike many CSS resets. +* Normalizes styles for a wide range of elements. +* Corrects bugs and common browser inconsistencies. +* Improves usability with subtle improvements. +* Explains what code does using detailed comments. + +## How to use it + +Normalize.css is intended to be used as an alternative to CSS resets. + +It's suggested that you read the `normalize.css` file and consider customising +it to meet your needs. Alternatively, include the file in your project and +override the defaults later in your CSS. + +## Browser support + +* Google Chrome +* Mozilla Firefox 4+ +* Apple Safari 5+ +* Opera 12+ +* Internet Explorer 8+ + +## Contribute + +Please read my [issue +guidelines](https://github.com/necolas/issue-guidelines). + +## Acknowledgements + +Normalize.css is a project by [Nicolas Gallagher](http://github.com/necolas) +and [Jonathan Neal](http://github.com/jonathantneal). diff --git a/core/misc/normalize/component.json b/core/misc/normalize/component.json new file mode 100644 index 0000000000000000000000000000000000000000..393f61ee048fdbfb39d2d4053149b5cbbac72f3c --- /dev/null +++ b/core/misc/normalize/component.json @@ -0,0 +1,15 @@ +{ + "name": "normalize-css", + "version": "2.0.1", + "author": "Nicolas Gallagher", + "homepage": "http://necolas.github.com/normalize.css/", + "styles": ["normalize.css"], + "repository": { + "type": "git", + "url": "https://github.com/necolas/normalize.css.git" + }, + "licenses": [{ + "type": "MIT", + "url": "http://opensource.org/licenses/MIT" + }] +} diff --git a/core/misc/normalize/normalize.css b/core/misc/normalize/normalize.css new file mode 100644 index 0000000000000000000000000000000000000000..57b5d2679ae36e5ad5943cbd9741699ed7563d8b --- /dev/null +++ b/core/misc/normalize/normalize.css @@ -0,0 +1,375 @@ +/*! normalize.css v2.0.1 | MIT License | git.io/normalize */ + +/* ========================================================================== + HTML5 display definitions + ========================================================================== */ + +/* + * Corrects `block` display not defined in IE 8/9. + */ + +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +nav, +section, +summary { + display: block; +} + +/* + * Corrects `inline-block` display not defined in IE 8/9. + */ + +audio, +canvas, +video { + display: inline-block; +} + +/* + * Prevents modern browsers from displaying `audio` without controls. + * Remove excess height in iOS 5 devices. + */ + +audio:not([controls]) { + display: none; + height: 0; +} + +/* + * Addresses styling for `hidden` attribute not present in IE 8/9. + */ + +[hidden] { + display: none; +} + +/* ========================================================================== + Base + ========================================================================== */ + +/* + * 1. Sets default font family to sans-serif. + * 2. Prevents 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 */ +} + +/* + * Removes default margin. + */ + +body { + margin: 0; +} + +/* ========================================================================== + Links + ========================================================================== */ + +/* + * Addresses `outline` inconsistency between Chrome and other browsers. + */ + +a:focus { + outline: thin dotted; +} + +/* + * Improves readability when focused and also mouse hovered in all browsers. + */ + +a:active, +a:hover { + outline: 0; +} + +/* ========================================================================== + Typography + ========================================================================== */ + +/* + * Addresses `h1` font sizes within `section` and `article` in Firefox 4+, + * Safari 5, and Chrome. + */ + +h1 { + font-size: 2em; +} + +/* + * Addresses 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. + */ + +b, +strong { + font-weight: bold; +} + +/* + * Addresses styling not present in Safari 5 and Chrome. + */ + +dfn { + font-style: italic; +} + +/* + * Addresses styling not present in IE 8/9. + */ + +mark { + background: #ff0; + color: #000; +} + + +/* + * Corrects font family set oddly in Safari 5 and Chrome. + */ + +code, +kbd, +pre, +samp { + font-family: monospace, serif; + font-size: 1em; +} + +/* + * Improves readability of pre-formatted text in all browsers. + */ + +pre { + white-space: pre; + white-space: pre-wrap; + word-wrap: break-word; +} + +/* + * Sets consistent quote types. + */ + +q { + quotes: "\201C" "\201D" "\2018" "\2019"; +} + +/* + * Addresses inconsistent and variable font size in all browsers. + */ + +small { + font-size: 80%; +} + +/* + * Prevents `sub` and `sup` affecting `line-height` in all browsers. + */ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sup { + top: -0.5em; +} + +sub { + bottom: -0.25em; +} + +/* ========================================================================== + Embedded content + ========================================================================== */ + +/* + * Removes border when inside `a` element in IE 8/9. + */ + +img { + border: 0; +} + +/* + * Corrects overflow displayed oddly in IE 9. + */ + +svg:not(:root) { + overflow: hidden; +} + +/* ========================================================================== + Figures + ========================================================================== */ + +/* + * Addresses margin not present in IE 8/9 and Safari 5. + */ + +figure { + margin: 0; +} + +/* ========================================================================== + Forms + ========================================================================== */ + +/* + * Define consistent border, margin, and padding. + */ + +fieldset { + border: 1px solid #c0c0c0; + margin: 0 2px; + padding: 0.35em 0.625em 0.75em; +} + +/* + * 1. Corrects color not being inherited in IE 8/9. + * 2. Remove padding so people aren't caught out if they zero out fieldsets. + */ + +legend { + border: 0; /* 1 */ + 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 + */ + +button, +input, +select, +textarea { + font-family: inherit; /* 1 */ + font-size: 100%; /* 2 */ + margin: 0; /* 3 */ +} + +/* + * Addresses Firefox 4+ setting `line-height` on `input` using `!important` in + * the UA stylesheet. + */ + +button, +input { + line-height: normal; +} + +/* + * 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 + * `input` and others. + */ + +button, +html input[type="button"], /* 1 */ +input[type="reset"], +input[type="submit"] { + -webkit-appearance: button; /* 2 */ + cursor: pointer; /* 3 */ +} + +/* + * Re-set default cursor for disabled elements. + */ + +button[disabled], +input[disabled] { + cursor: default; +} + +/* + * 1. Addresses box sizing set to `content-box` in IE 8/9. + * 2. Removes excess padding in IE 8/9. + */ + +input[type="checkbox"], +input[type="radio"] { + box-sizing: border-box; /* 1 */ + 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 + * (include `-moz` to future-proof). + */ + +input[type="search"] { + -webkit-appearance: textfield; /* 1 */ + -moz-box-sizing: content-box; + -webkit-box-sizing: content-box; /* 2 */ + box-sizing: content-box; +} + +/* + * Removes inner padding and search cancel button in Safari 5 and Chrome + * on OS X. + */ + +input[type="search"]::-webkit-search-cancel-button, +input[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +/* + * Removes inner padding and border in Firefox 4+. + */ + +button::-moz-focus-inner, +input::-moz-focus-inner { + border: 0; + padding: 0; +} + +/* + * 1. Removes default vertical scrollbar in IE 8/9. + * 2. Improves readability and alignment in all browsers. + */ + +textarea { + overflow: auto; /* 1 */ + vertical-align: top; /* 2 */ +} + +/* ========================================================================== + Tables + ========================================================================== */ + +/* + * Remove most spacing between table cells. + */ + +table { + border-collapse: collapse; + border-spacing: 0; +} diff --git a/core/modules/system/system.module b/core/modules/system/system.module index 074aa3174c94a9a826b390bf06d2b9dce1d26987..44751040fbeb4f62f6d4941578a6a237db04378d 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -1416,6 +1416,18 @@ function system_library_info() { ), ), ); + // Normalize. + $libraries['normalize'] = array( + 'title' => 'normalize.css', + 'website' => 'http://git.io/normalize', + 'version' => '2.0.1', + 'css' => array( + 'core/misc/normalize/normalize.css' => array( + 'every_page' => TRUE, + 'weight' => -10, + ), + ), + ); // jQuery UI. $libraries['jquery.ui.core'] = array( diff --git a/core/themes/seven/reset.css b/core/themes/seven/reset.css deleted file mode 100644 index 507955e2645cd01480ac1c19297b1fa41127c968..0000000000000000000000000000000000000000 --- a/core/themes/seven/reset.css +++ /dev/null @@ -1,201 +0,0 @@ - -/** - * Reset CSS styles. - * - * Based on Eric Meyer's "Reset CSS 1.0" tool from - * http://meyerweb.com/eric/tools/css/reset - */ - -html, -body, -div, -span, -applet, -object, -iframe, -h1, -h2, -h3, -h4, -h5, -h6, -p, -blockquote, -pre, -a, -abbr, -acronym, -address, -big, -cite, -code, -del, -dfn, -em, -font, -img, -ins, -kbd, -q, -s, -samp, -small, -strike, -strong, -sub, -sup, -tt, -var, -b, -u, -i, -center, -dl, -dt, -dd, -ol, -ul, -li, -fieldset, -form, -input, -select, -textarea, -label, -legend, -table, -caption, -tbody, -tfoot, -thead, -tr, -th, -td, -/* Drupal: system-menus.css */ -ul.links, -ul.links.inline, -ul.links li, -.block ul, -/* Drupal: admin.css */ -div.admin, -/* Drupal: system.css */ -tr.even, -tr.odd, -tr.drag, -tbody, -tbody th, -thead th, -.breadcrumb, -.item-list .icon, -.item-list .title, -.item-list ul, -.item-list ul li, -ol.task-list li.active, -.form-item, -tr.odd .form-item, -tr.even .form-item, -.form-item .description, -.form-item label, -.form-item label.option, -.form-checkboxes, -.form-radios, -.form-checkboxes .form-item, -.form-radios .form-item, -.marker, -.form-required, -.more-link, -.more-help-link, -.item-list .pager, -.item-list .pager li, -.pager-current, -.tips, -ul.primary, -ul.primary li, -ul.primary li a, -ul.primary li.active a, -ul.primary li a:hover, -ul.secondary, -ul.secondary li, -ul.secondary a, -ul.secondary a.active, -.resizable-textarea { - margin: 0; - padding: 0; - border: 0; - vertical-align: baseline; -} -/* Drupal: system-menus.css */ -ul.links, -ul.links.inline, -ul.links li, -.block ul, -ol, -ul, -.item-list ul, -.item-list ul li { - list-style: none; -} -blockquote, -q { - quotes: none; -} -blockquote:before, -blockquote:after, -q:before, -q:after { - content: ''; - content: none; -} - -/* Remember to highlight inserts somehow! */ -ins { - text-decoration: none; -} -del { - text-decoration: line-through; -} - -/* Tables still need 'cellspacing="0"' in the markup. */ -table { - border-collapse: collapse; - border-spacing: 0; -} - -/** - * Font reset. - * - * Specifically targets form elements which browsers often times give - * special treatment. - */ -input, -select, -textarea { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; -} -textarea { - font-size: 1em; - line-height: 1.538em; -} -/** - * Markup free clearing. - * - * Consider adding your own selectors to this instead of finding ways - * to sneak the clearfix class into Drupal's markup. - * From http://perishablepress.com/press/2009/12/06/new-clearfix-hack - */ -ul.links:after, -div.admin-panel .body:after, -.clearfix:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; -} - -/* Exclude inline links from clearfix behavior */ -ul.inline:after { - content: ""; - display: none; - clear: none; -} diff --git a/core/themes/seven/seven.info b/core/themes/seven/seven.info index 969f7490bb07e9c99b3ead2cdbc631db64c37d4b..87edba394c1a8f6f5c469b1826a0793d8d426a89 100644 --- a/core/themes/seven/seven.info +++ b/core/themes/seven/seven.info @@ -3,7 +3,6 @@ description = A simple one-column, tableless, fluid width administration theme. package = Core version = VERSION core = 8.x -stylesheets[screen][] = reset.css stylesheets[screen][] = style.css settings[shortcut_module_link] = 1 regions[content] = Content diff --git a/core/themes/seven/template.php b/core/themes/seven/template.php index a8643abc5a868157753085076934d8a9edd8a221..f135c9591e24dfccfa31a95cbbed02720894be96 100644 --- a/core/themes/seven/template.php +++ b/core/themes/seven/template.php @@ -21,6 +21,7 @@ function seven_preprocess_maintenance_page(&$vars) { * Implements hook_preprocess_HOOK() for html.tpl.php. */ function seven_preprocess_html(&$vars) { + drupal_add_library('system', 'normalize'); // Add conditional CSS for IE8 and below. drupal_add_css(path_to_theme() . '/ie.css', array('group' => CSS_THEME, 'browsers' => array('IE' => 'lte IE 8', '!IE' => FALSE), 'weight' => 999, 'preprocess' => FALSE)); }