Skip to content
This repository has been archived by the owner on Sep 13, 2024. It is now read-only.

Commit

Permalink
Update bower dist
Browse files Browse the repository at this point in the history
  • Loading branch information
Phil LaPier committed Mar 20, 2014
1 parent 0249edd commit 55b18a2
Show file tree
Hide file tree
Showing 26 changed files with 553 additions and 286 deletions.
11 changes: 3 additions & 8 deletions dist/_bourbon-deprecated-upcoming.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,7 @@
// These mixins/functions are deprecated
// They will be removed in the next MAJOR version release
//************************************************************************//
@mixin box-shadow ($shadows...) {
@include prefixer(box-shadow, $shadows, spec);
@warn "box-shadow is deprecated and will be removed in the next major version release";
}

@mixin background-size ($lengths...) {
@include prefixer(background-size, $lengths, spec);
@warn "background-size is deprecated and will be removed in the next major version release";
@mixin inline-block {
display: inline-block;
@warn "inline-block mixin is deprecated and will be removed in the next major version release";
}
14 changes: 10 additions & 4 deletions dist/_bourbon.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,28 @@
@import "settings/px-to-em";

// Custom Helpers
@import "helpers/convert-units";
@import "helpers/gradient-positions-parser";
@import "helpers/is-num";
@import "helpers/linear-angle-parser";
@import "helpers/linear-gradient-parser";
@import "helpers/linear-positions-parser";
@import "helpers/linear-side-corner-parser";
@import "helpers/radial-arg-parser";
@import "helpers/radial-positions-parser";
@import "helpers/radial-gradient-parser";
@import "helpers/render-gradients";
@import "helpers/shape-size-stripper";
@import "helpers/str-to-num";

// Custom Functions
@import "functions/assign";
@import "functions/color-lightness";
@import "functions/flex-grid";
@import "functions/grid-width";
@import "functions/golden-ratio";
@import "functions/linear-gradient";
@import "functions/grid-width";
@import "functions/modular-scale";
@import "functions/px-to-em";
@import "functions/radial-gradient";
@import "functions/strip-units";
@import "functions/tint-shade";
@import "functions/transition-property-name";
Expand All @@ -35,12 +41,12 @@
@import "css3/box-sizing";
@import "css3/calc";
@import "css3/columns";
@import "css3/filter";
@import "css3/flex-box";
@import "css3/font-face";
@import "css3/hyphens";
@import "css3/hidpi-media-query";
@import "css3/image-rendering";
@import "css3/inline-block";
@import "css3/keyframes";
@import "css3/linear-gradient";
@import "css3/perspective";
Expand Down
71 changes: 64 additions & 7 deletions dist/addons/_button.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@
@include pill($b-color, true, $t-size, $pad);
}

@if $type == flat and $b-color == grayscale($b-color) {
@include flat($b-color, true, $t-size, $pad);
}

// Colored button
@if $type == simple {
@include simple($b-color, false, $t-size, $pad);
Expand All @@ -83,6 +87,10 @@
@else if $type == pill {
@include pill($b-color, false, $t-size, $pad);
}

@else if $type == flat {
@include flat($b-color, false, $t-size, $pad);
}
}


Expand Down Expand Up @@ -136,7 +144,8 @@
@include linear-gradient ($base-color-hover, $stop-gradient-hover);
}

&:active:not(:disabled) {
&:active:not(:disabled),
&:focus:not(:disabled) {
$border-active: adjust-color($base-color, $saturation: 9%, $lightness: -14%);
$inset-shadow-active: adjust-color($base-color, $saturation: 7%, $lightness: -17%);

Expand All @@ -146,7 +155,7 @@
}

border: 1px solid $border-active;
box-shadow: inset 0 0 8px 4px $inset-shadow-active, inset 0 0 8px 4px $inset-shadow-active, 0 1px 1px 0 #eee;
box-shadow: inset 0 0 8px 4px $inset-shadow-active, inset 0 0 8px 4px $inset-shadow-active;
}
}

