diff --git a/core/themes/seven/reset.css b/core/themes/seven/reset.css index 507955e2645cd01480ac1c19297b1fa41127c968..1834e95b1a44aa83a1bc28e19392378b33f0bc0b 100644 --- a/core/themes/seven/reset.css +++ b/core/themes/seven/reset.css @@ -1,201 +1,306 @@ +/** + * @file + * Reset stylesheet for the Seven admin theme + * Based on normalize.css v2.0.1 | MIT License | git.io/normalize + */ /** - * 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, + * 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 iOS5 devices. + */ +audio:not([controls]) { + display: none; + height: 0; +} + +/* Addresses styling for `hidden` attribute not present in IE 8/9. */ +[hidden] { + display: none; +} + + +/** + * Base + */ + +/** + * Prevents iOS text size adjust after orientation change, without disabling + * user zoom. + */ +html { + -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, -del, -dfn, -em, -font, -img, -ins, kbd, -q, -s, -samp, -small, -strike, -strong, +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. Localizations may require override. */ +q { + quotes: "\201C" "\201D" "\2018" "\2019"; +} + +/* Addresses inconsistent and variable font size in all browsers. */ +small { + font-size: 80%; +} + +/** + * Normalizes vertical alignment of `sub` and `sup` elements and prevents + * affecting `line-height` in all browsers. + */ 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; +sup { + font-size: 75%; + line-height: 0; + position: relative; 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; +sup { + top: -0.5em; } -blockquote:before, -blockquote:after, -q:before, -q:after { - content: ''; - content: none; +sub { + bottom: -0.25em; } -/* Remember to highlight inserts somehow! */ -ins { - text-decoration: none; + +/** + * Embedded content + */ + +/* Removes border when inside `a` element in IE 8/9. */ +img { + border: 0; } -del { - text-decoration: line-through; + +/* Corrects overflow displayed oddly in IE 9. */ +svg:not(:root) { + overflow: hidden; } -/* Tables still need 'cellspacing="0"' in the markup. */ -table { - border-collapse: collapse; - border-spacing: 0; + +/** + * Figures + */ + +/* Addresses margin not present in IE 8/9, Safari 5, Opera 11. */ +figure { + margin: 0; } + /** - * Font reset. - * - * Specifically targets form elements which browsers often times give - * special treatment. + * 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. + */ +legend { + border: 0; /* 1 */ + padding: 0; +} + +/* + * 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: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: inherit; /* 1 */ + font-size: 100%; /* 2 */ + margin: 0; /* 3 */ } -textarea { - font-size: 1em; - line-height: 1.538em; + +/** + * Addresses Firefox 4+ setting `line-height` on `input` using `!important` in + * the UA stylesheet. + */ +button, +input { + line-height: normal; } + /** - * 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 + * 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. */ -ul.links:after, -div.admin-panel .body:after, -.clearfix:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; +button, +html input[type="button"], /* 1 */ +input[type="reset"], +input[type="submit"] { + -webkit-appearance: button; /* 2 */ + cursor: pointer; /* 3 */ } -/* Exclude inline links from clearfix behavior */ -ul.inline:after { - content: ""; - display: none; - clear: none; +/* 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, 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/themes/seven/template.php b/core/themes/seven/template.php index a8643abc5a868157753085076934d8a9edd8a221..1d4f9babb2698aca25b51d7e47c92e10c3cd2c59 100644 --- a/core/themes/seven/template.php +++ b/core/themes/seven/template.php @@ -114,4 +114,8 @@ function seven_css_alter(&$css) { if (isset($css['core/misc/ui/themes/base/jquery.ui.theme.css'])) { $css['core/misc/ui/themes/base/jquery.ui.theme.css']['data'] = drupal_get_path('theme', 'seven') . '/jquery.ui.theme.css'; } + // Move reset.css so that it's loaded first. + if (isset($css['core/themes/seven/reset.css'])) { + $css['core/themes/seven/reset.css']['group'] = CSS_SYSTEM -1; + } }