bootstrap-sass-rails 3.0.0.1 → 3.0.0.2

data/app/assets/stylesheets/twitter/bootstrap/_buttons.scss

@@ -54,16 +54,28 @@
 // Alternate buttons
 // --------------------------------------------------
 
-@include button-variant('.btn-default', $btn-default-color, $btn-default-bg, $btn-default-border);
-@include button-variant('.btn-primary', $btn-primary-color, $btn-primary-bg, $btn-primary-border);
+.btn-default {
+  @include button-variant($btn-default-color, $btn-default-bg, $btn-default-border);
+}
+.btn-primary {
+  @include button-variant($btn-primary-color, $btn-primary-bg, $btn-primary-border);
+}
 // Warning appears as orange
-@include button-variant('.btn-warning', $btn-warning-color, $btn-warning-bg, $btn-warning-border);
+.btn-warning {
+  @include button-variant($btn-warning-color, $btn-warning-bg, $btn-warning-border);
+}
 // Danger and error appear as red
-@include button-variant('.btn-danger', $btn-danger-color, $btn-danger-bg, $btn-danger-border);
+.btn-danger {
+  @include button-variant($btn-danger-color, $btn-danger-bg, $btn-danger-border);
+}
 // Success appears as green
-@include button-variant('.btn-success', $btn-success-color, $btn-success-bg, $btn-success-border);
+.btn-success {
+  @include button-variant($btn-success-color, $btn-success-bg, $btn-success-border);
+}
 // Info appears as blue-green
-@include button-variant('.btn-info', $btn-info-color, $btn-info-bg, $btn-info-border);
+.btn-info {
+  @include button-variant($btn-info-color, $btn-info-bg, $btn-info-border);
+}
 
 
 // Link buttons

data/app/assets/stylesheets/twitter/bootstrap/_dropdowns.scss

@@ -191,4 +191,3 @@
     }
   }
 }
-

data/app/assets/stylesheets/twitter/bootstrap/_forms.scss

@@ -223,6 +223,7 @@ input[type="checkbox"],
 }
 
 // Form control sizing
+
 @include input-size('.input-sm', $input-height-small, $padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $border-radius-small);
 
 @include input-size('.input-lg', $input-height-large, $padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $border-radius-large);

data/app/assets/stylesheets/twitter/bootstrap/_mixins.scss

@@ -120,7 +120,7 @@
   -webkit-transition-duration: $transition-duration;
           transition-duration: $transition-duration;
 }
