Merge branch 'release/2.0.2.2'

mjonuschat · mjonuschat · commit b969d67b5ce8 · 2012-03-21T15:07:05.000+01:00
diff --git a/lib/bootstrap/sass/rails/version.rb b/lib/bootstrap/sass/rails/version.rb
@@ -1,7 +1,7 @@
 module Bootstrap
   module Sass
     module Rails
-      VERSION = '2.0.2.1'
+      VERSION = '2.0.2.2'
     end
   end
 end
diff --git a/vendor/assets/stylesheets/twitter/bootstrap/_labels.scss b/vendor/assets/stylesheets/twitter/bootstrap/_labels.scss
@@ -3,7 +3,7 @@
 
 // Base
 .label {
-  padding: 11x 4px 3px;
+  padding: 1px 4px 2px;
   font-size: $baseFontSize * .846;
   font-weight: bold;
   line-height: 13px; // ensure proper line-height if floated
