From 4fbb400754986b969b40fc12eacfd332ace1a174 Mon Sep 17 00:00:00 2001
From: Giuliano Velli <wpbrains@giusi.org>
Date: Fri, 20 Apr 2012 17:54:51 +0200
Subject: Added Medias code and documentation

Fix for Issue #1711

Added media.less and edited bootstrap.less and responsive.less to
manage media components.

Added a section to the documentation (Media, in components.html) outlining how Medias work. Edited bootstrap.css and bootstrap-responsive.css to add the code for the demos

Signed-off-by: Giuliano Velli <wpbrains@giusi.org>
---
 docs/assets/css/bootstrap-responsive.css | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'docs/assets/css/bootstrap-responsive.css')

diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index d9fa91d6c..d87edf509 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -114,6 +114,18 @@
     padding-left: 10px;
     padding-right: 10px;
   }
+  .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;
+  }
   .modal {
     position: absolute;
     top: 10px;
@@ -169,9 +181,9 @@
     width: 100%;
     min-height: 28px;
     /* Make inputs at least the height of their button counterpart */
-
+  
     /* Makes inputs behave like true block-level elements */
-
+  
     -webkit-box-sizing: border-box;
     -moz-box-sizing: border-box;
     -ms-box-sizing: border-box;
-- 
cgit v1.2.3


From 6881c193ca838844cacaf343d5918fb166bdd437 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Mon, 17 Sep 2012 16:09:36 -0700
Subject: fixes #5039: properly set .row-fluid margins for .controls-row

---
 docs/assets/css/bootstrap-responsive.css | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'docs/assets/css/bootstrap-responsive.css')

diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 2d2d200c0..63ed85f76 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -215,6 +215,9 @@
   .row-fluid [class*="span"]:first-child {
     margin-left: 0;
   }
+  .row-fluid .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 2.564102564102564%;
+  }
   .row-fluid .span12 {
     width: 100%;
     *width: 99.94680851063829%;
@@ -562,6 +565,9 @@
   .row-fluid [class*="span"]:first-child {
     margin-left: 0;
   }
+  .row-fluid .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 2.7624309392265194%;
+  }
   .row-fluid .span12 {
     width: 100%;
     *width: 99.94680851063829%;
-- 
cgit v1.2.3


From 143fef9f95daca088c1a910fccd07f2b520d8b0b Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Mon, 17 Sep 2012 18:15:39 -0700
Subject: overhaul the docs and css to merge into 2.1.2 since this was against
 master

---
 docs/assets/css/bootstrap-responsive.css | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'docs/assets/css/bootstrap-responsive.css')

diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index a0b4f4684..72814d3f7 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -901,10 +901,8 @@
     float: none;
     margin-bottom: 10px;
   }
-  .media .pull-left {
+  .media-object {
     margin-right: 0;
-  }
-  .media .pull-right {
     margin-left: 0;
   }
   .modal {
-- 
cgit v1.2.3


From f4d3d7da2e3ddbd751e053729935df1f3dd4c051 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sun, 23 Sep 2012 16:06:28 -0700
Subject: ensure 100% width for .uneditable-inputs in <767px viewports

---
 docs/assets/css/bootstrap-responsive.css | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/assets/css/bootstrap-responsive.css')

diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index 0161885af..f1efde190 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -820,6 +820,7 @@
     margin-left: 0;
   }
   [class*="span"],
+  .uneditable-input[class*="span"],
   .row-fluid [class*="span"] {
     display: block;
     float: none;
-- 
cgit v1.2.3