-@mixin transition-transform($transition) {
+@mixin transition-transform($transition...) {
   -webkit-transition: -webkit-transform $transition;
      -moz-transition: -moz-transform $transition;
        -o-transition: -o-transform $transition;
@@ -283,7 +283,6 @@
   background-image: linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
 }
 
-
 // Reset filters for IE
 //
 // When you need to remove a gradient background, do not forget to use this to reset
@@ -299,7 +298,7 @@
 // Short retina mixin for setting background-image and -size
 
 @mixin img-retina($file-1x, $file-2x, $width-1x, $height-1x) {
-  background-image: url("$file-1x");
+  background-image: image-url("$file-1x");
 
   @media
   only screen and (-webkit-min-device-pixel-ratio: 2),
@@ -308,7 +307,7 @@
   only screen and (        min-device-pixel-ratio: 2),
   only screen and (                min-resolution: 192dpi),
   only screen and (                min-resolution: 2dppx) {
-    background-image: url("$file-2x");
+    background-image: image-url("$file-2x");
     background-size: $width-1x $height-1x;
   }
 }
@@ -404,29 +403,40 @@
 // -------------------------
 // Easily pump out default styles, as well as :hover, :focus, :active,
 // and disabled options for all buttons
-@mixin button-variant($parent, $color, $background, $border) {
-  #{$parent} {
+@mixin button-variant($color, $background, $border) {
+  color: $color;
+  background-color: $background;
+  border-color: $border;
+
+  &:hover,
+  &:focus,
+  &:active,
+  &.active {
     color: $color;
-    background-color: $background;
-    border-color: $border;
-  }
-  #{$parent}:hover,
-  #{$parent}:focus,
-  #{$parent}:active,
-  #{$parent}.active,
-  .open .dropdown-toggle#{$parent} {
+    background-color: darken($background, 8%);
+        border-color: darken($border, 12%);
+  }
+  .open & {
+    &.dropdown-toggle {
     color: $color;
     background-color: darken($background, 8%);
         border-color: darken($border, 12%);
+    }
+
   }
-  #{$parent}:active,
-  #{$parent}.active,
-  .open .dropdown-toggle#{$parent} {
+  &:active,
+  &.active {
     background-image: none;
   }
-  #{$parent}.disabled,
-  #{$parent}[disabled],
-  fieldset[disabled] #{$parent} {
+  .open & {
+    &.dropdown-toggle {
+    background-image: none;
+    }
+
+  }
+  &.disabled,
+  &[disabled],
+  fieldset[disabled] & {
     &,
     &:hover,
     &:focus,
@@ -708,6 +718,7 @@
 
 @mixin input-size($parent, $input-height, $padding-vertical, $padding-horizontal, $font-size, $line-height, $border-radius) {
   #{$parent} {
+
     height: $input-height;
     padding: $padding-vertical $padding-horizontal;
     font-size: $font-size;

data/app/assets/stylesheets/twitter/bootstrap/_modals.scss

@@ -10,13 +10,18 @@
 // Kill the scroll on the body
 .modal-open {
   overflow: hidden;
-}
 
 
-// Account for hiding of scrollbar
-body.modal-open,
-.modal-open .navbar-fixed-top,
-.modal-open .navbar-fixed-bottom {
+  // Account for hiding of scrollbar
+
+
+  .navbar-fixed-top,
+  .navbar-fixed-bottom {
+    margin-right: 15px
+  }
+}
+
+body.modal-open {
   margin-right: 15px
 }
 
@@ -137,5 +142,4 @@ body.modal-open,
   .modal-content {
     @include box-shadow(0 5px 15px rgba(0,0,0,.5));
   }
-
 }

data/app/assets/stylesheets/twitter/bootstrap/_navbar.scss

@@ -259,8 +259,12 @@
 // though so that navbar contents properly stack and align in mobile.
 
 @media (min-width: $grid-float-breakpoint) {
-  .navbar-left  { float: left !important; }
-  .navbar-right { float: right !important; }
+  .navbar-left {
+    float: left !important;
+  }
+  .navbar-right {
+    float: right !important;
+  }
 }
 
 

data/app/assets/stylesheets/twitter/bootstrap/_responsive-utilities.scss

@@ -39,52 +39,78 @@
 @media (max-width: $screen-xs-max) {
   @include responsive-visibility('.visible-xs');
 }
+
 @media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
   @include responsive-visibility('.visible-xs.visible-sm');
 }
+
+
 @media (min-width: $screen-md) and (max-width: $screen-md-max) {
   @include responsive-visibility('.visible-xs.visible-md');
 }
+
+
 @media (min-width: $screen-lg) {
   @include responsive-visibility('.visible-xs.visible-lg');
 }
 
+
 @include responsive-invisibility('.visible-sm');
+
 @media (max-width: $screen-xs-max) {
   @include responsive-visibility('.visible-sm.visible-xs');
 }
+
 @media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
   @include responsive-visibility('.visible-sm');
 }
+
 @media (min-width: $screen-md) and (max-width: $screen-md-max) {
   @include responsive-visibility('.visible-sm.visible-md');
 }
+
+
 @media (min-width: $screen-lg) {
   @include responsive-visibility('.visible-sm.visible-lg');
 }
+
+
 @include responsive-invisibility('.visible-md');
+
 @media (max-width: $screen-xs-max) {
   @include responsive-visibility('.visible-md.visible-xs');
 }
+
+
 @media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
   @include responsive-visibility('.visible-md.visible-sm');
 }
+
 @media (min-width: $screen-md) and (max-width: $screen-md-max) {
   @include responsive-visibility('.visible-md');
 }
+
 @media (min-width: $screen-lg) {
   @include responsive-visibility('.visible-md.visible-lg');
 }
