diff --git a/.gitignore b/.gitignore index 197ca7d..5cc990c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ skeleton.* skeleton_template.css *.html +dependencies/ diff --git a/README.md b/README.md index 584abf7..b3620d5 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ The only dependency for Skeleton Sass to run is Sass 3.3+. Any other libraries ( * `_functions.scss` the default global functions for Skeleton Sass * `_mixins.scss` the default global mixins for Skeleton Sass * `themes` where all of the themes live - * `demo` + * `demo` & `fresh` * `marrow` stores all project-level functions and mixins * `_mixins.scss` loads the default theme mixins and functions from `sphenoid` * `_base.scss` contains all of the base styles for Skeleton Sass with the exception of the reset styles @@ -61,7 +61,6 @@ The only dependency for Skeleton Sass to run is Sass 3.3+. Any other libraries ( * `_base.scss` contains all of the base styles for Skeleton Sass (same look as Skeleton CSS created) * `_vars.scss` contains project-scoped configuration options * `_skeleton.scss` contains all the styles to create the grid - * `fresh` * `_MYconfig.scss` contains all of your global configuration options that won't be overridden by an update to Skeleton Sass * `skeleton_template.scss` contains all of the styles accumulated into a single file. @@ -70,12 +69,16 @@ The only dependency for Skeleton Sass to run is Sass 3.3+. Any other libraries ( Install Skeleton Sass with bower via command line: - bower install skeleton-sass +~~~bash +bower install skeleton-sass --save +~~~ -You can also install alpha, beta, rc, and previous versions by looking at the [releases](https://github.com/atomicpages/skeleton-sass/releases) page and install with the following syntax: +You can also install alpha, beta, release candidate, and previous versions by looking at the [releases](https://github.com/atomicpages/skeleton-sass/releases) page and install with the following syntax: - bower install skeleton-sass#[tag] - bower install skeleton-sass#2.0.0-b2 +~~~bash +bower install skeleton-sass#[tag] +bower install skeleton-sass#2.0.0-b2 +~~~ [Learn how to set up Skeleton Sass for the first time here](https://github.com/atomicpages/skeleton-sass/wiki/Setting-up-Skeleton-Sass-for-first-time-use). @@ -111,10 +114,16 @@ Skeleton Sass is community driven. We will gladly review any issues that you fin Changelog --------- +### 2.5.4 +* Adding `normalize.scss` as a dependency +* Merged master in development for version bump + ### 2.5.3 -* Added some more HTML 5 form elements -* Migrated normalize to a bower dependency so it can be maintained in a better way -* Removed old version of normalize from mixin +* Comment cleanup +* Rearranging of dependencies +* Update to year in license and other copyright headers +* Change `Dir.exists?` to `Dir.exist?` to squash ruby 2.3.x deprecation notice +* Manual bump to normalize.css 4.2.0 ### 2.5.2 * Fixes [issue #22](https://github.com/atomicpages/skeleton-sass/issues/22) diff --git a/_MYconfig.scss b/_MYconfig.scss index bcc67f9..26c87ef 100644 --- a/_MYconfig.scss +++ b/_MYconfig.scss @@ -12,7 +12,7 @@ // // HOW TO RUN AUTOMATED SETUP // 1. Open terminal and issue the following command: -// bin/setup.rb - Note: You must have ruby installed +// bin/setup.rb - Note: You must have ruby 2.x installed // to run this script // 2. Follow prompts from script diff --git a/bin/theme_setup.rb b/bin/theme_setup.rb index 5f0cfd6..8da46ae 100755 --- a/bin/theme_setup.rb +++ b/bin/theme_setup.rb @@ -15,7 +15,7 @@ name = Helper.nfqr("Please enter in the name of your theme with no spaces or special characters other than - or _ and press [ENTER]", /[^\w\-]/, "Theme name invalid, please try again and press [ENTER]") puts "Theme name is #{name}" -if !Dir.exists?("skeleton/themes/#{name}") +if !Dir.exist?("skeleton/themes/#{name}") Dir.mkdir("skeleton/themes/#{name}") end @@ -28,7 +28,7 @@ file.puts("@import \"sphenoid/skeleton\"; // Override manually if you wish to create your own grid") puts "skeleton/themes/_loader.scss has been updated... moving on" -if !Dir.exists?("skeleton/themes/#{name}/marrow") +if !Dir.exist?("skeleton/themes/#{name}/marrow") Dir.mkdir("skeleton/themes/#{name}/marrow") end diff --git a/bin/update.rb b/bin/update.rb index 5e98060..070c257 100755 --- a/bin/update.rb +++ b/bin/update.rb @@ -37,7 +37,7 @@ end end -if File.exists?(".bower.json") +if File.exist?(".bower.json") resp = Helper.yesno("Bowers files found. Update with bower now? [y/n]") if resp =~ /y(es)?/i puts "Updating skeleton-sass" diff --git a/bin/upgrade.rb b/bin/upgrade.rb index 2d36b59..1056833 100755 --- a/bin/upgrade.rb +++ b/bin/upgrade.rb @@ -39,7 +39,7 @@ def nfqr(question, regex, errorMsg = "Invalid input. #{question}", isValid = nil end def cp(file, destination) - if !File.exists?(file) # fail quickly if not found + if !File.exist?(file) # fail quickly if not found raise SystemCallError, "#{file} was not found or does not exist" end @@ -125,7 +125,7 @@ def gem_available?(name) %x(ruby -i.bak -pe "gsub /#{key}/i, '#{value}'" #{filename}) end -if File.exists?("#{filename}.bak") +if File.exist?("#{filename}.bak") File.delete("#{filename}.bak") end diff --git a/bower.json b/bower.json index 542082e..8aec739 100644 --- a/bower.json +++ b/bower.json @@ -1,9 +1,7 @@ { "name": "skeleton-sass", - "version": "2.5.3", - "authors": [ - "Dennis Thompson " - ], + "version": "2.5.4", + "author": "Dennis Thompson", "homepage": "http://atomicpages.github.io/skeleton-sass/", "repository": { "type": "git", @@ -15,9 +13,7 @@ "url": "http://opensource.org/licenses/MIT" } ], - "main": [ - "skeleton_template.scss" - ], + "main": ["skeleton_template.scss"], "keywords": [ "sass", "design", @@ -33,6 +29,6 @@ "dependencies/" ], "dependencies": { - "normalize-scss": "normalize.scss#^4.2.1" + "normalize.scss": "latest" } } diff --git a/dependencies/normalize-scss/.bower.json b/dependencies/normalize-scss/.bower.json deleted file mode 100644 index 6f78919..0000000 --- a/dependencies/normalize-scss/.bower.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "name": "normalize-scss", - "description": "This is the Sass version of Normalize.css, a collection of HTML element and attribute rulesets to normalize styles across all browsers. This port aims to use a light dusting of Sass to make Normalize even easier to integrate with your website.", - "main": [ - "sass/_normalize.scss" - ], - "authors": [ - "John Albin Wilkins (http://john.albin.net/)" - ], - "license": "(MIT OR GPL-2.0)", - "keywords": [ - "sass", - "normalize", - "reset", - "typography", - "design", - "ui" - ], - "homepage": "https://github.com/JohnAlbin/normalize-scss", - "ignore": [ - "**/.*", - "CHANGELOG.md", - "CONTRIBUTING.md", - "lib", - "node_modules", - "normalize-scss.gemspec", - "sache.json", - "test.html", - "test" - ], - "version": "4.2.1", - "_release": "4.2.1", - "_resolution": { - "type": "version", - "tag": "4.2.1", - "commit": "bcc4052f44e686b9f8cab8ac7547b3d4de0b0d37" - }, - "_source": "https://github.com/JohnAlbin/normalize-scss.git", - "_target": "^4.2.1", - "_originalSource": "normalize.scss", - "_direct": true -} \ No newline at end of file diff --git a/dependencies/normalize-scss/LICENSE.md b/dependencies/normalize-scss/LICENSE.md deleted file mode 100644 index cff1ade..0000000 --- a/dependencies/normalize-scss/LICENSE.md +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) Nicolas Gallagher and Jonathan Neal and John Albin Wilkins - -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/dependencies/normalize-scss/README.md b/dependencies/normalize-scss/README.md deleted file mode 100644 index 2530271..0000000 --- a/dependencies/normalize-scss/README.md +++ /dev/null @@ -1,149 +0,0 @@ -# normalize-scss - -## Latest versions - -For use with… | normalize-scss version ------------------------------|----------------------- -Sass 3.4 or libSass | [4.2.1](https://github.com/JohnAlbin/normalize-scss/releases/tag/4.2.1)
combining normalize.css v3.0.3 with v1.1.3 -Ruby Sass 3.3 + Compass 1.0 | [3.0.3](https://github.com/JohnAlbin/normalize-scss/releases/tag/3.0.3)
combining normalize.css v3.0.3 with v1.1.3 -Ruby Sass 3.2 + Compass 0.12 | [2.2.0+normalize.2.1.3](https://github.com/JohnAlbin/normalize-scss/releases/tag/2.2.0%2Bnormalize.2.1.3)
combining normalize.css v2.1.3 with v1.1.3 - -## The Sass port of normalize.css - -__This project is the Sass version of Normalize.css__, a collection of HTML element and attribute rulesets to normalize styles across all browsers. This port aims to use a light dusting of Sass to make Normalize even easier to integrate with your website. To learn about why Normalize.css is so amazing, skip to the "normalize.css" section below. - -This Sass port currently utilizes: - -* Browser support variables: Allowing you to easily add/drop support for any browser by modifying a single Sass variable. -* Vertical rhythm mixins: Allowing you to alter the font-size, line-height and margins in Normalize’s output without hacking the library. - -In addition, Normalize.css has 2 major versions: version 3 (without “legacy browser” support) and version 1 (with support for IE 6/7, etc.) This Sass port combines the two versions into one file so that you can easily toggle between the two versions using its browser support variables. - -Did a client wait until the last minute to mention their CEO uses IE 6? Simply update your `$support-for` variable and recompile your Sass files. Details can be found at https://github.com/JohnAlbin/normalize-scss/wiki - -# normalize.css v3 - -Normalize.css is a customisable CSS file that makes browsers render all elements more consistently and in line with modern standards. - -The project relies on researching the differences between default browser styles in order to precisely target only the styles that need or benefit from normalizing. - -[View the test file](http://necolas.github.io/normalize.css/latest/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. - -## Install - -Install using one of the following methods: - -* Download directly from the [project page](https://github.com/JohnAlbin/normalize-scss/releases). -* Install with [npm](http://npmjs.org/): `npm install --save normalize-scss` -* Install with [Bower](http://bower.io/): `bower install --save normalize.scss` -* Install with [Ruby Gem](https://rubygems.org/gems/normalize-scss): `gem install normalize-scss`
- and, if using Compass, add `require "normalize-scss"` to your config.rb file. Note: if you want to alter the _normalize.scss file after installation (see "how to use it" below), you can use the `gem list --details normalize-scss` command to show you where the normalize-scss files were installed. - -## How to use it - -There is a fantastic introduction to the project and brief instructions how to use it in the [About normalize.css article](http://nicolasgallagher.com/about-normalize-css/). - -You can use the Sass port of Normalize in one of several methods, following the "About normalize.css" article's suggestions: - -__Approach 1:__ Download and use normalize-scss as a starting point for your own project's base Sass, customising the values to match the design's requirements. (The best approach, _IMO_.) - 1. Copy the normalize-scss files to your sass directory so that you can alter it - as you include it in your project. To aid with this method, normalize-scss - includes several ready-made "fork" versions: - * [fork-versions/default](fork-versions/default) - Fork for libSass or Ruby Sass - * [fork-versions/ruby-sass-compass](fork-versions/ruby-sass-compass) - Fork for Ruby Sass with Compass - * [fork-versions/typey](fork-versions/typey) - Fork with Typey - * [fork-versions/typey-chroma-kss](fork-versions/typey-chroma-kss) - Fork with Typey, Chroma and KSS - 2. The normalize-scss code uses the `support-for` module, so add it - -__Approach 2:__ Install and include normalize-scss untouched and then build upon it, overriding the defaults later in your Sass when necessary. Just import normalize-scss like any normal Sass module by: - 1. Set variables to override the default normalize-scss variables. - 2. Import with `@import "normalize";` - 3. Output the CSS rules with `@include normalize();` - -Alternatively, you can import normalize-scss immediately into your main Sass file without needing to use the `normalize()` mixin by: - - 1. (Optionally) set variables to override the default normalize-scss variables. - 2. Import with `@import "normalize/import-now";` - -Note: if you use [wiredep](https://github.com/taptapship/wiredep), normalize-scss's bower.json points at the normalize/import-now Sass partial. If you don't wish to immediately output the CSS, you will need to override the Sass partial that wiredep grabs from normalize-scss. - -## Browser support - -* Google Chrome (latest) -* Mozilla Firefox (latest) -* Mozilla Firefox ESR -* Opera (latest) -* Apple Safari 6+ -* Internet Explorer 6+ - -The exact browsers supported in your project is controlled by the browser -support variables. See https://github.com/JohnAlbin/normalize-scss/wiki - -## Extended details - -Additional detail and explanation of the esoteric parts of normalize.css. - -#### `pre, code, kbd, samp` - -The `font-family: monospace, monospace` hack fixes the inheritance and scaling -of font-size for preformated text. The duplication of `monospace` is -intentional. [Source](http://en.wikipedia.org/wiki/User:Davidgothberg/Test59). - -#### `sub, sup` - -Normally, using `sub` or `sup` affects the line-box height of text in all -browsers. [Source](http://gist.github.com/413930). - -#### `svg:not(:root)` - -Adding `overflow: hidden` fixes IE9's SVG rendering. Earlier versions of IE -don't support SVG, so we can safely use the `:not()` and `:root` selectors that -modern browsers use in the default UA stylesheets to apply this style. [SVG -Mailing List discussion](http://lists.w3.org/Archives/Public/public-svg-wg/2008JulSep/0339.html) - -#### `input[type="search"]` - -The search input is not fully stylable by default. In Chrome and Safari on -OSX/iOS you can't control `font`, `padding`, `border`, or `background`. In -Chrome and Safari on Windows you can't control `border` properly. It will apply -`border-width` but will only show a border color (which cannot be controlled) -for the outer 1px of that border. Applying `-webkit-appearance: textfield` -addresses these issues without removing the benefits of search inputs (e.g. -showing past searches). - -#### `legend` - -Adding `border: 0` corrects an IE 8–11 bug where `color` (yes, `color`) is not -inherited by `legend`. - -## Contributing -Please read Necolas' [contributing guidelines](https://github.com/necolas/normalize.css/blob/master/CONTRIBUTING.md). - -Updates to most CSS rules should be reported to Necolas' upstream [Normalize.css project](http://necolas.github.com/normalize.css/). Updates to the Sass should be reported in the [Normalize-scss project](https://github.com/JohnAlbin/normalize-scss/). - -## Acknowledgements - -Normalize.css is a project by [Nicolas Gallagher](https://github.com/necolas), -co-created with [Jonathan Neal](https://github.com/jonathantneal). - -This Sass port is a project by [John Albin Wilkins](http://john.albin.net). - -## Other ports of Normalize.css - -For the record, there are several other Sass ports as well. Including: - -* https://github.com/waynegraham/compass-normalize-plugin -* https://github.com/ksmandersen/compass-normalize -* https://github.com/hail2u/normalize.scss -* https://github.com/kristerkari/normalize.scss -* https://github.com/krisbulman/normalize-libsass - -[![Build Status](https://travis-ci.org/JohnAlbin/normalize-scss.png?branch=master)](https://travis-ci.org/JohnAlbin/normalize-scss) diff --git a/dependencies/normalize-scss/bower.json b/dependencies/normalize-scss/bower.json deleted file mode 100644 index 1cef998..0000000 --- a/dependencies/normalize-scss/bower.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "name": "normalize-scss", - "description": "This is the Sass version of Normalize.css, a collection of HTML element and attribute rulesets to normalize styles across all browsers. This port aims to use a light dusting of Sass to make Normalize even easier to integrate with your website.", - "main": [ - "sass/_normalize.scss" - ], - "authors": [ - "John Albin Wilkins (http://john.albin.net/)" - ], - "license": "(MIT OR GPL-2.0)", - "keywords": [ - "sass", - "normalize", - "reset", - "typography", - "design", - "ui" - ], - "homepage": "https://github.com/JohnAlbin/normalize-scss", - "ignore": [ - "**/.*", - "CHANGELOG.md", - "CONTRIBUTING.md", - "lib", - "node_modules", - "normalize-scss.gemspec", - "sache.json", - "test.html", - "test" - ] -} diff --git a/dependencies/normalize-scss/fork-versions/default/README.md b/dependencies/normalize-scss/fork-versions/default/README.md deleted file mode 100644 index a6f6a4e..0000000 --- a/dependencies/normalize-scss/fork-versions/default/README.md +++ /dev/null @@ -1,53 +0,0 @@ -# Fork-able normalize-scss
for libSass or Ruby Sass - -## Using with node-sass - -1. Copy these files to your Sass project. -2. This fork-able version requires the [support-for](https://github.com/JohnAlbin/support-for) Sass module. Add it to your package.json with: - - ```bash -npm install --save-dev support-for -``` - -3. Add support-for's `sass` directory to your nodeSass' [`includePaths` option](https://github.com/sass/node-sass#includepaths). - - ```js -var sass = require('node-sass'), - path = require('path'); - -sass.render({ - file: scss_filename, - includePaths: [ - path.dirname(require.resolve('support-for')) - ] -}, function(err, result) { /*...*/ }); -``` - -## Using with libSass - -If you are not using node-sass with libSass, you probably already know how to include 3rd party libraries into your Sass project. - -1. Copy these files to your Sass project. -2. This fork-able version requires the [support-for](https://github.com/JohnAlbin/support-for) Sass module. Add support-for's `sass` directory to your libSass include paths in the "usual way". - -## Using with Ruby Sass - -In addition to copying these files to your Sass project, you'll also need to: - -1. Edit your `Gemfile` file to add: - - ```ruby -gem 'support-for', '~> 1.0' -``` - -2. If you use Compass, edit your `config.rb` file to add: - - ```ruby -require 'support-for' -``` - -3. Update your local Gems with: - - ``` -bundle install -``` diff --git a/dependencies/normalize-scss/fork-versions/default/_normalize.scss b/dependencies/normalize-scss/fork-versions/default/_normalize.scss deleted file mode 100644 index dab96b7..0000000 --- a/dependencies/normalize-scss/fork-versions/default/_normalize.scss +++ /dev/null @@ -1,643 +0,0 @@ -/*! normalize-scss | MIT/GPLv2 License | bit.ly/normalize-scss */ - -@import 'variables'; -@import 'support-for'; -@import 'vertical-rhythm'; - -// If we've customized any font variables, we'll need extra properties. -@if $base-font-size != 16px - or $base-line-height != 24px - or $base-unit != 'em' - or $h1-font-size != 2 * $base-font-size - or $h2-font-size != 1.5 * $base-font-size - or $h3-font-size != 1.17 * $base-font-size - or $h4-font-size != 1 * $base-font-size - or $h5-font-size != 0.83 * $base-font-size - or $h6-font-size != 0.67 * $base-font-size - or $indent-amount != 40px { - $normalize-vertical-rhythm: true !global; -} - -/** - * 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 { - @if $normalize-vertical-rhythm or support-for(ie, 7) { - // Correct text resizing oddly in IE 6/7 when body `font-size` is set using - // `em` units. - font-size: ($base-font-size / 16px) * 100%; - } - @if $normalize-vertical-rhythm { - line-height: ($base-line-height / $base-font-size) * 1em; - } - font-family: $base-font-family; /* 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 { - @if support-for(ie, 9) { - display: inline-block; /* 1 */ - @if support-for(ie, 7) { - *display: inline; - *zoom: 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; -} - -@if support-for(ie, 10) { - /** - * Address `[hidden]` styling not present in IE 8/9/10. - */ - - [hidden] { - display: none; - } -} - -/** - * Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22. - */ - -template { - display: none; -} - -/* Links - ========================================================================== */ - -@if support-for(ie, 10) { - /** - * 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 { - @include normalize-font-size($h1-font-size); - @if $normalize-vertical-rhythm { - @include normalize-line-height($h1-font-size); - } - - /* Set 1 unit of vertical rhythm on the top and bottom margins. */ - @include normalize-margin(1 0, $h1-font-size); -} - -@if $normalize-vertical-rhythm or support-for(ie, 7) { - h2 { - @include normalize-font-size($h2-font-size); - @if $normalize-vertical-rhythm { - @include normalize-line-height($h2-font-size); - } - @include normalize-margin(1 0, $h2-font-size); - } - - h3 { - @include normalize-font-size($h3-font-size); - @if $normalize-vertical-rhythm { - @include normalize-line-height($h3-font-size); - } - @include normalize-margin(1 0, $h3-font-size); - } - - h4 { - @include normalize-font-size($h4-font-size); - @if $normalize-vertical-rhythm { - @include normalize-line-height($h4-font-size); - } - @include normalize-margin(1 0, $h4-font-size); - } - - h5 { - @include normalize-font-size($h5-font-size); - @if $normalize-vertical-rhythm { - @include normalize-line-height($h5-font-size); - } - @include normalize-margin(1 0, $h5-font-size); - } - - h6 { - @include normalize-font-size($h6-font-size); - @if $normalize-vertical-rhythm { - @include normalize-line-height($h6-font-size); - } - @include normalize-margin(1 0, $h6-font-size); - } -} - -@if support-for(ie, 9) { - /** - * 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 - ========================================================================== */ - -@if support-for(ie, 10) { - /** - * Remove border when inside `a` element in IE 8/9/10. - */ - - img { - border: 0; - @if support-for(ie, 7) { - /* Improve image quality when scaled in IE 7. */ - -ms-interpolation-mode: bicubic; - } - } -} - -/** - * Correct overflow not hidden in IE 9/10/11. - */ - -svg:not(:root) { - overflow: hidden; -} - -/* Grouping content - ========================================================================== */ - -@if $normalize-vertical-rhythm or support-for(ie, 7) { - /** - * Address margins set differently in IE 6/7. - */ - - dl, - menu, - ol, - ul { - @include normalize-margin(1 0); - } -} - -@if $normalize-vertical-rhythm { - /** - * Turn off margins on nested lists. - */ - - ol, - ul { - ol, - ul { - margin: 0; - } - } -} - -@if $normalize-vertical-rhythm or support-for(ie, 7) { - dd { - margin: 0 0 0 $indent-amount; - } - - /** - * Address paddings set differently in IE 6/7. - */ - - menu, - ol, - ul { - padding: 0 0 0 $indent-amount; - } -} - -@if support-for(ie, 7) { - /** - * Correct list images handled incorrectly in IE 7. - */ - - nav ul, - nav ol { - list-style: none; - list-style-image: none; - } -} - -@if $normalize-vertical-rhythm or support-for(ie, 7) { - /** - * Set 1 unit of vertical rhythm on the top and bottom margin. - */ - - blockquote { - @include normalize-margin(1 $indent-amount); - } -} - -@if $normalize-vertical-rhythm or support-for(ie, 9) or support-for(safari, 6) { - /** - * Address margin not present in IE 8/9 and Safari. - */ - - figure { - @include normalize-margin(1 $indent-amount); - } -} - -/** - * Address differences between Firefox and other browsers. - */ - -hr { - @if support-for(firefox, 28) { - -moz-box-sizing: content-box; - } - box-sizing: content-box; - height: 0; -} - -@if $normalize-vertical-rhythm or support-for(ie, 7) { - /** - * Set 1 unit of vertical rhythm on the top and bottom margin. - */ - - p, - pre { - @include normalize-margin(1 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; - @if support-for(ie, 6) { - _font-family: 'courier new', 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. - */ - -@if support-for(ie, 7) { - /** - * Correct margin displayed oddly in IE 6/7. - */ - - form { - margin: 0; - } -} - -/** - * 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. - * 4. Address `font-family` inconsistency between `textarea` and other form in IE 7 - * 5. Improve appearance and consistency with IE 6/7. - */ - -button, -input, -optgroup, -select, -textarea { - color: inherit; /* 1 */ - font: inherit; /* 2 */ - margin: 0; /* 3 */ - @if support-for(ie, 7) { - *font-family: $base-font-family; /* 4 */ - *vertical-align: middle; /* 5 */ - } -} - -/** - * 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. - * 4. Remove inner spacing in IE 7 without affecting normal text inputs. - * Known issue: inner spacing remains in IE 6. - */ - -button, -html input[type="button"], /* 1 */ -input[type="reset"], -input[type="submit"] { - -webkit-appearance: button; /* 2 */ - cursor: pointer; /* 3 */ - @if support-for(ie, 7) { - *overflow: visible; /* 4 */ - } -} - -/** - * 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; -} - -@if support-for(ie, 10) { - /** - * 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. - * 3. Remove excess padding in IE 7. - * Known issue: excess padding remains in IE 6. - */ - - input[type="checkbox"], - input[type="radio"] { - box-sizing: border-box; /* 1 */ - padding: 0; /* 2 */ - @if support-for(ie, 7) { - *height: 13px; /* 3 */ - *width: 13px; /* 3 */ - } - } -} - -/** - * 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 */ - @if support-for(safari, 5) or support-for(chrome, 9) { - -webkit-box-sizing: content-box; - } - 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). - */ - - &::-webkit-search-cancel-button, - &::-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. - * 3. Correct alignment displayed oddly in IE 6/7. - */ - -legend { - @if support-for(ie, 11) { - border: 0; /* 1 */ - } - padding: 0; /* 2 */ - @if support-for(ie, 7) { - *margin-left: -7px; /* 3 */ - } -} - -/** - * 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/dependencies/normalize-scss/fork-versions/default/_variables.scss b/dependencies/normalize-scss/fork-versions/default/_variables.scss deleted file mode 100644 index 711b2aa..0000000 --- a/dependencies/normalize-scss/fork-versions/default/_variables.scss +++ /dev/null @@ -1,42 +0,0 @@ -// -// Variables -// -// If you have an initialization partial (or equivalent), you should move these -// lines to that file. - -// Support the same browsers as normalize.css v3. -$support-for: ( - ie: 9, - '*': -4, -); - -// The font size set on the root html element. -$base-font-size: 16px; - -// The base line height determines the basic unit of vertical rhythm. -$base-line-height: 24px; - -// The length unit in which to output vertical rhythm values. -// Supported values: px, em, rem. -$base-unit: 'em'; - -// The default font family. -$base-font-family: sans-serif; - -// The font sizes for h1-h6. -$h1-font-size: 2 * $base-font-size; -$h2-font-size: 1.5 * $base-font-size; -$h3-font-size: 1.17 * $base-font-size; -$h4-font-size: 1 * $base-font-size; -$h5-font-size: 0.83 * $base-font-size; -$h6-font-size: 0.67 * $base-font-size; - -// The amount lists and blockquotes are indented. -$indent-amount: 40px; - -// The following variable controls whether normalize-scss will output -// font-sizes, line-heights and block-level top/bottom margins that form a basic -// vertical rhythm on the page, which differs from the original Normalize.css. -// However, changing any of the variables above will cause -// $normalize-vertical-rhythm to be automatically set to true. -$normalize-vertical-rhythm: false; diff --git a/dependencies/normalize-scss/fork-versions/default/_vertical-rhythm.scss b/dependencies/normalize-scss/fork-versions/default/_vertical-rhythm.scss deleted file mode 100644 index 40c95f8..0000000 --- a/dependencies/normalize-scss/fork-versions/default/_vertical-rhythm.scss +++ /dev/null @@ -1,74 +0,0 @@ -// -// Vertical Rhythm -// -// This is the minimal amount of code needed to create vertical rhythm in our -// CSS. If you are looking for a robust solution, look at the excellent Typey -// library. @see https://github.com/jptaranto/typey - -@function normalize-rhythm($value, $relative-to: $base-font-size, $unit: $base-unit) { - @if unit($value) != px { - @error "The normalize vertical-rhythm module only supports px inputs. The typey library is better."; - } - @if $unit == rem { - @return ($value / $base-font-size) * 1rem; - } - @else if $unit == em { - @return ($value / $relative-to) * 1em; - } - @else { // $unit == px - @return $value; - } -} - -@mixin normalize-font-size($value, $relative-to: $base-font-size) { - @if unit($value) != 'px' { - @error "normalize-font-size() only supports px inputs. The typey library is better."; - } - // px fallback for IE 8 and earlier. Note: IE 9/10 don't understand rem - // in font shorthand, but font-size longhand is fine. - @if $base-unit == rem and support-for(ie, 8) { - font-size: $value; - } - font-size: normalize-rhythm($value, $relative-to); -} - -@mixin normalize-rhythm($property, $values, $relative-to: $base-font-size) { - $value-list: $values; - $sep: space; - @if type-of($values) == 'list' { - $sep: list-separator($values); - } - @else { - $value-list: append((), $values); - } - - $normalized-values: (); - $px-fallback: (); - - @each $value in $value-list { - $px-value: $value; - @if unitless($value) and $value != 0 { - $value: $value * normalize-rhythm($base-line-height, $relative-to); - $px-value: $px-value * normalize-rhythm($base-line-height, $relative-to, px); - } - $normalized-values: append($normalized-values, $value, $sep); - $px-fallback: append($px-fallback, $px-value, $sep); - } - @if $base-unit == rem and support-for(ie, 8) { - #{$property}: $px-fallback; - } - #{$property}: $normalized-values; -} - -@mixin normalize-margin($values, $relative-to: $base-font-size) { - @include normalize-rhythm(margin, $values, $relative-to); -} - -@mixin normalize-line-height($font-size, $min-line-padding: 2px) { - $lines: ceil($font-size / $base-line-height); - // If lines are cramped include some extra leading. - @if ($lines * $base-line-height - $font-size) < ($min-line-padding * 2) { - $lines: $lines + 1; - } - @include normalize-rhythm(line-height, $lines, $font-size); -} diff --git a/dependencies/normalize-scss/fork-versions/ruby-sass-compass/README.md b/dependencies/normalize-scss/fork-versions/ruby-sass-compass/README.md deleted file mode 100644 index 7a549ec..0000000 --- a/dependencies/normalize-scss/fork-versions/ruby-sass-compass/README.md +++ /dev/null @@ -1,17 +0,0 @@ -# Fork-able normalize-scss
for Ruby Sass and Compass 1.0 - -In addition to copying these files to your Sass project, you'll also need to: - -1. Edit your `Gemfile` file to add: - - ```ruby -gem 'support-for', '~> 1.0' -``` - -2. Edit your project's Compass `config.rb` file to add: - - ```ruby -require 'support-for' -``` - -3. Update your local Gems with: `bundle install` diff --git a/dependencies/normalize-scss/fork-versions/ruby-sass-compass/_normalize.scss b/dependencies/normalize-scss/fork-versions/ruby-sass-compass/_normalize.scss deleted file mode 100644 index 5a0d931..0000000 --- a/dependencies/normalize-scss/fork-versions/ruby-sass-compass/_normalize.scss +++ /dev/null @@ -1,643 +0,0 @@ -/*! normalize-scss | MIT/GPLv2 License | bit.ly/normalize-scss */ - -@import "variables"; -// After the default variables are set, import the required Compass partials. -// Feel free to move these lines to your own initialization partial. -@import "compass/support"; -@import "compass/css3/box-sizing"; -@import "compass/typography/vertical_rhythm"; - -// If we've customized any font variables, we'll need extra properties. -@if $base-font-size != 16px - or $base-line-height != 24px - or $rhythm-unit != 'em' - or $h1-font-size != 2 * $base-font-size - or $h2-font-size != 1.5 * $base-font-size - or $h3-font-size != 1.17 * $base-font-size - or $h4-font-size != 1 * $base-font-size - or $h5-font-size != 0.83 * $base-font-size - or $h6-font-size != 0.67 * $base-font-size - or $indent-amount != 40px { - $normalize-vertical-rhythm: true; -} - -@if $normalize-vertical-rhythm or support-legacy-browser(ie, "7") { - /** - * Establish a vertical rhythm unit using $base-font-size, $base-line-height, - * and $rhythm-unit variables. Also, correct text resizing oddly in IE 6/7 when - * body `font-size` is set using `em` units. - */ - - @include establish-baseline(); -} - -/** - * 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: $base-font-family; /* 1 */ - -ms-text-size-adjust: 100%; /* 2 */ - -webkit-text-size-adjust: 100%; /* 2 */ - // Show a background image that can be used to debug your alignments. - // @include debug-vertical-alignment(); -} - -/** - * 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 { - @if support-legacy-browser(ie, "9") { - display: inline-block; /* 1 */ - @if support-legacy-browser(ie, "7") { - *display: inline; - *zoom: 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; -} - -@if support-legacy-browser(ie, "10") { - /** - * Address `[hidden]` styling not present in IE 8/9/10. - */ - - [hidden] { - display: none; - } -} - -/** - * Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22. - */ - -template { - display: none; -} - -/* Links - ========================================================================== */ - -@if support-legacy-browser(ie, "10") { - /** - * 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; -} - -@if $normalize-vertical-rhythm or support-legacy-browser(ie, "7") { - /** - * Set 1 unit of vertical rhythm on the top and bottom margin. - */ - - blockquote { - @include output-rhythm(margin, rhythm(1) $indent-amount); - } -} - -/** - * 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 { - /* Set the font-size and line-height while keeping a proper vertical rhythm. */ - @if $normalize-vertical-rhythm or support-legacy-browser(ie, "7") { - @include adjust-font-size-to( $h1-font-size ); - } - @else { - font-size: if($rhythm-unit == "px", $h1-font-size, ($h1-font-size / $base-font-size)#{$rhythm-unit}); - } - - /* Set 1 unit of vertical rhythm on the top and bottom margins. */ - @include leader(1, $h1-font-size); - @include trailer(1, $h1-font-size); -} - -@if $normalize-vertical-rhythm or support-legacy-browser(ie, "7") { - h2 { - @include adjust-font-size-to( $h2-font-size ); - @include leader(1, $h2-font-size); - @include trailer(1, $h2-font-size); - } - - h3 { - @include adjust-font-size-to( $h3-font-size ); - @include leader(1, $h3-font-size); - @include trailer(1, $h3-font-size); - } - - h4 { - @include adjust-font-size-to( $h4-font-size ); - @include leader(1, $h4-font-size); - @include trailer(1, $h4-font-size); - } - - h5 { - @include adjust-font-size-to( $h5-font-size ); - @include leader(1, $h5-font-size); - @include trailer(1, $h5-font-size); - } - - h6 { - @include adjust-font-size-to( $h6-font-size ); - @include leader(1, $h6-font-size); - @include trailer(1, $h6-font-size); - } -} - -@if support-legacy-browser(ie, "9") { - /** - * Address styling not present in IE 8/9. - */ - - mark { - background: #ff0; - color: #000; - } -} - -@if $normalize-vertical-rhythm or support-legacy-browser(ie, "7") { - /** - * Set 1 unit of vertical rhythm on the top and bottom margin. - */ - - p, - pre { - @include output-rhythm(margin, rhythm(1) 0); - } -} - -/** - * 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; -} - -@if $normalize-vertical-rhythm or support-legacy-browser(ie, "7") { - /* Lists - ========================================================================== */ - - /** - * Address margins set differently in IE 6/7. - */ - - dl, - menu, - ol, - ul { - @include output-rhythm(margin, rhythm(1) 0); - } - - @if $normalize-vertical-rhythm { - /** - * Turn off margins on nested lists. - */ - - ol, - ul { - ol, - ul { - margin: 0; - } - } - } - - dd { - margin: 0 0 0 $indent-amount; - } - - /** - * Address paddings set differently in IE 6/7. - */ - - menu, - ol, - ul { - padding: 0 0 0 $indent-amount; - } -} - -@if support-legacy-browser(ie, "7") { - /** - * Correct list images handled incorrectly in IE 7. - */ - - nav ul, - nav ol { - list-style: none; - list-style-image: none; - } -} - -/* Embedded content - ========================================================================== */ - -@if support-legacy-browser(ie, "10") { - /** - * Remove border when inside `a` element in IE 8/9/10. - */ - - img { - border: 0; - @if support-legacy-browser(ie, "7") { - /* Improve image quality when scaled in IE 7. */ - -ms-interpolation-mode: bicubic; - } - } -} - -/** - * Correct overflow not hidden in IE 9/10/11. - */ - -svg:not(:root) { - overflow: hidden; -} - -/* Grouping content - ========================================================================== */ - -@if support-legacy-browser(ie, "9") or support-legacy-browser(safari, "6") { - /** - * Address margin not present in IE 8/9 and Safari. - */ - - figure { - @include output-rhythm(margin, rhythm(1) $indent-amount); - } -} - -/** - * Address differences between Firefox and other browsers. - */ - -hr { - @include 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; - @if support-legacy-browser(ie, "6") { - _font-family: 'courier new', 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. - */ - -@if support-legacy-browser(ie, "7") { - /** - * Correct margin displayed oddly in IE 6/7. - */ - - form { - margin: 0; - } -} - -/** - * 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. - * 4. Address `font-family` inconsistency between `textarea` and other form in IE 7 - * 5. Improve appearance and consistency with IE 6/7. - */ - -button, -input, -optgroup, -select, -textarea { - color: inherit; /* 1 */ - font: inherit; /* 2 */ - margin: 0; /* 3 */ - @if support-legacy-browser(ie, "7") { - *font-family: $base-font-family; /* 4 */ - *vertical-align: middle; /* 5 */ - } -} - -/** - * 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. - * 4. Remove inner spacing in IE 7 without affecting normal text inputs. - * Known issue: inner spacing remains in IE 6. - */ - -button, -html input[type="button"], /* 1 */ -input[type="reset"], -input[type="submit"] { - -webkit-appearance: button; /* 2 */ - cursor: pointer; /* 3 */ - @if support-legacy-browser(ie, "7") { - *overflow: visible; /* 4 */ - } -} - -/** - * 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; -} - -@if support-legacy-browser(ie, "10") { - /** - * 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. - * 3. Remove excess padding in IE 7. - * Known issue: excess padding remains in IE 6. - */ - - input[type="checkbox"], - input[type="radio"] { - @include box-sizing(border-box); /* 1 */ - padding: 0; /* 2 */ - @if support-legacy-browser(ie, "7") { - *height: 13px; /* 3 */ - *width: 13px; /* 3 */ - } - } -} - -/** - * 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 */ - @include 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). - */ - - &::-webkit-search-cancel-button, - &::-webkit-search-decoration { - -webkit-appearance: none; - } -} - -/** - * Define consistent border, margin, and padding. - */ - -fieldset { - margin: 0 2px; - /* Apply borders and padding that keep the vertical rhythm. */ - border-color: #c0c0c0; - @include apply-side-rhythm-border(top, $width: 1px, $lines: 0.35 ); - @include apply-side-rhythm-border(bottom, $width: 1px, $lines: 0.65 ); - @include apply-side-rhythm-border(left, $width: 1px, $lines: 0.625); - @include apply-side-rhythm-border(right, $width: 1px, $lines: 0.625); -} - -/** - * 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. - * 3. Correct alignment displayed oddly in IE 6/7. - */ - -legend { - @if support-legacy-browser(ie, "11") { - border: 0; /* 1 */ - } - padding: 0; /* 2 */ - @if support-legacy-browser(ie, "7") { - *margin-left: -7px; /* 3 */ - } -} - -/** - * 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/dependencies/normalize-scss/fork-versions/ruby-sass-compass/_variables.scss b/dependencies/normalize-scss/fork-versions/ruby-sass-compass/_variables.scss deleted file mode 100644 index 6254b3f..0000000 --- a/dependencies/normalize-scss/fork-versions/ruby-sass-compass/_variables.scss +++ /dev/null @@ -1,53 +0,0 @@ -// Variables -// -// If you have a base partial (or equivalent), you should move these lines to -// that file. NOTE: Edit the lines to remove "!default". -// @see http://compass-style.org/help/tutorials/best_practices/ -// ============================================================================= - -// These 3 variables are copies of ones used in Compass' Vertical Rhythm module. - - // The font size set on the root html element. - $base-font-size: 16px !default; - - // The base line height determines the basic unit of vertical rhythm. - $base-line-height: 24px !default; - - // The length unit in which to output vertical rhythm values. - // Supported values: px, em, rem. - $rhythm-unit: 'em' !default; - - // Note: This project also makes use of variables from Compass' support - // module. Documentation for this can be found on the wiki at: - // http://compass-style.org/reference/compass/support/ - $critical-usage-threshold: 0.01 !default; - - $browser-minimum-versions: ( - 'chrome': null, - 'firefox': null, - 'ie': null, - 'safari': null, - 'opera': null - ) !default; - - -// The default font family. -$base-font-family: sans-serif !default; - -// The font sizes for h1-h6. -$h1-font-size: 2 * $base-font-size !default; -$h2-font-size: 1.5 * $base-font-size !default; -$h3-font-size: 1.17 * $base-font-size !default; -$h4-font-size: 1 * $base-font-size !default; -$h5-font-size: 0.83 * $base-font-size !default; -$h6-font-size: 0.67 * $base-font-size !default; - -// The amount lists and blockquotes are indented. -$indent-amount: 40px !default; - -// The following variable controls whether normalize-scss will output -// font-sizes, line-heights and block-level top/bottom margins that form a basic -// vertical rhythm on the page, which differs from the original Normalize.css. -// However, changing any of the variables above will cause -// $normalize-vertical-rhythm to be automatically set to true. -$normalize-vertical-rhythm: false !default; diff --git a/dependencies/normalize-scss/fork-versions/typey-chroma-kss/README.md b/dependencies/normalize-scss/fork-versions/typey-chroma-kss/README.md deleted file mode 100644 index 96ce886..0000000 --- a/dependencies/normalize-scss/fork-versions/typey-chroma-kss/README.md +++ /dev/null @@ -1,65 +0,0 @@ -# Fork-able normalize-scss
for Typey, Chroma and KSS - -## Using with node-sass - -1. Copy these files to your Sass project. -2. This fork-able version requires: - - * [chroma](https://github.com/JohnAlbin/chroma) - * [support-for](https://github.com/JohnAlbin/support-for) - * [typey](https://github.com/jptaranto/typey) - - Add them to your package.json with: - - ```bash -npm install --save-dev support-for typey chroma-sass -``` - -3. Add the dependencies' directories to your nodeSass' [`includePaths` option](https://github.com/sass/node-sass#includepaths). - - ```js -var sass = require('node-sass'), - path = require('path'); - -sass.render({ - file: scss_filename, - includePaths: [ - path.dirname(require.resolve('chroma-sass')), - path.dirname(require.resolve('support-for')), - path.dirname(require.resolve('typey')) - ] -}, function(err, result) { /*...*/ }); -``` - -## Using with libSass - -If you are not using node-sass with libSass, you probably already know how to include 3rd party libraries into your Sass project. - -1. Copy these files to your Sass project. -2. This fork-able version requires the [support-for](https://github.com/JohnAlbin/support-for) Sass module and the [typey](https://github.com/jptaranto/typey) Sass module. Add support-for's `sass` directory and typey's `stylesheets` directory to your libSass include paths in the "usual way". - -## Using with Ruby Sass - -In addition to copying these files to your Sass project, you'll also need to: - -1. Edit your `Gemfile` file to add: - - ```ruby -gem 'chroma-sass', '~> 1.0' -gem 'support-for', '~> 1.0' -gem 'typey', '~> 1.0.0.beta.7' -``` - -2. If you use Compass, edit your `config.rb` file to add: - - ```ruby -require 'chroma-sass' -require 'support-for' -require 'typey' -``` - -3. Update your local Gems with: - - ``` -bundle install -``` diff --git a/dependencies/normalize-scss/fork-versions/typey-chroma-kss/_init.scss b/dependencies/normalize-scss/fork-versions/typey-chroma-kss/_init.scss deleted file mode 100644 index d2e61e2..0000000 --- a/dependencies/normalize-scss/fork-versions/typey-chroma-kss/_init.scss +++ /dev/null @@ -1,59 +0,0 @@ -// Initialization partial -// -// To make it easier to use all variables and mixins in any Sass file in this -// project, each .scss file has a `@import 'init';` declaration. The _init.scss -// file is in charge of importing all the other partials needed for the -// project. -// -// The initialization partial is organized in this way: -// - First we set any shared Sass variables. -// - Next we import Sass modules. -// - Last we define our custom mixins for this project. -// -// Weight: -1 -// -// Style guide: sass.init - - -// The following Sass functions/mixins are required to generate some variables' -// values, so we load them first. -@import 'chroma/functions'; -@import 'support-for'; - -@import 'init/colors'; -@import 'init/variables'; - - -// 3rd party libraries -// -// The following sass modules are shared with all .scsss files: -// - [Chroma](https://github.com/JohnAlbin/chroma) -// - [Support-for](https://github.com/JohnAlbin/support-for) -// - [Typey](https://github.com/jptaranto/typey) -// -// Additional pre-built libraries can be found on the [Sache website](http://www.sache.in/). -// -// Style guide: sass.modules - -// Add Chroma to manage colors. -@import 'chroma'; -// Add typey to manage font sizes and margins. -@import 'typey'; - - -// Mixins -// -// Custom mixins used on this site. -// -// Weight: 1 -// -// Style guide: sass.mixins - -// Functions -// -// Custom functions used on this site. -// -// Weight: 1 -// -// Style guide: sass.functions -@import 'init/rtl/rtl'; diff --git a/dependencies/normalize-scss/fork-versions/typey-chroma-kss/base/_html5.scss b/dependencies/normalize-scss/fork-versions/typey-chroma-kss/base/_html5.scss deleted file mode 100644 index fba788b..0000000 --- a/dependencies/normalize-scss/fork-versions/typey-chroma-kss/base/_html5.scss +++ /dev/null @@ -1,53 +0,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; -} - -audio, -canvas, -progress, -video { - @if support-for(ie, 9) { - // Correct `inline-block` display not defined in IE 8/9. - display: inline-block; - } - // Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. - vertical-align: baseline; -} - -// Prevent modern browsers from displaying `audio` without controls. -audio:not([controls]) { - display: none; - // Remove excess height in iOS 5 devices. - height: 0; -} - -@if support-for(ie, 10) { - // Address `[hidden]` styling not present in IE 8/9/10. - [hidden] { - display: none; - } -} - -// Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. -template { - display: none; -} diff --git a/dependencies/normalize-scss/fork-versions/typey-chroma-kss/base/_normalize.scss b/dependencies/normalize-scss/fork-versions/typey-chroma-kss/base/_normalize.scss deleted file mode 100644 index 0667d0d..0000000 --- a/dependencies/normalize-scss/fork-versions/typey-chroma-kss/base/_normalize.scss +++ /dev/null @@ -1,15 +0,0 @@ -/*! normalize-scss | MIT/GPLv2 License | bit.ly/normalize-scss */ - -// Normalize-scss is broken into modular pieces to make it easier to edit. -@import 'root'; -@import 'html5'; -@import 'links/links'; -@import 'headings/headings'; -@import 'text/text'; -@import 'grouping/grouping'; -@import 'embedded/embedded'; -@import 'forms/forms'; -@import 'tables/tables'; - -// Note: we allow the .button component (loaded by forms) to override :link, by -// loading links first. diff --git a/dependencies/normalize-scss/fork-versions/typey-chroma-kss/base/_root.scss b/dependencies/normalize-scss/fork-versions/typey-chroma-kss/base/_root.scss deleted file mode 100644 index 830d2af..0000000 --- a/dependencies/normalize-scss/fork-versions/typey-chroma-kss/base/_root.scss +++ /dev/null @@ -1,29 +0,0 @@ -// Use the saner border-box model for all elements. -* { - @if support-for(firefox, 28) { - -moz-box-sizing: border-box; - } - box-sizing: border-box; -} - -html { - @include define-type-sizing(); - // Set default font family to sans-serif. - font-family: $font-body; - // Prevent iOS text size adjust after orientation change, without disabling - // user zoom. - -ms-text-size-adjust: 100%; - -webkit-text-size-adjust: 100%; - // On short pages, we want any background gradients to fill the entire height - // of the browser. - min-height: 100%; -} - -body { - // Output a horizontal grid to help with debugging typography. The - // $typey-debug variable will toggle its output. - @include typey-debug-grid(); - // Remove default margin and padding. - margin: 0; - padding: 0; -} diff --git a/dependencies/normalize-scss/fork-versions/typey-chroma-kss/base/embedded/_embedded.scss b/dependencies/normalize-scss/fork-versions/typey-chroma-kss/base/embedded/_embedded.scss deleted file mode 100644 index db41ca8..0000000 --- a/dependencies/normalize-scss/fork-versions/typey-chroma-kss/base/embedded/_embedded.scss +++ /dev/null @@ -1,47 +0,0 @@ -// Embedded content -// -// Weight: 2 -// -// Style guide: base.embedded - -// Image -// -// An `` element represents an image. -// -// Markup: embedded-img.hbs -// -// Style guide: base.embedded.img - -img { - @if support-for(ie, 10) { - // Remove border when inside `a` element in IE 8/9/10. - border: 0; - } - @if support-for(ie, 7) { - // Improve image quality when scaled in IE 7. - -ms-interpolation-mode: bicubic; - } -} - -img, -svg { - // Suppress the space beneath the baseline - // vertical-align: bottom; - - // Responsive images - max-width: 100%; - height: auto; -} - -// Scalable vector -// -// A `` element represents an image encoded as a Scalable Vector Graphic. -// -// Markup: embedded-svg.hbs -// -// Style guide: base.embedded.svg - -svg:not(:root) { - // Correct overflow not hidden in IE 9/10/11. - overflow: hidden; -} diff --git a/dependencies/normalize-scss/fork-versions/typey-chroma-kss/base/embedded/embedded-img.hbs b/dependencies/normalize-scss/fork-versions/typey-chroma-kss/base/embedded/embedded-img.hbs deleted file mode 100644 index b0da948..0000000 --- a/dependencies/normalize-scss/fork-versions/typey-chroma-kss/base/embedded/embedded-img.hbs +++ /dev/null @@ -1,6 +0,0 @@ -

An image that is inline with other text.

- -
-
An image inside a figure.
- -
diff --git a/dependencies/normalize-scss/fork-versions/typey-chroma-kss/base/embedded/embedded-svg.hbs b/dependencies/normalize-scss/fork-versions/typey-chroma-kss/base/embedded/embedded-svg.hbs deleted file mode 100644 index 44b5862..0000000 --- a/dependencies/normalize-scss/fork-versions/typey-chroma-kss/base/embedded/embedded-svg.hbs +++ /dev/null @@ -1,8 +0,0 @@ -

A svg image that is inline with other text.

- -
-
A svg inside a figure.
- - - -
diff --git a/dependencies/normalize-scss/fork-versions/typey-chroma-kss/base/forms/_forms.scss b/dependencies/normalize-scss/fork-versions/typey-chroma-kss/base/forms/_forms.scss deleted file mode 100644 index 93940d5..0000000 --- a/dependencies/normalize-scss/fork-versions/typey-chroma-kss/base/forms/_forms.scss +++ /dev/null @@ -1,284 +0,0 @@ -// Dependencies. -@import 'components/button/button'; - -// Form defaults -// -// These are the default base styles applied to HTML form elements. -// -// Component classes can override these styles, but if no class applies a style -// to an HTML form element, these styles will be the ones displayed. -// -// Weight: -1 -// -// Style guide: forms.base - -// -// The following 8 rules are from normalize.css and help to fix inconsistencies -// across various browsers. You should probably leave these rules as is and jump -// to the "Buttons" rule on line 95 before you start editing this file. -// - -button, -input, -optgroup, -select, -textarea { - // Keep form elements constrained in their containers. - box-sizing: border-box; - max-width: 100%; - // Correct color not being inherited. - // Known issue: affects color of disabled elements. - color: inherit; - // Correct font properties not being inherited. - font: inherit; - // Address margins set differently in Firefox 4+, Safari, and Chrome. - margin: 0; - @if support-for(ie, 7) { - // Address `font-family` inconsistency between `textarea` and other form in IE 7 - *font-family: $font-body; - // Improve appearance and consistency with IE 6/7. - *vertical-align: middle; - } -} - -// 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; -} - -// Remove inner padding and border in Firefox 4+. -button::-moz-focus-inner, -input::-moz-focus-inner { - border: 0; - padding: 0; -} - -// 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. -html input[type="button"], // 1 -[type="reset"], -[type="submit"] { - -webkit-appearance: button; // 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; -} - -input[type="search"] { - // Address `appearance` set to `searchfield` in Safari and Chrome. - -webkit-appearance: textfield; - - // 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). - &::-webkit-search-cancel-button, - &::-webkit-search-decoration { - -webkit-appearance: none; - } -} - -// Buttons -// -// Buttons built with the ` - -

-

- - -

-

- - -

-

- - -

-

- - -

-

- - -

-

- Link button - Disabled link button -

diff --git a/dependencies/normalize-scss/fork-versions/typey-chroma-kss/components/divider/_divider.scss b/dependencies/normalize-scss/fork-versions/typey-chroma-kss/components/divider/_divider.scss deleted file mode 100644 index 0e925d7..0000000 --- a/dependencies/normalize-scss/fork-versions/typey-chroma-kss/components/divider/_divider.scss +++ /dev/null @@ -1,19 +0,0 @@ -// Divider -// -// Can be used as an `
`, an empty `
` or as a container. -// -// Markup: divider.hbs -// -// Style guide: components.divider - -.divider, -%divider { - @include margin(1 0); - border: 0; - border-top: 1px solid color(border); - - // If used as a container, add a top margin to the first child. - > :first-child { - @include margin-top(1); - } -} diff --git a/dependencies/normalize-scss/fork-versions/typey-chroma-kss/components/divider/divider.hbs b/dependencies/normalize-scss/fork-versions/typey-chroma-kss/components/divider/divider.hbs deleted file mode 100644 index 3a2e968..0000000 --- a/dependencies/normalize-scss/fork-versions/typey-chroma-kss/components/divider/divider.hbs +++ /dev/null @@ -1,11 +0,0 @@ -
- -

{{content}}

- -
-

{{content}}

-
- -
- -

{{content}}

diff --git a/dependencies/normalize-scss/fork-versions/typey-chroma-kss/components/divider/divider.json b/dependencies/normalize-scss/fork-versions/typey-chroma-kss/components/divider/divider.json deleted file mode 100644 index 91e6347..0000000 --- a/dependencies/normalize-scss/fork-versions/typey-chroma-kss/components/divider/divider.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "content": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." -} diff --git a/dependencies/normalize-scss/fork-versions/typey-chroma-kss/init/_colors.scss b/dependencies/normalize-scss/fork-versions/typey-chroma-kss/init/_colors.scss deleted file mode 100644 index 7070af7..0000000 --- a/dependencies/normalize-scss/fork-versions/typey-chroma-kss/init/_colors.scss +++ /dev/null @@ -1,39 +0,0 @@ -// Colors -// -// Use the `color()` function to add colors to CSS properties. - -// Define the default color scheme's color names. -$chroma: define-default-color-scheme('branding', "The site's main colors. Can be used to define colors in other color schemes."); - -$chroma: add-colors(( - black: #000, - grey-dark: ('black' lighten 40%), // #666 - 'grey': ('black' lighten 60%), // #999 - grey-light: ('black' lighten 80%), // #ccc - grey-extra-light: ('black' lighten 93.33%), // #eee - white: #fff, - - blue: #0072b9, - red: #c00, - yellow: #fd0, -)); - -// Define color names for functional uses. -$chroma: define-color-scheme('functional', 'Colors used by functional parts of the design.'); -$chroma: add-colors('functional', ( - // Colors used in the main content area. - text: 'black', - - link: 'blue', - link-visited: ('blue' darken 20%), - link-active: 'red', - - border: 'grey-light', - - button: 'text', - button-disabled: 'grey', - - mark-bg: 'yellow', -)); - -$chroma-active-scheme: 'functional'; diff --git a/dependencies/normalize-scss/fork-versions/typey-chroma-kss/init/_variables.scss b/dependencies/normalize-scss/fork-versions/typey-chroma-kss/init/_variables.scss deleted file mode 100644 index fbd8d2f..0000000 --- a/dependencies/normalize-scss/fork-versions/typey-chroma-kss/init/_variables.scss +++ /dev/null @@ -1,66 +0,0 @@ -// Variables -// -// Set variables for this site before a library sets its !default value. -// -// Style guide: sass.variables - - -// -// Browser support -// - -// Support the same browsers as normalize.css v3. -// Possible keys: chrome, edge, firefox, ie, opera, safari, '*' -$support-for: ( - ie: 9, // IE 9-11 - '*': -4, // The last 4 versions of all other browsers. -); - - -// -// Font faces, stacks and sizes. -// - -// The font size set on the root html element. -$base-font-size: 16px; - -// The base line height determines the basic unit of vertical rhythm. -$base-line-height: 24px; - -// The font sizes for h1-h6 expressed as tee shirt sizes. -$font-size: ( - xxl: 32px, - xl: 24px, - l: 20px, - m: $base-font-size, - s: 14px, - xs: 10px -); - -// Output a horizontal grid to help with debugging typography. -$typey-debug: false; - -// The length unit in which to output font size and margin values. -// Supported values: px, em, rem. -$base-unit: 'rem'; - -// px fallbacks for rem units are needed for IE 8 and earlier. -$rem-fallback: if(support-for(ie, 8), true, false); - -// The default font family. -$font-body: Verdana, Tahoma, 'DejaVu Sans', sans-serif; - -// For an explanation of why "sans-serif" is at the end of this list, see -// http://meyerweb.com/eric/thoughts/2010/02/12/fixed-monospace-sizing/ -$font-monospace: Menlo, 'DejaVu Sans Mono', 'Ubuntu Mono', Courier, 'Courier New', monospace, sans-serif; - -// -// Misc -// - -// The amount lists and blockquotes are indented. -$indent-amount: 2 * $base-font-size; - -// Adds a [dir='rtl'] selector for RTL language support. You can -// turn off all RTL CSS by setting the following variable to false. -$include-rtl: false; diff --git a/dependencies/normalize-scss/fork-versions/typey-chroma-kss/init/rtl/_rtl.scss b/dependencies/normalize-scss/fork-versions/typey-chroma-kss/init/rtl/_rtl.scss deleted file mode 100644 index cde659f..0000000 --- a/dependencies/normalize-scss/fork-versions/typey-chroma-kss/init/rtl/_rtl.scss +++ /dev/null @@ -1,22 +0,0 @@ -$include-rtl: true !default; - -// rtl() -// -// Includes Right-To-Left language support. Can be turned off globally by -// setting `$include-rtl: false;`. -// -// Style guide: sass.mixins.rtl -@mixin rtl() { - @if $include-rtl { - @if & { - [dir="rtl"] & { - @content; - } - } - @else { - [dir="rtl"] { - @content; - } - } - } -} diff --git a/dependencies/normalize-scss/fork-versions/typey-chroma-kss/styles-base.scss b/dependencies/normalize-scss/fork-versions/typey-chroma-kss/styles-base.scss deleted file mode 100644 index 374769d..0000000 --- a/dependencies/normalize-scss/fork-versions/typey-chroma-kss/styles-base.scss +++ /dev/null @@ -1,39 +0,0 @@ -// -// The major stylesheet for this project. -// -// We categorize our components by creating headings in this file. See the -// description on the style guide home page for more information. - - -// Colors and Sass -// -// Documentation for colors and Sass mixins and variables. -// -// Weight: -1 -// -// Style guide: sass -@import 'init'; - -// Defaults -// -// These are the default base styles applied to HTML elements. -// -// Component classes can override these styles, but if no class applies a style -// to an HTML element, these styles will be the ones displayed. -// -// Style guide: base -@import 'base/normalize'; - -// Components -// -// Design components are reusable designs that can be applied using just the CSS -// class names specified in the component. -// -// Weight: 2 -// -// Style guide: components - -// This file is @import'ed by base/forms, so we don't import it again. -// @import 'components/button/button'; -// This file is @import'ed by base/grouping, so we don't import it again. -// @import 'components/divider/divider'; diff --git a/dependencies/normalize-scss/fork-versions/typey/README.md b/dependencies/normalize-scss/fork-versions/typey/README.md deleted file mode 100644 index 9c368a9..0000000 --- a/dependencies/normalize-scss/fork-versions/typey/README.md +++ /dev/null @@ -1,56 +0,0 @@ -# Fork-able normalize-scss
for Typey - -## Using with node-sass - -1. Copy these files to your Sass project. -2. This fork-able version requires the [support-for](https://github.com/JohnAlbin/support-for) Sass module and the [typey](https://github.com/jptaranto/typey) Sass module. Add it to your package.json with: - - ```bash -npm install --save-dev support-for typey -``` - -3. Add support-for's `sass` directory to your nodeSass' [`includePaths` option](https://github.com/sass/node-sass#includepaths). - - ```js -var sass = require('node-sass'), - path = require('path'); - -sass.render({ - file: scss_filename, - includePaths: [ - path.dirname(require.resolve('support-for')), - path.dirname(require.resolve('typey')) - ] -}, function(err, result) { /*...*/ }); -``` - -## Using with libSass - -If you are not using node-sass with libSass, you probably already know how to include 3rd party libraries into your Sass project. - -1. Copy these files to your Sass project. -2. This fork-able version requires the [support-for](https://github.com/JohnAlbin/support-for) Sass module and the [typey](https://github.com/jptaranto/typey) Sass module. Add support-for's `sass` directory and typey's `stylesheets` directory to your libSass include paths in the "usual way". - -## Using with Ruby Sass - -In addition to copying these files to your Sass project, you'll also need to: - -1. Edit your `Gemfile` file to add: - - ```ruby -gem 'support-for', '~> 1.0' -gem 'typey', '~> 1.0.0.beta.7' -``` - -2. If you use Compass, edit your `config.rb` file to add: - - ```ruby -require 'support-for' -require 'typey' -``` - -3. Update your local Gems with: - - ``` -bundle install -``` diff --git a/dependencies/normalize-scss/fork-versions/typey/_normalize.scss b/dependencies/normalize-scss/fork-versions/typey/_normalize.scss deleted file mode 100644 index c948316..0000000 --- a/dependencies/normalize-scss/fork-versions/typey/_normalize.scss +++ /dev/null @@ -1,595 +0,0 @@ -/*! normalize-scss | MIT/GPLv2 License | bit.ly/normalize-scss */ - -@import 'variables'; -@import 'support-for'; -@import 'typey'; - -/** - * 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 { - @include define-type-sizing(); - // Show a background image that can be used to debug your alignments. - // @include debug-vertical-alignment(); - font-family: $base-font-family; /* 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 { - @if support-for(ie, 9) { - display: inline-block; /* 1 */ - @if support-for(ie, 7) { - *display: inline; - *zoom: 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; -} - -@if support-for(ie, 10) { - /** - * Address `[hidden]` styling not present in IE 8/9/10. - */ - - [hidden] { - display: none; - } -} - -/** - * Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22. - */ - -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; -} - -code, -kbd, -samp { - @extend %monospace; -} - -/** - * 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 { - @include type-layout(xxl, 2); - - /* Set 1 unit of vertical rhythm on the top and bottom margins. */ - @include margin(1 0, xxl); -} - -h2 { - @include type-layout(xl, 1.5); - @include margin(1 0, xl); -} - -h3 { - @include type-layout(l, 1); - @include margin(1 0, l); -} - -h4 { - @include type-layout(m, 1); - @include margin(1 0, m); -} - -h5 { - @include type-layout(s, 1); - @include margin(1 0, s); -} - -h6 { - @include type-layout(xs, 1); - @include margin(1 0, xs); -} - -@if support-for(ie, 9) { - /** - * 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 - ========================================================================== */ - -@if support-for(ie, 10) { - /** - * Remove border when inside `a` element in IE 8/9/10. - */ - - img { - border: 0; - @if support-for(ie, 7) { - /* Improve image quality when scaled in IE 7. */ - -ms-interpolation-mode: bicubic; - } - } -} - -/** - * Correct overflow not hidden in IE 9/10/11. - */ - -svg:not(:root) { - overflow: hidden; -} - -/* Grouping content - ========================================================================== */ - -/** - * Address margins set differently in IE 6/7. - */ - -dl, -menu, -ol, -ul { - @include margin(1 0); -} - -/** - * Turn off margins on nested lists. - */ - -ol, -ul { - ol, - ul { - margin: 0; - } -} - -dd { - margin: 0 0 0 $indent-amount; -} - -/** - * Address paddings set differently in IE 6/7. - */ - -menu, -ol, -ul { - padding: 0 0 0 $indent-amount; -} - -@if support-for(ie, 7) { - /** - * Correct list images handled incorrectly in IE 7. - */ - - nav ul, - nav ol { - list-style: none; - list-style-image: none; - } -} - -/** - * Set 1 unit of vertical rhythm on the top and bottom margin. - */ - -blockquote { - @include margin(1 $indent-amount); -} - -/** - * Address margin not present in IE 8/9 and Safari. - */ - -figure { - @include margin(1 $indent-amount); -} - -/** - * Address differences between Firefox and other browsers. - */ - -hr { - @if support-for(firefox, 28) { - -moz-box-sizing: content-box; - } - box-sizing: content-box; - height: 0; -} - -/** - * Set 1 unit of vertical rhythm on the top and bottom margin. - */ - -p, -pre { - @include margin(1 0); -} - -/** - * Contain overflow in all browsers. - */ - -pre { - @extend %monospace; - overflow: auto; -} - -/** - * Address odd `em`-unit font size rendering in all browsers. - */ - -%monospace { - font-family: monospace, monospace; - @if support-for(ie, 6) { - _font-family: 'courier new', 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. - */ - -@if support-for(ie, 7) { - /** - * Correct margin displayed oddly in IE 6/7. - */ - - form { - margin: 0; - } -} - -/** - * 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. - * 4. Address `font-family` inconsistency between `textarea` and other form in IE 7 - * 5. Improve appearance and consistency with IE 6/7. - */ - -button, -input, -optgroup, -select, -textarea { - color: inherit; /* 1 */ - font: inherit; /* 2 */ - margin: 0; /* 3 */ - @if support-for(ie, 7) { - *font-family: $base-font-family; /* 4 */ - *vertical-align: middle; /* 5 */ - } -} - -/** - * 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. - * 4. Remove inner spacing in IE 7 without affecting normal text inputs. - * Known issue: inner spacing remains in IE 6. - */ - -button, -html input[type="button"], /* 1 */ -input[type="reset"], -input[type="submit"] { - -webkit-appearance: button; /* 2 */ - cursor: pointer; /* 3 */ - @if support-for(ie, 7) { - *overflow: visible; /* 4 */ - } -} - -/** - * 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; -} - -@if support-for(ie, 10) { - /** - * 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. - * 3. Remove excess padding in IE 7. - * Known issue: excess padding remains in IE 6. - */ - - input[type="checkbox"], - input[type="radio"] { - box-sizing: border-box; /* 1 */ - padding: 0; /* 2 */ - @if support-for(ie, 7) { - *height: 13px; /* 3 */ - *width: 13px; /* 3 */ - } - } -} - -/** - * 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 */ - @if support-for(safari, 5) or support-for(chrome, 9) { - -webkit-box-sizing: content-box; - } - 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). - */ - - &::-webkit-search-cancel-button, - &::-webkit-search-decoration { - -webkit-appearance: none; - } -} - -/** - * Define consistent border, margin, and padding. - */ - -fieldset { - // Apply borders and padding that keep the vertical rhythm. - @include padding(.35 .625 .65); - border: 1px solid #c0c0c0; - margin: 0 2px; -} - -/** - * 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. - * 3. Correct alignment displayed oddly in IE 6/7. - */ - -legend { - @if support-for(ie, 11) { - border: 0; /* 1 */ - } - padding: 0; /* 2 */ - @if support-for(ie, 7) { - *margin-left: -7px; /* 3 */ - } -} - -/** - * 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/dependencies/normalize-scss/fork-versions/typey/_variables.scss b/dependencies/normalize-scss/fork-versions/typey/_variables.scss deleted file mode 100644 index 409e425..0000000 --- a/dependencies/normalize-scss/fork-versions/typey/_variables.scss +++ /dev/null @@ -1,45 +0,0 @@ -// -// Variables -// -// If you have an initialization partial (or equivalent), you should move these -// lines to that file. - -// Support the same browsers as normalize.css v3. -$support-for: ( - ie: 9, // IE 9-11 - '*': -4, // The last 4 versions of all other browsers. -); - -// The font size set on the root html element. -$base-font-size: 16px; - -// The base line height determines the basic unit of vertical rhythm. -$base-line-height: 24px; - -// The length unit in which to output font size and margin values. -// Supported values: px, em, rem. -$base-unit: 'rem'; - -// px fallbacks for rem units are needed for IE 8 and earlier. -$rem-fallback: false; - -// The default font family. -$base-font-family: sans-serif; - -// The font sizes for h1-h6 expressed as tee shirt sizes. -$font-size: ( - xxl: 32px, - xl: 24px, - l: 20px, - m: $base-font-size, - s: 14px, - xs: 10px, -); - -// The amount lists and blockquotes are indented. -$indent-amount: 40px; - -// The following variable controls whether normalize-scss will output -// font-sizes, line-heights and block-level top/bottom margins that form a basic -// vertical rhythm on the page, which differs from the original Normalize.css. -$normalize-vertical-rhythm: false; diff --git a/dependencies/normalize-scss/package.json b/dependencies/normalize-scss/package.json deleted file mode 100644 index 74efb61..0000000 --- a/dependencies/normalize-scss/package.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "name": "normalize-scss", - "version": "4.2.1", - "description": "This is the Sass version of Normalize.css, a collection of HTML element and attribute rulesets to normalize styles across all browsers. This port aims to use a light dusting of Sass to make Normalize even easier to integrate with your website.", - "homepage": "https://github.com/JohnAlbin/normalize-scss", - "bugs": { - "url": "https://github.com/JohnAlbin/normalize-scss/issues" - }, - "repository": { - "type": "git", - "url": "git://github.com/JohnAlbin/normalize-scss.git" - }, - "author": "John Albin Wilkins (http://john.albin.net/)", - "keywords": [ - "eyeglass-module", - "sass", - "normalize" - ], - "main": "sass/_normalize.scss", - "style": "sass/_normalize.scss", - "eyeglass": { - "sassDir": "sass", - "exports": false, - "name": "normalize", - "needs": "*" - }, - "directories": { - "lib": "sass", - "test": "test" - }, - "scripts": { - "test": "mocha", - "posttest": "eslint test" - }, - "license": "(MIT OR GPL-2.0)", - "devDependencies": { - "chai": "^3.5.0", - "chroma-sass": "^1.2.3", - "eslint": "^2.4.0", - "eyeglass": "^0.8.3", - "mocha": "^2.4.5", - "sassy-test": "^3.0.0", - "support-for": "^1.0.5", - "typey": "^1.0.0" - } -} diff --git a/dependencies/normalize-scss/sass/_normalize.scss b/dependencies/normalize-scss/sass/_normalize.scss deleted file mode 100644 index ba09c5d..0000000 --- a/dependencies/normalize-scss/sass/_normalize.scss +++ /dev/null @@ -1,4 +0,0 @@ -@import 'support-for'; -@import 'normalize/variables'; -@import 'normalize/vertical-rhythm'; -@import 'normalize/normalize-mixin'; diff --git a/dependencies/normalize-scss/sass/_support-for.scss b/dependencies/normalize-scss/sass/_support-for.scss deleted file mode 100644 index 6275f0d..0000000 --- a/dependencies/normalize-scss/sass/_support-for.scss +++ /dev/null @@ -1,64 +0,0 @@ -// Support the last 4 versions of all browsers except IE. -$support-for: ( - chrome: -4, - edge: -4, - firefox: -4, - ie: 9, - opera: -4, - safari: -4, - '*': -4, -) !default; - -// Set the current version number for all browsers. As of: 2016-04-30 -$support-for-current-browser-version: ( - chrome: 50, // https://en.wikipedia.org/wiki/Google_Chrome_release_history - edge: 25, // https://en.wikipedia.org/wiki/Microsoft_Edge - firefox: 46, // https://en.wikipedia.org/wiki/Firefox_release_history - ie: 11, // https://en.wikipedia.org/wiki/Internet_Explorer_versions - opera: 36, // https://en.wikipedia.org/wiki/Opera_(web_browser) - safari: 9, // https://en.wikipedia.org/wiki/Safari_version_history -) !default; - - -// support-for() -// -// Determines if the project has declared a minimum supported version number for -// the specified browser. -// -// If configured, this is a wrapper function that uses Compass' -// support-legacy-browser(). -// @see http://compass-style.org/reference/compass/support/#function-support-legacy-browser -// -@function support-for($browser, $version) { - // Ensure $version is an integer (or null). - @if not (type-of($version) == "null" or type-of($version) == "number" and round($version) == $version) { - @error "The $version parameter of support-for() must be an integer; #{type-of($version)} given."; - } - - // Check against declared minimums. - $min-version: null; - @if map-has-key($support-for, $browser) { - $min-version: map-get($support-for, $browser); - } - @else if map-has-key($support-for, '*') { - $min-version: map-get($support-for, '*'); - } - - // Ensure $min-version is an integer (or null). - @if type-of($min-version) != "null" and type-of($min-version) != "number" { - @error "$support-for: (#{$browser}: #{$min-version}) must be set to an integer (or null); #{$min-version} is a #{type-of($min-version)}."; - } - @elseif type-of($min-version) == "number" and round($min-version) != $min-version { - @error "$support-for: (#{$browser}: #{$min-version}) must be set to an integer (or null); #{$min-version} is not an integer."; - } - - // Negative $min-version means "X most recent versions". - @if type-of($min-version) == "number" and $min-version < 0 { - @if not map-has-key($support-for-current-browser-version, $browser) { - @error "#{$browser} not found in $support-for-current-browser-version map; it must be set to an integer."; - } - $min-version: map-get($support-for-current-browser-version, $browser) + $min-version + 1; - } - - @return if(($min-version and ($version >= $min-version)), true, false); -} diff --git a/dependencies/normalize-scss/sass/normalize/_import-now.scss b/dependencies/normalize-scss/sass/normalize/_import-now.scss deleted file mode 100644 index aac5d2b..0000000 --- a/dependencies/normalize-scss/sass/normalize/_import-now.scss +++ /dev/null @@ -1,11 +0,0 @@ -// Import Now -// -// If you import this module directly, it will immediately output all the CSS -// needed to normalize default HTML elements across all browsers. -// -// ``` -// @import "normalize/import-now"; -// ``` - -@import '../normalize'; -@include normalize(); diff --git a/dependencies/normalize-scss/sass/normalize/_normalize-mixin.scss b/dependencies/normalize-scss/sass/normalize/_normalize-mixin.scss deleted file mode 100644 index 4d2b1b6..0000000 --- a/dependencies/normalize-scss/sass/normalize/_normalize-mixin.scss +++ /dev/null @@ -1,678 +0,0 @@ -// Helper function for the normalize() mixin. -$_normalize-include: (); -$_normalize-exclude: (); -@function _normalize-include($section) { - // Check if $section is in the $include list. - @if index($_normalize-include, $section) { - @return true; - } - // If $include is set to (all), make sure $section is not in $exclude. - @else if not index($_normalize-exclude, $section) and index($_normalize-include, all) { - @return true; - } - @return false; -} - -@mixin normalize($include: (all), $exclude: ()) { - // If we had local functions, we could access our parameters inside the - // function without passing them in as parameters. The hacky work-around is to - // stuff them into global variables so can access them from a global function. - $_normalize-include: if(type-of($include) == 'list', $include, ($include)) !global; - $_normalize-exclude: if(type-of($exclude) == 'list', $exclude, ($exclude)) !global; - - // If we've customized any font variables, we'll need extra properties. - @if $base-font-size != 16px - or $base-line-height != 24px - or $base-unit != 'em' - or $h1-font-size != 2 * $base-font-size - or $h2-font-size != 1.5 * $base-font-size - or $h3-font-size != 1.17 * $base-font-size - or $h4-font-size != 1 * $base-font-size - or $h5-font-size != 0.83 * $base-font-size - or $h6-font-size != 0.67 * $base-font-size - or $indent-amount != 40px { - $normalize-vertical-rhythm: true !global; - } - - /*! normalize-scss | MIT/GPLv2 License | bit.ly/normalize-scss */ - - @if _normalize-include(root) { - /** - * 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 { - @if $normalize-vertical-rhythm or support-for(ie, 7) { - // Correct text resizing oddly in IE 6/7 when body `font-size` is set using - // `em` units. - font-size: ($base-font-size / 16px) * 100%; - } - @if $normalize-vertical-rhythm { - line-height: ($base-line-height / $base-font-size) * 1em; - } - font-family: $base-font-family; /* 1 */ - -ms-text-size-adjust: 100%; /* 2 */ - -webkit-text-size-adjust: 100%; /* 2 */ - } - - /** - * Remove default margin. - */ - - body { - margin: 0; - } - } - - @if _normalize-include(html5) { - /* 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 { - @if support-for(ie, 9) { - display: inline-block; /* 1 */ - @if support-for(ie, 7) { - *display: inline; - *zoom: 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; - } - - @if support-for(ie, 10) { - /** - * Address `[hidden]` styling not present in IE 8/9/10. - */ - - [hidden] { - display: none; - } - } - - /** - * Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22. - */ - - template { - display: none; - } - } - - @if _normalize-include(links) { - /* Links - ========================================================================== */ - - @if support-for(ie, 10) { - /** - * 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; - } - } - - @if _normalize-include(text) { - /* 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 { - @include normalize-font-size($h1-font-size); - @if $normalize-vertical-rhythm { - @include normalize-line-height($h1-font-size); - } - - /* Set 1 unit of vertical rhythm on the top and bottom margins. */ - @include normalize-margin(1 0, $h1-font-size); - } - - @if $normalize-vertical-rhythm or support-for(ie, 7) { - h2 { - @include normalize-font-size($h2-font-size); - @if $normalize-vertical-rhythm { - @include normalize-line-height($h2-font-size); - } - @include normalize-margin(1 0, $h2-font-size); - } - - h3 { - @include normalize-font-size($h3-font-size); - @if $normalize-vertical-rhythm { - @include normalize-line-height($h3-font-size); - } - @include normalize-margin(1 0, $h3-font-size); - } - - h4 { - @include normalize-font-size($h4-font-size); - @if $normalize-vertical-rhythm { - @include normalize-line-height($h4-font-size); - } - @include normalize-margin(1 0, $h4-font-size); - } - - h5 { - @include normalize-font-size($h5-font-size); - @if $normalize-vertical-rhythm { - @include normalize-line-height($h5-font-size); - } - @include normalize-margin(1 0, $h5-font-size); - } - - h6 { - @include normalize-font-size($h6-font-size); - @if $normalize-vertical-rhythm { - @include normalize-line-height($h6-font-size); - } - @include normalize-margin(1 0, $h6-font-size); - } - } - - @if support-for(ie, 9) { - /** - * 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; - } - } - - @if _normalize-include(embedded) { - /* Embedded content - ========================================================================== */ - - @if support-for(ie, 10) { - /** - * Remove border when inside `a` element in IE 8/9/10. - */ - - img { - border: 0; - @if support-for(ie, 7) { - /* Improve image quality when scaled in IE 7. */ - -ms-interpolation-mode: bicubic; - } - } - } - - /** - * Correct overflow not hidden in IE 9/10/11. - */ - - svg:not(:root) { - overflow: hidden; - } - } - - @if _normalize-include(grouping) { - /* Grouping content - ========================================================================== */ - - @if $normalize-vertical-rhythm or support-for(ie, 7) { - /** - * Address margins set differently in IE 6/7. - */ - - dl, - menu, - ol, - ul { - @include normalize-margin(1 0); - } - } - - @if $normalize-vertical-rhythm { - /** - * Turn off margins on nested lists. - */ - - ol, - ul { - ol, - ul { - margin: 0; - } - } - } - - @if $normalize-vertical-rhythm or support-for(ie, 7) { - dd { - margin: 0 0 0 $indent-amount; - } - - /** - * Address paddings set differently in IE 6/7. - */ - - menu, - ol, - ul { - padding: 0 0 0 $indent-amount; - } - } - - @if support-for(ie, 7) { - /** - * Correct list images handled incorrectly in IE 7. - */ - - nav ul, - nav ol { - list-style: none; - list-style-image: none; - } - } - - @if $normalize-vertical-rhythm or support-for(ie, 7) { - /** - * Set 1 unit of vertical rhythm on the top and bottom margin. - */ - - blockquote { - @include normalize-margin(1 $indent-amount); - } - } - - @if $normalize-vertical-rhythm or support-for(ie, 9) or support-for(safari, 6) { - /** - * Address margin not present in IE 8/9 and Safari. - */ - - figure { - @include normalize-margin(1 $indent-amount); - } - } - - /** - * Address differences between Firefox and other browsers. - */ - - hr { - @if support-for(firefox, 28) { - -moz-box-sizing: content-box; - } - box-sizing: content-box; - height: 0; - } - - @if $normalize-vertical-rhythm or support-for(ie, 7) { - /** - * Set 1 unit of vertical rhythm on the top and bottom margin. - */ - - p, - pre { - @include normalize-margin(1 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; - @if support-for(ie, 6) { - _font-family: 'courier new', monospace; - } - font-size: 1em; - } - } - - @if _normalize-include(forms) { - /* Forms - ========================================================================== */ - - /** - * Known limitation: by default, Chrome and Safari on OS X allow very limited - * styling of `select`, unless a `border` property is set. - */ - - @if support-for(ie, 7) { - /** - * Correct margin displayed oddly in IE 6/7. - */ - - form { - margin: 0; - } - } - - /** - * 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. - * 4. Address `font-family` inconsistency between `textarea` and other form in IE 7 - * 5. Improve appearance and consistency with IE 6/7. - */ - - button, - input, - optgroup, - select, - textarea { - color: inherit; /* 1 */ - font: inherit; /* 2 */ - margin: 0; /* 3 */ - @if support-for(ie, 7) { - *font-family: $base-font-family; /* 4 */ - *vertical-align: middle; /* 5 */ - } - } - - /** - * 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. - * 4. Remove inner spacing in IE 7 without affecting normal text inputs. - * Known issue: inner spacing remains in IE 6. - */ - - button, - html input[type="button"], /* 1 */ - input[type="reset"], - input[type="submit"] { - -webkit-appearance: button; /* 2 */ - cursor: pointer; /* 3 */ - @if support-for(ie, 7) { - *overflow: visible; /* 4 */ - } - } - - /** - * 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; - } - - @if support-for(ie, 10) { - /** - * 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. - * 3. Remove excess padding in IE 7. - * Known issue: excess padding remains in IE 6. - */ - - input[type="checkbox"], - input[type="radio"] { - box-sizing: border-box; /* 1 */ - padding: 0; /* 2 */ - @if support-for(ie, 7) { - *height: 13px; /* 3 */ - *width: 13px; /* 3 */ - } - } - } - - /** - * 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 */ - @if support-for(safari, 5) or support-for(chrome, 9) { - -webkit-box-sizing: content-box; - } - 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). - */ - - &::-webkit-search-cancel-button, - &::-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. - * 3. Correct alignment displayed oddly in IE 6/7. - */ - - legend { - @if support-for(ie, 11) { - border: 0; /* 1 */ - } - padding: 0; /* 2 */ - @if support-for(ie, 7) { - *margin-left: -7px; /* 3 */ - } - } - - /** - * 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; - } - } - - @if _normalize-include(tables) { - /* Tables - ========================================================================== */ - - /** - * Remove most spacing between table cells. - */ - - table { - border-collapse: collapse; - border-spacing: 0; - } - - td, - th { - padding: 0; - } - } -} diff --git a/dependencies/normalize-scss/sass/normalize/_variables.scss b/dependencies/normalize-scss/sass/normalize/_variables.scss deleted file mode 100644 index 2f06b25..0000000 --- a/dependencies/normalize-scss/sass/normalize/_variables.scss +++ /dev/null @@ -1,36 +0,0 @@ -// -// Variables -// -// You can override the default values by setting the variables in your Sass -// before importing the normalize-scss library. - -// The font size set on the root html element. -$base-font-size: 16px !default; - -// The base line height determines the basic unit of vertical rhythm. -$base-line-height: 24px !default; - -// The length unit in which to output vertical rhythm values. -// Supported values: px, em, rem. -$base-unit: 'em' !default; - -// The default font family. -$base-font-family: sans-serif !default; - -// The font sizes for h1-h6. -$h1-font-size: 2 * $base-font-size !default; -$h2-font-size: 1.5 * $base-font-size !default; -$h3-font-size: 1.17 * $base-font-size !default; -$h4-font-size: 1 * $base-font-size !default; -$h5-font-size: 0.83 * $base-font-size !default; -$h6-font-size: 0.67 * $base-font-size !default; - -// The amount lists and blockquotes are indented. -$indent-amount: 40px !default; - -// The following variable controls whether normalize-scss will output -// font-sizes, line-heights and block-level top/bottom margins that form a basic -// vertical rhythm on the page, which differs from the original Normalize.css. -// However, changing any of the variables above will cause -// $normalize-vertical-rhythm to be automatically set to true. -$normalize-vertical-rhythm: false !default; diff --git a/dependencies/normalize-scss/sass/normalize/_vertical-rhythm.scss b/dependencies/normalize-scss/sass/normalize/_vertical-rhythm.scss deleted file mode 100644 index 40c95f8..0000000 --- a/dependencies/normalize-scss/sass/normalize/_vertical-rhythm.scss +++ /dev/null @@ -1,74 +0,0 @@ -// -// Vertical Rhythm -// -// This is the minimal amount of code needed to create vertical rhythm in our -// CSS. If you are looking for a robust solution, look at the excellent Typey -// library. @see https://github.com/jptaranto/typey - -@function normalize-rhythm($value, $relative-to: $base-font-size, $unit: $base-unit) { - @if unit($value) != px { - @error "The normalize vertical-rhythm module only supports px inputs. The typey library is better."; - } - @if $unit == rem { - @return ($value / $base-font-size) * 1rem; - } - @else if $unit == em { - @return ($value / $relative-to) * 1em; - } - @else { // $unit == px - @return $value; - } -} - -@mixin normalize-font-size($value, $relative-to: $base-font-size) { - @if unit($value) != 'px' { - @error "normalize-font-size() only supports px inputs. The typey library is better."; - } - // px fallback for IE 8 and earlier. Note: IE 9/10 don't understand rem - // in font shorthand, but font-size longhand is fine. - @if $base-unit == rem and support-for(ie, 8) { - font-size: $value; - } - font-size: normalize-rhythm($value, $relative-to); -} - -@mixin normalize-rhythm($property, $values, $relative-to: $base-font-size) { - $value-list: $values; - $sep: space; - @if type-of($values) == 'list' { - $sep: list-separator($values); - } - @else { - $value-list: append((), $values); - } - - $normalized-values: (); - $px-fallback: (); - - @each $value in $value-list { - $px-value: $value; - @if unitless($value) and $value != 0 { - $value: $value * normalize-rhythm($base-line-height, $relative-to); - $px-value: $px-value * normalize-rhythm($base-line-height, $relative-to, px); - } - $normalized-values: append($normalized-values, $value, $sep); - $px-fallback: append($px-fallback, $px-value, $sep); - } - @if $base-unit == rem and support-for(ie, 8) { - #{$property}: $px-fallback; - } - #{$property}: $normalized-values; -} - -@mixin normalize-margin($values, $relative-to: $base-font-size) { - @include normalize-rhythm(margin, $values, $relative-to); -} - -@mixin normalize-line-height($font-size, $min-line-padding: 2px) { - $lines: ceil($font-size / $base-line-height); - // If lines are cramped include some extra leading. - @if ($lines * $base-line-height - $font-size) < ($min-line-padding * 2) { - $lines: $lines + 1; - } - @include normalize-rhythm(line-height, $lines, $font-size); -} diff --git a/skeleton/core/_config.scss b/skeleton/core/_config.scss index 4cd8c4e..6afc288 100644 --- a/skeleton/core/_config.scss +++ b/skeleton/core/_config.scss @@ -1,8 +1,6 @@ -// GLOBAL VARIABLES - include your variables here or alter the -// predefined vars. -// Changes to these variables will alter ALL flavors EXCEPT css. -// If you wish to override for any given flavor, please edit the vars -// partial in that flavor. +// GLOBAL VARIABLES - default global variables in this file. +// If you wish to change the default value of these variables, +// please do so in your _MYconfig.scss. // background vars $background-color: #fff !global; // default background color diff --git a/skeleton/core/_dependencies.scss b/skeleton/core/_dependencies.scss index 349d0ea..d4415c2 100644 --- a/skeleton/core/_dependencies.scss +++ b/skeleton/core/_dependencies.scss @@ -1,5 +1,6 @@ -// Core dependencies shared by all flavors (except css) are here. Any changes to these -// dependencies will reflect on ALL flavors. Alter with discretion. +// Core mixin and function dependencies that are globally scoped. +// Can be used as building blocks for other functions/mixins in your +// own themes. // ---------- MIXIN DEPENDENCIES @@ -9,7 +10,7 @@ /* Overrides */ $gutter: percent($base-gutter-width) / 100; .container { - @if($new == true) { width: 80%; } // FIXME: make this dynamic somehow + @if($new == true) { width: 80%; } // TODO: make this dynamic somehow } @if($new == false) { .column, diff --git a/skeleton/core/_functions.scss b/skeleton/core/_functions.scss index e9b5191..07cac89 100644 --- a/skeleton/core/_functions.scss +++ b/skeleton/core/_functions.scss @@ -1,4 +1,4 @@ -// Public functions that can be used globally. Have at it! +// Public functions that can be used globally. @import "dependencies"; // Don't remove me diff --git a/skeleton/core/_mixins.scss b/skeleton/core/_mixins.scss index 59c2eb4..9f29fa0 100644 --- a/skeleton/core/_mixins.scss +++ b/skeleton/core/_mixins.scss @@ -1,6 +1,5 @@ -// Core mixins shared by all flavors (except css) are here. Any changes to these -// mixins will reflect on ALL flavors. Alter with discretion. -// Note: all logic for "private" mixins are in _dependencies.scss +// Core mixins with global scope. +// Note: all logic for private mixins are in _dependencies.scss // grid ( [ number $width: 960px, [ boolean $fluid: false, [ number $gutterWidth: 20px, [ number $colCount: 16 ] ] ] ] ) @mixin grid($width: $base-width, $fluid: $is-fluid, $gutterWidth: $base-gutter-width, $colCount: $base-col-count) { diff --git a/skeleton/themes/_loader.scss b/skeleton/themes/_loader.scss index 109c6ab..c471707 100644 --- a/skeleton/themes/_loader.scss +++ b/skeleton/themes/_loader.scss @@ -1,5 +1,6 @@ // fresh theme created with love using Skeleton Sass theme setup script! +@import "../core/config"; // default dependencies for all themes @import "fresh/vars"; @import "fresh/base"; @import "fresh/skeleton"; // Override manually if you wish to create your own grid diff --git a/skeleton/themes/demo/_base.scss b/skeleton/themes/demo/_base.scss index 56b0933..ca914fe 100644 --- a/skeleton/themes/demo/_base.scss +++ b/skeleton/themes/demo/_base.scss @@ -1,7 +1,7 @@ -// This template file is almost an exact replica of the sphenoid -// base file except the reset styles are missing. Feel free to -// edit this file to your hearts content and create an amazing base -// style for Skeleton Sass! +// The foundation of Skeleton which includes all base styles +// that come bundled by default. +// See skeleton/core/_config.scss for default variable values. +// See _vars.scss for theme-scoped default values. @import "vars"; diff --git a/skeleton/themes/demo/_vars.scss b/skeleton/themes/demo/_vars.scss index 4c80acf..c5de4f7 100644 --- a/skeleton/themes/demo/_vars.scss +++ b/skeleton/themes/demo/_vars.scss @@ -3,7 +3,6 @@ // stored in the marrow folder, but to also create project-level // variables. -@import "../../core/config"; // default dependencies @import "marrow/mixins"; // @import "my_folder/_foo.scss"; // import dependencies from a custom folder // @import "bourbon"; // install bourbon in this directory and uncomment this line to enable bourbon, for example diff --git a/skeleton/themes/fresh/_base.scss b/skeleton/themes/fresh/_base.scss index f99db62..2f13846 100644 --- a/skeleton/themes/fresh/_base.scss +++ b/skeleton/themes/fresh/_base.scss @@ -1,13 +1,13 @@ -// This template file is almost an exact replica of the sphenoid -// base file except the reset styles are missing. Feel free to -// edit this file to your hearts content and create an amazing base -// style for Skeleton Sass! +// The foundation of Skeleton which includes all base styles +// that come bundled by default. +// See skeleton/core/_config.scss for default variable values. +// See _vars.scss for theme-scoped default values. @import "vars"; /* RESET * ------------------------------------------------ */ -@import "../../../dependencies/normalize-scss/sass/normalize"; + @include normalize(); /* BASIC STYLES * ------------------------------------------------ */ diff --git a/skeleton/themes/fresh/_vars.scss b/skeleton/themes/fresh/_vars.scss index 76fbe25..0ab1ee5 100644 --- a/skeleton/themes/fresh/_vars.scss +++ b/skeleton/themes/fresh/_vars.scss @@ -3,7 +3,7 @@ // stored in the marrow folder, but to also create project-level // variables. -@import "../../core/config"; // default dependencies +@import "../../../dependencies/normalize.scss/sass/normalize"; @import "marrow/mixins"; // @import "my_folder/_foo.scss"; // import dependencies from a custom folder // @import "bourbon"; // install bourbon in this directory and uncomment this line to enable bourbon, for example diff --git a/skeleton/themes/sphenoid/_base.scss b/skeleton/themes/sphenoid/_base.scss index 315ee91..f8b4933 100644 --- a/skeleton/themes/sphenoid/_base.scss +++ b/skeleton/themes/sphenoid/_base.scss @@ -1,3 +1,8 @@ +// The foundation of Skeleton which includes all base styles +// that come bundled by default. +// See skeleton/core/_config.scss for default variable values. +// See _vars.scss for theme-scoped default values. + @import "vars"; /* RESET diff --git a/skeleton/themes/sphenoid/_vars.scss b/skeleton/themes/sphenoid/_vars.scss index d67a287..a810ef7 100644 --- a/skeleton/themes/sphenoid/_vars.scss +++ b/skeleton/themes/sphenoid/_vars.scss @@ -3,10 +3,8 @@ // stored in the marrow folder, but to also create project-level // variables. - @import "marrow/private"; @import "marrow/public"; -@import "../../core/config"; // default dependencies // Yep, taken right from bourbon - https://github.com/thoughtbot/bourbon/blob/master/dist/settings/_prefixer.scss $prefix-for-webkit: true !default; diff --git a/skeleton/themes/sphenoid/marrow/_private.scss b/skeleton/themes/sphenoid/marrow/_private.scss index 3992725..42f1696 100644 --- a/skeleton/themes/sphenoid/marrow/_private.scss +++ b/skeleton/themes/sphenoid/marrow/_private.scss @@ -1,9 +1,4 @@ -// DISCLAIMER: this file is called private because these items are not supposed to accessed directly -// outside of the public file. They are also not supposed to be edited directly either. Alter only if -// you know what you're doing. Changes here can potentially render the sphenoid theme unusable. -// -// Am I allowed to use these in my own theme? You bet! -// I have a fix... how do I help? Check the README! +// Private mixins scoped at the theme level. Change with discretion. // ---------- MIXIN DEPENDENCIES @mixin _bd($vert, $horiz, $radius) { @@ -12,10 +7,11 @@ border-#{$vert}-#{$horiz}-radius: $radius; } -// needs multiple stop support -// needs center adjustment support // _buildRadialGradient ( mixed $start, mixed $stop, boolean $ie ) @mixin _buildRadialGradient($start, $stop, $ie) { + // TODO: needs multiple stop support + // TODO: needs center adjustment support + @if type-of($start) != "list" { $start: append($start, 0%, space); } diff --git a/skeleton_template.scss b/skeleton_template.scss index 2da4aab..4932631 100644 --- a/skeleton_template.scss +++ b/skeleton_template.scss @@ -1,9 +1,9 @@ /** * SASS/SCSS/Compass Transcription of Skeleton Responsive Grid * @author Dennis Thompson - * @copyright Copyright (c) 2014 AtomicPages LLC + * @copyright Copyright (c) 2016 AtomicPages LLC * @license MIT - * @version 2.5.3 + * @version 2.5.4 */ @import "skeleton/themes/loader"; // sass --update -C skeleton.scss:skeleton.css