(less) Merge branch 'master' of github.com:twbs/bootstrap

Conflicts: dist/css/bootstrap.min.css
stempler · Sep 11, 2013 · 499c2e5 · 499c2e5
2 parents 4ecf502 + dfa6459
commit 499c2e5
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 14 deletions.
diff --git a/bootstrap.less b/bootstrap.less
@@ -1,13 +1,3 @@
-/*!
- * Bootstrap v3.0.0
- *
- * Copyright 2013 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world by @mdo and @fat.
- */
-
 // Core variables and mixins
 @import "variables.less";
 @import "mixins.less";

diff --git a/carousel.less b/carousel.less
@@ -195,7 +195,7 @@
   // Scale up the controls a smidge
   .carousel-control {
     .glyphicons-chevron-left,
-    .glyphicons-chevron-right
+    .glyphicons-chevron-right,
     .icon-prev,
     .icon-next {
       width: 30px;

diff --git a/code.less b/code.less
@@ -5,7 +5,9 @@
 
 // Inline and block code styles
 code,
-pre {
+kdb,
+pre,
+samp {
   font-family: @font-family-monospace;
 }
 

diff --git a/forms.less b/forms.less
@@ -355,7 +355,7 @@ input[type="checkbox"],
   }
 
   // Only right align form labels here when the columns stop stacking
-  @media (min-width: @screen-sm) {
+  @media (min-width: @screen-sm-min) {
     .control-label {
       text-align: right;
     }

diff --git a/type.less b/type.less
@@ -264,7 +264,6 @@ blockquote:after {
 
 // Addresses
 address {
-  display: block;
   margin-bottom: @line-height-computed;
   font-style: normal;
   line-height: @line-height-base;
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,9 @@ @@
     // Inline and block code styles
     code,
-    pre {
+    kdb,
+    pre,
+    samp {
       font-family: @font-family-monospace;
     }
@@ Expand Down @@