Skip to content

Commit

Permalink
Bump to 3.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
jedfoster committed Dec 17, 2012
1 parent a7756f0 commit 4076214
Show file tree
Hide file tree
Showing 27 changed files with 170 additions and 351 deletions.
8 changes: 4 additions & 4 deletions bourbon-compass.gemspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Gem::Specification.new do |s|
# Release Specific Information
s.version = "2.1.3"
s.date = "2012-12-05"
s.version = "3.0.1"
s.date = "2012-12-07"

# Gem Details
s.name = "bourbon-compass"
Expand All @@ -18,5 +18,5 @@ Gem::Specification.new do |s|
# Gem Bookkeeping
s.rubygems_version = %q{1.3.6}
s.add_dependency("compass", [">= 0.11"])
s.add_dependency("sass", [">=3.2"])
end
s.add_dependency("sass", [">=3.2.0"])
end
3 changes: 3 additions & 0 deletions stylesheets/bourbon/_bourbon-deprecated-upcoming.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
//************************************************************************//
// These mixins/functions will be deprecated in the next MAJOR version release
//************************************************************************//
5 changes: 5 additions & 0 deletions stylesheets/bourbon/_bourbon.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// Custom Functions
@import "functions/compact";
@import "functions/deprecated-webkit-gradient";
@import "functions/flex-grid";
@import "functions/grid-width";
Expand Down Expand Up @@ -26,6 +27,7 @@
@import "css3/image-rendering";
@import "css3/inline-block";
@import "css3/linear-gradient";
@import "css3/perspective";
@import "css3/radial-gradient";
@import "css3/transform";
@import "css3/transition";
Expand All @@ -40,3 +42,6 @@
@import "addons/position";
@import "addons/prefixer";
@import "addons/timing-functions";

// Soon to be deprecated Mixins
@import "bourbon-deprecated-upcoming";
22 changes: 21 additions & 1 deletion stylesheets/bourbon/addons/_html5-input-types.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,35 @@ $inputs-list: 'input[type="email"]',
'input[type="week"]';

$unquoted-inputs-list: ();

@each $input-type in $inputs-list {
$unquoted-inputs-list: append($unquoted-inputs-list, unquote($input-type), comma);
}

$all-text-inputs: $unquoted-inputs-list;


// Hover Pseudo-class
//************************************************************************//
$all-text-inputs-hover: ();
@each $input-type in $unquoted-inputs-list {
$input-type-hover: $input-type + ":hover";
$all-text-inputs-hover: append($all-text-inputs-hover, $input-type-hover, comma);
}

// Focus Pseudo-class
//************************************************************************//
$all-text-inputs-focus: ();
@each $input-type in $unquoted-inputs-list {
$input-type-focus: $input-type + ":focus";
$all-text-inputs-focus: append($all-text-inputs-focus, $input-type-focus, comma);
}

// You must use interpolation on the variable:
// #{$all-text-inputs}
// #{$all-text-inputs-hover}
// #{$all-text-inputs-focus}

