From: Mark Otto <markotto@twitter.com>
Date: Mon, 17 Sep 2012 23:43:18 +0000 (-0700)
Subject: resolve conflicts and remake
X-Git-Tag: v2.2.0^2~90^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=917b46a3430b33b7f2cde9ffe67a13aaa935e9a3;p=thirdparty%2Fbootstrap.git

resolve conflicts and remake
---

917b46a3430b33b7f2cde9ffe67a13aaa935e9a3
diff --cc docs/assets/css/bootstrap-responsive.css
index 9259d26dca,d87edf5096..a0b4f4684f
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@@ -711,348 -653,46 +711,360 @@@
    .uneditable-input {
      margin-left: 0;
    }
 -  input.span12, textarea.span12, .uneditable-input.span12 {
 -    width: 1160px;
 +  .controls-row [class*="span"] + [class*="span"] {
 +    margin-left: 20px;
    }
 -  input.span11, textarea.span11, .uneditable-input.span11 {
 -    width: 1060px;
 +  input.span12,
 +  textarea.span12,
 +  .uneditable-input.span12 {
 +    width: 710px;
 +  }
 +  input.span11,
 +  textarea.span11,
 +  .uneditable-input.span11 {
 +    width: 648px;
 +  }
 +  input.span10,
 +  textarea.span10,
 +  .uneditable-input.span10 {
 +    width: 586px;
 +  }
 +  input.span9,
 +  textarea.span9,
 +  .uneditable-input.span9 {
 +    width: 524px;
 +  }
 +  input.span8,
 +  textarea.span8,
 +  .uneditable-input.span8 {
 +    width: 462px;
 +  }
 +  input.span7,
 +  textarea.span7,
 +  .uneditable-input.span7 {
 +    width: 400px;
 +  }
 +  input.span6,
 +  textarea.span6,
 +  .uneditable-input.span6 {
 +    width: 338px;
 +  }
 +  input.span5,
 +  textarea.span5,
 +  .uneditable-input.span5 {
 +    width: 276px;
 +  }
 +  input.span4,
 +  textarea.span4,
 +  .uneditable-input.span4 {
 +    width: 214px;
 +  }
 +  input.span3,
 +  textarea.span3,
 +  .uneditable-input.span3 {
 +    width: 152px;
 +  }
 +  input.span2,
 +  textarea.span2,
 +  .uneditable-input.span2 {
 +    width: 90px;
 +  }
 +  input.span1,
 +  textarea.span1,
 +  .uneditable-input.span1 {
 +    width: 28px;
    }
 -  input.span10, textarea.span10, .uneditable-input.span10 {
 -    width: 960px;
 +}
 +
 +@media (max-width: 767px) {
 +  body {
 +    padding-right: 20px;
 +    padding-left: 20px;
    }
 -  input.span9, textarea.span9, .uneditable-input.span9 {
 -    width: 860px;
 +  .navbar-fixed-top,
 +  .navbar-fixed-bottom,
 +  .navbar-static-top {
 +    margin-right: -20px;
 +    margin-left: -20px;
    }
 -  input.span8, textarea.span8, .uneditable-input.span8 {
 -    width: 760px;
 +  .container-fluid {
 +    padding: 0;
    }
 -  input.span7, textarea.span7, .uneditable-input.span7 {
 -    width: 660px;
 +  .dl-horizontal dt {
 +    float: none;
 +    width: auto;
 +    clear: none;
 +    text-align: left;
    }
 -  input.span6, textarea.span6, .uneditable-input.span6 {
 -    width: 560px;
 +  .dl-horizontal dd {
 +    margin-left: 0;
    }
 -  input.span5, textarea.span5, .uneditable-input.span5 {
 -    width: 460px;
 +  .container {
 +    width: auto;
    }
 -  input.span4, textarea.span4, .uneditable-input.span4 {
 -    width: 360px;
 +  .row-fluid {
 +    width: 100%;
    }
 -  input.span3, textarea.span3, .uneditable-input.span3 {
 -    width: 260px;
 +  .row,
 +  .thumbnails {
 +    margin-left: 0;
    }
 -  input.span2, textarea.span2, .uneditable-input.span2 {
 -    width: 160px;
 +  .thumbnails > li {
 +    float: none;
 +    margin-left: 0;
    }
 -  input.span1, textarea.span1, .uneditable-input.span1 {
 -    width: 60px;
 +  [class*="span"],
 +  .row-fluid [class*="span"] {
 +    display: block;
 +    float: none;
 +    width: 100%;
 +    margin-left: 0;
 +    -webkit-box-sizing: border-box;
 +       -moz-box-sizing: border-box;
 +            box-sizing: border-box;
    }
 -  .thumbnails {
 -    margin-left: -30px;
 +  .span12,
 +  .row-fluid .span12 {
 +    width: 100%;
 +    -webkit-box-sizing: border-box;
 +       -moz-box-sizing: border-box;
 +            box-sizing: border-box;
    }
 -  .thumbnails > li {
 -    margin-left: 30px;
 +  .input-large,
 +  .input-xlarge,
 +  .input-xxlarge,
 +  input[class*="span"],
 +  select[class*="span"],
 +  textarea[class*="span"],
 +  .uneditable-input {
 +    display: block;
 +    width: 100%;
 +    min-height: 30px;
 +    -webkit-box-sizing: border-box;
 +       -moz-box-sizing: border-box;
 +            box-sizing: border-box;
 +  }
 +  .input-prepend input,
 +  .input-append input,
 +  .input-prepend input[class*="span"],
 +  .input-append input[class*="span"] {
 +    display: inline-block;
 +    width: auto;
 +  }
 +  .controls-row [class*="span"] + [class*="span"] {
 +    margin-left: 0;
 +  }
 +  .modal {
 +    position: fixed;
 +    top: 20px;
 +    right: 20px;
 +    left: 20px;
 +    width: auto;
 +    margin: 0;
 +  }
 +  .modal.fade.in {
 +    top: auto;
 +  }
 +}
 +
 +@media (max-width: 480px) {
 +  .nav-collapse {
 +    -webkit-transform: translate3d(0, 0, 0);
 +  }
 +  .page-header h1 small {
 +    display: block;
 +    line-height: 20px;
 +  }
 +  input[type="checkbox"],
 +  input[type="radio"] {
 +    border: 1px solid #ccc;
 +  }
 +  .form-horizontal .control-label {
 +    float: none;
 +    width: auto;
 +    padding-top: 0;
 +    text-align: left;
 +  }
 +  .form-horizontal .controls {
 +    margin-left: 0;
 +  }
 +  .form-horizontal .control-list {
 +    padding-top: 0;
 +  }
 +  .form-horizontal .form-actions {
 +    padding-right: 10px;
 +    padding-left: 10px;
 +  }
++  .media .pull-left,
++  .media .pull-right {
++    display: block;
++    float: none;
++    margin-bottom: 10px;
++  }
++  .media .pull-left {
++    margin-right: 0;
++  }
++  .media .pull-right {
++    margin-left: 0;
++  }
 +  .modal {
 +    top: 10px;
 +    right: 10px;
 +    left: 10px;
 +  }
 +  .modal-header .close {
 +    padding: 10px;
 +    margin: -10px;
 +  }
 +  .carousel-caption {
 +    position: static;
 +  }
 +}
 +
 +@media (max-width: 979px) {
 +  body {
 +    padding-top: 0;
 +  }
 +  .navbar-fixed-top,
 +  .navbar-fixed-bottom {
 +    position: static;
 +  }
 +  .navbar-fixed-top {
 +    margin-bottom: 20px;
 +  }
 +  .navbar-fixed-bottom {
 +    margin-top: 20px;
 +  }
 +  .navbar-fixed-top .navbar-inner,
 +  .navbar-fixed-bottom .navbar-inner {
 +    padding: 5px;
 +  }
 +  .navbar .container {
 +    width: auto;
 +    padding: 0;
 +  }
 +  .navbar .brand {
 +    padding-right: 10px;
 +    padding-left: 10px;
 +    margin: 0 0 0 -5px;
 +  }
 +  .nav-collapse {
 +    clear: both;
 +  }
 +  .nav-collapse .nav {
 +    float: none;
 +    margin: 0 0 10px;
 +  }
 +  .nav-collapse .nav > li {
 +    float: none;
 +  }
 +  .nav-collapse .nav > li > a {
 +    margin-bottom: 2px;
 +  }
 +  .nav-collapse .nav > .divider-vertical {
 +    display: none;
 +  }
 +  .nav-collapse .nav .nav-header {
 +    color: #777777;
 +    text-shadow: none;
 +  }
 +  .nav-collapse .nav > li > a,
 +  .nav-collapse .dropdown-menu a {
 +    padding: 9px 15px;
 +    font-weight: bold;
 +    color: #777777;
 +    -webkit-border-radius: 3px;
 +       -moz-border-radius: 3px;
 +            border-radius: 3px;
 +  }
 +  .nav-collapse .btn {
 +    padding: 4px 10px 4px;
 +    font-weight: normal;
 +    -webkit-border-radius: 4px;
 +       -moz-border-radius: 4px;
 +            border-radius: 4px;
 +  }
 +  .nav-collapse .dropdown-menu li + li a {
 +    margin-bottom: 2px;
 +  }
 +  .nav-collapse .nav > li > a:hover,
 +  .nav-collapse .dropdown-menu a:hover {
 +    background-color: #f2f2f2;
 +  }
 +  .navbar-inverse .nav-collapse .nav > li > a:hover,
 +  .navbar-inverse .nav-collapse .dropdown-menu a:hover {
 +    background-color: #111111;
 +  }
 +  .nav-collapse.in .btn-group {
 +    padding: 0;
 +    margin-top: 5px;
 +  }
 +  .nav-collapse .dropdown-menu {
 +    position: static;
 +    top: auto;
 +    left: auto;
 +    display: block;
 +    float: none;
 +    max-width: none;
 +    padding: 0;
 +    margin: 0 15px;
 +    background-color: transparent;
 +    border: none;
 +    -webkit-border-radius: 0;
 +       -moz-border-radius: 0;
 +            border-radius: 0;
 +    -webkit-box-shadow: none;
 +       -moz-box-shadow: none;
 +            box-shadow: none;
 +  }
 +  .nav-collapse .dropdown-menu:before,
 +  .nav-collapse .dropdown-menu:after {
 +    display: none;
 +  }
 +  .nav-collapse .dropdown-menu .divider {
 +    display: none;
 +  }
 +  .nav-collapse .nav > li > .dropdown-menu:before,
 +  .nav-collapse .nav > li > .dropdown-menu:after {
 +    display: none;
 +  }
 +  .nav-collapse .navbar-form,
 +  .nav-collapse .navbar-search {
 +    float: none;
 +    padding: 10px 15px;
 +    margin: 10px 0;
 +    border-top: 1px solid #f2f2f2;
 +    border-bottom: 1px solid #f2f2f2;
 +    -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
 +       -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
 +            box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
 +  }
 +  .navbar-inverse .nav-collapse .navbar-form,
 +  .navbar-inverse .nav-collapse .navbar-search {
 +    border-top-color: #111111;
 +    border-bottom-color: #111111;
 +  }
 +  .navbar .nav-collapse .nav.pull-right {
 +    float: none;
 +    margin-left: 0;
 +  }
 +  .nav-collapse,
 +  .nav-collapse.collapse {
 +    height: 0;
 +    overflow: hidden;
 +  }
 +  .navbar .btn-navbar {
 +    display: block;
 +  }
 +  .navbar-static .navbar-inner {
 +    padding-right: 10px;
 +    padding-left: 10px;
 +  }
 +}
 +
 +@media (min-width: 980px) {
 +  .nav-collapse.collapse {
 +    height: auto !important;
 +    overflow: visible !important;
    }
  }
diff --cc docs/assets/css/bootstrap.css
index 9fa6f766fc,69cc2f0bcd..5b8073bf57
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@@ -5263,43 -3556,123 +5263,120 @@@ a.thumbnail:hover 
  .thumbnail > img {
    display: block;
    max-width: 100%;
 -  margin-left: auto;
    margin-right: auto;
 +  margin-left: auto;
  }
 +
  .thumbnail .caption {
    padding: 9px;
 +  color: #555555;
  }
 +
+ .media,
+ .media-body {
+   overflow: hidden;
+   *overflow: visible;
+   zoom: 1;
+ }
++
+ .media {
+   margin-bottom: 10px;
+ }
++
+ .media .media {
+   margin-top: 20px;
+ }
++
+ .media .pull-left {
+   margin-right: 10px;
+ }
++
+ .media .pull-right {
+   margin-left: 10px;
+ }
++
+ .media .media-object {
+   display: block;
+ }
++
+ .medias {
+   margin-top: 20px;
+   margin-left: 0;
+   list-style-type: none;
+ }
++
+ .medias .media {
+   padding-bottom: 10px;
+   border-bottom: 1px solid rgba(0, 0, 0, 0.07);
+ }
 -.medias > .media:last-child {
++
++.medias > .media.last {
+   margin: 0;
+   border-bottom: none;
+ }
++
+ .medias > .media .media {
 -  margin-bottom: 0;
+   padding-bottom: 0;
++  margin-bottom: 0;
+   border-bottom: none;
+ }
++
+ .media-box {
 -  margin-bottom: 19px;
+   padding: 10px;
++  margin-bottom: 19px;
+   background-color: #fff;
+   border: 1px solid rgba(0, 0, 0, 0.09);
+   -webkit-border-radius: 4px;
 -  -moz-border-radius: 4px;
 -  border-radius: 4px;
++     -moz-border-radius: 4px;
++          border-radius: 4px;
+   -webkit-box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.1);
 -  -moz-box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.1);
 -  box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.1);
++     -moz-box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.1);
++          box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.1);
+ }
 -.label {
 -  padding: 1px 4px 2px;
 -  font-size: 10.998px;
++
++@media (max-width: 480px) {
++  .media .pull-left,
++  .media .pull-right {
++    display: block;
++    float: none;
++    margin-bottom: 10px;
++  }
++  .media .pull-left {
++    margin-right: 0;
++  }
++  .media .pull-right {
++    margin-left: 0;
++  }
++}
++
 +.label,
 +.badge {
 +  font-size: 11.844px;
    font-weight: bold;
 -  line-height: 13px;
 +  line-height: 14px;
    color: #ffffff;
 -  vertical-align: middle;
 -  white-space: nowrap;
    text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
 +  white-space: nowrap;
 +  vertical-align: baseline;
    background-color: #999999;
 -  -webkit-border-radius: 3px;
 -  -moz-border-radius: 3px;
 -  border-radius: 3px;
 -}
 -.label:hover {
 -  color: #ffffff;
 -  text-decoration: none;
 -}
 -.label-important {
 -  background-color: #b94a48;
 -}
 -.label-important:hover {
 -  background-color: #953b39;
  }
 -.label-warning {
 -  background-color: #f89406;
 -}
 -.label-warning:hover {
 -  background-color: #c67605;
 -}
 -.label-success {
 -  background-color: #468847;
 -}
 -.label-success:hover {
 -  background-color: #356635;
 -}
 -.label-info {
 -  background-color: #3a87ad;
 -}
 -.label-info:hover {
 -  background-color: #2d6987;
 -}
 -.label-inverse {
 -  background-color: #333333;
 -}
 -.label-inverse:hover {
 -  background-color: #1a1a1a;
 +
 +.label {
 +  padding: 1px 4px 2px;
 +  -webkit-border-radius: 3px;
 +     -moz-border-radius: 3px;
 +          border-radius: 3px;
  }
 +
  .badge {
    padding: 1px 9px 2px;
 -  font-size: 12.025px;
 -  font-weight: bold;
 -  white-space: nowrap;
 -  color: #ffffff;
 -  background-color: #999999;
    -webkit-border-radius: 9px;
 -  -moz-border-radius: 9px;
 -  border-radius: 9px;
 +     -moz-border-radius: 9px;
 +          border-radius: 9px;
  }
 -.badge:hover {
 +
 +a.label:hover,
 +a.badge:hover {
    color: #ffffff;
    text-decoration: none;
    cursor: pointer;
diff --cc less/bootstrap.less
index aaa3d8a6f2,4802fb4f62..0a1d2f375a
--- a/less/bootstrap.less
+++ b/less/bootstrap.less
@@@ -52,7 -52,9 +52,8 @@@
  
  // Components: Misc
  @import "thumbnails.less";
+ @import "media.less";
 -@import "labels.less";
 -@import "badges.less";
 +@import "labels-badges.less";
  @import "progress-bars.less";
  @import "accordion.less";
  @import "carousel.less";
diff --cc less/responsive-767px-max.less
index 79c7eaa82b,0000000000..322acae217
mode 100644,000000..100644
--- a/less/responsive-767px-max.less
+++ b/less/responsive-767px-max.less
@@@ -1,174 -1,0 +1,188 @@@
 +//
 +// Responsive: Landscape phone to desktop/tablet
 +// --------------------------------------------------
 +
 +
 +@media (max-width: 767px) {
 +
 +  // Padding to set content in a bit
 +  body {
 +    padding-left: 20px;
 +    padding-right: 20px;
 +  }
 +  // Negative indent the now static "fixed" navbar
 +  .navbar-fixed-top,
 +  .navbar-fixed-bottom,
 +  .navbar-static-top {
 +    margin-left: -20px;
 +    margin-right: -20px;
 +  }
 +  // Remove padding on container given explicit padding set on body
 +  .container-fluid {
 +    padding: 0;
 +  }
 +
 +  // TYPOGRAPHY
 +  // ----------
 +  // Reset horizontal dl
 +  .dl-horizontal {
 +    dt {
 +      float: none;
 +      clear: none;
 +      width: auto;
 +      text-align: left;
 +    }
 +    dd {
 +      margin-left: 0;
 +    }
 +  }
 +
 +  // GRID & CONTAINERS
 +  // -----------------
 +  // Remove width from containers
 +  .container {
 +    width: auto;
 +  }
 +  // Fluid rows
 +  .row-fluid {
 +    width: 100%;
 +  }
 +  // Undo negative margin on rows and thumbnails
 +  .row,
 +  .thumbnails {
 +    margin-left: 0;
 +  }
 +  .thumbnails > li {
 +    float: none;
 +    margin-left: 0; // Reset the default margin for all li elements when no .span* classes are present
 +  }
 +  // Make all grid-sized elements block level again
 +  [class*="span"],
 +  .row-fluid [class*="span"] {
 +    float: none;
 +    display: block;
 +    width: 100%;
 +    margin-left: 0;
 +    .box-sizing(border-box);
 +  }
 +  .span12,
 +  .row-fluid .span12 {
 +    width: 100%;
 +    .box-sizing(border-box);
 +  }
 +
 +  // FORM FIELDS
 +  // -----------
 +  // Make span* classes full width
 +  .input-large,
 +  .input-xlarge,
 +  .input-xxlarge,
 +  input[class*="span"],
 +  select[class*="span"],
 +  textarea[class*="span"],
 +  .uneditable-input {
 +    .input-block-level();
 +  }
 +  // But don't let it screw up prepend/append inputs
 +  .input-prepend input,
 +  .input-append input,
 +  .input-prepend input[class*="span"],
 +  .input-append input[class*="span"] {
 +    display: inline-block; // redeclare so they don't wrap to new lines
 +    width: auto;
 +  }
 +  .controls-row [class*="span"] + [class*="span"] {
 +    margin-left: 0;
 +  }
 +
 +  // Modals
 +  .modal {
 +    position: fixed;
 +    top:   20px;
 +    left:  20px;
 +    right: 20px;
 +    width: auto;
 +    margin: 0;
 +    &.fade.in { top: auto; }
 +  }
 +
 +}
 +
 +
 +
 +// UP TO LANDSCAPE PHONE
 +// ---------------------
 +
 +@media (max-width: 480px) {
 +
 +  // Smooth out the collapsing/expanding nav
 +  .nav-collapse {
 +    -webkit-transform: translate3d(0, 0, 0); // activate the GPU
 +  }
 +
 +  // Block level the page header small tag for readability
 +  .page-header h1 small {
 +    display: block;
 +    line-height: @baseLineHeight;
 +  }
 +
 +  // Update checkboxes for iOS
 +  input[type="checkbox"],
 +  input[type="radio"] {
 +    border: 1px solid #ccc;
 +  }
 +
 +  // Remove the horizontal form styles
 +  .form-horizontal {
 +    .control-label {
 +      float: none;
 +      width: auto;
 +      padding-top: 0;
 +      text-align: left;
 +    }
 +    // Move over all input controls and content
 +    .controls {
 +      margin-left: 0;
 +    }
 +    // Move the options list down to align with labels
 +    .control-list {
 +      padding-top: 0; // has to be padding because margin collaspes
 +    }
 +    // Move over buttons in .form-actions to align with .controls
 +    .form-actions {
 +      padding-left: 10px;
 +      padding-right: 10px;
 +    }
 +  }
 +
++  // Medias
++  .media .pull-left,
++  .media .pull-right {
++    float: none;
++    display: block;
++    margin-bottom: 10px;
++  }
++  .media .pull-left {
++    margin-right: 0;
++  }
++  .media .pull-right {
++    margin-left: 0;
++  }
++
 +  // Modals
 +  .modal {
 +    top:   10px;
 +    left:  10px;
 +    right: 10px;
 +  }
 +  .modal-header .close {
 +    padding: 10px;
 +    margin: -10px;
 +  }
 +
 +  // Carousel
 +  .carousel-caption {
 +    position: static;
 +  }
 +
 +}