+
+
 @include responsive-invisibility('.visible-lg');
+
 @media (max-width: $screen-xs-max) {
   @include responsive-visibility('.visible-lg.visible-xs');
 }
+
+
 @media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
   @include responsive-visibility('.visible-lg.visible-sm');
 }
+
+
 @media (min-width: $screen-md) and (max-width: $screen-md-max) {
   @include responsive-visibility('.visible-lg.visible-md');
 }
+
 @media (min-width: $screen-lg) {
   @include responsive-visibility('.visible-lg');
 }
@@ -93,59 +119,91 @@
 @media (max-width: $screen-xs-max) {
   @include responsive-invisibility('.hidden-xs');
 }
+
 @media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
   @include responsive-invisibility('.hidden-xs.hidden-sm');
 }
+
+
 @media (min-width: $screen-md) and (max-width: $screen-md-max) {
   @include responsive-invisibility('.hidden-xs.hidden-md');
 }
+
+
 @media (min-width: $screen-lg) {
   @include responsive-invisibility('.hidden-xs.hidden-lg');
 }
+
+
 @include responsive-visibility('.hidden-sm');
+
 @media (max-width: $screen-xs-max) {
   @include responsive-invisibility('.hidden-sm.hidden-xs');
 }
+
 @media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
   @include responsive-invisibility('.hidden-sm');
 }
+
 @media (min-width: $screen-md) and (max-width: $screen-md-max) {
   @include responsive-invisibility('.hidden-sm.hidden-md');
 }
+
+
 @media (min-width: $screen-lg) {
   @include responsive-invisibility('.hidden-sm.hidden-lg');
 }
+
+
 @include responsive-visibility('.hidden-md');
+
 @media (max-width: $screen-xs-max) {
   @include responsive-invisibility('.hidden-md.hidden-xs');
 }
+
+
 @media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
   @include responsive-invisibility('.hidden-md.hidden-sm');
 }
+
 @media (min-width: $screen-md) and (max-width: $screen-md-max) {
   @include responsive-invisibility('.hidden-md');
 }
+
 @media (min-width: $screen-lg) {
   @include responsive-invisibility('.hidden-md.hidden-lg');
 }
+
+
 @include responsive-visibility('.hidden-lg');
+
 @media (max-width: $screen-xs-max) {
   @include responsive-invisibility('.hidden-lg.hidden-xs');
 }
+
+
 @media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
   @include responsive-invisibility('.hidden-lg.hidden-sm');
 }
+
+
 @media (min-width: $screen-md) and (max-width: $screen-md-max) {
   @include responsive-invisibility('.hidden-lg.hidden-md');
 }
+
 @media (min-width: $screen-lg) {
   @include responsive-invisibility('.hidden-lg');
 }
 
 // Print utilities
+
 @include responsive-invisibility('.visible-print');
 
 @media print {
+
   @include responsive-visibility('.visible-print');
+
+
   @include responsive-invisibility('.hidden-print');
+
 }

data/app/assets/stylesheets/twitter/bootstrap/_tables.scss

@@ -169,9 +169,9 @@ table {
 }
 
 // Generate the contextual variants
-@include table-row-variant(success, $state-success-bg, $state-success-border);
-@include table-row-variant(danger, $state-danger-bg, $state-danger-border);
-@include table-row-variant(warning, $state-warning-bg, $state-warning-border);
+@include table-row-variant('success', $state-success-bg, $state-success-border);
+@include table-row-variant('danger', $state-danger-bg, $state-danger-border);
+@include table-row-variant('warning', $state-warning-bg, $state-warning-border);
 
 
 // Responsive tables

data/app/assets/stylesheets/twitter/bootstrap/_theme.scss

@@ -3,8 +3,8 @@
 // Load core variables and mixins
 // --------------------------------------------------
 
-$import "variables.less";
-$import "mixins.less";
+@import "twitter/bootstrap/variables";
+@import "twitter/bootstrap/mixins";
 
 
 
@@ -31,7 +31,7 @@ $import "mixins.less";
 }
 
 // Mixin for generating new styles