// Example
//************************************************************************//
// #{$all-text-inputs}, textarea {
// border: 1px solid red;
Expand Down
37 changes: 24 additions & 13 deletions stylesheets/bourbon/addons/_prefixer.scss
Original file line number Diff line number Diff line change
@@ -1,16 +1,27 @@
//************************************************************************//
// Default: Webkit, moz, spec
// Example: @include prefixer(border-radius, $radii, $o: true);
// Example: @include prefixer(border-radius, $radii, webkit ms spec);
//************************************************************************//
@mixin prefixer ($property, $value,
$webkit: true,
$moz: true,
$ms: false,
$o: false,
$spec: true) {
@if $webkit { -webkit-#{$property}: $value; }
@if $moz { -moz-#{$property}: $value; }
@if $ms { -ms-#{$property}: $value; }
@if $o { -o-#{$property}: $value; }
@if $spec { #{$property}: $value; }
@mixin prefixer ($property, $value, $prefixes) {

@each $prefix in $prefixes {

@if $prefix == webkit {
-webkit-#{$property}: $value;
}
@else if $prefix == moz {
-moz-#{$property}: $value;
}
@else if $prefix == ms {
-ms-#{$property}: $value;
}
@else if $prefix == o {
-o-#{$property}: $value;
}
@else if $prefix == spec {
#{$property}: $value;
}
@else {
@warn "Unrecognized prefix: #{$prefix}";
}
}
}
119 changes: 23 additions & 96 deletions stylesheets/bourbon/css3/_animation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,124 +2,51 @@
// Each of these mixins support comma separated lists of values, which allows different transitions for individual properties to be described in a single style rule. Each value in the list corresponds to the value at that same position in the other properties.

// Official animation shorthand property.
@mixin animation ($animation-1,
$animation-2: false, $animation-3: false,
$animation-4: false, $animation-5: false,
$animation-6: false, $animation-7: false,
$animation-8: false, $animation-9: false)
{
$full: compact($animation-1, $animation-2, $animation-3, $animation-4,
$animation-5, $animation-6, $animation-7, $animation-8, $animation-9);

@include prefixer(animation, $full);
@mixin animation ($animations...) {
@include prefixer(animation, $animations, webkit moz spec);
}

// Individual Animation Properties
@mixin animation-name ($name-1,
$name-2: false, $name-3: false,
$name-4: false, $name-5: false,
$name-6: false, $name-7: false,
$name-8: false, $name-9: false)
{
$full: compact($name-1, $name-2, $name-3, $name-4,
$name-5, $name-6, $name-7, $name-8, $name-9);

@include prefixer(animation-name, $full);
@mixin animation-name ($names...) {
@include prefixer(animation-name, $names, webkit moz spec);
}


@mixin animation-duration ($time-1: 0,
$time-2: false, $time-3: false,
$time-4: false, $time-5: false,
$time-6: false, $time-7: false,
$time-8: false, $time-9: false)
{
$full: compact($time-1, $time-2, $time-3, $time-4,
$time-5, $time-6, $time-7, $time-8, $time-9);

@include prefixer(animation-duration, $full);
@mixin animation-duration ($times...) {
@include prefixer(animation-duration, $times, webkit moz spec);
}


@mixin animation-timing-function ($motion-1: ease,
// ease | linear | ease-in | ease-out | ease-in-out
$motion-2: false, $motion-3: false,
$motion-4: false, $motion-5: false,
$motion-6: false, $motion-7: false,
$motion-8: false, $motion-9: false)
{
$full: compact($motion-1, $motion-2, $motion-3, $motion-4,
$motion-5, $motion-6, $motion-7, $motion-8, $motion-9);

@include prefixer(animation-timing-function, $full);
@mixin animation-timing-function ($motions...) {
// ease | linear | ease-in | ease-out | ease-in-out
@include prefixer(animation-timing-function, $motions, webkit moz spec);
}


@mixin animation-iteration-count ($value-1: 1,
// infinite | <number>
$value-2: false, $value-3: false,
$value-4: false, $value-5: false,
$value-6: false, $value-7: false,
$value-8: false, $value-9: false)
{
$full: compact($value-1, $value-2, $value-3, $value-4,
$value-5, $value-6, $value-7, $value-8, $value-9);

@include prefixer(animation-iteration-count, $full);
@mixin animation-iteration-count ($values...) {
// infinite | <number>
@include prefixer(animation-iteration-count, $values, webkit moz spec);
}


@mixin animation-direction ($direction-1: normal,
// normal | alternate
$direction-2: false, $direction-3: false,
$direction-4: false, $direction-5: false,
$direction-6: false, $direction-7: false,
$direction-8: false, $direction-9: false)
{
$full: compact($direction-1, $direction-2, $direction-3, $direction-4,
$direction-5, $direction-6, $direction-7, $direction-8, $direction-9);

@include prefixer(animation-direction, $full);
@mixin animation-direction ($directions...) {
// normal | alternate
@include prefixer(animation-direction, $directions, webkit moz spec);
}


@mixin animation-play-state ($state-1: running,
// running | paused
$state-2: false, $state-3: false,
$state-4: false, $state-5: false,
$state-6: false, $state-7: false,
$state-8: false, $state-9: false)
{
$full: compact($state-1, $state-2, $state-3, $state-4,
$state-5, $state-6, $state-7, $state-8, $state-9);

@include prefixer(animation-play-state, $full);
@mixin animation-play-state ($states...) {
// running | paused
@include prefixer(animation-play-state, $states, webkit moz spec);
}


@mixin animation-delay ($time-1: 0,
$time-2: false, $time-3: false,
$time-4: false, $time-5: false,
$time-6: false, $time-7: false,
$time-8: false, $time-9: false)
{
$full: compact($time-1, $time-2, $time-3, $time-4,
$time-5, $time-6, $time-7, $time-8, $time-9);

@include prefixer(animation-delay, $full);
@mixin animation-delay ($times...) {
@include prefixer(animation-delay, $times, webkit moz spec);
}


@mixin animation-fill-mode ($mode-1: none,
// http://goo.gl/l6ckm
// none | forwards | backwards | both
$mode-2: false, $mode-3: false,
$mode-4: false, $mode-5: false,
$mode-6: false, $mode-7: false,
$mode-8: false, $mode-9: false)
{
$full: compact($mode-1, $mode-2, $mode-3, $mode-4,
$mode-5, $mode-6, $mode-7, $mode-8, $mode-9);

@include prefixer(animation-fill-mode, $full);
@mixin animation-fill-mode ($modes...) {
// none | forwards | backwards | both
@include prefixer(animation-fill-mode, $modes, webkit moz spec);
}
2 changes: 1 addition & 1 deletion stylesheets/bourbon/css3/_appearance.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@mixin appearance ($value) {
@include prefixer(appearance, $value, webkit, moz, ms, o);
@include prefixer(appearance, $value, webkit moz ms o spec);
}
17 changes: 2 additions & 15 deletions stylesheets/bourbon/css3/_background-image.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,7 @@
// gradients, or for stringing multiple gradients together.
//************************************************************************//

@mixin background-image(
$image-1 , $image-2: false,
$image-3: false, $image-4: false,
$image-5: false, $image-6: false,
$image-7: false, $image-8: false,
$image-9: false, $image-10: false
) {
$images: compact($image-1, $image-2,
$image-3, $image-4,
$image-5, $image-6,
$image-7, $image-8,
$image-9, $image-10);

@mixin background-image($images...) {
background-image: add-prefix($images, webkit);
background-image: add-prefix($images, moz);
background-image: add-prefix($images, ms);
Expand Down Expand Up @@ -48,10 +36,9 @@
}



//Examples:
//@include background-image(linear-gradient(top, orange, red));
//@include background-image(radial-gradient(50% 50%, cover circle, orange, red));
//@include background-image(url("/images/a.png"), linear-gradient(orange, red));
//@include background-image(url("image.png"), linear-gradient(orange, red), url("image.png"));
//@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);
//@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));
12 changes: 2 additions & 10 deletions stylesheets/bourbon/css3/_background-size.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
@mixin background-size ($length-1,
$length-2: false, $length-3: false,
$length-4: false, $length-5: false,
$length-6: false, $length-7: false,
$length-8: false, $length-9: false)
{
$full: compact($length-1, $length-2, $length-3, $length-4,
$length-5, $length-6, $length-7, $length-8, $length-9);

@include prefixer(background-size, $full, webkit, moz, ms, o);
@mixin background-size ($lengths...) {
@include prefixer(background-size, $lengths, webkit moz ms o spec);
}
50 changes: 14 additions & 36 deletions stylesheets/bourbon/css3/_border-radius.scss
Original file line number Diff line number Diff line change
@@ -1,44 +1,22 @@
@mixin border-radius ($radii) {
@include prefixer(border-radius, $radii, webkit, not moz);
@warn "border-radius mixin is deprecated and will be removed in the next major version release.";
}

@mixin border-top-left-radius($radii) {
@include prefixer(border-top-left-radius, $radii, webkit, not moz);
@warn "border-top-left-radius mixin is deprecated and will be removed in the next major version release.";
}

@mixin border-top-right-radius($radii) {
@include prefixer(border-top-right-radius, $radii, webkit, not moz);
@warn "border-top-right-radius mixin is deprecated and will be removed in the next major version release.";
}

@mixin border-bottom-left-radius($radii) {
@include prefixer(border-bottom-left-radius, $radii, webkit, not moz);
@warn "border-bottom-left-radius mixin is deprecated and will be removed in the next major version release.";
}

@mixin border-bottom-right-radius($radii) {
@include prefixer(border-bottom-right-radius, $radii, webkit, not moz);
@warn "border-bottom-right-radius mixin is deprecated and will be removed in the next major version release.";
}

//************************************************************************//
// Shorthand Border-radius mixins
//************************************************************************//
@mixin border-top-radius($radii) {
@include border-top-left-radius($radii);
@include border-top-right-radius($radii);
}

@mixin border-right-radius($radii) {
@include border-top-right-radius($radii);
@include border-bottom-right-radius($radii);
@include prefixer(border-top-left-radius, $radii, spec);
@include prefixer(border-top-right-radius, $radii, spec);
}

@mixin border-bottom-radius($radii) {
@include border-bottom-left-radius($radii);
@include border-bottom-right-radius($radii);
@include prefixer(border-bottom-left-radius, $radii, spec);
@include prefixer(border-bottom-right-radius, $radii, spec);
}

@mixin border-left-radius($radii) {
@include border-top-left-radius($radii);
@include border-bottom-left-radius($radii);
@include prefixer(border-top-left-radius, $radii, spec);
@include prefixer(border-bottom-left-radius, $radii, spec);
}

@mixin border-right-radius($radii) {
@include prefixer(border-top-right-radius, $radii, spec);
@include prefixer(border-bottom-right-radius, $radii, spec);
}
13 changes: 2 additions & 11 deletions stylesheets/bourbon/css3/_box-shadow.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
// Box-Shadow Mixin Requires Sass v3.1.1+
@mixin box-shadow ($shadow-1,
$shadow-2: false, $shadow-3: false,
$shadow-4: false, $shadow-5: false,
$shadow-6: false, $shadow-7: false,
$shadow-8: false, $shadow-9: false)
{
$full: compact($shadow-1, $shadow-2, $shadow-3, $shadow-4,
$shadow-5, $shadow-6, $shadow-7, $shadow-8, $shadow-9);

@include prefixer(box-shadow, $full, webkit, not moz);
@mixin box-shadow ($shadows...) {
@include prefixer(box-shadow, $shadows, webkit spec);
}
Loading

0 comments on commit 4076214

Please sign in to comment.