From 4fbb400754986b969b40fc12eacfd332ace1a174 Mon Sep 17 00:00:00 2001 From: Giuliano Velli 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 --- 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 08b8571cb842e9fc668d9faf6c305a51523b27fb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 5 Sep 2012 10:00:57 -0700 Subject: version bump to get this started --- docs/assets/css/bootstrap-responsive.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (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 9259d26dc..17aa03a54 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -1,5 +1,5 @@ /*! - * Bootstrap Responsive v2.1.1 + * Bootstrap Responsive v2.1.2 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 -- cgit v1.2.3 From f29f98501c11678e2ecfe8fd5c842adcd5a40091 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 7 Sep 2012 11:42:21 -0700 Subject: run make after merging #5028, which removes the left margin of responsive fluid grid offsets --- docs/assets/css/bootstrap-responsive.css | 3 +++ 1 file changed, 3 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 17aa03a54..2d2d200c0 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -830,6 +830,9 @@ -moz-box-sizing: border-box; box-sizing: border-box; } + .row-fluid [class*="offset"]:first-child { + margin-left: 0; + } .input-large, .input-xlarge, .input-xxlarge, -- cgit v1.2.3 From 6881c193ca838844cacaf343d5918fb166bdd437 Mon Sep 17 00:00:00 2001 From: Mark Otto 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 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 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 From ecbb0ed4df3975d473e3c3558db322e26c6620ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Cederstro=CC=88m?= Date: Thu, 27 Sep 2012 11:44:48 +0200 Subject: Making modal work with max width 767px - fixes #4860 --- docs/assets/css/bootstrap-responsive.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (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 f1efde190..5320eadf8 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -872,8 +872,11 @@ width: auto; margin: 0; } + .modal.fade { + top: -100px; + } .modal.fade.in { - top: auto; + top: 20px; } } -- cgit v1.2.3 From e4f522990e8cbab988650a52c8af19a738d74183 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 7 Oct 2012 21:43:37 -0700 Subject: fixes #5416: use correct variable for inverse navbar responsive links --- docs/assets/css/bootstrap-responsive.css | 4 ++++ 1 file changed, 4 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 5320eadf8..dc2a2ea4b 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -1002,6 +1002,10 @@ .nav-collapse .dropdown-menu a:hover { background-color: #f2f2f2; } + .navbar-inverse .nav-collapse .nav > li > a, + .navbar-inverse .nav-collapse .dropdown-menu a { + color: #999999; + } .navbar-inverse .nav-collapse .nav > li > a:hover, .navbar-inverse .nav-collapse .dropdown-menu a:hover { background-color: #111111; -- cgit v1.2.3 From 41ad16fe406956cc8604b295ae0b5f185386c595 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 29 Oct 2012 21:00:53 -0700 Subject: v2.2.0 instead of v2.1.2 --- docs/assets/css/bootstrap-responsive.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (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 dc2a2ea4b..37235953a 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -1,5 +1,5 @@ /*! - * Bootstrap Responsive v2.1.2 + * Bootstrap Responsive v2.2.0 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 -- cgit v1.2.3