diff --git a/.gitignore b/.gitignore index 2b237d5..a36c2ef 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /boilerplate.sublime-workspace project-x/node_modules/ project-x/.sass-cache/ +project-x/npm-debug.log diff --git a/project-x/Gruntfile.js b/project-x/Gruntfile.js index f8aed9b..deebd71 100644 --- a/project-x/Gruntfile.js +++ b/project-x/Gruntfile.js @@ -26,7 +26,6 @@ module.exports = function(grunt) { } } }, - autoprefixer: { build: { options: { diff --git a/project-x/assets/styles/dist/main.css b/project-x/assets/styles/dist/main.css new file mode 100644 index 0000000..ba6037a --- /dev/null +++ b/project-x/assets/styles/dist/main.css @@ -0,0 +1,621 @@ +/** + * Project-x / Public Site + * ========================================================================== + * + */ +/* ========================================================================== + Imports + ========================================================================== */ +/* ========================================================================== + Settings + ========================================================================== */ +/* Typography + ========================================================================== */ +/* Colour Palette + ========================================================================== */ +/* Spacings + ========================================================================== */ +/* Z-index + ========================================================================== */ +/* Screen widths + ========================================================================== */ +/* Transitions + ========================================================================== */ +/* ========================================================================== + Functions + ========================================================================== */ +/* ========================================================================== + Mixins + ========================================================================== */ +/* ========================================================================== + Helpers + ========================================================================== */ +.clearfix:before, +.clearfix:after { + content: " "; + display: table; } + +.clearfix:after { + clear: both; } + +.center-vertically { + text-align: center; + height: 100%; } + .center-vertically:before { + content: ""; + display: inline-block; + height: 100%; + vertical-align: middle; } + .center-vertically > * { + display: inline-block; + vertical-align: middle; } + +/* ========================================================================== + Trumps + ========================================================================== */ +.left { + float: left !important; } + +.right { + float: right !important; } + +.align-left { + text-align: left !important; } + +.align-right { + text-align: right !important; } + +.align-center { + text-align: center !important; } + +.is-visible { + visibility: visible !important; + opacity: 1 !important; } + +.is-hidden { + visibility: hidden !important; + opacity: 0 !important; } + +/* Accessibility + ========================================================================== */ +/* + * Hide visually and from screen readers: h5bp.com/u + */ +.hidden { + display: none !important; + visibility: hidden; } + +/* + * Hide only visually, but have it available for screen readers: h5bp.com/v + */ +.visuallyhidden { + border: 0; + clip: rect(0 0 0 0); + height: 1px; + margin: -1px; + overflow: hidden; + padding: 0; + position: absolute; + width: 1px; } + +/* + * Extends the .visuallyhidden class to allow the element to be focusable + * when navigated to via the keyboard: h5bp.com/p + */ +.visuallyhidden.focusable:active, +.visuallyhidden.focusable:focus { + clip: auto; + height: auto; + margin: 0; + overflow: visible; + position: static; + width: auto; } + +/* + * Hide visually and from screen readers, but maintain layout + */ +.invisible { + visibility: hidden; } + +/*! normalize.css v3.0.1 | MIT License | git.io/normalize */ +/** + * 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 */ + -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, +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/11, Safari, and Firefox < 22. + */ +[hidden], +template { + display: none; } + +/* Links + ========================================================================== */ +/** + * Remove the gray background color from active links in IE 10. + */ +a { + background: transparent; } + +/** + * Improve readability when focused and also mouse hovered in all browsers. + */ +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"], +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 + * (include `-moz` to future-proof). + */ +input[type="search"] { + -webkit-appearance: textfield; + /* 1 */ + /* 2 */ + box-sizing: content-box; } + +/** + * 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; } + +/* ========================================================================== + Fonts + ========================================================================== */ +/* ========================================================================== + Base + ========================================================================== */ +*, *:before, *:after { + box-sizing: inherit; } + +html { + box-sizing: border-box; + font-size: 16px; + font-family: sans-serif; + line-height: 1.4; + color: #222222; } + +::-moz-selection { + background: #b3d4fc; + text-shadow: none; } + +::selection { + background: #b3d4fc; + text-shadow: none; } + +hr { + display: block; + height: 1px; + border: 0; + border-top: 1px solid #ccc; + margin: 1em 0; + padding: 0; } + +img, svg { + vertical-align: middle; + max-width: 100%; } + +textarea { + resize: vertical; } + +a { + color: #1a0dab; } + a:hover { + color: #13097c; } + +.container { + position: relative; + margin: 0 auto; } + +/* ========================================================================== + Headings + ========================================================================== */ +h1, .h1, .alpha { + font-size: 32px; + line-height: 1.2; + margin-top: 0; } + +h2, .h2, .beta { + font-size: 24px; + line-height: 1.2; + margin-top: 0; } + +h3, .h3, .gamma { + font-size: 19px; + line-height: 1.2; + margin-top: 0; } + +h4, .h4, .delta { + font-size: 16px; + line-height: 1.2; + margin-top: 0; } + +h5, .h5, .epsilon { + font-size: 13px; + line-height: 1.2; + margin-top: 0; } + +h6, .h6, .zeta { + font-size: 11px; + line-height: 1.2; + margin-top: 0; } + +/* ========================================================================== + Grid + ========================================================================== */ +.grid { + position: relative; + margin-left: -20px; + font-size: 0; } + +.grid--full { + margin-left: 0; } + .grid--full .grid__item, .grid--full .whole, .grid--full .half, .grid--full .third, .grid--full .two-thirds, .grid--full .quarter, .grid--full .fifth { + padding-left: 0; + margin-bottom: 0; } + +.grid__item, .whole, .half, .third, .two-thirds, .quarter, .fifth { + display: inline-block; + width: 100%; + vertical-align: top; + padding-left: 20px; + margin-bottom: 20px; } + +@media (min-width: 1024px) { + .half { + width: 50%; } } + +@media (min-width: 1024px) { + .third { + width: 33.33333%; } } + +@media (min-width: 1024px) { + .two-thirds { + width: 66.66667%; } } + +@media (min-width: 768px) { + .quarter { + width: 50%; } } +@media (min-width: 1024px) { + .quarter { + width: 25%; } } + +@media (min-width: 768px) { + .fifth { + width: 50%; } } +@media (min-width: 1024px) { + .fifth { + width: 20%; } } + +/* ========================================================================== + Forms + ========================================================================== */ +.input, .select, .checkbox { + background-color: #cccccc; + display: block; + border: none; + outline: none; + color: black; + border-radius: 0; + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; } + +.select { + min-width: 300px; } + +.checkbox { + display: inline-block; + width: 30px; + height: 30px; } diff --git a/project-x/assets/styles/src/_import.scss b/project-x/assets/styles/src/_import.scss index 6ed9036..e4072a7 100644 --- a/project-x/assets/styles/src/_import.scss +++ b/project-x/assets/styles/src/_import.scss @@ -4,15 +4,19 @@ @import 'settings' - , 'vendor/jacket' + , 'vendors/jacket' , 'tools/functions' , 'tools/mixins' - , 'tools/trumps' - , 'base/fonts' + , 'generic/helpers' + , 'generic/trumps' + , 'base/normalize' - , 'base/page' + , 'base/fonts' + , 'base/base' , 'base/headings' + , 'base/grid' + , 'base/forms' ; diff --git a/project-x/assets/styles/src/base/_base.scss b/project-x/assets/styles/src/base/_base.scss index dc2180b..fd120a9 100644 --- a/project-x/assets/styles/src/base/_base.scss +++ b/project-x/assets/styles/src/base/_base.scss @@ -10,7 +10,7 @@ html { font-size : $font-size; font-family : $font-family; line-height : $line-height; - color : $ia-body-text-color; + color : $color; } ::selection { diff --git a/project-x/assets/styles/src/base/_forms.scss b/project-x/assets/styles/src/base/_forms.scss index cf19c90..caa2376 100644 --- a/project-x/assets/styles/src/base/_forms.scss +++ b/project-x/assets/styles/src/base/_forms.scss @@ -2,7 +2,8 @@ Forms ========================================================================== */ .input { - width: 100%; + background-color: #cccccc; + //width: 100%; display: block; border: none; outline: none; @@ -14,9 +15,13 @@ } .select { - + @extend .input; + min-width: 300px; } .checkbox { - + @extend .input; + display: inline-block; + width: 30px; + height: 30px; } diff --git a/project-x/assets/styles/src/generic/_normalize.scss b/project-x/assets/styles/src/base/_normalize.scss similarity index 100% rename from project-x/assets/styles/src/generic/_normalize.scss rename to project-x/assets/styles/src/base/_normalize.scss diff --git a/project-x/assets/styles/src/project-x.scss b/project-x/assets/styles/src/main.scss similarity index 100% rename from project-x/assets/styles/src/project-x.scss rename to project-x/assets/styles/src/main.scss diff --git a/project-x/index.html b/project-x/index.html index 8d14bda..ac8302e 100644 --- a/project-x/index.html +++ b/project-x/index.html @@ -13,6 +13,16 @@
+ +