Expand Down Expand Up @@ -212,14 +221,15 @@
$fourth-stop-hover 100%);
}

&:active:not(:disabled) {
&:active:not(:disabled),
&:focus:not(:disabled) {
$inset-shadow-active: adjust-color($base-color, $red: -111, $green: -116, $blue: -122);

@if $grayscale == true {
$inset-shadow-active: grayscale($inset-shadow-active);
}

box-shadow: inset 0 0 20px 0 $inset-shadow-active, 0 1px 0 #fff;
box-shadow: inset 0 0 20px 0 $inset-shadow-active;
}
}

Expand Down Expand Up @@ -252,7 +262,7 @@
border: 1px solid $border-top;
border-color: $border-top $border-sides $border-bottom;
border-radius: 16px;
box-shadow: inset 0 1px 0 0 $inset-shadow, 0 1px 2px 0 #b3b3b3;
box-shadow: inset 0 1px 0 0 $inset-shadow;
color: $color;
display: inline-block;
font-size: $textsize;
Expand Down Expand Up @@ -293,7 +303,8 @@
background-clip: padding-box;
}

&:active:not(:disabled) {
&:active:not(:disabled),
&:focus:not(:disabled) {
$active-color: adjust-color($base-color, $hue: 4, $saturation: -12%, $lightness: -10%);
$border-active: adjust-color($base-color, $hue: 6, $saturation: -2.5%, $lightness: -30%);
$border-bottom-active: adjust-color($base-color, $hue: 11, $saturation: 6%, $lightness: -31%);
Expand All @@ -311,7 +322,53 @@
background: $active-color;
border: 1px solid $border-active;
border-bottom: 1px solid $border-bottom-active;
box-shadow: inset 0 0 6px 3px $inset-shadow-active, 0 1px 0 0 #fff;
box-shadow: inset 0 0 6px 3px $inset-shadow-active;
text-shadow: 0 -1px 1px $text-shadow-active;
}
}



