From 84b5a67b95d849e2851a03092f70de2cbf966fdc Mon Sep 17 00:00:00 2001 From: Alexander Schmitz Date: Mon, 30 Mar 2015 13:51:28 -0400 Subject: [PATCH] Build: Add normalize.css and include in default build This includes normalize.css in the external folder and includes it as part of the default build. Fixes gh-7 Closes gh-66 --- .gitignore | 1 - Gruntfile.js | 28 +- external/normalize.css/LICENSE.md | 19 ++ external/normalize.css/normalize.scss | 424 ++++++++++++++++++++++++++ package.json | 7 +- scss/lint.scss | 18 ++ scss/style.scss | 12 +- 7 files changed, 496 insertions(+), 13 deletions(-) create mode 100644 external/normalize.css/LICENSE.md create mode 100644 external/normalize.css/normalize.scss create mode 100644 scss/lint.scss diff --git a/.gitignore b/.gitignore index 651780f..cf2aa3e 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,6 @@ style.css # Folders bower_components/ node_modules/ -external/ icons/svg-min/ .sass-cache/ dist/ diff --git a/Gruntfile.js b/Gruntfile.js index 4cf6ce3..5412a06 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -44,7 +44,7 @@ var config = { } }, csslint: { - src: [ "dist/css/*.css" ] + src: [ "dist/css/chassis.lint.css", "dist/css/chassis.lint.css" ] }, jscs: { all: [ "*.js", "performance/**/*.js" ] @@ -55,7 +55,20 @@ var config = { jshintrc: ".jshintrc" } }, + npmcopy: { + options: { + destPrefix: "external" + }, + normalize: { + files: { + "normalize.css/LICENSE.md": "normalize.css/LICENSE.md", + "normalize.css/normalize.scss": "normalize.css/normalize.css" + } + } + }, sass: { + + // This is the same as lint below except including normalize.css dist: { options: { sourceMap: true, @@ -66,6 +79,19 @@ var config = { files: { "dist/css/chassis.css": "scss/style.scss" } + }, + + // This is everything except normalize.css which won't pass our lint settings + lint: { + options: { + sourceMap: true, + + // This actually does nested until libsass updates to support expanded + outputStyle: "expanded" + }, + files: { + "dist/css/chassis.lint.css": "scss/lint.scss" + } } }, diff --git a/external/normalize.css/LICENSE.md b/external/normalize.css/LICENSE.md new file mode 100644 index 0000000..c6bcc9b --- /dev/null +++ b/external/normalize.css/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/external/normalize.css/normalize.scss b/external/normalize.css/normalize.scss new file mode 100644 index 0000000..5e5e3c8 --- /dev/null +++ b/external/normalize.css/normalize.scss @@ -0,0 +1,424 @@ +/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */ + +/** + * 1. Set default font family to sans-serif. + * 2. Prevent iOS and IE text size adjust after device orientation change, + * without disabling user zoom. + */ + +html { + font-family: sans-serif; /* 1 */ + -ms-text-size-adjust: 100%; /* 2 */ + -webkit-text-size-adjust: 100%; /* 2 */ +} + +/** + * Remove default margin. + */ + +body { + margin: 0; +} + +/* HTML5 display definitions + ========================================================================== */ + +/** + * Correct `block` display not defined for any HTML5 element in IE 8/9. + * Correct `block` display not defined for `details` or `summary` in IE 10/11 + * and Firefox. + * Correct `block` display not defined for `main` in IE 11. + */ + +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +main, +menu, +nav, +section, +summary { + display: block; +} + +/** + * 1. Correct `inline-block` display not defined in IE 8/9. + * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. + */ + +audio, +canvas, +progress, +video { + display: inline-block; /* 1 */ + vertical-align: baseline; /* 2 */ +} + +/** + * Prevent modern browsers from displaying `audio` without controls. + * Remove excess height in iOS 5 devices. + */ + +audio:not([controls]) { + display: none; + height: 0; +} + +/** + * Address `[hidden]` styling not present in IE 8/9/10. + * Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22. + */ + +[hidden], +template { + display: none; +} + +/* Links + ========================================================================== */ + +/** + * Remove the gray background color from active links in IE 10. + */ + +a { + background-color: transparent; +} + +/** + * Improve readability of focused elements when they are also in an + * active/hover state. + */ + +a:active, +a:hover { + outline: 0; +} + +/* Text-level semantics + ========================================================================== */ + +/** + * Address styling not present in IE 8/9/10/11, Safari, and Chrome. + */ + +abbr[title] { + border-bottom: 1px dotted; +} + +/** + * Address style set to `bolder` in Firefox 4+, Safari, and Chrome. + */ + +b, +strong { + font-weight: bold; +} + +/** + * Address styling not present in Safari and Chrome. + */ + +dfn { + font-style: italic; +} + +/** + * Address variable `h1` font-size and margin within `section` and `article` + * contexts in Firefox 4+, Safari, and Chrome. + */ + +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +/** + * Address styling not present in IE 8/9. + */ + +mark { + background: #ff0; + color: #000; +} + +/** + * Address inconsistent and variable font size in all browsers. + */ + +small { + font-size: 80%; +} + +/** + * Prevent `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 + ========================================================================== */ + +/** + * Remove border when inside `a` element in IE 8/9/10. + */ + +img { + border: 0; +} + +/** + * Correct overflow not hidden in IE 9/10/11. + */ + +svg:not(:root) { + overflow: hidden; +} + +/* Grouping content + ========================================================================== */ + +/** + * Address margin not present in IE 8/9 and Safari. + */ + +figure { + margin: 1em 40px; +} + +/** + * Address differences between Firefox and other browsers. + */ + +hr { + box-sizing: content-box; + height: 0; +} + +/** + * Contain overflow in all browsers. + */ + +pre { + overflow: auto; +} + +/** + * Address odd `em`-unit font size rendering in all browsers. + */ + +code, +kbd, +pre, +samp { + font-family: monospace, monospace; + font-size: 1em; +} + +/* Forms + ========================================================================== */ + +/** + * Known limitation: by default, Chrome and Safari on OS X allow very limited + * styling of `select`, unless a `border` property is set. + */ + +/** + * 1. Correct color not being inherited. + * Known issue: affects color of disabled elements. + * 2. Correct font properties not being inherited. + * 3. Address margins set differently in Firefox 4+, Safari, and Chrome. + */ + +button, +input, +optgroup, +select, +textarea { + color: inherit; /* 1 */ + font: inherit; /* 2 */ + margin: 0; /* 3 */ +} + +/** + * Address `overflow` set to `hidden` in IE 8/9/10/11. + */ + +button { + overflow: visible; +} + +/** + * 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 Firefox, IE 8/9/10/11, and Opera. + * Correct `select` style inheritance in Firefox. + */ + +button, +select { + text-transform: none; +} + +/** + * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` + * and `video` controls. + * 2. Correct inability to style clickable `input` types in iOS. + * 3. Improve 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], +html input[disabled] { + cursor: default; +} + +/** + * Remove inner padding and border in Firefox 4+. + */ + +button::-moz-focus-inner, +input::-moz-focus-inner { + border: 0; + padding: 0; +} + +/** + * Address Firefox 4+ setting `line-height` on `input` using `!important` in + * the UA stylesheet. + */ + +input { + line-height: normal; +} + +/** + * It's recommended that you don't attempt to style these elements. + * Firefox's implementation doesn't respect box-sizing, padding, or width. + * + * 1. Address box sizing set to `content-box` in IE 8/9/10. + * 2. Remove excess padding in IE 8/9/10. + */ + +input[type="checkbox"], +input[type="radio"] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Fix the cursor style for Chrome's increment/decrement buttons. For certain + * `font-size` values of the `input`, it causes the cursor style of the + * decrement button to change from `default` to `text`. + */ + +input[type="number"]::-webkit-inner-spin-button, +input[type="number"]::-webkit-outer-spin-button { + height: auto; +} + +/** + * 1. Address `appearance` set to `searchfield` in Safari and Chrome. + * 2. Address `box-sizing` set to `border-box` in Safari and Chrome. + */ + +input[type="search"] { + -webkit-appearance: textfield; /* 1 */ + box-sizing: content-box; /* 2 */ +} + +/** + * Remove inner padding and search cancel button in Safari and Chrome on OS X. + * Safari (but not Chrome) clips the cancel button when the search input has + * padding (and `textfield` appearance). + */ + +input[type="search"]::-webkit-search-cancel-button, +input[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +/** + * Define consistent border, margin, and padding. + */ + +fieldset { + border: 1px solid #c0c0c0; + margin: 0 2px; + padding: 0.35em 0.625em 0.75em; +} + +/** + * 1. Correct `color` not being inherited in IE 8/9/10/11. + * 2. Remove padding so people aren't caught out if they zero out fieldsets. + */ + +legend { + border: 0; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Remove default vertical scrollbar in IE 8/9/10/11. + */ + +textarea { + overflow: auto; +} + +/** + * Don't inherit the `font-weight` (applied by a rule above). + * NOTE: the default cannot safely be changed in Chrome and Safari on OS X. + */ + +optgroup { + font-weight: bold; +} + +/* Tables + ========================================================================== */ + +/** + * Remove most spacing between table cells. + */ + +table { + border-collapse: collapse; + border-spacing: 0; +} + +td, +th { + padding: 0; +} diff --git a/package.json b/package.json index f55d531..c1f1006 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "css-chassis", "title": "Chassis", "description": "An attempt at creating open standards designed for CSS libraries, JavaScript UI libraries, and web developers in general", - "version": "0.0.1", + "version": "0.0.1-pre", "author": { "name": "jQuery Foundation and other contributors", "url": "https://github.com/jquery/css-chassis/blob/master/AUTHORS.txt" @@ -40,7 +40,9 @@ "start": "grunt watch", "test": "grunt" }, - "dependencies": {}, + "dependencies": { + "normalize.css": "3.0.3" + }, "devDependencies": { "browser-perf": "1.2.3", "chromedriver": "2.13.0", @@ -58,6 +60,7 @@ "grunt-git-authors": "2.0.0", "grunt-html": "1.6.0", "grunt-jscs": "0.6.2", + "grunt-npmcopy": "0.1.0", "grunt-sass": "0.17.0", "grunt-selenium-server": "0.1.2", "grunt-svgmin": "2.0.0", diff --git a/scss/lint.scss b/scss/lint.scss new file mode 100644 index 0000000..186712c --- /dev/null +++ b/scss/lint.scss @@ -0,0 +1,18 @@ +// ========================================================================== +// CSS Chassis +// +// This contains all the chassis scss execpt normalize.css which will not pass our linter +// we use this file to create a distriubable for linting style.scss contains this file plus +// normalize.css +// ========================================================================== + +@import + "_utilities/clearfix", + "_utilities/colors"; + +@import + "atoms/icons/icons", + "atoms/typography/typography"; + +@import + "views/main"; diff --git a/scss/style.scss b/scss/style.scss index c9c1647..257f5ed 100644 --- a/scss/style.scss +++ b/scss/style.scss @@ -1,14 +1,8 @@ // ========================================================================== // CSS Chassis // ========================================================================== +// This just adds normalize to the build see lint.scss for explanation. @import - "_utilities/clearfix", - "_utilities/colors"; - -@import - "atoms/icons/icons", - "atoms/typography/typography"; - -@import - "views/main"; + "external/normalize.css/normalize.scss", + "lint.scss";