-@extend .btn-styles($btn-color: #555;) {
+@mixin btn-styles($btn-color: #555) {
   @include gradient-vertical($start-color: $btn-color, $end-color: darken($btn-color, 10%));
   border-color: darken($btn-color, 12%);
 
@@ -52,12 +52,12 @@ $import "mixins.less";
 }
 
 // Apply the mixin to the buttons
-.btn-default { @extend .btn-styles($btn-default-bg;); text-shadow: 0 1px 0 #fff; border-color: #ccc; }
-.btn-primary { @extend .btn-styles($btn-primary-bg); }
-.btn-success { @extend .btn-styles($btn-success-bg); }
-.btn-warning { @extend .btn-styles($btn-warning-bg); }
-.btn-danger  { @extend .btn-styles($btn-danger-bg); }
-.btn-info    { @extend .btn-styles($btn-info-bg); }
+.btn-default { @include btn-styles($btn-default-bg); text-shadow: 0 1px 0 #fff; border-color: #ccc; }
+.btn-primary { @include btn-styles($btn-primary-bg); }
+.btn-success { @include btn-styles($btn-success-bg); }
+.btn-warning { @include btn-styles($btn-warning-bg); }
+.btn-danger  { @include btn-styles($btn-danger-bg); }
+.btn-info    { @include btn-styles($btn-info-bg); }
 
 
 
@@ -93,7 +93,7 @@ $import "mixins.less";
 
 // Basic navbar
 .navbar {
-  @include gradient-vertical($start-color: lighten($navbar-default-bg, 10%), $end-color: $navbar-default-bg;);
+  @include gradient-vertical($start-color: lighten($navbar-default-bg, 10%), $end-color: $navbar-default-bg);
   border-radius: $navbar-border-radius;
   $shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075);
   @include box-shadow($shadow);
@@ -109,7 +109,7 @@ $import "mixins.less";
 
 // Inverted navbar
 .navbar-inverse {
-  @include gradient-vertical($start-color: lighten($navbar-inverse-bg, 10%), $end-color: $navbar-inverse-bg;);
+  @include gradient-vertical($start-color: lighten($navbar-inverse-bg, 10%), $end-color: $navbar-inverse-bg);
 
   .navbar-nav > .active > a {
     background-color: $navbar-inverse-bg;
@@ -142,16 +142,16 @@ $import "mixins.less";
 }
 
 // Mixin for generating new styles
-@extend .alert-styles($color) {
+@mixin alert-styles($color) {
   @include gradient-vertical($start-color: $color, $end-color: darken($color, 7.5%));
   border-color: darken($color, 15%);
 }
 
 // Apply the mixin to the alerts
-.alert-success    { @extend .alert-styles($alert-success-bg); }
-.alert-info       { @extend .alert-styles($alert-info-bg); }
-.alert-warning    { @extend .alert-styles($alert-warning-bg); }
-.alert-danger     { @extend .alert-styles($alert-danger-bg); }
+.alert-success    { @include alert-styles($alert-success-bg); }
+.alert-info       { @include alert-styles($alert-info-bg); }
+.alert-warning    { @include alert-styles($alert-warning-bg); }
+.alert-danger     { @include alert-styles($alert-danger-bg); }
 
 
 
@@ -161,20 +161,20 @@ $import "mixins.less";
 
 // Give the progress background some depth
 .progress {
-  @include gradient-vertical($start-color: darken($progress-bg, 4%), $end-color: $progress-bg;)
+  @include gradient-vertical($start-color: darken($progress-bg, 4%), $end-color: $progress-bg)
 }
 
 // Mixin for generating new styles
-@extend .progress-bar-styles($color) {
+@mixin progress-bar-styles($color) {
   @include gradient-vertical($start-color: $color, $end-color: darken($color, 10%));
 }
 
 // Apply the mixin to the progress bars
-.progress-bar            { @extend .progress-bar-styles($progress-bar-bg); }
-.progress-bar-success    { @extend .progress-bar-styles($progress-bar-success-bg); }
-.progress-bar-info       { @extend .progress-bar-styles($progress-bar-info-bg); }
-.progress-bar-warning    { @extend .progress-bar-styles($progress-bar-warning-bg); }
-.progress-bar-danger     { @extend .progress-bar-styles($progress-bar-danger-bg); }
+.progress-bar            { @include progress-bar-styles($progress-bar-bg); }
+.progress-bar-success    { @include progress-bar-styles($progress-bar-success-bg); }
+.progress-bar-info       { @include progress-bar-styles($progress-bar-info-bg); }
+.progress-bar-warning    { @include progress-bar-styles($progress-bar-warning-bg); }
+.progress-bar-danger     { @include progress-bar-styles($progress-bar-danger-bg); }
 
 
 
@@ -206,17 +206,17 @@ $import "mixins.less";
 }
 
 // Mixin for generating new styles
-@extend .panel-heading-styles($color) {
+@mixin panel-heading-styles($color) {
   @include gradient-vertical($start-color: $color, $end-color: darken($color, 5%));
 }
 
 // Apply the mixin to the panel headings only
-.panel-default > .panel-heading   { @extend .panel-heading-styles($panel-default-heading-bg); }
-.panel-primary > .panel-heading   { @extend .panel-heading-styles($panel-primary-heading-bg); }
-.panel-success > .panel-heading   { @extend .panel-heading-styles($panel-success-heading-bg); }
-.panel-info > .panel-heading      { @extend .panel-heading-styles($panel-info-heading-bg); }
-.panel-warning > .panel-heading   { @extend .panel-heading-styles($panel-warning-heading-bg); }
-.panel-danger > .panel-heading    { @extend .panel-heading-styles($panel-danger-heading-bg); }
+.panel-default > .panel-heading   { @include panel-heading-styles($panel-default-heading-bg); }
+.panel-primary > .panel-heading   { @include panel-heading-styles($panel-primary-heading-bg); }
+.panel-success > .panel-heading   { @include panel-heading-styles($panel-success-heading-bg); }
+.panel-info > .panel-heading      { @include panel-heading-styles($panel-info-heading-bg); }
+.panel-warning > .panel-heading   { @include panel-heading-styles($panel-warning-heading-bg); }
+.panel-danger > .panel-heading    { @include panel-heading-styles($panel-danger-heading-bg); }
 
 
 
@@ -225,7 +225,7 @@ $import "mixins.less";
 // --------------------------------------------------
 
 .well {
-  @include gradient-vertical($start-color: darken($well-bg, 5%), $end-color: $well-bg;);
+  @include gradient-vertical($start-color: darken($well-bg, 5%), $end-color: $well-bg);
   border-color: darken($well-bg, 10%);
   $shadow: inset 0 1px 3px rgba(0,0,0,.05), 0 1px 0 rgba(255,255,255,.1);
   @include box-shadow($shadow);

data/lib/bootstrap/sass/rails/version.rb

@@ -1,7 +1,7 @@
 module Bootstrap
   module Sass
     module Rails
-      VERSION = '3.0.0.1'
+      VERSION = '3.0.0.2'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-sass-rails
 version: !ruby/object:Gem::Version
-  version: 3.0.0.1
+  version: 3.0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -169,6 +169,7 @@ files:
 - test/cases/less_to_sass_spec.rb
 - test/cases/usage_css_spec.rb
 - test/cases/usage_js_spec.rb
+- test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/javascripts/individual.js
 - test/dummy/app/assets/stylesheets/application.css.scss
@@ -198,7 +199,6 @@ files:
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
-- test/dummy/Rakefile
 - test/dummy/script/rails
 - test/spec_helper.rb
 - test/support/helpers.rb
@@ -216,7 +216,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2878222951575493356
+      hash: 3798204253335234736
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -225,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2878222951575493356
+      hash: 3798204253335234736
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -237,6 +237,7 @@ test_files:
 - test/cases/less_to_sass_spec.rb
 - test/cases/usage_css_spec.rb
 - test/cases/usage_js_spec.rb
+- test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/javascripts/individual.js
 - test/dummy/app/assets/stylesheets/application.css.scss
@@ -266,7 +267,6 @@ test_files:
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
-- test/dummy/Rakefile
 - test/dummy/script/rails
 - test/spec_helper.rb
 - test/support/helpers.rb