// Flat Button
//************************************************************************//
@mixin flat($base-color, $grayscale: false, $textsize: inherit, $padding: 7px 18px) {
$color: hsl(0, 0, 100%);

@if is-light($base-color) {
$color: hsl(0, 0, 20%);
}

background-color: $base-color;
border-radius: 3px;
border: none;
color: $color;
display: inline-block;
font-size: inherit;
font-weight: bold;
padding: 7px 18px;
text-decoration: none;
background-clip: padding-box;

&:hover:not(:disabled){
$base-color-hover: adjust-color($base-color, $saturation: 4%, $lightness: 5%);

@if $grayscale == true {
$base-color-hover: grayscale($base-color-hover);
}

background-color: $base-color-hover;
cursor: pointer;
}

&:active:not(:disabled),
&:focus:not(:disabled) {
$base-color-active: adjust-color($base-color, $saturation: -4%, $lightness: -5%);

@if $grayscale == true {
$base-color-active: grayscale($base-color-active);
}

background-color: $base-color-active;
cursor: pointer;
}
}
10 changes: 5 additions & 5 deletions dist/addons/_position.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@mixin position ($position: relative, $coordinates: 0 0 0 0) {
@mixin position ($position: relative, $coordinates: null null null null) {

@if type-of($position) == list {
$coordinates: $position;
Expand All @@ -14,19 +14,19 @@

position: $position;

@if ($top and $top == auto) or (type-of($top) == number and not unitless($top)) {
@if ($top and $top == auto) or (type-of($top) == number) {
top: $top;
}

@if ($right and $right == auto) or (type-of($right) == number and not unitless($right)) {
@if ($right and $right == auto) or (type-of($right) == number) {
right: $right;
}

@if ($bottom and $bottom == auto) or (type-of($bottom) == number and not unitless($bottom)) {
@if ($bottom and $bottom == auto) or (type-of($bottom) == number) {
bottom: $bottom;
}

@if ($left and $left == auto) or (type-of($left) == number and not unitless($left)) {
@if ($left and $left == auto) or (type-of($left) == number) {
left: $left;
}
}
46 changes: 9 additions & 37 deletions dist/addons/_size.scss
View file
Original file line number Diff line number Diff line change
@@ -1,44 +1,16 @@
@mixin size($size) {
@if length($size) == 1 {
@if $size == auto {
width: $size;
height: $size;
}
$height: nth($size, 1);
$width: $height;

@else if unitless($size) {
width: $size + px;
height: $size + px;
}

@else if not(unitless($size)) {
width: $size;
height: $size;
}
}

// Width x Height
@if length($size) == 2 {
$width: nth($size, 1);
@if length($size) > 1 {
$height: nth($size, 2);
}

@if $width == auto {
width: $width;
}
@else if not(unitless($width)) {
width: $width;
}
@else if unitless($width) {
width: $width + px;
}
@if $height == auto or (type-of($height) == number and not unitless($height)) {
height: $height;
}

@if $height == auto {
height: $height;
}
@else if not(unitless($height)) {
height: $height;
}
@else if unitless($height) {
height: $height + px;
}
@if $width == auto or (type-of($height) == number and not unitless($width)) {
width: $width;
}
}
66 changes: 53 additions & 13 deletions dist/addons/_triangle.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,44 +2,84 @@
height: 0;
width: 0;

$width: nth($size, 1);
$height: nth($size, length($size));

$foreground-color: nth($color, 1);
$background-color: transparent !default;
@if (length($color) == 2) {
$background-color: nth($color, 2);
}

@if ($direction == up) or ($direction == down) or ($direction == right) or ($direction == left) {
border-color: transparent;
border-style: solid;
border-width: $size / 2;

$width: $width / 2;

@if $direction == up {
border-bottom-color: $color;
border-left: $width solid $background-color;
border-right: $width solid $background-color;
border-bottom: $height solid $foreground-color;

} @else if $direction == right {
border-left-color: $color;
border-top: $width solid $background-color;
border-bottom: $width solid $background-color;
border-left: $height solid $foreground-color;

} @else if $direction == down {
border-top-color: $color;
border-left: $width solid $background-color;
border-right: $width solid $background-color;
border-top: $height solid $foreground-color;

} @else if $direction == left {
border-right-color: $color;
border-top: $width solid $background-color;
border-bottom: $width solid $background-color;
border-right: $height solid $foreground-color;
}
}

@else if ($direction == up-right) or ($direction == up-left) {
border-top: $size solid $color;
border-top: $height solid $foreground-color;

@if $direction == up-right {
border-left: $size solid transparent;
border-left: $width solid $background-color;

} @else if $direction == up-left {
border-right: $size solid transparent;
border-right: $width solid $background-color;
}
}

@else if ($direction == down-right) or ($direction == down-left) {
border-bottom: $size solid $color;
border-bottom: $height solid $foreground-color;

@if $direction == down-right {
border-left: $size solid transparent;
border-left: $width solid $background-color;

} @else if $direction == down-left {
border-right: $size solid transparent;
border-right: $width solid $background-color;
}
}

@else if ($direction == inset-up) {
border-width: $height $width;
border-style: solid;
border-color: $background-color $background-color $foreground-color;
}

@else if ($direction == inset-down) {
border-width: $height $width;
border-style: solid;
border-color: $foreground-color $background-color $background-color;
}

@else if ($direction == inset-right) {
border-width: $width $height;
border-style: solid;
border-color: $background-color $background-color $background-color $foreground-color;
}

@else if ($direction == inset-left) {
border-width: $width $height;
border-style: solid;
border-color: $background-color $foreground-color $background-color $background-color;
}
}
Loading

0 comments on commit 55b18a2

Please sign in to comment.