{"commit":{"revision":"b58b9d0b794a401c5ab75dae24963484f3af86df","shortRevision":"b58b9d0b79","subject":"Update Bourbon files (4.0.2)","authoredAt":"2014-08-13T11:20:00-07:00","authorName":"Paul O’Shannessy","authorEmail":"paul@oshannessy.com"},"parents":["8dbdd53e46c4834b7f8db0da321736d26f9784a2"],"body":"","files":[{"status":"M","path":"docs\/_css\/bourbon\/_bourbon-deprecated-upcoming.scss"},{"status":"M","path":"docs\/_css\/bourbon\/_bourbon.scss"},{"status":"M","path":"docs\/_css\/bourbon\/addons\/_button.scss"},{"status":"M","path":"docs\/_css\/bourbon\/addons\/_clearfix.scss"},{"status":"A","path":"docs\/_css\/bourbon\/addons\/_directional-values.scss"},{"status":"A","path":"docs\/_css\/bourbon\/addons\/_ellipsis.scss"},{"status":"M","path":"docs\/_css\/bourbon\/addons\/_font-family.scss"},{"status":"M","path":"docs\/_css\/bourbon\/addons\/_hide-text.scss"},{"status":"M","path":"docs\/_css\/bourbon\/addons\/_html5-input-types.scss"},{"status":"M","path":"docs\/_css\/bourbon\/addons\/_position.scss"},{"status":"M","path":"docs\/_css\/bourbon\/addons\/_prefixer.scss"},{"status":"M","path":"docs\/_css\/bourbon\/addons\/_retina-image.scss"},{"status":"M","path":"docs\/_css\/bourbon\/addons\/_size.scss"},{"status":"M","path":"docs\/_css\/bourbon\/addons\/_timing-functions.scss"},{"status":"M","path":"docs\/_css\/bourbon\/addons\/_triangle.scss"},{"status":"A","path":"docs\/_css\/bourbon\/addons\/_word-wrap.scss"},{"status":"M","path":"docs\/_css\/bourbon\/css3\/_background-image.scss"},{"status":"M","path":"docs\/_css\/bourbon\/css3\/_background.scss"},{"status":"M","path":"docs\/_css\/bourbon\/css3\/_border-image.scss"},{"status":"A","path":"docs\/_css\/bourbon\/css3\/_calc.scss"},{"status":"M","path":"docs\/_css\/bourbon\/css3\/_columns.scss"},{"status":"A","path":"docs\/_css\/bourbon\/css3\/_filter.scss"},{"status":"M","path":"docs\/_css\/bourbon\/css3\/_flex-box.scss"},{"status":"M","path":"docs\/_css\/bourbon\/css3\/_font-face.scss"},{"status":"A","path":"docs\/_css\/bourbon\/css3\/_font-feature-settings.scss"},{"status":"A","path":"docs\/_css\/bourbon\/css3\/_hyphens.scss"},{"status":"M","path":"docs\/_css\/bourbon\/css3\/_image-rendering.scss"},{"status":"D","path":"docs\/_css\/bourbon\/css3\/_inline-block.scss"},{"status":"M","path":"docs\/_css\/bourbon\/css3\/_keyframes.scss"},{"status":"M","path":"docs\/_css\/bourbon\/css3\/_linear-gradient.scss"},{"status":"M","path":"docs\/_css\/bourbon\/css3\/_placeholder.scss"},{"status":"M","path":"docs\/_css\/bourbon\/css3\/_radial-gradient.scss"},{"status":"M","path":"docs\/_css\/bourbon\/css3\/_transition.scss"},{"status":"A","path":"docs\/_css\/bourbon\/functions\/_assign.scss"},{"status":"A","path":"docs\/_css\/bourbon\/functions\/_color-lightness.scss"},{"status":"D","path":"docs\/_css\/bourbon\/functions\/_compact.scss"},{"status":"A","path":"docs\/_css\/bourbon\/functions\/_golden-ratio.scss"},{"status":"D","path":"docs\/_css\/bourbon\/functions\/_linear-gradient.scss"},{"status":"M","path":"docs\/_css\/bourbon\/functions\/_modular-scale.scss"},{"status":"M","path":"docs\/_css\/bourbon\/functions\/_px-to-em.scss"},{"status":"A","path":"docs\/_css\/bourbon\/functions\/_px-to-rem.scss"},{"status":"D","path":"docs\/_css\/bourbon\/functions\/_radial-gradient.scss"},{"status":"A","path":"docs\/_css\/bourbon\/functions\/_strip-units.scss"},{"status":"A","path":"docs\/_css\/bourbon\/functions\/_unpack.scss"},{"status":"A","path":"docs\/_css\/bourbon\/helpers\/_convert-units.scss"},{"status":"D","path":"docs\/_css\/bourbon\/helpers\/_deprecated-webkit-gradient.scss"},{"status":"A","path":"docs\/_css\/bourbon\/helpers\/_is-num.scss"},{"status":"A","path":"docs\/_css\/bourbon\/helpers\/_linear-angle-parser.scss"},{"status":"A","path":"docs\/_css\/bourbon\/helpers\/_linear-gradient-parser.scss"},{"status":"A","path":"docs\/_css\/bourbon\/helpers\/_linear-side-corner-parser.scss"},{"status":"M","path":"docs\/_css\/bourbon\/helpers\/_radial-arg-parser.scss"},{"status":"A","path":"docs\/_css\/bourbon\/helpers\/_radial-gradient-parser.scss"},{"status":"A","path":"docs\/_css\/bourbon\/helpers\/_str-to-num.scss"},{"status":"A","path":"docs\/_css\/bourbon\/settings\/_asset-pipeline.scss"},{"status":"A","path":"docs\/_css\/bourbon\/settings\/_prefixer.scss"},{"status":"A","path":"docs\/_css\/bourbon\/settings\/_px-to-em.scss"}],"patch":"diff --git a\/docs\/_css\/bourbon\/_bourbon-deprecated-upcoming.scss b\/docs\/_css\/bourbon\/_bourbon-deprecated-upcoming.scss\nindex 5332496d82..f946b3b456 100644\n--- a\/docs\/_css\/bourbon\/_bourbon-deprecated-upcoming.scss\n+++ b\/docs\/_css\/bourbon\/_bourbon-deprecated-upcoming.scss\n@@ -2,12 +2,7 @@\n \/\/ These mixins\/functions are deprecated\n \/\/ They will be removed in the next MAJOR version release\n \/\/************************************************************************\/\/\n-@mixin box-shadow ($shadows...) {\n- @include prefixer(box-shadow, $shadows, spec);\n- @warn \"box-shadow is deprecated and will be removed in the next major version release\";\n-}\n-\n-@mixin background-size ($lengths...) {\n- @include prefixer(background-size, $lengths, spec);\n- @warn \"background-size is deprecated and will be removed in the next major version release\";\n+@mixin inline-block {\n+ display: inline-block;\n+ @warn \"inline-block mixin is deprecated and will be removed in the next major version release\";\n }\ndiff --git a\/docs\/_css\/bourbon\/_bourbon.scss b\/docs\/_css\/bourbon\/_bourbon.scss\nindex 53fbca877f..eea6e21e9e 100644\n--- a\/docs\/_css\/bourbon\/_bourbon.scss\n+++ b\/docs\/_css\/bourbon\/_bourbon.scss\n@@ -1,22 +1,36 @@\n+\/\/ Settings\n+@import \"settings\/prefixer\";\n+@import \"settings\/px-to-em\";\n+@import \"settings\/asset-pipeline\";\n+\n \/\/ Custom Helpers\n-@import \"helpers\/deprecated-webkit-gradient\";\n+@import \"helpers\/convert-units\";\n @import \"helpers\/gradient-positions-parser\";\n+@import \"helpers\/is-num\";\n+@import \"helpers\/linear-angle-parser\";\n+@import \"helpers\/linear-gradient-parser\";\n @import \"helpers\/linear-positions-parser\";\n+@import \"helpers\/linear-side-corner-parser\";\n @import \"helpers\/radial-arg-parser\";\n @import \"helpers\/radial-positions-parser\";\n+@import \"helpers\/radial-gradient-parser\";\n @import \"helpers\/render-gradients\";\n @import \"helpers\/shape-size-stripper\";\n+@import \"helpers\/str-to-num\";\n \n \/\/ Custom Functions\n-@import \"functions\/compact\";\n+@import \"functions\/assign\";\n+@import \"functions\/color-lightness\";\n @import \"functions\/flex-grid\";\n+@import \"functions\/golden-ratio\";\n @import \"functions\/grid-width\";\n-@import \"functions\/linear-gradient\";\n @import \"functions\/modular-scale\";\n @import \"functions\/px-to-em\";\n-@import \"functions\/radial-gradient\";\n+@import \"functions\/px-to-rem\";\n+@import \"functions\/strip-units\";\n @import \"functions\/tint-shade\";\n @import \"functions\/transition-property-name\";\n+@import \"functions\/unpack\";\n \n \/\/ CSS3 Mixins\n @import \"css3\/animation\";\n@@ -27,12 +41,15 @@\n @import \"css3\/border-image\";\n @import \"css3\/border-radius\";\n @import \"css3\/box-sizing\";\n+@import \"css3\/calc\";\n @import \"css3\/columns\";\n+@import \"css3\/filter\";\n @import \"css3\/flex-box\";\n @import \"css3\/font-face\";\n+@import \"css3\/font-feature-settings\";\n+@import \"css3\/hyphens\";\n @import \"css3\/hidpi-media-query\";\n @import \"css3\/image-rendering\";\n-@import \"css3\/inline-block\";\n @import \"css3\/keyframes\";\n @import \"css3\/linear-gradient\";\n @import \"css3\/perspective\";\n@@ -45,6 +62,8 @@\n \/\/ Addons & other mixins\n @import \"addons\/button\";\n @import \"addons\/clearfix\";\n+@import \"addons\/directional-values\";\n+@import \"addons\/ellipsis\";\n @import \"addons\/font-family\";\n @import \"addons\/hide-text\";\n @import \"addons\/html5-input-types\";\n@@ -54,6 +73,7 @@\n @import \"addons\/size\";\n @import \"addons\/timing-functions\";\n @import \"addons\/triangle\";\n+@import \"addons\/word-wrap\";\n \n \/\/ Soon to be deprecated Mixins\n @import \"bourbon-deprecated-upcoming\";\ndiff --git a\/docs\/_css\/bourbon\/addons\/_button.scss b\/docs\/_css\/bourbon\/addons\/_button.scss\nindex 3ae393c090..14a89e480c 100644\n--- a\/docs\/_css\/bourbon\/addons\/_button.scss\n+++ b\/docs\/_css\/bourbon\/addons\/_button.scss\n@@ -1,38 +1,51 @@\n-@mixin button ($style: simple, $base-color: #4294f0) {\n+@mixin button ($style: simple, $base-color: #4294f0, $text-size: inherit, $padding: 7px 18px) {\n \n- @if type-of($style) == color {\n+ @if type-of($style) == string and type-of($base-color) == color {\n+ @include buttonstyle($style, $base-color, $text-size, $padding);\n+ }\n+\n+ @if type-of($style) == string and type-of($base-color) == number {\n+ $padding: $text-size;\n+ $text-size: $base-color;\n+ $base-color: #4294f0;\n+\n+ @if $padding == inherit {\n+ $padding: 7px 18px;\n+ }\n+\n+ @include buttonstyle($style, $base-color, $text-size, $padding);\n+ }\n+\n+ @if type-of($style) == color and type-of($base-color) == color {\n $base-color: $style;\n $style: simple;\n+ @include buttonstyle($style, $base-color, $text-size, $padding);\n }\n \n- \/\/ Grayscale button\n- @if $base-color == grayscale($base-color) {\n- @if $style == simple {\n- @include simple($base-color, $grayscale: true);\n- }\n+ @if type-of($style) == color and type-of($base-color) == number {\n+ $padding: $text-size;\n+ $text-size: $base-color;\n+ $base-color: $style;\n+ $style: simple;\n \n- @else if $style == shiny {\n- @include shiny($base-color, $grayscale: true);\n+ @if $padding == inherit {\n+ $padding: 7px 18px;\n }\n \n- @else if $style == pill {\n- @include pill($base-color, $grayscale: true);\n- }\n+ @include buttonstyle($style, $base-color, $text-size, $padding);\n }\n \n- \/\/ Colored button\n- @else {\n- @if $style == simple {\n- @include simple($base-color);\n- }\n+ @if type-of($style) == number {\n+ $padding: $base-color;\n+ $text-size: $style;\n+ $base-color: #4294f0;\n+ $style: simple;\n \n- @else if $style == shiny {\n- @include shiny($base-color);\n+ @if $padding == #4294f0 {\n+ $padding: 7px 18px;\n }\n \n- @else if $style == pill {\n- @include pill($base-color);\n- }\n+ @include buttonstyle($style, $base-color, $text-size, $padding);\n }\n \n &:disabled {\n@@ -42,16 +55,55 @@\n }\n \n \n+\/\/ Selector Style Button\n+\/\/************************************************************************\/\/\n+@mixin buttonstyle($type, $b-color, $t-size, $pad) {\n+ \/\/ Grayscale button\n+ @if $type == simple and $b-color == grayscale($b-color) {\n+ @include simple($b-color, true, $t-size, $pad);\n+ }\n+\n+ @if $type == shiny and $b-color == grayscale($b-color) {\n+ @include shiny($b-color, true, $t-size, $pad);\n+ }\n+\n+ @if $type == pill and $b-color == grayscale($b-color) {\n+ @include pill($b-color, true, $t-size, $pad);\n+ }\n+\n+ @if $type == flat and $b-color == grayscale($b-color) {\n+ @include flat($b-color, true, $t-size, $pad);\n+ }\n+\n+ \/\/ Colored button\n+ @if $type == simple {\n+ @include simple($b-color, false, $t-size, $pad);\n+ }\n+\n+ @else if $type == shiny {\n+ @include shiny($b-color, false, $t-size, $pad);\n+ }\n+\n+ @else if $type == pill {\n+ @include pill($b-color, false, $t-size, $pad);\n+ }\n+\n+ @else if $type == flat {\n+ @include flat($b-color, false, $t-size, $pad);\n+ }\n+}\n+\n+\n \/\/ Simple Button\n \/\/************************************************************************\/\/\n-@mixin simple($base-color, $grayscale: false) {\n+@mixin simple($base-color, $grayscale: false, $textsize: inherit, $padding: 7px 18px) {\n $color: hsl(0, 0, 100%);\n $border: adjust-color($base-color, $saturation: 9%, $lightness: -14%);\n $inset-shadow: adjust-color($base-color, $saturation: -8%, $lightness: 15%);\n $stop-gradient: adjust-color($base-color, $saturation: 9%, $lightness: -11%);\n $text-shadow: adjust-color($base-color, $saturation: 15%, $lightness: -18%);\n \n- @if lightness($base-color) > 70% {\n+ @if is-light($base-color) {\n $color: hsl(0, 0, 20%);\n $text-shadow: adjust-color($base-color, $saturation: 10%, $lightness: 4%);\n }\n@@ -68,10 +120,10 @@\n box-shadow: inset 0 1px 0 0 $inset-shadow;\n color: $color;\n display: inline-block;\n- font-size: 11px;\n+ font-size: $textsize;\n font-weight: bold;\n @include linear-gradient ($base-color, $stop-gradient);\n- padding: 7px 18px;\n+ padding: $padding;\n text-decoration: none;\n text-shadow: 0 1px 0 $text-shadow;\n background-clip: padding-box;\n@@ -92,7 +144,8 @@\n @include linear-gradient ($base-color-hover, $stop-gradient-hover);\n }\n \n- &:active:not(:disabled) {\n+ &:active:not(:disabled),\n+ &:focus:not(:disabled) {\n $border-active: adjust-color($base-color, $saturation: 9%, $lightness: -14%);\n $inset-shadow-active: adjust-color($base-color, $saturation: 7%, $lightness: -17%);\n \n@@ -102,14 +155,14 @@\n }\n \n border: 1px solid $border-active;\n- box-shadow: inset 0 0 8px 4px $inset-shadow-active, inset 0 0 8px 4px $inset-shadow-active, 0 1px 1px 0 #eee;\n+ box-shadow: inset 0 0 8px 4px $inset-shadow-active, inset 0 0 8px 4px $inset-shadow-active;\n }\n }\n \n \n \/\/ Shiny Button\n \/\/************************************************************************\/\/\n-@mixin shiny($base-color, $grayscale: false) {\n+@mixin shiny($base-color, $grayscale: false, $textsize: inherit, $padding: 7px 18px) {\n $color: hsl(0, 0, 100%);\n $border: adjust-color($base-color, $red: -117, $green: -111, $blue: -81);\n $border-bottom: adjust-color($base-color, $red: -126, $green: -127, $blue: -122);\n@@ -119,7 +172,7 @@\n $text-shadow: adjust-color($base-color, $red: -140, $green: -141, $blue: -114);\n $third-stop: adjust-color($base-color, $red: -86, $green: -75, $blue: -48);\n \n- @if lightness($base-color) > 70% {\n+ @if is-light($base-color) {\n $color: hsl(0, 0, 20%);\n $text-shadow: adjust-color($base-color, $saturation: 10%, $lightness: 4%);\n }\n@@ -140,10 +193,10 @@\n box-shadow: inset 0 1px 0 0 $inset-shadow;\n color: $color;\n display: inline-block;\n- font-size: 14px;\n+ font-size: $textsize;\n font-weight: bold;\n @include linear-gradient(top, $base-color 0%, $second-stop 50%, $third-stop 50%, $fourth-stop 100%);\n- padding: 8px 20px;\n+ padding: $padding;\n text-align: center;\n text-decoration: none;\n text-shadow: 0 -1px 1px $text-shadow;\n@@ -168,21 +221,22 @@\n $fourth-stop-hover 100%);\n }\n \n- &:active:not(:disabled) {\n+ &:active:not(:disabled),\n+ &:focus:not(:disabled) {\n $inset-shadow-active: adjust-color($base-color, $red: -111, $green: -116, $blue: -122);\n \n @if $grayscale == true {\n $inset-shadow-active: grayscale($inset-shadow-active);\n }\n \n- box-shadow: inset 0 0 20px 0 $inset-shadow-active, 0 1px 0 #fff;\n+ box-shadow: inset 0 0 20px 0 $inset-shadow-active;\n }\n }\n \n \n \/\/ Pill Button\n \/\/************************************************************************\/\/\n-@mixin pill($base-color, $grayscale: false) {\n+@mixin pill($base-color, $grayscale: false, $textsize: inherit, $padding: 7px 18px) {\n $color: hsl(0, 0, 100%);\n $border-bottom: adjust-color($base-color, $hue: 8, $saturation: -11%, $lightness: -26%);\n $border-sides: adjust-color($base-color, $hue: 4, $saturation: -21%, $lightness: -21%);\n@@ -191,7 +245,7 @@\n $stop-gradient: adjust-color($base-color, $hue: 8, $saturation: 14%, $lightness: -10%);\n $text-shadow: adjust-color($base-color, $hue: 5, $saturation: -19%, $lightness: -15%);\n \n- @if lightness($base-color) > 70% {\n+ @if is-light($base-color) {\n $color: hsl(0, 0, 20%);\n $text-shadow: adjust-color($base-color, $saturation: 10%, $lightness: 4%);\n }\n@@ -208,14 +262,14 @@\n border: 1px solid $border-top;\n border-color: $border-top $border-sides $border-bottom;\n border-radius: 16px;\n- box-shadow: inset 0 1px 0 0 $inset-shadow, 0 1px 2px 0 #b3b3b3;\n+ box-shadow: inset 0 1px 0 0 $inset-shadow;\n color: $color;\n display: inline-block;\n- font-size: 11px;\n+ font-size: $textsize;\n font-weight: normal;\n line-height: 1;\n @include linear-gradient ($base-color, $stop-gradient);\n- padding: 5px 16px;\n+ padding: $padding;\n text-align: center;\n text-decoration: none;\n text-shadow: 0 -1px 1px $text-shadow;\n@@ -249,7 +303,8 @@\n background-clip: padding-box;\n }\n \n- &:active:not(:disabled) {\n+ &:active:not(:disabled),\n+ &:focus:not(:disabled) {\n $active-color: adjust-color($base-color, $hue: 4, $saturation: -12%, $lightness: -10%);\n $border-active: adjust-color($base-color, $hue: 6, $saturation: -2.5%, $lightness: -30%);\n $border-bottom-active: adjust-color($base-color, $hue: 11, $saturation: 6%, $lightness: -31%);\n@@ -267,7 +322,53 @@\n background: $active-color;\n border: 1px solid $border-active;\n border-bottom: 1px solid $border-bottom-active;\n- box-shadow: inset 0 0 6px 3px $inset-shadow-active, 0 1px 0 0 #fff;\n+ box-shadow: inset 0 0 6px 3px $inset-shadow-active;\n text-shadow: 0 -1px 1px $text-shadow-active;\n }\n }\n+\n+\n+\n+\/\/ Flat Button\n+\/\/************************************************************************\/\/\n+@mixin flat($base-color, $grayscale: false, $textsize: inherit, $padding: 7px 18px) {\n+ $color: hsl(0, 0, 100%);\n+\n+ @if is-light($base-color) {\n+ $color: hsl(0, 0, 20%);\n+ }\n+\n+ background-color: $base-color;\n+ border-radius: 3px;\n+ border: none;\n+ color: $color;\n+ display: inline-block;\n+ font-size: inherit;\n+ font-weight: bold;\n+ padding: 7px 18px;\n+ text-decoration: none;\n+ background-clip: padding-box;\n+\n+ &:hover:not(:disabled){\n+ $base-color-hover: adjust-color($base-color, $saturation: 4%, $lightness: 5%);\n+\n+ @if $grayscale == true {\n+ $base-color-hover: grayscale($base-color-hover);\n+ }\n+\n+ background-color: $base-color-hover;\n+ cursor: pointer;\n+ }\n+\n+ &:active:not(:disabled),\n+ &:focus:not(:disabled) {\n+ $base-color-active: adjust-color($base-color, $saturation: -4%, $lightness: -5%);\n+\n+ @if $grayscale == true {\n+ $base-color-active: grayscale($base-color-active);\n+ }\n+\n+ background-color: $base-color-active;\n+ cursor: pointer;\n+ }\n+}\ndiff --git a\/docs\/_css\/bourbon\/addons\/_clearfix.scss b\/docs\/_css\/bourbon\/addons\/_clearfix.scss\nindex ca9903cf02..783cfbc792 100644\n--- a\/docs\/_css\/bourbon\/addons\/_clearfix.scss\n+++ b\/docs\/_css\/bourbon\/addons\/_clearfix.scss\n@@ -1,4 +1,4 @@\n-\/\/ Micro clearfix provides an easy way to contain floats without adding additional markup\n+\/\/ Modern micro clearfix provides an easy way to contain floats without adding additional markup.\n \/\/\n \/\/ Example usage:\n \/\/\n@@ -12,18 +12,12 @@\n \/\/ }\n \n @mixin clearfix {\n- *zoom: 1;\n-\n- &:before,\n- &:after {\n- content: \" \";\n- display: table;\n- }\n-\n &:after {\n- clear: both;\n+ content:\"\";\n+ display:table;\n+ clear:both;\n }\n }\n \n \/\/ Acknowledgements\n-\/\/ Micro clearfix: [Nicolas Gallagher](http:\/\/nicolasgallagher.com\/micro-clearfix-hack\/)\n+\/\/ Beat *that* clearfix: [Thierry Koblentz](http:\/\/www.css-101.org\/articles\/clearfix\/latest-new-clearfix-so-far.php)\ndiff --git a\/docs\/_css\/bourbon\/addons\/_directional-values.scss b\/docs\/_css\/bourbon\/addons\/_directional-values.scss\nnew file mode 100644\nindex 0000000000..742f1031a4\n--- \/dev\/null\n+++ b\/docs\/_css\/bourbon\/addons\/_directional-values.scss\n@@ -0,0 +1,111 @@\n+\/\/ directional-property mixins are shorthands\n+\/\/ for writing properties like the following\n+\/\/\n+\/\/ @include margin(null 0 10px);\n+\/\/ ------\n+\/\/ margin-right: 0;\n+\/\/ margin-bottom: 10px;\n+\/\/ margin-left: 0;\n+\/\/\n+\/\/ - or -\n+\/\/\n+\/\/ @include border-style(dotted null);\n+\/\/ ------\n+\/\/ border-top-style: dotted;\n+\/\/ border-bottom-style: dotted;\n+\/\/\n+\/\/ ------\n+\/\/\n+\/\/ Note: You can also use false instead of null\n+\n+@function collapse-directionals($vals) {\n+ $output: null;\n+\n+ $A: nth( $vals, 1 );\n+ $B: if( length($vals) < 2, $A, nth($vals, 2));\n+ $C: if( length($vals) < 3, $A, nth($vals, 3));\n+ $D: if( length($vals) < 2, $A, nth($vals, if( length($vals) < 4, 2, 4) ));\n+\n+ @if $A == 0 { $A: 0 }\n+ @if $B == 0 { $B: 0 }\n+ @if $C == 0 { $C: 0 }\n+ @if $D == 0 { $D: 0 }\n+\n+ @if $A == $B and $A == $C and $A == $D { $output: $A }\n+ @else if $A == $C and $B == $D { $output: $A $B }\n+ @else if $B == $D { $output: $A $B $C }\n+ @else { $output: $A $B $C $D }\n+\n+ @return $output;\n+}\n+\n+@function contains-falsy($list) {\n+ @each $item in $list {\n+ @if not $item {\n+ @return true;\n+ }\n+ }\n+\n+ @return false;\n+}\n+\n+@mixin directional-property($pre, $suf, $vals) {\n+ \/\/ Property Names\n+ $top: $pre + \"-top\" + if($suf, \"-#{$suf}\", \"\");\n+ $bottom: $pre + \"-bottom\" + if($suf, \"-#{$suf}\", \"\");\n+ $left: $pre + \"-left\" + if($suf, \"-#{$suf}\", \"\");\n+ $right: $pre + \"-right\" + if($suf, \"-#{$suf}\", \"\");\n+ $all: $pre + if($suf, \"-#{$suf}\", \"\");\n+\n+ $vals: collapse-directionals($vals);\n+\n+ @if contains-falsy($vals) {\n+ @if nth($vals, 1) { #{$top}: nth($vals, 1); }\n+\n+ @if length($vals) == 1 {\n+ @if nth($vals, 1) { #{$right}: nth($vals, 1); }\n+ } @else {\n+ @if nth($vals, 2) { #{$right}: nth($vals, 2); }\n+ }\n+\n+ \/\/ prop: top\/bottom right\/left\n+ @if length($vals) == 2 {\n+ @if nth($vals, 1) { #{$bottom}: nth($vals, 1); }\n+ @if nth($vals, 2) { #{$left}: nth($vals, 2); }\n+\n+ \/\/ prop: top right\/left bottom\n+ } @else if length($vals) == 3 {\n+ @if nth($vals, 3) { #{$bottom}: nth($vals, 3); }\n+ @if nth($vals, 2) { #{$left}: nth($vals, 2); }\n+\n+ \/\/ prop: top right bottom left\n+ } @else if length($vals) == 4 {\n+ @if nth($vals, 3) { #{$bottom}: nth($vals, 3); }\n+ @if nth($vals, 4) { #{$left}: nth($vals, 4); }\n+ }\n+\n+ \/\/ prop: top\/right\/bottom\/left\n+ } @else {\n+ #{$all}: $vals;\n+ }\n+}\n+\n+@mixin margin($vals...) {\n+ @include directional-property(margin, false, $vals...);\n+}\n+\n+@mixin padding($vals...) {\n+ @include directional-property(padding, false, $vals...);\n+}\n+\n+@mixin border-style($vals...) {\n+ @include directional-property(border, style, $vals...);\n+}\n+\n+@mixin border-color($vals...) {\n+ @include directional-property(border, color, $vals...);\n+}\n+\n+@mixin border-width($vals...) {\n+ @include directional-property(border, width, $vals...);\n+}\ndiff --git a\/docs\/_css\/bourbon\/addons\/_ellipsis.scss b\/docs\/_css\/bourbon\/addons\/_ellipsis.scss\nnew file mode 100644\nindex 0000000000..a8ea2a4a86\n--- \/dev\/null\n+++ b\/docs\/_css\/bourbon\/addons\/_ellipsis.scss\n@@ -0,0 +1,7 @@\n+@mixin ellipsis($width: 100%) {\n+ display: inline-block;\n+ max-width: $width;\n+ overflow: hidden;\n+ text-overflow: ellipsis;\n+ white-space: nowrap;\n+}\ndiff --git a\/docs\/_css\/bourbon\/addons\/_font-family.scss b\/docs\/_css\/bourbon\/addons\/_font-family.scss\nindex df8a80ddfc..31f5d9ca75 100644\n--- a\/docs\/_css\/bourbon\/addons\/_font-family.scss\n+++ b\/docs\/_css\/bourbon\/addons\/_font-family.scss\n@@ -1,5 +1,5 @@\n $georgia: Georgia, Cambria, \"Times New Roman\", Times, serif;\n-$helvetica: \"Helvetica Neue\", Helvetica, Arial, sans-serif;\n+$helvetica: \"Helvetica Neue\", Helvetica, Roboto, Arial, sans-serif;\n $lucida-grande: \"Lucida Grande\", Tahoma, Verdana, Arial, sans-serif;\n $monospace: \"Bitstream Vera Sans Mono\", Consolas, Courier, monospace;\n $verdana: Verdana, Geneva, sans-serif;\ndiff --git a\/docs\/_css\/bourbon\/addons\/_hide-text.scss b\/docs\/_css\/bourbon\/addons\/_hide-text.scss\nindex 68d4bf86cb..fc7943811d 100644\n--- a\/docs\/_css\/bourbon\/addons\/_hide-text.scss\n+++ b\/docs\/_css\/bourbon\/addons\/_hide-text.scss\n@@ -1,5 +1,10 @@\n @mixin hide-text {\n- color: transparent;\n- font: 0\/0 a;\n- text-shadow: none;\n+ overflow: hidden;\n+\n+ &:before {\n+ content: \"\";\n+ display: block;\n+ width: 0;\n+ height: 100%;\n+ }\n }\ndiff --git a\/docs\/_css\/bourbon\/addons\/_html5-input-types.scss b\/docs\/_css\/bourbon\/addons\/_html5-input-types.scss\nindex b184382d91..9e9324ae0a 100644\n--- a\/docs\/_css\/bourbon\/addons\/_html5-input-types.scss\n+++ b\/docs\/_css\/bourbon\/addons\/_html5-input-types.scss\n@@ -20,29 +20,19 @@ $inputs-list: 'input[type=\"email\"]',\n 'input[type=\"time\"]',\n 'input[type=\"week\"]';\n \n-$unquoted-inputs-list: ();\n-@each $input-type in $inputs-list {\n- $unquoted-inputs-list: append($unquoted-inputs-list, unquote($input-type), comma);\n-}\n-\n-$all-text-inputs: $unquoted-inputs-list;\n-\n+\/\/ Bare inputs\n+\/\/************************************************************************\/\/\n+$all-text-inputs: assign-inputs($inputs-list);\n \n \/\/ Hover Pseudo-class\n \/\/************************************************************************\/\/\n-$all-text-inputs-hover: ();\n-@each $input-type in $unquoted-inputs-list {\n- $input-type-hover: $input-type + \":hover\";\n- $all-text-inputs-hover: append($all-text-inputs-hover, $input-type-hover, comma);\n-}\n+$all-text-inputs-hover: assign-inputs($inputs-list, hover);\n \n \/\/ Focus Pseudo-class\n \/\/************************************************************************\/\/\n-$all-text-inputs-focus: ();\n-@each $input-type in $unquoted-inputs-list {\n- $input-type-focus: $input-type + \":focus\";\n- $all-text-inputs-focus: append($all-text-inputs-focus, $input-type-focus, comma);\n-}\n+$all-text-inputs-focus: assign-inputs($inputs-list, focus);\n+\n+\n \n \/\/ You must use interpolation on the variable:\n \/\/ #{$all-text-inputs}\n@@ -54,3 +44,43 @@ $all-text-inputs-focus: ();\n \/\/ #{$all-text-inputs}, textarea {\n \/\/ border: 1px solid red;\n \/\/ }\n+\n+\n+\n+\/\/************************************************************************\/\/\n+\/\/ Generate a variable ($all-button-inputs) with a list of all html5\n+\/\/ input types that have a button-based input, excluding button.\n+\/\/************************************************************************\/\/\n+$inputs-button-list: 'input[type=\"button\"]',\n+ 'input[type=\"reset\"]',\n+ 'input[type=\"submit\"]';\n+\n+\/\/ Bare inputs\n+\/\/************************************************************************\/\/\n+$all-button-inputs: assign-inputs($inputs-button-list);\n+\n+\/\/ Hover Pseudo-class\n+\/\/************************************************************************\/\/\n+$all-button-inputs-hover: assign-inputs($inputs-button-list, hover);\n+\n+\/\/ Focus Pseudo-class\n+\/\/************************************************************************\/\/\n+$all-button-inputs-focus: assign-inputs($inputs-button-list, focus);\n+\n+\/\/ Active Pseudo-class\n+\/\/************************************************************************\/\/\n+$all-button-inputs-active: assign-inputs($inputs-button-list, active);\n+\n+\n+\n+\/\/ You must use interpolation on the variable:\n+\/\/ #{$all-button-inputs}\n+\/\/ #{$all-button-inputs-hover}\n+\/\/ #{$all-button-inputs-focus}\n+\/\/ #{$all-button-inputs-active}\n+\n+\/\/ Example\n+\/\/************************************************************************\/\/\n+\/\/ #{$all-button-inputs}, button {\n+\/\/ border: 1px solid red;\n+\/\/ }\ndiff --git a\/docs\/_css\/bourbon\/addons\/_position.scss b\/docs\/_css\/bourbon\/addons\/_position.scss\nindex faad1cae50..7de75182bc 100644\n--- a\/docs\/_css\/bourbon\/addons\/_position.scss\n+++ b\/docs\/_css\/bourbon\/addons\/_position.scss\n@@ -1,10 +1,12 @@\n-@mixin position ($position: relative, $coordinates: 0 0 0 0) {\n+@mixin position ($position: relative, $coordinates: null null null null) {\n \n @if type-of($position) == list {\n $coordinates: $position;\n $position: relative;\n }\n \n+ $coordinates: unpack($coordinates);\n+\n $top: nth($coordinates, 1);\n $right: nth($coordinates, 2);\n $bottom: nth($coordinates, 3);\n@@ -12,31 +14,19 @@\n \n position: $position;\n \n- @if $top == auto {\n- top: $top;\n- }\n- @else if not(unitless($top)) {\n+ @if ($top and $top == auto) or (type-of($top) == number) {\n top: $top;\n }\n \n- @if $right == auto {\n- right: $right;\n- }\n- @else if not(unitless($right)) {\n+ @if ($right and $right == auto) or (type-of($right) == number) {\n right: $right;\n }\n \n- @if $bottom == auto {\n- bottom: $bottom;\n- }\n- @else if not(unitless($bottom)) {\n+ @if ($bottom and $bottom == auto) or (type-of($bottom) == number) {\n bottom: $bottom;\n }\n \n- @if $left == auto {\n- left: $left;\n- }\n- @else if not(unitless($left)) {\n+ @if ($left and $left == auto) or (type-of($left) == number) {\n left: $left;\n }\n }\ndiff --git a\/docs\/_css\/bourbon\/addons\/_prefixer.scss b\/docs\/_css\/bourbon\/addons\/_prefixer.scss\nindex 6bfd23a1dd..c32f502758 100644\n--- a\/docs\/_css\/bourbon\/addons\/_prefixer.scss\n+++ b\/docs\/_css\/bourbon\/addons\/_prefixer.scss\n@@ -1,11 +1,7 @@\n \/\/************************************************************************\/\/\n \/\/ Example: @include prefixer(border-radius, $radii, webkit ms spec);\n \/\/************************************************************************\/\/\n-$prefix-for-webkit: true !default;\n-$prefix-for-mozilla: true !default;\n-$prefix-for-microsoft: true !default;\n-$prefix-for-opera: true !default;\n-$prefix-for-spec: true !default; \/\/ required for keyframe mixin\n+\/\/ Variables located in \/settings\/_prefixer.scss\n \n @mixin prefixer ($property, $value, $prefixes) {\n @each $prefix in $prefixes {\n@@ -41,9 +37,9 @@ $prefix-for-spec: true !default; \/\/ required for keyframe mixin\n }\n \n @mixin disable-prefix-for-all() {\n- $prefix-for-webkit: false;\n- $prefix-for-mozilla: false;\n- $prefix-for-microsoft: false;\n- $prefix-for-opera: false;\n- $prefix-for-spec: false;\n+ $prefix-for-webkit: false !global;\n+ $prefix-for-mozilla: false !global;\n+ $prefix-for-microsoft: false !global;\n+ $prefix-for-opera: false !global;\n+ $prefix-for-spec: false !global;\n }\ndiff --git a\/docs\/_css\/bourbon\/addons\/_retina-image.scss b\/docs\/_css\/bourbon\/addons\/_retina-image.scss\nindex ed300715e4..3995c1970a 100644\n--- a\/docs\/_css\/bourbon\/addons\/_retina-image.scss\n+++ b\/docs\/_css\/bourbon\/addons\/_retina-image.scss\n@@ -1,28 +1,27 @@\n-@mixin retina-image($filename, $background-size, $extension: png, $retina-filename: null, $asset-pipeline: false) {\n+@mixin retina-image($filename, $background-size, $extension: png, $retina-filename: null, $retina-suffix: _2x, $asset-pipeline: $asset-pipeline) {\n @if $asset-pipeline {\n- background-image: image_url($filename + \".\" + $extension);\n+ background-image: image-url(\"#{$filename}.#{$extension}\");\n }\n @else {\n- background-image: url($filename + \".\" + $extension);\n+ background-image: url(\"#{$filename}.#{$extension}\");\n }\n \n @include hidpi {\n-\n @if $asset-pipeline {\n @if $retina-filename {\n- background-image: image_url($retina-filename + \".\" + $extension);\n+ background-image: image-url(\"#{$retina-filename}.#{$extension}\");\n }\n @else {\n- background-image: image_url($filename + \"@2x\" + \".\" + $extension);\n+ background-image: image-url(\"#{$filename}#{$retina-suffix}.#{$extension}\");\n }\n }\n \n @else {\n @if $retina-filename {\n- background-image: url($retina-filename + \".\" + $extension);\n+ background-image: url(\"#{$retina-filename}.#{$extension}\");\n }\n @else {\n- background-image: url($filename + \"@2x\" + \".\" + $extension);\n+ background-image: url(\"#{$filename}#{$retina-suffix}.#{$extension}\");\n }\n }\n \ndiff --git a\/docs\/_css\/bourbon\/addons\/_size.scss b\/docs\/_css\/bourbon\/addons\/_size.scss\nindex 342e41b79f..a8653799a7 100644\n--- a\/docs\/_css\/bourbon\/addons\/_size.scss\n+++ b\/docs\/_css\/bourbon\/addons\/_size.scss\n@@ -1,44 +1,16 @@\n @mixin size($size) {\n- @if length($size) == 1 {\n- @if $size == auto {\n- width: $size;\n- height: $size;\n- }\n+ $height: nth($size, 1);\n+ $width: $height;\n \n- @else if unitless($size) {\n- width: $size + px;\n- height: $size + px;\n- }\n-\n- @else if not(unitless($size)) {\n- width: $size;\n- height: $size;\n- }\n- }\n-\n- \/\/ Width x Height\n- @if length($size) == 2 {\n- $width: nth($size, 1);\n+ @if length($size) > 1 {\n $height: nth($size, 2);\n+ }\n \n- @if $width == auto {\n- width: $width;\n- }\n- @else if not(unitless($width)) {\n- width: $width;\n- }\n- @else if unitless($width) {\n- width: $width + px;\n- }\n+ @if $height == auto or (type-of($height) == number and not unitless($height)) {\n+ height: $height;\n+ }\n \n- @if $height == auto {\n- height: $height;\n- }\n- @else if not(unitless($height)) {\n- height: $height;\n- }\n- @else if unitless($height) {\n- height: $height + px;\n- }\n+ @if $width == auto or (type-of($width) == number and not unitless($width)) {\n+ width: $width;\n }\n }\ndiff --git a\/docs\/_css\/bourbon\/addons\/_timing-functions.scss b\/docs\/_css\/bourbon\/addons\/_timing-functions.scss\nindex 51b2410914..5ecc6f9dcf 100644\n--- a\/docs\/_css\/bourbon\/addons\/_timing-functions.scss\n+++ b\/docs\/_css\/bourbon\/addons\/_timing-functions.scss\n@@ -1,5 +1,5 @@\n \/\/ CSS cubic-bezier timing functions. Timing functions courtesy of jquery.easie (github.com\/jaukia\/easie)\n-\/\/ Timing functions are the same as demo'ed here: http:\/\/jqueryui.com\/demos\/effect\/easing.html\n+\/\/ Timing functions are the same as demo'ed here: http:\/\/jqueryui.com\/resources\/demos\/effect\/easing.html\n \n \/\/ EASE IN\n $ease-in-quad: cubic-bezier(0.550, 0.085, 0.680, 0.530);\ndiff --git a\/docs\/_css\/bourbon\/addons\/_triangle.scss b\/docs\/_css\/bourbon\/addons\/_triangle.scss\nindex 0e02aca2ca..573954e41e 100644\n--- a\/docs\/_css\/bourbon\/addons\/_triangle.scss\n+++ b\/docs\/_css\/bourbon\/addons\/_triangle.scss\n@@ -2,44 +2,82 @@\n height: 0;\n width: 0;\n \n+ $width: nth($size, 1);\n+ $height: nth($size, length($size));\n+\n+ $foreground-color: nth($color, 1);\n+ $background-color: if(length($color) == 2, nth($color, 2), transparent);\n+\n @if ($direction == up) or ($direction == down) or ($direction == right) or ($direction == left) {\n- border-color: transparent;\n- border-style: solid;\n- border-width: $size \/ 2;\n+\n+ $width: $width \/ 2;\n+ $height: if(length($size) > 1, $height, $height\/2);\n \n @if $direction == up {\n- border-bottom-color: $color;\n+ border-left: $width solid $background-color;\n+ border-right: $width solid $background-color;\n+ border-bottom: $height solid $foreground-color;\n \n } @else if $direction == right {\n- border-left-color: $color;\n+ border-top: $width solid $background-color;\n+ border-bottom: $width solid $background-color;\n+ border-left: $height solid $foreground-color;\n \n } @else if $direction == down {\n- border-top-color: $color;\n+ border-left: $width solid $background-color;\n+ border-right: $width solid $background-color;\n+ border-top: $height solid $foreground-color;\n \n } @else if $direction == left {\n- border-right-color: $color;\n+ border-top: $width solid $background-color;\n+ border-bottom: $width solid $background-color;\n+ border-right: $height solid $foreground-color;\n }\n }\n \n @else if ($direction == up-right) or ($direction == up-left) {\n- border-top: $size solid $color;\n+ border-top: $height solid $foreground-color;\n \n @if $direction == up-right {\n- border-left: $size solid transparent;\n+ border-left: $width solid $background-color;\n \n } @else if $direction == up-left {\n- border-right: $size solid transparent;\n+ border-right: $width solid $background-color;\n }\n }\n \n @else if ($direction == down-right) or ($direction == down-left) {\n- border-bottom: $size solid $color;\n+ border-bottom: $height solid $foreground-color;\n \n @if $direction == down-right {\n- border-left: $size solid transparent;\n+ border-left: $width solid $background-color;\n \n } @else if $direction == down-left {\n- border-right: $size solid transparent;\n+ border-right: $width solid $background-color;\n }\n }\n+\n+ @else if ($direction == inset-up) {\n+ border-width: $height $width;\n+ border-style: solid;\n+ border-color: $background-color $background-color $foreground-color;\n+ }\n+\n+ @else if ($direction == inset-down) {\n+ border-width: $height $width;\n+ border-style: solid;\n+ border-color: $foreground-color $background-color $background-color;\n+ }\n+\n+ @else if ($direction == inset-right) {\n+ border-width: $width $height;\n+ border-style: solid;\n+ border-color: $background-color $background-color $background-color $foreground-color;\n+ }\n+\n+ @else if ($direction == inset-left) {\n+ border-width: $width $height;\n+ border-style: solid;\n+ border-color: $background-color $foreground-color $background-color $background-color;\n+ }\n }\ndiff --git a\/docs\/_css\/bourbon\/addons\/_word-wrap.scss b\/docs\/_css\/bourbon\/addons\/_word-wrap.scss\nnew file mode 100644\nindex 0000000000..9734a597cd\n--- \/dev\/null\n+++ b\/docs\/_css\/bourbon\/addons\/_word-wrap.scss\n@@ -0,0 +1,8 @@\n+@mixin word-wrap($wrap: break-word) {\n+ word-wrap: $wrap;\n+\n+ @if $wrap == break-word {\n+ overflow-wrap: break-word;\n+ word-break: break-all;\n+ }\n+}\ndiff --git a\/docs\/_css\/bourbon\/css3\/_background-image.scss b\/docs\/_css\/bourbon\/css3\/_background-image.scss\nindex 17016b91b9..6abe88be9a 100644\n--- a\/docs\/_css\/bourbon\/css3\/_background-image.scss\n+++ b\/docs\/_css\/bourbon\/css3\/_background-image.scss\n@@ -4,45 +4,39 @@\n \/\/************************************************************************\/\/\n \n @mixin background-image($images...) {\n- background-image: _add-prefix($images, webkit);\n- background-image: _add-prefix($images);\n-}\n+ $webkit-images: ();\n+ $spec-images: ();\n+\n+ @each $image in $images {\n+ $webkit-image: ();\n+ $spec-image: ();\n+\n+ @if (type-of($image) == string) {\n+ $url-str: str-slice($image, 0, 3);\n+ $gradient-type: str-slice($image, 0, 6);\n \n-@function _add-prefix($images, $vendor: false) {\n- $images-prefixed: ();\n- $gradient-positions: false;\n- @for $i from 1 through length($images) {\n- $type: type-of(nth($images, $i)); \/\/ Get type of variable - List or String\n-\n- \/\/ If variable is a list - Gradient\n- @if $type == list {\n- $gradient-type: nth(nth($images, $i), 1); \/\/ linear or radial\n- $gradient-pos: null;\n- $gradient-args: null;\n-\n- @if ($gradient-type == linear) or ($gradient-type == radial) {\n- $gradient-pos: nth(nth($images, $i), 2); \/\/ Get gradient position\n- $gradient-args: nth(nth($images, $i), 3); \/\/ Get actual gradient (red, blue)\n+ @if $url-str == \"url\" {\n+ $webkit-image: $image;\n+ $spec-image: $image;\n }\n- @else {\n- $gradient-args: nth(nth($images, $i), 2); \/\/ Get actual gradient (red, blue)\n+\n+ @else if $gradient-type == \"linear\" {\n+ $gradients: _linear-gradient-parser($image);\n+ $webkit-image: map-get($gradients, webkit-image);\n+ $spec-image: map-get($gradients, spec-image);\n }\n \n- $gradient-positions: _gradient-positions-parser($gradient-type, $gradient-pos);\n- $gradient: _render-gradients($gradient-positions, $gradient-args, $gradient-type, $vendor);\n- $images-prefixed: append($images-prefixed, $gradient, comma);\n- }\n- \/\/ If variable is a string - Image\n- @else if $type == string {\n- $images-prefixed: join($images-prefixed, nth($images, $i), comma);\n+ @else if $gradient-type == \"radial\" {\n+ $gradients: _radial-gradient-parser($image);\n+ $webkit-image: map-get($gradients, webkit-image);\n+ $spec-image: map-get($gradients, spec-image);\n+ }\n }\n+\n+ $webkit-images: append($webkit-images, $webkit-image, comma);\n+ $spec-images: append($spec-images, $spec-image, comma);\n }\n- @return $images-prefixed;\n-}\n \n-\/\/Examples:\n- \/\/@include background-image(linear-gradient(top, orange, red));\n- \/\/@include background-image(radial-gradient(50% 50%, cover circle, orange, red));\n- \/\/@include background-image(url(\"\/images\/a.png\"), linear-gradient(orange, red));\n- \/\/@include background-image(url(\"image.png\"), linear-gradient(orange, red), url(\"image.png\"));\n- \/\/@include background-image(linear-gradient(hsla(0, 100%, 100%, 0.25) 0%, hsla(0, 100%, 100%, 0.08) 50%, transparent 50%), linear-gradient(orange, red));\n+ background-image: $webkit-images;\n+ background-image: $spec-images;\n+}\ndiff --git a\/docs\/_css\/bourbon\/css3\/_background.scss b\/docs\/_css\/bourbon\/css3\/_background.scss\nindex 766d5d3224..9bce9308bf 100644\n--- a\/docs\/_css\/bourbon\/css3\/_background.scss\n+++ b\/docs\/_css\/bourbon\/css3\/_background.scss\n@@ -3,101 +3,53 @@\n \/\/ notation.\n \/\/************************************************************************\/\/\n \n-@mixin background(\n- $background-1 , $background-2: false,\n- $background-3: false, $background-4: false,\n- $background-5: false, $background-6: false,\n- $background-7: false, $background-8: false,\n- $background-9: false, $background-10: false,\n- $fallback: false\n-) {\n- $backgrounds: compact($background-1, $background-2,\n- $background-3, $background-4,\n- $background-5, $background-6,\n- $background-7, $background-8,\n- $background-9, $background-10);\n+@mixin background($backgrounds...) {\n+ $webkit-backgrounds: ();\n+ $spec-backgrounds: ();\n \n- $fallback-color: false;\n- @if (type-of($fallback) == color) or ($fallback == \"transparent\") {\n- $fallback-color: $fallback;\n- }\n- @else {\n- $fallback-color: _extract-background-color($backgrounds);\n- }\n-\n- @if $fallback-color {\n- background-color: $fallback-color;\n- }\n- background: _background-add-prefix($backgrounds, webkit);\n- background: _background-add-prefix($backgrounds);\n-}\n-\n-@function _extract-background-color($backgrounds) {\n- $final-bg-layer: nth($backgrounds, length($backgrounds));\n- @if type-of($final-bg-layer) == list {\n- @for $i from 1 through length($final-bg-layer) {\n- $value: nth($final-bg-layer, $i);\n- @if type-of($value) == color {\n- @return $value;\n- }\n- }\n- }\n- @return false;\n-}\n-\n-@function _background-add-prefix($backgrounds, $vendor: false) {\n- $backgrounds-prefixed: ();\n+ @each $background in $backgrounds {\n+ $webkit-background: ();\n+ $spec-background: ();\n+ $background-type: type-of($background);\n \n- @for $i from 1 through length($backgrounds) {\n- $shorthand: nth($backgrounds, $i); \/\/ Get member for current index\n- $type: type-of($shorthand); \/\/ Get type of variable - List (gradient) or String (image)\n+ @if $background-type == string or list {\n+ $background-str: if($background-type == list, nth($background, 1), $background);\n \n- \/\/ If shorthand is a list (gradient)\n- @if $type == list {\n- $first-member: nth($shorthand, 1); \/\/ Get first member of shorthand\n+ $url-str: str-slice($background-str, 0, 3);\n+ $gradient-type: str-slice($background-str, 0, 6);\n \n- \/\/ Linear Gradient\n- @if index(linear radial, nth($first-member, 1)) {\n- $gradient-type: nth($first-member, 1); \/\/ linear || radial\n- $gradient-args: false;\n- $gradient-positions: false;\n- $shorthand-start: false;\n- @if type-of($first-member) == list { \/\/ Linear gradient plus additional shorthand values - lg(red,orange)repeat,...\n- $gradient-positions: nth($first-member, 2);\n- $gradient-args: nth($first-member, 3);\n- $shorthand-start: 2;\n- }\n- @else { \/\/ Linear gradient only - lg(red,orange),...\n- $gradient-positions: nth($shorthand, 2);\n- $gradient-args: nth($shorthand, 3); \/\/ Get gradient (red, blue)\n- }\n+ @if $url-str == \"url\" {\n+ $webkit-background: $background;\n+ $spec-background: $background;\n+ }\n \n- $gradient-positions: _gradient-positions-parser($gradient-type, $gradient-positions);\n- $gradient: _render-gradients($gradient-positions, $gradient-args, $gradient-type, $vendor);\n+ @else if $gradient-type == \"linear\" {\n+ $gradients: _linear-gradient-parser(\"#{$background}\");\n+ $webkit-background: map-get($gradients, webkit-image);\n+ $spec-background: map-get($gradients, spec-image);\n+ }\n \n- \/\/ Append any additional shorthand args to gradient\n- @if $shorthand-start {\n- @for $j from $shorthand-start through length($shorthand) {\n- $gradient: join($gradient, nth($shorthand, $j), space);\n- }\n- }\n- $backgrounds-prefixed: append($backgrounds-prefixed, $gradient, comma);\n+ @else if $gradient-type == \"radial\" {\n+ $gradients: _radial-gradient-parser(\"#{$background}\");\n+ $webkit-background: map-get($gradients, webkit-image);\n+ $spec-background: map-get($gradients, spec-image);\n }\n- \/\/ Image with additional properties\n+\n @else {\n- $backgrounds-prefixed: append($backgrounds-prefixed, $shorthand, comma);\n+ $webkit-background: $background;\n+ $spec-background: $background;\n }\n }\n- \/\/ If shorthand is a simple string (color or image)\n- @else if $type == string {\n- $backgrounds-prefixed: join($backgrounds-prefixed, $shorthand, comma);\n+\n+ @else {\n+ $webkit-background: $background;\n+ $spec-background: $background;\n }\n+\n+ $webkit-backgrounds: append($webkit-backgrounds, $webkit-background, comma);\n+ $spec-backgrounds: append($spec-backgrounds, $spec-background, comma);\n }\n- @return $backgrounds-prefixed;\n-}\n \n-\/\/Examples:\n- \/\/@include background(linear-gradient(top, orange, red));\n- \/\/@include background(radial-gradient(circle at 40% 40%, orange, red));\n- \/\/@include background(url(\"\/images\/a.png\") no-repeat, linear-gradient(orange, red));\n- \/\/@include background(url(\"image.png\") center center, linear-gradient(orange, red), url(\"image.png\"));\n+ background: $webkit-backgrounds;\n+ background: $spec-backgrounds;\n+}\ndiff --git a\/docs\/_css\/bourbon\/css3\/_border-image.scss b\/docs\/_css\/bourbon\/css3\/_border-image.scss\nindex 1fff212df8..e338c2dcd2 100644\n--- a\/docs\/_css\/bourbon\/css3\/_border-image.scss\n+++ b\/docs\/_css\/bourbon\/css3\/_border-image.scss\n@@ -1,48 +1,53 @@\n-@mixin border-image($images) {\n- -webkit-border-image: _border-add-prefix($images, webkit);\n- -moz-border-image: _border-add-prefix($images, moz);\n- -o-border-image: _border-add-prefix($images, o);\n- border-image: _border-add-prefix($images);\n-}\n+@mixin border-image($borders...) {\n+ $webkit-borders: ();\n+ $spec-borders: ();\n+\n+ @each $border in $borders {\n+ $webkit-border: ();\n+ $spec-border: ();\n+ $border-type: type-of($border);\n+\n+ @if $border-type == string or list {\n+ $border-str: if($border-type == list, nth($border, 1), $border);\n+\n+ $url-str: str-slice($border-str, 0, 3);\n+ $gradient-type: str-slice($border-str, 0, 6);\n+\n+ @if $url-str == \"url\" {\n+ $webkit-border: $border;\n+ $spec-border: $border;\n+ }\n+\n+ @else if $gradient-type == \"linear\" {\n+ $gradients: _linear-gradient-parser(\"#{$border}\");\n+ $webkit-border: map-get($gradients, webkit-image);\n+ $spec-border: map-get($gradients, spec-image);\n+ }\n+\n+ @else if $gradient-type == \"radial\" {\n+ $gradients: _radial-gradient-parser(\"#{$border}\");\n+ $webkit-border: map-get($gradients, webkit-image);\n+ $spec-border: map-get($gradients, spec-image);\n+ }\n \n-@function _border-add-prefix($images, $vendor: false) {\n- $border-image: null;\n- $images-type: type-of(nth($images, 1));\n- $first-var: nth(nth($images, 1), 1); \/\/ Get type of Gradient (Linear || radial)\n-\n- \/\/ If input is a gradient\n- @if $images-type == string {\n- @if ($first-var == \"linear\") or ($first-var == \"radial\") {\n- $gradient-type: nth($images, 1); \/\/ Get type of gradient (linear || radial)\n- $gradient-pos: nth($images, 2); \/\/ Get gradient position\n- $gradient-args: nth($images, 3); \/\/ Get actual gradient (red, blue)\n- $gradient-positions: _gradient-positions-parser($gradient-type, $gradient-pos);\n- $border-image: _render-gradients($gradient-positions, $gradient-args, $gradient-type, $vendor);\n+ @else {\n+ $webkit-border: $border;\n+ $spec-border: $border;\n+ }\n }\n- \/\/ If input is a URL\n+\n @else {\n- $border-image: $images;\n- }\n- }\n- \/\/ If input is gradient or url + additional args\n- @else if $images-type == list {\n- $type: type-of(nth($images, 1)); \/\/ Get type of variable - List or String\n-\n- \/\/ If variable is a list - Gradient\n- @if $type == list {\n- $gradient: nth($images, 1);\n- $gradient-type: nth($gradient, 1); \/\/ Get type of gradient (linear || radial)\n- $gradient-pos: nth($gradient, 2); \/\/ Get gradient position\n- $gradient-args: nth($gradient, 3); \/\/ Get actual gradient (red, blue)\n- $gradient-positions: _gradient-positions-parser($gradient-type, $gradient-pos);\n- $border-image: _render-gradients($gradient-positions, $gradient-args, $gradient-type, $vendor);\n-\n- @for $i from 2 through length($images) {\n- $border-image: append($border-image, nth($images, $i));\n- }\n+ $webkit-border: $border;\n+ $spec-border: $border;\n }\n+\n+ $webkit-borders: append($webkit-borders, $webkit-border, comma);\n+ $spec-borders: append($spec-borders, $spec-border, comma);\n }\n- @return $border-image;\n+\n+ -webkit-border-image: $webkit-borders;\n+ border-image: $spec-borders;\n+ border-style: solid;\n }\n \n \/\/Examples:\n@@ -52,4 +57,3 @@\n \/\/ @include border-image(linear-gradient(45deg, orange, yellow) stretch);\n \/\/ @include border-image(linear-gradient(45deg, orange, yellow) 20 30 40 50 stretch round);\n \/\/ @include border-image(radial-gradient(top, cover, orange, yellow, orange));\n-\ndiff --git a\/docs\/_css\/bourbon\/css3\/_calc.scss b\/docs\/_css\/bourbon\/css3\/_calc.scss\nnew file mode 100644\nindex 0000000000..94d7e4cef3\n--- \/dev\/null\n+++ b\/docs\/_css\/bourbon\/css3\/_calc.scss\n@@ -0,0 +1,4 @@\n+@mixin calc($property, $value) {\n+ #{$property}: -webkit-calc(#{$value});\n+ #{$property}: calc(#{$value});\n+}\ndiff --git a\/docs\/_css\/bourbon\/css3\/_columns.scss b\/docs\/_css\/bourbon\/css3\/_columns.scss\nindex 42274a4eeb..96f601c1a8 100644\n--- a\/docs\/_css\/bourbon\/css3\/_columns.scss\n+++ b\/docs\/_css\/bourbon\/css3\/_columns.scss\n@@ -15,7 +15,7 @@\n \n @mixin column-fill($arg: auto) {\n \/\/ auto || length\n- @include prefixer(columns-fill, $arg, webkit moz spec);\n+ @include prefixer(column-fill, $arg, webkit moz spec);\n }\n \n @mixin column-rule($arg) {\ndiff --git a\/docs\/_css\/bourbon\/css3\/_filter.scss b\/docs\/_css\/bourbon\/css3\/_filter.scss\nnew file mode 100644\nindex 0000000000..8560d77676\n--- \/dev\/null\n+++ b\/docs\/_css\/bourbon\/css3\/_filter.scss\n@@ -0,0 +1,5 @@\n+@mixin filter($function: none) {\n+ \/\/ [= 1 {\n- @include prefixer(transition, $properties, webkit moz spec);\n+ \/\/ Fix for vendor-prefix transform property\n+ $needs-prefixes: false;\n+ $webkit: ();\n+ $moz: ();\n+ $spec: ();\n+\n+ \/\/ Create lists for vendor-prefixed transform\n+ @each $list in $properties {\n+ @if nth($list, 1) == \"transform\" {\n+ $needs-prefixes: true;\n+ $list1: -webkit-transform;\n+ $list2: -moz-transform;\n+ $list3: ();\n+\n+ @each $var in $list {\n+ $list3: join($list3, $var);\n+\n+ @if $var != \"transform\" {\n+ $list1: join($list1, $var);\n+ $list2: join($list2, $var);\n+ }\n+ }\n+\n+ $webkit: append($webkit, $list1);\n+ $moz: append($moz, $list2);\n+ $spec: append($spec, $list3);\n+ }\n+\n+ \/\/ Create lists for non-prefixed transition properties\n+ @else {\n+ $webkit: append($webkit, $list, comma);\n+ $moz: append($moz, $list, comma);\n+ $spec: append($spec, $list, comma);\n+ }\n }\n \n+ @if $needs-prefixes {\n+ -webkit-transition: $webkit;\n+ -moz-transition: $moz;\n+ transition: $spec;\n+ }\n @else {\n- $properties: all 0.15s ease-out 0;\n- @include prefixer(transition, $properties, webkit moz spec);\n+ @if length($properties) >= 1 {\n+ @include prefixer(transition, $properties, webkit moz spec);\n+ }\n+\n+ @else {\n+ $properties: all 0.15s ease-out 0s;\n+ @include prefixer(transition, $properties, webkit moz spec);\n+ }\n }\n }\n \ndiff --git a\/docs\/_css\/bourbon\/functions\/_assign.scss b\/docs\/_css\/bourbon\/functions\/_assign.scss\nnew file mode 100644\nindex 0000000000..9a1db93ef7\n--- \/dev\/null\n+++ b\/docs\/_css\/bourbon\/functions\/_assign.scss\n@@ -0,0 +1,11 @@\n+@function assign-inputs($inputs, $pseudo: null) {\n+ $list : ();\n+\n+ @each $input in $inputs {\n+ $input: unquote($input);\n+ $input: if($pseudo, $input + \":\" + $pseudo, $input);\n+ $list: append($list, $input, comma);\n+ }\n+\n+ @return $list;\n+}\n\\ No newline at end of file\ndiff --git a\/docs\/_css\/bourbon\/functions\/_color-lightness.scss b\/docs\/_css\/bourbon\/functions\/_color-lightness.scss\nnew file mode 100644\nindex 0000000000..8c6df4e256\n--- \/dev\/null\n+++ b\/docs\/_css\/bourbon\/functions\/_color-lightness.scss\n@@ -0,0 +1,13 @@\n+\/\/ Programatically determines whether a color is light or dark\n+\/\/ Returns a boolean\n+\/\/ More details here http:\/\/robots.thoughtbot.com\/closer-look-color-lightness\n+\n+@function is-light($hex-color) {\n+ $-local-red: red(rgba($hex-color, 1.0));\n+ $-local-green: green(rgba($hex-color, 1.0));\n+ $-local-blue: blue(rgba($hex-color, 1.0));\n+\n+ $-local-lightness: ($-local-red * 0.2126 + $-local-green * 0.7152 + $-local-blue * 0.0722) \/ 255;\n+\n+ @return $-local-lightness > .6;\n+}\ndiff --git a\/docs\/_css\/bourbon\/functions\/_compact.scss b\/docs\/_css\/bourbon\/functions\/_compact.scss\ndeleted file mode 100644\nindex 871500e339..0000000000\n--- a\/docs\/_css\/bourbon\/functions\/_compact.scss\n+++ \/dev\/null\n@@ -1,11 +0,0 @@\n-\/\/ Remove `false` values from a list\n-\n-@function compact($vars...) {\n- $list: ();\n- @each $var in $vars {\n- @if $var {\n- $list: append($list, $var, comma);\n- }\n- }\n- @return $list;\n-}\ndiff --git a\/docs\/_css\/bourbon\/functions\/_golden-ratio.scss b\/docs\/_css\/bourbon\/functions\/_golden-ratio.scss\nnew file mode 100644\nindex 0000000000..463d14a00c\n--- \/dev\/null\n+++ b\/docs\/_css\/bourbon\/functions\/_golden-ratio.scss\n@@ -0,0 +1,3 @@\n+@function golden-ratio($value, $increment) {\n+ @return modular-scale($value, $increment, $golden)\n+}\ndiff --git a\/docs\/_css\/bourbon\/functions\/_linear-gradient.scss b\/docs\/_css\/bourbon\/functions\/_linear-gradient.scss\ndeleted file mode 100644\nindex c8454d83f0..0000000000\n--- a\/docs\/_css\/bourbon\/functions\/_linear-gradient.scss\n+++ \/dev\/null\n@@ -1,13 +0,0 @@\n-@function linear-gradient($pos, $gradients...) {\n- $type: linear;\n- $pos-type: type-of(nth($pos, 1));\n-\n- \/\/ if $pos doesn't exist, fix $gradient\n- @if ($pos-type == color) or (nth($pos, 1) == \"transparent\") {\n- $gradients: zip($pos $gradients);\n- $pos: false;\n- }\n-\n- $type-gradient: $type, $pos, $gradients;\n- @return $type-gradient;\n-}\ndiff --git a\/docs\/_css\/bourbon\/functions\/_modular-scale.scss b\/docs\/_css\/bourbon\/functions\/_modular-scale.scss\nindex dddccb5224..afc59eb954 100644\n--- a\/docs\/_css\/bourbon\/functions\/_modular-scale.scss\n+++ b\/docs\/_css\/bourbon\/functions\/_modular-scale.scss\n@@ -1,40 +1,66 @@\n+\/\/ Scaling Variables\n+$golden: 1.618;\n+$minor-second: 1.067;\n+$major-second: 1.125;\n+$minor-third: 1.2;\n+$major-third: 1.25;\n+$perfect-fourth: 1.333;\n+$augmented-fourth: 1.414;\n+$perfect-fifth: 1.5;\n+$minor-sixth: 1.6;\n+$major-sixth: 1.667;\n+$minor-seventh: 1.778;\n+$major-seventh: 1.875;\n+$octave: 2;\n+$major-tenth: 2.5;\n+$major-eleventh: 2.667;\n+$major-twelfth: 3;\n+$double-octave: 4;\n+\n @function modular-scale($value, $increment, $ratio) {\n+ $v1: nth($value, 1);\n+ $v2: nth($value, length($value));\n+ $value: $v1;\n+\n+ \/\/ scale $v2 to just above $v1\n+ @while $v2 > $v1 {\n+ $v2: ($v2 \/ $ratio); \/\/ will be off-by-1\n+ }\n+ @while $v2 < $v1 {\n+ $v2: ($v2 * $ratio); \/\/ will fix off-by-1\n+ }\n+\n+ \/\/ check AFTER scaling $v2 to prevent double-counting corner-case\n+ $double-stranded: $v2 > $v1;\n+\n @if $increment > 0 {\n @for $i from 1 through $increment {\n- $value: ($value * $ratio);\n+ @if $double-stranded and ($v1 * $ratio) > $v2 {\n+ $value: $v2;\n+ $v2: ($v2 * $ratio);\n+ } @else {\n+ $v1: ($v1 * $ratio);\n+ $value: $v1;\n+ }\n }\n }\n \n @if $increment < 0 {\n- $increment: abs($increment);\n- @for $i from 1 through $increment {\n- $value: ($value \/ $ratio);\n+ \/\/ adjust $v2 to just below $v1\n+ @if $double-stranded {\n+ $v2: ($v2 \/ $ratio);\n+ }\n+\n+ @for $i from $increment through -1 {\n+ @if $double-stranded and ($v1 \/ $ratio) < $v2 {\n+ $value: $v2;\n+ $v2: ($v2 \/ $ratio);\n+ } @else {\n+ $v1: ($v1 \/ $ratio);\n+ $value: $v1;\n+ }\n }\n }\n \n @return $value;\n }\n-\n-\/\/ div {\n-\/\/ Increment Up GR with positive value\n-\/\/ font-size: modular-scale(14px, 1, 1.618); \/\/ returns: 22.652px\n-\/\/\n-\/\/ Increment Down GR with negative value\n-\/\/ font-size: modular-scale(14px, -1, 1.618); \/\/ returns: 8.653px\n-\/\/\n-\/\/ Can be used with ceil(round up) or floor(round down)\n-\/\/ font-size: floor( modular-scale(14px, 1, 1.618) ); \/\/ returns: 22px\n-\/\/ font-size: ceil( modular-scale(14px, 1, 1.618) ); \/\/ returns: 23px\n-\/\/ }\n-\/\/\n-\/\/ modularscale.com\n-\n-@function golden-ratio($value, $increment) {\n- @return modular-scale($value, $increment, 1.618)\n-}\n-\n-\/\/ div {\n-\/\/ font-size: golden-ratio(14px, 1); \/\/ returns: 22.652px\n-\/\/ }\n-\/\/\n-\/\/ goldenratiocalculator.com\ndiff --git a\/docs\/_css\/bourbon\/functions\/_px-to-em.scss b\/docs\/_css\/bourbon\/functions\/_px-to-em.scss\nindex 2eb1031c60..4832245e45 100644\n--- a\/docs\/_css\/bourbon\/functions\/_px-to-em.scss\n+++ b\/docs\/_css\/bourbon\/functions\/_px-to-em.scss\n@@ -2,7 +2,12 @@\n \/\/ eg. for a relational value of 12px write em(12) when the parent is 16px\n \/\/ if the parent is another value say 24px write em(12, 24)\n \n-@function em($pxval, $base: 16) {\n+@function em($pxval, $base: $em-base) {\n+ @if not unitless($pxval) {\n+ $pxval: strip-units($pxval);\n+ }\n+ @if not unitless($base) {\n+ $base: strip-units($base);\n+ }\n @return ($pxval \/ $base) * 1em;\n }\n-\ndiff --git a\/docs\/_css\/bourbon\/functions\/_px-to-rem.scss b\/docs\/_css\/bourbon\/functions\/_px-to-rem.scss\nnew file mode 100644\nindex 0000000000..96b244e4cb\n--- \/dev\/null\n+++ b\/docs\/_css\/bourbon\/functions\/_px-to-rem.scss\n@@ -0,0 +1,15 @@\n+\/\/ Convert pixels to rems\n+\/\/ eg. for a relational value of 12px write rem(12)\n+\/\/ Assumes $em-base is the font-size of \n+\n+@function rem($pxval) {\n+ @if not unitless($pxval) {\n+ $pxval: strip-units($pxval);\n+ }\n+\n+ $base: $em-base;\n+ @if not unitless($base) {\n+ $base: strip-units($base);\n+ }\n+ @return ($pxval \/ $base) * 1rem;\n+}\ndiff --git a\/docs\/_css\/bourbon\/functions\/_radial-gradient.scss b\/docs\/_css\/bourbon\/functions\/_radial-gradient.scss\ndeleted file mode 100644\nindex 75584060d2..0000000000\n--- a\/docs\/_css\/bourbon\/functions\/_radial-gradient.scss\n+++ \/dev\/null\n@@ -1,23 +0,0 @@\n-\/\/ This function is required and used by the background-image mixin.\n-@function radial-gradient($G1, $G2,\n- $G3: false, $G4: false,\n- $G5: false, $G6: false,\n- $G7: false, $G8: false,\n- $G9: false, $G10: false,\n- $pos: null,\n- $shape-size: null) {\n-\n- $data: _radial-arg-parser($G1, $G2, $pos, $shape-size);\n- $G1: nth($data, 1);\n- $G2: nth($data, 2);\n- $pos: nth($data, 3);\n- $shape-size: nth($data, 4);\n-\n- $type: radial;\n- $gradient: compact($G1, $G2, $G3, $G4, $G5, $G6, $G7, $G8, $G9, $G10);\n-\n- $type-gradient: $type, $shape-size $pos, $gradient;\n- @return $type-gradient;\n-}\n-\n-\ndiff --git a\/docs\/_css\/bourbon\/functions\/_strip-units.scss b\/docs\/_css\/bourbon\/functions\/_strip-units.scss\nnew file mode 100644\nindex 0000000000..6afc6e601c\n--- \/dev\/null\n+++ b\/docs\/_css\/bourbon\/functions\/_strip-units.scss\n@@ -0,0 +1,5 @@\n+\/\/ Srtips the units from a value. e.g. 12px -> 12\n+\n+@function strip-units($val) {\n+ @return ($val \/ ($val * 0 + 1));\n+}\ndiff --git a\/docs\/_css\/bourbon\/functions\/_unpack.scss b\/docs\/_css\/bourbon\/functions\/_unpack.scss\nnew file mode 100644\nindex 0000000000..377596365c\n--- \/dev\/null\n+++ b\/docs\/_css\/bourbon\/functions\/_unpack.scss\n@@ -0,0 +1,17 @@\n+\/\/ Convert shorthand to the 4-value syntax\n+\n+@function unpack($shorthand) {\n+ @if length($shorthand) == 1 {\n+ @return nth($shorthand, 1) nth($shorthand, 1) nth($shorthand, 1) nth($shorthand, 1);\n+ }\n+ @else if length($shorthand) == 2 {\n+ @return nth($shorthand, 1) nth($shorthand, 2) nth($shorthand, 1) nth($shorthand, 2);\n+ }\n+ @else if length($shorthand) == 3 {\n+ @return nth($shorthand, 1) nth($shorthand, 2) nth($shorthand, 3) nth($shorthand, 2);\n+ }\n+ @else {\n+ @return $shorthand;\n+ }\n+}\n+\ndiff --git a\/docs\/_css\/bourbon\/helpers\/_convert-units.scss b\/docs\/_css\/bourbon\/helpers\/_convert-units.scss\nnew file mode 100644\nindex 0000000000..3443db397c\n--- \/dev\/null\n+++ b\/docs\/_css\/bourbon\/helpers\/_convert-units.scss\n@@ -0,0 +1,15 @@\n+\/\/************************************************************************\/\/\n+\/\/ Helper function for str-to-num fn.\n+\/\/ Source: http:\/\/sassmeister.com\/gist\/9647408\n+\/\/************************************************************************\/\/\n+@function _convert-units($number, $unit) {\n+ $strings: 'px' 'cm' 'mm' '%' 'ch' 'pica' 'in' 'em' 'rem' 'pt' 'pc' 'ex' 'vw' 'vh' 'vmin' 'vmax', 'deg', 'rad', 'grad', 'turn';\n+ $units: 1px 1cm 1mm 1% 1ch 1pica 1in 1em 1rem 1pt 1pc 1ex 1vw 1vh 1vmin 1vmax, 1deg, 1rad, 1grad, 1turn;\n+ $index: index($strings, $unit);\n+\n+ @if not $index {\n+ @warn \"Unknown unit `#{$unit}`.\";\n+ @return false;\n+ }\n+ @return $number * nth($units, $index);\n+}\ndiff --git a\/docs\/_css\/bourbon\/helpers\/_deprecated-webkit-gradient.scss b\/docs\/_css\/bourbon\/helpers\/_deprecated-webkit-gradient.scss\ndeleted file mode 100644\nindex cd17e2832d..0000000000\n--- a\/docs\/_css\/bourbon\/helpers\/_deprecated-webkit-gradient.scss\n+++ \/dev\/null\n@@ -1,39 +0,0 @@\n-\/\/ Render Deprecated Webkit Gradient - Linear || Radial\n-\/\/************************************************************************\/\/\n-@function _deprecated-webkit-gradient($type,\n- $deprecated-pos1, $deprecated-pos2,\n- $full,\n- $deprecated-radius1: false, $deprecated-radius2: false) {\n- $gradient-list: ();\n- $gradient: false;\n- $full-length: length($full);\n- $percentage: false;\n- $gradient-type: $type;\n-\n- @for $i from 1 through $full-length {\n- $gradient: nth($full, $i);\n-\n- @if length($gradient) == 2 {\n- $color-stop: color-stop(nth($gradient, 2), nth($gradient, 1));\n- $gradient-list: join($gradient-list, $color-stop, comma);\n- }\n- @else if $gradient != null {\n- @if $i == $full-length {\n- $percentage: 100%;\n- }\n- @else {\n- $percentage: ($i - 1) * (100 \/ ($full-length - 1)) + \"%\";\n- }\n- $color-stop: color-stop(unquote($percentage), $gradient);\n- $gradient-list: join($gradient-list, $color-stop, comma);\n- }\n- }\n-\n- @if $type == radial {\n- $gradient: -webkit-gradient(radial, $deprecated-pos1, $deprecated-radius1, $deprecated-pos2, $deprecated-radius2, $gradient-list);\n- }\n- @else if $type == linear {\n- $gradient: -webkit-gradient(linear, $deprecated-pos1, $deprecated-pos2, $gradient-list);\n- }\n- @return $gradient;\n-}\ndiff --git a\/docs\/_css\/bourbon\/helpers\/_is-num.scss b\/docs\/_css\/bourbon\/helpers\/_is-num.scss\nnew file mode 100644\nindex 0000000000..71459e1404\n--- \/dev\/null\n+++ b\/docs\/_css\/bourbon\/helpers\/_is-num.scss\n@@ -0,0 +1,8 @@\n+\/\/************************************************************************\/\/\n+\/\/ Helper for linear-gradient-parser\n+\/\/************************************************************************\/\/\n+@function _is-num($char) {\n+ $values: '0' '1' '2' '3' '4' '5' '6' '7' '8' '9' 0 1 2 3 4 5 6 7 8 9;\n+ $index: index($values, $char);\n+ @return if($index, true, false);\n+}\ndiff --git a\/docs\/_css\/bourbon\/helpers\/_linear-angle-parser.scss b\/docs\/_css\/bourbon\/helpers\/_linear-angle-parser.scss\nnew file mode 100644\nindex 0000000000..e0401ed8df\n--- \/dev\/null\n+++ b\/docs\/_css\/bourbon\/helpers\/_linear-angle-parser.scss\n@@ -0,0 +1,25 @@\n+\/\/ Private function for linear-gradient-parser\n+@function _linear-angle-parser($image, $first-val, $prefix, $suffix) {\n+ $offset: null;\n+ $unit-short: str-slice($first-val, str-length($first-val) - 2, str-length($first-val));\n+ $unit-long: str-slice($first-val, str-length($first-val) - 3, str-length($first-val));\n+\n+ @if ($unit-long == \"grad\") or\n+ ($unit-long == \"turn\") {\n+ $offset: if($unit-long == \"grad\", -100grad * 3, -0.75turn);\n+ }\n+\n+ @else if ($unit-short == \"deg\") or\n+ ($unit-short == \"rad\") {\n+ $offset: if($unit-short == \"deg\", -90 * 3, 1.6rad);\n+ }\n+\n+ @if $offset {\n+ $num: _str-to-num($first-val);\n+\n+ @return (\n+ webkit-image: -webkit- + $prefix + ($offset - $num) + $suffix,\n+ spec-image: $image\n+ );\n+ }\n+}\ndiff --git a\/docs\/_css\/bourbon\/helpers\/_linear-gradient-parser.scss b\/docs\/_css\/bourbon\/helpers\/_linear-gradient-parser.scss\nnew file mode 100644\nindex 0000000000..12bcdcda8f\n--- \/dev\/null\n+++ b\/docs\/_css\/bourbon\/helpers\/_linear-gradient-parser.scss\n@@ -0,0 +1,41 @@\n+@function _linear-gradient-parser($image) {\n+ $image: unquote($image);\n+ $gradients: ();\n+ $start: str-index($image, \"(\");\n+ $end: str-index($image, \",\");\n+ $first-val: str-slice($image, $start + 1, $end - 1);\n+\n+ $prefix: str-slice($image, 0, $start);\n+ $suffix: str-slice($image, $end, str-length($image));\n+\n+ $has-multiple-vals: str-index($first-val, \" \");\n+ $has-single-position: unquote(_position-flipper($first-val) + \"\");\n+ $has-angle: _is-num(str-slice($first-val, 0, 0));\n+\n+ @if $has-multiple-vals {\n+ $gradients: _linear-side-corner-parser($image, $first-val, $prefix, $suffix, $has-multiple-vals);\n+ }\n+\n+ @else if $has-single-position != \"\" {\n+ $pos: unquote($has-single-position + \"\");\n+\n+ $gradients: (\n+ webkit-image: -webkit- + $image,\n+ spec-image: $prefix + \"to \" + $pos + $suffix\n+ );\n+ }\n+\n+ @else if $has-angle {\n+ \/\/ Rotate degree for webkit\n+ $gradients: _linear-angle-parser($image, $first-val, $prefix, $suffix);\n+ }\n+\n+ @else {\n+ $gradients: (\n+ webkit-image: -webkit- + $image,\n+ spec-image: $image\n+ );\n+ }\n+\n+ @return $gradients;\n+}\ndiff --git a\/docs\/_css\/bourbon\/helpers\/_linear-side-corner-parser.scss b\/docs\/_css\/bourbon\/helpers\/_linear-side-corner-parser.scss\nnew file mode 100644\nindex 0000000000..86ad88fbb7\n--- \/dev\/null\n+++ b\/docs\/_css\/bourbon\/helpers\/_linear-side-corner-parser.scss\n@@ -0,0 +1,31 @@\n+\/\/ Private function for linear-gradient-parser\n+@function _linear-side-corner-parser($image, $first-val, $prefix, $suffix, $has-multiple-vals) {\n+ $val-1: str-slice($first-val, 0, $has-multiple-vals - 1 );\n+ $val-2: str-slice($first-val, $has-multiple-vals + 1, str-length($first-val));\n+ $val-3: null;\n+ $has-val-3: str-index($val-2, \" \");\n+\n+ @if $has-val-3 {\n+ $val-3: str-slice($val-2, $has-val-3 + 1, str-length($val-2));\n+ $val-2: str-slice($val-2, 0, $has-val-3 - 1);\n+ }\n+\n+ $pos: _position-flipper($val-1) _position-flipper($val-2) _position-flipper($val-3);\n+ $pos: unquote($pos + \"\");\n+\n+ \/\/ Use old spec for webkit\n+ @if $val-1 == \"to\" {\n+ @return (\n+ webkit-image: -webkit- + $prefix + $pos + $suffix,\n+ spec-image: $image\n+ );\n+ }\n+\n+ \/\/ Bring the code up to spec\n+ @else {\n+ @return (\n+ webkit-image: -webkit- + $image,\n+ spec-image: $prefix + \"to \" + $pos + $suffix\n+ );\n+ }\n+}\ndiff --git a\/docs\/_css\/bourbon\/helpers\/_radial-arg-parser.scss b\/docs\/_css\/bourbon\/helpers\/_radial-arg-parser.scss\nindex 3466695bdf..a3a3704af5 100644\n--- a\/docs\/_css\/bourbon\/helpers\/_radial-arg-parser.scss\n+++ b\/docs\/_css\/bourbon\/helpers\/_radial-arg-parser.scss\n@@ -22,7 +22,7 @@\n $pos: $pos nth($value, $i);\n }\n }\n- $G1: false;\n+ $G1: null;\n }\n \n \/\/ If not spec calculate correct values\n@@ -38,7 +38,7 @@\n $pos: $value;\n \n @if $pos == $G1 {\n- $G1: false;\n+ $G1: null;\n }\n }\n \n@@ -55,11 +55,11 @@\n $shape-size: $value;\n \n @if $value == $G1 {\n- $G1: false;\n+ $G1: null;\n }\n \n @else if $value == $G2 {\n- $G2: false;\n+ $G2: null;\n }\n }\n }\ndiff --git a\/docs\/_css\/bourbon\/helpers\/_radial-gradient-parser.scss b\/docs\/_css\/bourbon\/helpers\/_radial-gradient-parser.scss\nnew file mode 100644\nindex 0000000000..6dde50f064\n--- \/dev\/null\n+++ b\/docs\/_css\/bourbon\/helpers\/_radial-gradient-parser.scss\n@@ -0,0 +1,50 @@\n+@function _radial-gradient-parser($image) {\n+ $image: unquote($image);\n+ $gradients: ();\n+ $start: str-index($image, \"(\");\n+ $end: str-index($image, \",\");\n+ $first-val: str-slice($image, $start + 1, $end - 1);\n+\n+ $prefix: str-slice($image, 0, $start);\n+ $suffix: str-slice($image, $end, str-length($image));\n+\n+ $is-spec-syntax: str-index($first-val, \"at\");\n+\n+ @if $is-spec-syntax and $is-spec-syntax > 1 {\n+ $keyword: str-slice($first-val, 1, $is-spec-syntax - 2);\n+ $pos: str-slice($first-val, $is-spec-syntax + 3, str-length($first-val));\n+ $pos: append($pos, $keyword, comma);\n+\n+ $gradients: (\n+ webkit-image: -webkit- + $prefix + $pos + $suffix,\n+ spec-image: $image\n+ )\n+ }\n+\n+ @else if $is-spec-syntax == 1 {\n+ $pos: str-slice($first-val, $is-spec-syntax + 3, str-length($first-val));\n+\n+ $gradients: (\n+ webkit-image: -webkit- + $prefix + $pos + $suffix,\n+ spec-image: $image\n+ )\n+ }\n+\n+ @else if str-index($image, \"cover\") or str-index($image, \"contain\") {\n+ @warn \"Radial-gradient needs to be updated to conform to latest spec.\";\n+\n+ $gradients: (\n+ webkit-image: null,\n+ spec-image: $image\n+ )\n+ }\n+\n+ @else {\n+ $gradients: (\n+ webkit-image: -webkit- + $image,\n+ spec-image: $image\n+ )\n+ }\n+\n+ @return $gradients;\n+}\ndiff --git a\/docs\/_css\/bourbon\/helpers\/_str-to-num.scss b\/docs\/_css\/bourbon\/helpers\/_str-to-num.scss\nnew file mode 100644\nindex 0000000000..b3d616824d\n--- \/dev\/null\n+++ b\/docs\/_css\/bourbon\/helpers\/_str-to-num.scss\n@@ -0,0 +1,50 @@\n+\/\/************************************************************************\/\/\n+\/\/ Helper function for linear\/radial-gradient-parsers.\n+\/\/ Source: http:\/\/sassmeister.com\/gist\/9647408\n+\/\/************************************************************************\/\/\n+@function _str-to-num($string) {\n+ \/\/ Matrices\n+ $strings: '0' '1' '2' '3' '4' '5' '6' '7' '8' '9';\n+ $numbers: 0 1 2 3 4 5 6 7 8 9;\n+\n+ \/\/ Result\n+ $result: 0;\n+ $divider: 0;\n+ $minus: false;\n+\n+ \/\/ Looping through all characters\n+ @for $i from 1 through str-length($string) {\n+ $character: str-slice($string, $i, $i);\n+ $index: index($strings, $character);\n+\n+ @if $character == '-' {\n+ $minus: true;\n+ }\n+\n+ @else if $character == '.' {\n+ $divider: 1;\n+ }\n+\n+ @else {\n+ @if not $index {\n+ $result: if($minus, $result * -1, $result);\n+ @return _convert-units($result, str-slice($string, $i));\n+ }\n+\n+ $number: nth($numbers, $index);\n+\n+ @if $divider == 0 {\n+ $result: $result * 10;\n+ }\n+\n+ @else {\n+ \/\/ Move the decimal dot to the left\n+ $divider: $divider * 10;\n+ $number: $number \/ $divider;\n+ }\n+\n+ $result: $result + $number;\n+ }\n+ }\n+ @return if($minus, $result * -1, $result);\n+}\ndiff --git a\/docs\/_css\/bourbon\/settings\/_asset-pipeline.scss b\/docs\/_css\/bourbon\/settings\/_asset-pipeline.scss\nnew file mode 100644\nindex 0000000000..d481a6afb1\n--- \/dev\/null\n+++ b\/docs\/_css\/bourbon\/settings\/_asset-pipeline.scss\n@@ -0,0 +1 @@\n+$asset-pipeline: false !default;\ndiff --git a\/docs\/_css\/bourbon\/settings\/_prefixer.scss b\/docs\/_css\/bourbon\/settings\/_prefixer.scss\nnew file mode 100644\nindex 0000000000..ecab49fb54\n--- \/dev\/null\n+++ b\/docs\/_css\/bourbon\/settings\/_prefixer.scss\n@@ -0,0 +1,6 @@\n+\/\/ Variable settings for \/addons\/prefixer.scss\n+$prefix-for-webkit: true !default;\n+$prefix-for-mozilla: true !default;\n+$prefix-for-microsoft: true !default;\n+$prefix-for-opera: true !default;\n+$prefix-for-spec: true !default; \/\/ required for keyframe mixin\ndiff --git a\/docs\/_css\/bourbon\/settings\/_px-to-em.scss b\/docs\/_css\/bourbon\/settings\/_px-to-em.scss\nnew file mode 100644\nindex 0000000000..f2f9a3e8de\n--- \/dev\/null\n+++ b\/docs\/_css\/bourbon\/settings\/_px-to-em.scss\n@@ -0,0 +1 @@\n+$em-base: 16px !default;\n"}

dillon1000/react

Files changed