Permalink
Browse files

Pull Bourbon in favor of native Bootstrap mixins for maintenance sake…

…. Update Sass Bootstrap install
  • Loading branch information...
1 parent 17eac5d commit 6ff4c3cc31cd1059f45bb7a654c3c2e3d82eac5d @javasteve99 committed Aug 9, 2012
Showing with 4 additions and 1,435 deletions.
  1. +2 −2 stylesheets/application.css
  2. +2 −2 stylesheets/sass/_variables.scss
  3. +0 −39 stylesheets/sass/bourbon/_bourbon.scss
  4. +0 −273 stylesheets/sass/bourbon/addons/_button.scss
  5. +0 −29 stylesheets/sass/bourbon/addons/_clearfix.scss
  6. +0 −12 stylesheets/sass/bourbon/addons/_font-face.scss
  7. +0 −5 stylesheets/sass/bourbon/addons/_font-family.scss
  8. +0 −15 stylesheets/sass/bourbon/addons/_hide-text.scss
  9. +0 −36 stylesheets/sass/bourbon/addons/_html5-input-types.scss
  10. +0 −42 stylesheets/sass/bourbon/addons/_position.scss
  11. +0 −32 stylesheets/sass/bourbon/addons/_timing-functions.scss
  12. +0 −125 stylesheets/sass/bourbon/css3/_animation.scss
  13. +0 −3 stylesheets/sass/bourbon/css3/_appearance.scss
  14. +0 −57 stylesheets/sass/bourbon/css3/_background-image.scss
  15. +0 −11 stylesheets/sass/bourbon/css3/_background-size.scss
  16. +0 −56 stylesheets/sass/bourbon/css3/_border-image.scss
  17. +0 −42 stylesheets/sass/bourbon/css3/_border-radius.scss
  18. +0 −12 stylesheets/sass/bourbon/css3/_box-shadow.scss
  19. +0 −4 stylesheets/sass/bourbon/css3/_box-sizing.scss
  20. +0 −47 stylesheets/sass/bourbon/css3/_columns.scss
  21. +0 −52 stylesheets/sass/bourbon/css3/_flex-box.scss
  22. +0 −8 stylesheets/sass/bourbon/css3/_inline-block.scss
  23. +0 −43 stylesheets/sass/bourbon/css3/_linear-gradient.scss
  24. +0 −12 stylesheets/sass/bourbon/css3/_prefixer.scss
  25. +0 −76 stylesheets/sass/bourbon/css3/_radial-gradient.scss
  26. +0 −11 stylesheets/sass/bourbon/css3/_transform.scss
  27. +0 −72 stylesheets/sass/bourbon/css3/_transition.scss
  28. +0 −3 stylesheets/sass/bourbon/css3/_user-select.scss
  29. +0 −44 stylesheets/sass/bourbon/functions/_deprecated-webkit-gradient.scss
  30. +0 −35 stylesheets/sass/bourbon/functions/_flex-grid.scss
  31. +0 −13 stylesheets/sass/bourbon/functions/_grid-width.scss
  32. +0 −23 stylesheets/sass/bourbon/functions/_linear-gradient.scss
  33. +0 −40 stylesheets/sass/bourbon/functions/_modular-scale.scss
  34. +0 −62 stylesheets/sass/bourbon/functions/_radial-gradient.scss
  35. +0 −14 stylesheets/sass/bourbon/functions/_render-gradients.scss
  36. +0 −9 stylesheets/sass/bourbon/functions/_tint-shade.scss
  37. +0 −22 stylesheets/sass/bourbon/functions/_transition-property-name.scss
  38. +0 −19 stylesheets/sass/bourbon/lib/bourbon.rb
  39. +0 −6 stylesheets/sass/bourbon/lib/bourbon/sass_extensions.rb
  40. +0 −13 stylesheets/sass/bourbon/lib/bourbon/sass_extensions/functions.rb
  41. +0 −14 stylesheets/sass/bourbon/lib/bourbon/sass_extensions/functions/compact.rb
@@ -1351,15 +1351,15 @@ table .span24 {
*margin-right: .3em;
line-height: 14px;
vertical-align: text-top;
- background-image: url("../images/glyphicons-halflings.png");
+ background-image: url("../img/glyphicons-halflings.png");
background-position: 14px 14px;
background-repeat: no-repeat; }
[class^="icon-"]:last-child,
[class*=" icon-"]:last-child {
*margin-left: 0; }
.icon-white {
- background-image: url("../images/glyphicons-halflings-white.png"); }
+ background-image: url("../img/glyphicons-halflings-white.png"); }
.icon-glass {
background-position: 0 0; }
@@ -127,8 +127,8 @@ $zindexModal: 1050 !default;
// Sprite icons path
// -------------------------
-$iconSpritePath: "../images/glyphicons-halflings.png" !default;
-$iconWhiteSpritePath: "../images/glyphicons-halflings-white.png" !default;
+$iconSpritePath: "../img/glyphicons-halflings.png" !default;
+$iconWhiteSpritePath: "../img/glyphicons-halflings-white.png" !default;
// Input placeholder text color
@@ -1,39 +0,0 @@
-// Custom Functions
-@import "functions/deprecated-webkit-gradient";
-@import "functions/flex-grid";
-@import "functions/grid-width";
-@import "functions/linear-gradient";
-@import "functions/modular-scale";
-@import "functions/radial-gradient";
-@import "functions/render-gradients";
-@import "functions/tint-shade";
-@import "functions/transition-property-name";
-
-// CSS3 Mixins
-@import "css3/animation";
-@import "css3/appearance";
-@import "css3/background-image";
-@import "css3/background-size";
-@import "css3/border-image";
-@import "css3/border-radius";
-@import "css3/box-shadow";
-@import "css3/box-sizing";
-@import "css3/columns";
-@import "css3/flex-box";
-@import "css3/inline-block";
-@import "css3/linear-gradient";
-@import "css3/prefixer";
-@import "css3/radial-gradient";
-@import "css3/transform";
-@import "css3/transition";
-@import "css3/user-select";
-
-// Addons & other mixins
-@import "addons/button";
-@import "addons/clearfix";
-@import "addons/font-face";
-@import "addons/font-family";
-@import "addons/hide-text";
-@import "addons/html5-input-types";
-@import "addons/position";
-@import "addons/timing-functions";
@@ -1,273 +0,0 @@
-@mixin button ($style: simple, $base-color: #4294f0) {
-
- @if type-of($style) == color {
- $base-color: $style;
- $style: simple;
- }
-
- // Grayscale button
- @if $base-color == grayscale($base-color) {
- @if $style == simple {
- @include simple($base-color, $grayscale: true);
- }
-
- @else if $style == shiny {
- @include shiny($base-color, $grayscale: true);
- }
-
- @else if $style == pill {
- @include pill($base-color, $grayscale: true);
- }
- }
-
- // Colored button
- @else {
- @if $style == simple {
- @include simple($base-color);
- }
-
- @else if $style == shiny {
- @include shiny($base-color);
- }
-
- @else if $style == pill {
- @include pill($base-color);
- }
- }
-
- &:disabled {
- opacity: 0.5;
- cursor: not-allowed;
- }
-}
-
-
-// Simple Button
-//************************************************************************//
-@mixin simple($base-color, $grayscale: false) {
- $color: hsl(0, 0, 100%);
- $border: adjust-color($base-color, $saturation: 9%, $lightness: -14%);
- $inset-shadow: adjust-color($base-color, $saturation: -8%, $lightness: 15%);
- $stop-gradient: adjust-color($base-color, $saturation: 9%, $lightness: -11%);
- $text-shadow: adjust-color($base-color, $saturation: 15%, $lightness: -18%);
-
- @if lightness($base-color) > 70% {
- $color: hsl(0, 0, 20%);
- $text-shadow: adjust-color($base-color, $saturation: 10%, $lightness: 4%);
- }
-
- @if $grayscale == true {
- $border: grayscale($border);
- $inset-shadow: grayscale($inset-shadow);
- $stop-gradient: grayscale($stop-gradient);
- $text-shadow: grayscale($text-shadow);
- }
-
- border: 1px solid $border;
- @include border-radius (3px);
- @include box-shadow (inset 0 1px 0 0 $inset-shadow);
- color: $color;
- display: inline-block;
- font-size: 11px;
- font-weight: bold;
- @include linear-gradient ($base-color, $stop-gradient);
- padding: 7px 18px;
- text-decoration: none;
- text-shadow: 0 1px 0 $text-shadow;
- -webkit-background-clip: padding-box;
-
- &:hover:not(:disabled) {
- $base-color-hover: adjust-color($base-color, $saturation: -4%, $lightness: -5%);
- $inset-shadow-hover: adjust-color($base-color, $saturation: -7%, $lightness: 5%);
- $stop-gradient-hover: adjust-color($base-color, $saturation: 8%, $lightness: -14%);
-
- @if $grayscale == true {
- $base-color-hover: grayscale($base-color-hover);
- $inset-shadow-hover: grayscale($inset-shadow-hover);
- $stop-gradient-hover: grayscale($stop-gradient-hover);
- }
-
- @include box-shadow (inset 0 1px 0 0 $inset-shadow-hover);
- cursor: pointer;
- @include linear-gradient ($base-color-hover, $stop-gradient-hover);
- }
-
- &:active:not(:disabled) {
- $border-active: adjust-color($base-color, $saturation: 9%, $lightness: -14%);
- $inset-shadow-active: adjust-color($base-color, $saturation: 7%, $lightness: -17%);
-
- @if $grayscale == true {
- $border-active: grayscale($border-active);
- $inset-shadow-active: grayscale($inset-shadow-active);
- }
-
- border: 1px solid $border-active;
- @include box-shadow (inset 0 0 8px 4px $inset-shadow-active, inset 0 0 8px 4px $inset-shadow-active, 0 1px 1px 0 #eee);
- }
-}
-
-
-// Shiny Button
-//************************************************************************//
-@mixin shiny($base-color, $grayscale: false) {
- $color: hsl(0, 0, 100%);
- $border: adjust-color($base-color, $red: -117, $green: -111, $blue: -81);
- $border-bottom: adjust-color($base-color, $red: -126, $green: -127, $blue: -122);
- $fourth-stop: adjust-color($base-color, $red: -79, $green: -70, $blue: -46);
- $inset-shadow: adjust-color($base-color, $red: 37, $green: 29, $blue: 12);
- $second-stop: adjust-color($base-color, $red: -56, $green: -50, $blue: -33);
- $text-shadow: adjust-color($base-color, $red: -140, $green: -141, $blue: -114);
- $third-stop: adjust-color($base-color, $red: -86, $green: -75, $blue: -48);
-
- @if lightness($base-color) > 70% {
- $color: hsl(0, 0, 20%);
- $text-shadow: adjust-color($base-color, $saturation: 10%, $lightness: 4%);
- }
-
- @if $grayscale == true {
- $border: grayscale($border);
- $border-bottom: grayscale($border-bottom);
- $fourth-stop: grayscale($fourth-stop);
- $inset-shadow: grayscale($inset-shadow);
- $second-stop: grayscale($second-stop);
- $text-shadow: grayscale($text-shadow);
- $third-stop: grayscale($third-stop);
- }
-
- border: 1px solid $border;
- border-bottom: 1px solid $border-bottom;
- @include border-radius(5px);
- @include box-shadow(inset 0 1px 0 0 $inset-shadow);
- color: $color;
- display: inline-block;
- font-size: 14px;
- font-weight: bold;
- @include linear-gradient(top, $base-color 0%, $second-stop 50%, $third-stop 50%, $fourth-stop 100%);
- padding: 8px 20px;
- text-align: center;
- text-decoration: none;
- text-shadow: 0 -1px 1px $text-shadow;
-
- &:hover:not(:disabled) {
- $first-stop-hover: adjust-color($base-color, $red: -13, $green: -15, $blue: -18);
- $second-stop-hover: adjust-color($base-color, $red: -66, $green: -62, $blue: -51);
- $third-stop-hover: adjust-color($base-color, $red: -93, $green: -85, $blue: -66);
- $fourth-stop-hover: adjust-color($base-color, $red: -86, $green: -80, $blue: -63);
-
- @if $grayscale == true {
- $first-stop-hover: grayscale($first-stop-hover);
- $second-stop-hover: grayscale($second-stop-hover);
- $third-stop-hover: grayscale($third-stop-hover);
- $fourth-stop-hover: grayscale($fourth-stop-hover);
- }
-
- cursor: pointer;
- @include linear-gradient(top, $first-stop-hover 0%,
- $second-stop-hover 50%,
- $third-stop-hover 50%,
- $fourth-stop-hover 100%);
- }
-
- &:active: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);
- }
-
- @include box-shadow(inset 0 0 20px 0 $inset-shadow-active, 0 1px 0 #fff);
- }
-}
-
-
-// Pill Button
-//************************************************************************//
-@mixin pill($base-color, $grayscale: false) {
- $color: hsl(0, 0, 100%);
- $border-bottom: adjust-color($base-color, $hue: 8, $saturation: -11%, $lightness: -26%);
- $border-sides: adjust-color($base-color, $hue: 4, $saturation: -21%, $lightness: -21%);
- $border-top: adjust-color($base-color, $hue: -1, $saturation: -30%, $lightness: -15%);
- $inset-shadow: adjust-color($base-color, $hue: -1, $saturation: -1%, $lightness: 7%);
- $stop-gradient: adjust-color($base-color, $hue: 8, $saturation: 14%, $lightness: -10%);
- $text-shadow: adjust-color($base-color, $hue: 5, $saturation: -19%, $lightness: -15%);
-
- @if lightness($base-color) > 70% {
- $color: hsl(0, 0, 20%);
- $text-shadow: adjust-color($base-color, $saturation: 10%, $lightness: 4%);
- }
-
- @if $grayscale == true {
- $border-bottom: grayscale($border-bottom);
- $border-sides: grayscale($border-sides);
- $border-top: grayscale($border-top);
- $inset-shadow: grayscale($inset-shadow);
- $stop-gradient: grayscale($stop-gradient);
- $text-shadow: grayscale($text-shadow);
- }
-
- border: 1px solid $border-top;
- border-color: $border-top $border-sides $border-bottom;
- @include border-radius(16px);
- @include box-shadow(inset 0 1px 0 0 $inset-shadow, 0 1px 2px 0 #b3b3b3);
- color: $color;
- display: inline-block;
- font-size: 11px;
- font-weight: normal;
- line-height: 1;
- @include linear-gradient ($base-color, $stop-gradient);
- padding: 5px 16px;
- text-align: center;
- text-decoration: none;
- text-shadow: 0 -1px 1px $text-shadow;
- -webkit-background-clip: padding-box;
-
- &:hover:not(:disabled) {
- $base-color-hover: adjust-color($base-color, $lightness: -4.5%);
- $border-bottom: adjust-color($base-color, $hue: 8, $saturation: 13.5%, $lightness: -32%);
- $border-sides: adjust-color($base-color, $hue: 4, $saturation: -2%, $lightness: -27%);
- $border-top: adjust-color($base-color, $hue: -1, $saturation: -17%, $lightness: -21%);
- $inset-shadow-hover: adjust-color($base-color, $saturation: -1%, $lightness: 3%);
- $stop-gradient-hover: adjust-color($base-color, $hue: 8, $saturation: -4%, $lightness: -15.5%);
- $text-shadow-hover: adjust-color($base-color, $hue: 5, $saturation: -5%, $lightness: -22%);
-
- @if $grayscale == true {
- $base-color-hover: grayscale($base-color-hover);
- $border-bottom: grayscale($border-bottom);
- $border-sides: grayscale($border-sides);
- $border-top: grayscale($border-top);
- $inset-shadow-hover: grayscale($inset-shadow-hover);
- $stop-gradient-hover: grayscale($stop-gradient-hover);
- $text-shadow-hover: grayscale($text-shadow-hover);
- }
-
- border: 1px solid $border-top;
- border-color: $border-top $border-sides $border-bottom;
- @include box-shadow(inset 0 1px 0 0 $inset-shadow-hover);
- cursor: pointer;
- @include linear-gradient ($base-color-hover, $stop-gradient-hover);
- text-shadow: 0 -1px 1px $text-shadow-hover;
- -webkit-background-clip: padding-box;
- }
-
- &:active: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%);
- $inset-shadow-active: adjust-color($base-color, $hue: 9, $saturation: 2%, $lightness: -21.5%);
- $text-shadow-active: adjust-color($base-color, $hue: 5, $saturation: -12%, $lightness: -21.5%);
-
- @if $grayscale == true {
- $active-color: grayscale($active-color);
- $border-active: grayscale($border-active);
- $border-bottom-active: grayscale($border-bottom-active);
- $inset-shadow-active: grayscale($inset-shadow-active);
- $text-shadow-active: grayscale($text-shadow-active);
- }
-
- background: $active-color;
- border: 1px solid $border-active;
- border-bottom: 1px solid $border-bottom-active;
- @include box-shadow(inset 0 0 6px 3px $inset-shadow-active, 0 1px 0 0 #fff);
- text-shadow: 0 -1px 1px $text-shadow-active;
- }
-}
@@ -1,29 +0,0 @@
-// Micro clearfix provides an easy way to contain floats without adding additional markup
-//
-// Example usage:
-//
-// // Contain all floats within .wrapper
-// .wrapper {
-// @include clearfix;
-// .content,
-// .sidebar {
-// float : left;
-// }
-// }
-
-@mixin clearfix {
- zoom: 1;
-
- &:before,
- &:after {
- content: "";
- display: table;
- }
-
- &:after {
- clear: both;
- }
-}
-
-// Acknowledgements
-// Micro clearfix: [Nicolas Gallagher](http://nicolasgallagher.com/micro-clearfix-hack/)
@@ -1,12 +0,0 @@
-@mixin font-face($font-family, $file-path, $weight: normal, $style: normal ) {
- @font-face {
- font-family: $font-family;
- src: url('#{$file-path}.eot');
- src: url('#{$file-path}.eot?#iefix') format('embedded-opentype'),
- url('#{$file-path}.woff') format('woff'),
- url('#{$file-path}.ttf') format('truetype'),
- url('#{$file-path}.svg##{$font-family}') format('svg');
- font-weight: $weight;
- font-style: $style;
- }
-}
@@ -1,5 +0,0 @@
-$georgia: Georgia, Cambria, "Times New Roman", Times, serif;
-$helvetica: "Helvetica Neue", Helvetica, Arial, sans-serif;
-$lucida-grande: "Lucida Grande", Tahoma, Verdana, Arial, sans-serif;
-$monospace: "Bitstream Vera Sans Mono", Consolas, Courier, monospace;
-$verdana: Verdana, Geneva, sans-serif;
Oops, something went wrong.

0 comments on commit 6ff4c3c

Please sign in to comment.