twitter_bootstrap_sass 0.0.2 → 0.0.3

data/CHANGELOG.md

@@ -6,3 +6,8 @@
 
 * Rename the 'app' folder 'vendor' since this is more technically
   correct.
+
+## v0.0.3
+
+* Namespace any mixins that conflict with bourbon or compass so that
+  this can be used alongside.

data/lib/twitter_bootstrap_sass/version.rb

@@ -1,3 +1,3 @@
 module TwitterBootstrapSass
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/vendor/assets/stylesheets/_twitter_bootstrap_sass.scss

@@ -9,6 +9,9 @@
  * Date: @DATE
  */
 
+// Bourbon
+@import "bourbon"
+
 // CSS Reset
 @import "twitter_bootstrap_sass/reset";
 

data/vendor/assets/stylesheets/twitter_bootstrap_sass/_forms.scss

@@ -74,7 +74,7 @@ select,
   line-height: $baseline;
   color: $gray;
   border: 1px solid #ccc;
-  @include border-radius(3px);
+  @include twitter-border-radius(3px);
 }
 
 /* mini reset for non-html5 file types */
@@ -94,7 +94,7 @@ input[type=file] {
   padding: initial;
   border: initial;
   line-height: initial;
-  @include box-shadow(none);
+  @include twitter-box-shadow(none);
 }
 
 input[type=button],
@@ -125,7 +125,7 @@ textarea {
   background-color: $white;
   display: block;
   border-color: #eee;
-  @include box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
+  @include twitter-box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
   cursor: not-allowed;
 }
 
@@ -141,20 +141,20 @@ textarea {
 input,
 textarea {
   $transition: border linear .2s, box-shadow linear .2s;
-  @include transition($transition);
-  @include box-shadow(inset 0 1px 3px rgba(0,0,0,.1));
+  @include twitter-transition($transition);
+  @include twitter-box-shadow(inset 0 1px 3px rgba(0,0,0,.1));
 }
 input:focus,
 textarea:focus {
   outline: 0;
   border-color: rgba(82,168,236,.8);
   $shadow: inset 0 1px 3px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6);
-  @include box-shadow($shadow);
+  @include twitter-box-shadow($shadow);
 }
 input[type=file]:focus,
 input[type=checkbox]:focus,
 select:focus {
-  @include box-shadow(none); // override for file inputs
+  @include twitter-box-shadow(none); // override for file inputs
   outline: 1px dotted #666; // Selet elements don't get box-shadow styles, so instead we do outline
 }
 
@@ -163,7 +163,7 @@ form div.clearfix.error {
   background: lighten($red, 57%);
   padding: 10px 0;
   margin: -10px 0 10px;
-  @include border-radius(4px);
+  @include twitter-border-radius(4px);
   $error-text: desaturate(lighten($red, 25%), 25%);
   > label,
   span.help-inline,
@@ -173,10 +173,10 @@ form div.clearfix.error {
   input,
   textarea {
     border-color: $error-text;
-    @include box-shadow(0 0 3px rgba(171,41,32,.25));
+    @include twitter-box-shadow(0 0 3px rgba(171,41,32,.25));
     &:focus {
       border-color: darken($error-text, 10%);
-      @include box-shadow(0 0 6px rgba(171,41,32,.5));
+      @include twitter-box-shadow(0 0 6px rgba(171,41,32,.5));
     }
   }
   .input-prepend,
@@ -280,7 +280,7 @@ textarea[readonly] {
   margin-bottom: $baseline;
   padding: ($baseline - 1) 20px $baseline 150px;
   border-top: 1px solid #ddd;
-  @include border-radius(0 0 3px 3px);
+  @include twitter-border-radius(0 0 3px 3px);
   .secondary-action {
     float: right;
     a {
@@ -332,7 +332,7 @@ textarea[readonly] {
 .input-prepend,
 .input-append {
   input {
-    @include border-radius(0 3px 3px 0);
+    @include twitter-border-radius(0 3px 3px 0);
   }
   .add-on {
     position: relative;
@@ -351,7 +351,7 @@ textarea[readonly] {
     color: $grayLight;
     text-align: center;
     text-shadow: 0 1px 0 $white;
-    @include border-radius(3px 0 0 3px);
+    @include twitter-border-radius(3px 0 0 3px);
   }
   .active {
     background: lighten($green, 30);
@@ -366,10 +366,10 @@ textarea[readonly] {
 .input-append {
   input {
     float: left;
-    @include border-radius(3px 0 0 3px);
+    @include twitter-border-radius(3px 0 0 3px);
   }
   .add-on {
-    @include border-radius(0 3px 3px 0);
+    @include twitter-border-radius(0 3px 3px 0);
     margin-right: 0;
     margin-left: -1px;
   }

data/vendor/assets/stylesheets/twitter_bootstrap_sass/_mixins.scss

@@ -76,7 +76,7 @@
   @include clearfix();
 }
 
-@mixin columns($columnSpan: 1) {
+@mixin twitter-columns($columnSpan: 1) {
   width: ($gridColumnWidth * $columnSpan) + ($gridGutterWidth * ($columnSpan - 1));
 }
 
@@ -94,25 +94,25 @@
 // makeColumn can be used to mark any element (e.g., .content-primary) as a column without changing markup to .span something
 @mixin makeColumn($columnSpan: 1) {
   @include gridColumn();
-  @include columns($columnSpan);
+  @include twitter-columns($columnSpan);
 }
 
 // Border Radius
-@mixin border-radius($radius: 5px) {
+@mixin twitter-border-radius($radius: 5px) {
   -webkit-border-radius: $radius;
      -moz-border-radius: $radius;
           border-radius: $radius;
 }
 
 // Drop shadows
-@mixin box-shadow($shadow: 0 1px 3px rgba(0,0,0,.25)) {
+@mixin twitter-box-shadow($shadow: 0 1px 3px rgba(0,0,0,.25)) {
   -webkit-box-shadow: $shadow;
      -moz-box-shadow: $shadow;
           box-shadow: $shadow;
 }
 
 // Transitions
-@mixin transition($transition) {
+@mixin twitter-transition($transition) {
   -webkit-transition: $transition;
      -moz-transition: $transition;
       -ms-transition: $transition;

data/vendor/assets/stylesheets/twitter_bootstrap_sass/_patterns.scss

@@ -79,10 +79,10 @@
     color: $white;
     color: rgba(255,255,255,.75);
     border: 1px solid #111;
-    @include border-radius(4px);
+    @include twitter-border-radius(4px);
     $shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.25);
-    @include box-shadow($shadow);
-    @include transition(none);
+    @include twitter-box-shadow($shadow);
+    @include twitter-transition(none);
 
     // Placeholder text gets special styles; can't be bundled together though for some reason
     &:-moz-placeholder {
@@ -106,7 +106,7 @@
       text-shadow: 0 1px 0 $white;
       border: 0;
       padding: 5px 10px;
-      @include box-shadow(0 0 3px rgba(0,0,0,.15));
+      @include twitter-box-shadow(0 0 3px rgba(0,0,0,.15));
     }
   }
 }
@@ -118,7 +118,7 @@
   background-color: #222;
   @include gradient-vertical(#333, #222);
   $shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
-  @include box-shadow($shadow);
+  @include twitter-box-shadow($shadow);
 }
 
 
@@ -258,8 +258,8 @@ a.menu:after,
   border-color: rgba(0,0,0,.2);
   border-style: solid;
   border-width: 0 1px 1px;
-  @include border-radius(0 0 6px 6px);
-  @include box-shadow(0 2px 4px rgba(0,0,0,.2));
+  @include twitter-border-radius(0 0 6px 6px);
+  @include twitter-box-shadow(0 2px 4px rgba(0,0,0,.2));
   @include background-clip(padding-box);
 
   // Unfloat any li's to make them stack
@@ -294,7 +294,7 @@ a.menu:after,
       color: $grayDark;
       text-decoration: none;
       $shadow: inset 0 1px 0 rgba(0,0,0,.025), inset 0 -1px rgba(0,0,0,.025);
-      @include box-shadow($shadow);
+      @include twitter-box-shadow($shadow);
     }
   }
 }
@@ -346,7 +346,7 @@ a.menu:after,
       margin-right: 2px;
       line-height: $baseline * 2;
       border: 1px solid transparent;
-      @include border-radius(4px 4px 0 0);
+      @include twitter-border-radius(4px 4px 0 0);
       &:hover {
         text-decoration: none;
         background-color: #eee;
@@ -365,7 +365,7 @@ a.menu:after,
   .dropdown-menu {
     top: 35px;
     border-width: 1px;
-    @include border-radius(0 6px 6px 6px);
+    @include twitter-border-radius(0 6px 6px 6px);
   }
   // first one for backwards compatibility
   a.menu:after,
@@ -396,7 +396,7 @@ a.menu:after,
     padding: 0 15px;
     text-shadow: 0 1px 1px $white;
     line-height: 30px;
-    @include border-radius(15px);
+    @include twitter-border-radius(15px);
     &:hover {
       background: $linkColorHover;
       color: $white;
@@ -430,8 +430,8 @@ a.menu:after,
   padding: 7px 14px;
   @include gradient-vertical(#ffffff, #f5f5f5);
   border: 1px solid #ddd;
-  @include border-radius(3px);
-  @include box-shadow(inset 0 1px 0 $white);
+  @include twitter-border-radius(3px);
+  @include twitter-box-shadow(inset 0 1px 0 $white);
   li {
     display: inline;
     text-shadow: 0 1px 0 $white;
@@ -455,7 +455,7 @@ a.menu:after,
   background-color: #f5f5f5;
   margin-bottom: 30px;
   padding: 60px;
-  @include border-radius(6px);
+  @include twitter-border-radius(6px);
   h1 {
     margin-bottom: 0;
     font-size: 60px;
@@ -481,7 +481,7 @@ footer {
 .page-header {
   margin-bottom: $baseline - 1;
   border-bottom: 1px solid #ddd;
-  @include box-shadow(0 1px 0 rgba(255,255,255,.5));
+  @include twitter-box-shadow(0 1px 0 rgba(255,255,255,.5));
   h1 {
     margin-bottom: ($baseline / 2) - 1px;
   }
@@ -533,9 +533,9 @@ footer {
   line-height: normal;
   border: 1px solid #ccc;
   border-bottom-color: #bbb;
-  @include border-radius(4px);
+  @include twitter-border-radius(4px);
   $shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
-  @include box-shadow($shadow);
+  @include twitter-box-shadow($shadow);
 
   &:hover {
     background-position: 0 -15px;
@@ -555,19 +555,19 @@ footer {
   }
 
    // Transitions
-  @include transition(.1s linear all);
+  @include twitter-transition(.1s linear all);
 
   // Active and Disabled states
   &:active {
     $shadow: inset 0 2px 4px rgba(0,0,0,.25), 0 1px 2px rgba(0,0,0,.05);
-    @include box-shadow($shadow);
+    @include twitter-box-shadow($shadow);
   }
   &.disabled {
     cursor: default;
     background-image: none;
     @include reset-filter();
     @include opacity(0.65);
-    @include box-shadow(none);
+    @include twitter-box-shadow(none);
   }
   &[disabled] {
     // disabled pseudo can't be included with .disabled
@@ -576,7 +576,7 @@ footer {
     background-image: none;
     @include reset-filter();
     @include opacity(0.65);
-    @include box-shadow(none);
+    @include twitter-box-shadow(none);
   }
 
   // Button Sizes
@@ -584,7 +584,7 @@ footer {
     font-size: $basefont + 2px;
     line-height: normal;
     padding: 9px 14px 9px;
-    @include border-radius(6px);
+    @include twitter-border-radius(6px);
   }
   &.small {
     padding: 7px 9px 7px;
@@ -638,8 +638,8 @@ input[type=submit].btn {
   text-shadow: 0 1px 0 rgba(255,255,255,.5);
   border-width: 1px;
   border-style: solid;
-  @include border-radius(4px);
-  @include box-shadow(inset 0 1px 0 rgba(255,255,255,.25));
+  @include twitter-border-radius(4px);
+  @include twitter-box-shadow(inset 0 1px 0 rgba(255,255,255,.25));
 
   // Adjust close icon
   .close {
@@ -660,7 +660,7 @@ input[type=submit].btn {
   }
   .btn {
     // Provide actions with buttons
-    @include box-shadow(0 1px 0 rgba(255,255,255,.25));
+    @include twitter-box-shadow(0 1px 0 rgba(255,255,255,.25));
   }
 
   &.block-message {
@@ -669,7 +669,7 @@ input[type=submit].btn {
     @include reset-filter();
     padding: 14px;
     border-color: #fceec1;
-    @include box-shadow(none);
+    @include twitter-box-shadow(none);
     ul, p {
       margin-right: 30px;
     }
@@ -715,8 +715,8 @@ input[type=submit].btn {
     margin: 0;
     border: 1px solid #ddd;
     border: 1px solid rgba(0,0,0,.15);
-    @include border-radius(3px);
-    @include box-shadow(0 1px 2px rgba(0,0,0,.05));
+    @include twitter-border-radius(3px);
+    @include twitter-box-shadow(0 1px 2px rgba(0,0,0,.05));
   }
   li {
     display: inline;
@@ -756,8 +756,8 @@ input[type=submit].btn {
   min-height: 20px;
   border: 1px solid #eee;
   border: 1px solid rgba(0,0,0,.05);
-  @include border-radius(4px);
-  @include box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
+  @include twitter-border-radius(4px);
+  @include twitter-box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
   blockquote {
     border-color: #ddd;
     border-color: rgba(0,0,0,.15);
@@ -795,12 +795,12 @@ input[type=submit].btn {
   border: 1px solid #999;
   border: 1px solid rgba(0,0,0,.3);
   *border: 1px solid #999; /* IE6-7 */
-  @include border-radius(6px);
-  @include box-shadow(0 3px 7px rgba(0,0,0,0.3));
+  @include twitter-border-radius(6px);
+  @include twitter-box-shadow(0 3px 7px rgba(0,0,0,0.3));
   @include background-clip(padding-box);
   .close { margin-top: 7px; }
   &.fade {
-    @include transition(e('opacity .3s linear, top .3s ease-out'));
+    @include twitter-transition(e('opacity .3s linear, top .3s ease-out'));
     top: -25%;
   }
   &.fade.in { top: 50%; }
@@ -816,8 +816,8 @@ input[type=submit].btn {
   background-color: #f5f5f5;
   padding: 14px 15px 15px;
   border-top: 1px solid #ddd;
-  @include border-radius(0 0 6px 6px);
-  @include box-shadow(inset 0 1px 0 $white);
+  @include twitter-border-radius(0 0 6px 6px);
+  @include twitter-box-shadow(inset 0 1px 0 $white);
   @include clearfix();
   margin-bottom: 0;
   .btn {
@@ -889,7 +889,7 @@ input[type=submit].btn {
   text-align: center;
   max-width: 200px;
   text-decoration: none;
-  @include border-radius(4px);
+  @include twitter-border-radius(4px);
 }
 .twipsy-arrow {
   position: absolute;
@@ -923,20 +923,20 @@ input[type=submit].btn {
     padding: 3px;
     overflow: hidden;
     width: 280px;
-    @include border-radius(6px);
-    @include box-shadow(0 3px 7px rgba(0,0,0,0.3));
+    @include twitter-border-radius(6px);
+    @include twitter-box-shadow(0 3px 7px rgba(0,0,0,0.3));
   }
   .title {
     background-color: #f5f5f5;
     padding: 9px 15px;
     line-height: 1;
-    @include border-radius(3px 3px 0 0);
+    @include twitter-border-radius(3px 3px 0 0);
     border-bottom:1px solid #eee;
   }
   .content {
     background-color: $white;
     padding: 14px;
-    @include border-radius(0 0 3px 3px);
+    @include twitter-border-radius(0 0 3px 3px);
     @include background-clip(padding-box);
     p, ul, ol {
       margin-bottom: 0;
@@ -949,7 +949,7 @@ input[type=submit].btn {
 // ------------------
 
 .fade {
-  @include transition(opacity .15s linear);
+  @include twitter-transition(opacity .15s linear);
   opacity: 0;
   &.in {
     opacity: 1;
@@ -967,7 +967,7 @@ input[type=submit].btn {
   font-weight: bold;
   color: $white;
   text-transform: uppercase;
-  @include border-radius(3px);
+  @include twitter-border-radius(3px);
   &.important { background-color: #c43c35; }
   &.warning   { background-color: $orange; }
   &.success   { background-color: $green; }
@@ -990,14 +990,14 @@ input[type=submit].btn {
     padding: 4px;
     margin: 0 0 20px 20px;
     border: 1px solid #ddd;
-    @include border-radius(4px);
-    @include box-shadow(0 1px 1px rgba(0,0,0,.075));
+    @include twitter-border-radius(4px);
+    @include twitter-box-shadow(0 1px 1px rgba(0,0,0,.075));
     img {
       display: block;
     }
     &:hover {
       border-color: $linkColor;
-      @include box-shadow(0 1px 4px rgba(0,105,214,.25));
+      @include twitter-box-shadow(0 1px 4px rgba(0,105,214,.25));
     }
   }
 }

data/vendor/assets/stylesheets/twitter_bootstrap_sass/_scaffolding.scss

@@ -87,32 +87,32 @@ a {
 }
 
 // Default columns
-.span1     { @include columns(1); }
-.span2     { @include columns(2); }
-.span3     { @include columns(3); }
-.span4     { @include columns(4); }
-.span5     { @include columns(5); }
-.span6     { @include columns(6); }
-.span7     { @include columns(7); }
-.span8     { @include columns(8); }
-.span9     { @include columns(9); }
-.span10    { @include columns(10); }
-.span11    { @include columns(11); }
-.span12    { @include columns(12); }
-.span13    { @include columns(13); }
-.span14    { @include columns(14); }
-.span15    { @include columns(15); }
-.span16    { @include columns(16); }
+.span1     { @include twitter-columns(1); }
+.span2     { @include twitter-columns(2); }
+.span3     { @include twitter-columns(3); }
+.span4     { @include twitter-columns(4); }
+.span5     { @include twitter-columns(5); }
+.span6     { @include twitter-columns(6); }
+.span7     { @include twitter-columns(7); }
+.span8     { @include twitter-columns(8); }
+.span9     { @include twitter-columns(9); }
+.span10    { @include twitter-columns(10); }
+.span11    { @include twitter-columns(11); }
+.span12    { @include twitter-columns(12); }
+.span13    { @include twitter-columns(13); }
+.span14    { @include twitter-columns(14); }
+.span15    { @include twitter-columns(15); }
+.span16    { @include twitter-columns(16); }
 
 // For optional 24-column grid
-.span17    { @include columns(17); }
-.span18    { @include columns(18); }
-.span19    { @include columns(19); }
-.span20    { @include columns(20); }
-.span21    { @include columns(21); }
-.span22    { @include columns(22); }
-.span23    { @include columns(23); }
-.span24    { @include columns(24); }
+.span17    { @include twitter-columns(17); }
+.span18    { @include twitter-columns(18); }
+.span19    { @include twitter-columns(19); }
+.span20    { @include twitter-columns(20); }
+.span21    { @include twitter-columns(21); }
+.span22    { @include twitter-columns(22); }
+.span23    { @include twitter-columns(23); }
+.span24    { @include twitter-columns(24); }
 
 // Offset column options
 .offset1   { @include offset(1); }

data/vendor/assets/stylesheets/twitter_bootstrap_sass/_tables.scss

@@ -15,7 +15,7 @@ table {
   *border-collapse: collapse; /* IE7, collapse table to remove spacing */
   font-size: $basefont;
   border: 1px solid #ddd;
-  @include border-radius(4px);
+  @include twitter-border-radius(4px);
   th, td {
     padding: 10px 10px 9px;
     line-height: $baseline;
@@ -38,16 +38,16 @@ table {
     border-top: 1px solid #ddd;
   }
   tbody tr:first-child td:first-child {
-    @include border-radius(4px 0 0 0);
+    @include twitter-border-radius(4px 0 0 0);
   }
   tbody tr:first-child td:last-child {
-    @include border-radius(0 4px 0 0);
+    @include twitter-border-radius(0 4px 0 0);
   }
   tbody tr:last-child td:first-child {
-    @include border-radius(0 0 0 4px);
+    @include twitter-border-radius(0 0 0 4px);
   }
   tbody tr:last-child td:last-child {
-    @include border-radius(0 0 4px 0);
+    @include twitter-border-radius(0 0 4px 0);
   }
 }
 
@@ -107,7 +107,7 @@ table {
       border-right: 4px solid transparent;
       border-top: 4px solid #000;
       visibility:visible;
-      @include box-shadow(none); //can't add boxshadow to downward facing arrow :(
+      @include twitter-box-shadow(none); //can't add boxshadow to downward facing arrow :(
       @include opacity(60);
     }
   }
@@ -168,4 +168,4 @@ table {
   .headerSortDown.purple {
     background-color: lighten($purple, 40%);
   }
-}
+}

data/vendor/assets/stylesheets/twitter_bootstrap_sass/_type.scss

@@ -163,7 +163,7 @@ code, pre {
   padding: 0 3px 2px;
   font-family: Monaco, Andale Mono, Courier New, monospace;
   font-size: 12px;
-  @include border-radius(3px);
+  @include twitter-border-radius(3px);
 }
 code {
   background-color: lighten($orange, 40%);
@@ -179,9 +179,9 @@ pre {
   font-size: 12px;
   border: 1px solid #ccc;
   border: 1px solid rgba(0,0,0,.15);
-  @include border-radius(3px);
+  @include twitter-border-radius(3px);
   white-space: pre;
   white-space: pre-wrap;
   word-wrap: break-word;
 
-}
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twitter_bootstrap_sass
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70284145260880 !ruby/object:Gem::Requirement
+  requirement: &70269394159540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70284145260880
+  version_requirements: *70269394159540
 description: To use this gem, simply import 'twitter-bootstrap-sass' into your scss
   stylesheet.
 email: