From 8e0afbeaa42dfabb75817b7fc1c677cd372c8c43 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 14 Mar 2012 12:00:27 -0700 Subject: update hide text to h5bp technique #2586 --- docs/assets/css/bootstrap-responsive.css | 12 +++++++----- 1 file changed, 7 insertions(+), 5 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..b007300c2 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -19,9 +19,11 @@ clear: both; } .hide-text { - overflow: hidden; - text-indent: 100%; - white-space: nowrap; + border: 0; + font: 0/0 a; + text-shadow: none; + color: transparent; + background-color: transparent; } .input-block-level { display: block; @@ -169,9 +171,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 ab068f6fda525236220af6e1bf879a677ed6bfc0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Mar 2012 21:33:06 -0700 Subject: bump version numbers in css files to 2.0.3, break out responsive CSS into separate files for further customization --- docs/assets/css/bootstrap-responsive.css | 230 +++++++++++++++---------------- 1 file changed, 115 insertions(+), 115 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 b007300c2..14d7594d2 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -1,5 +1,5 @@ /*! - * Bootstrap Responsive v2.0.2 + * Bootstrap Responsive v2.0.3 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 @@ -375,120 +375,6 @@ width: 32px; } } -@media (max-width: 979px) { - body { - padding-top: 0; - } - .navbar-fixed-top { - position: static; - margin-bottom: 18px; - } - .navbar-fixed-top .navbar-inner { - padding: 5px; - } - .navbar .container { - width: auto; - padding: 0; - } - .navbar .brand { - padding-left: 10px; - padding-right: 10px; - margin: 0 0 0 -5px; - } - .navbar .nav-collapse { - clear: left; - } - .navbar .nav { - float: none; - margin: 0 0 9px; - } - .navbar .nav > li { - float: none; - } - .navbar .nav > li > a { - margin-bottom: 2px; - } - .navbar .nav > .divider-vertical { - display: none; - } - .navbar .nav .nav-header { - color: #999999; - text-shadow: none; - } - .navbar .nav > li > a, - .navbar .dropdown-menu a { - padding: 6px 15px; - font-weight: bold; - color: #999999; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - } - .navbar .dropdown-menu li + li a { - margin-bottom: 2px; - } - .navbar .nav > li > a:hover, - .navbar .dropdown-menu a:hover { - background-color: #222222; - } - .navbar .dropdown-menu { - position: static; - top: auto; - left: auto; - float: none; - display: block; - max-width: none; - margin: 0 15px; - padding: 0; - 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; - } - .navbar .dropdown-menu:before, - .navbar .dropdown-menu:after { - display: none; - } - .navbar .dropdown-menu .divider { - display: none; - } - .navbar-form, - .navbar-search { - float: none; - padding: 9px 15px; - margin: 9px 0; - border-top: 1px solid #222222; - border-bottom: 1px solid #222222; - -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 .nav.pull-right { - float: none; - margin-left: 0; - } - .navbar-static .navbar-inner { - padding-left: 10px; - padding-right: 10px; - } - .btn-navbar { - display: block; - } - .nav-collapse { - overflow: hidden; - height: 0; - } -} -@media (min-width: 980px) { - .nav-collapse.collapse { - height: auto !important; - overflow: visible !important; - } -} @media (min-width: 1200px) { .row { margin-left: -30px; @@ -686,3 +572,117 @@ margin-left: 30px; } } +@media (max-width: 979px) { + body { + padding-top: 0; + } + .navbar-fixed-top { + position: static; + margin-bottom: 18px; + } + .navbar-fixed-top .navbar-inner { + padding: 5px; + } + .navbar .container { + width: auto; + padding: 0; + } + .navbar .brand { + padding-left: 10px; + padding-right: 10px; + margin: 0 0 0 -5px; + } + .navbar .nav-collapse { + clear: left; + } + .navbar .nav { + float: none; + margin: 0 0 9px; + } + .navbar .nav > li { + float: none; + } + .navbar .nav > li > a { + margin-bottom: 2px; + } + .navbar .nav > .divider-vertical { + display: none; + } + .navbar .nav .nav-header { + color: #999999; + text-shadow: none; + } + .navbar .nav > li > a, + .navbar .dropdown-menu a { + padding: 6px 15px; + font-weight: bold; + color: #999999; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + } + .navbar .dropdown-menu li + li a { + margin-bottom: 2px; + } + .navbar .nav > li > a:hover, + .navbar .dropdown-menu a:hover { + background-color: #222222; + } + .navbar .dropdown-menu { + position: static; + top: auto; + left: auto; + float: none; + display: block; + max-width: none; + margin: 0 15px; + padding: 0; + 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; + } + .navbar .dropdown-menu:before, + .navbar .dropdown-menu:after { + display: none; + } + .navbar .dropdown-menu .divider { + display: none; + } + .navbar-form, + .navbar-search { + float: none; + padding: 9px 15px; + margin: 9px 0; + border-top: 1px solid #222222; + border-bottom: 1px solid #222222; + -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 .nav.pull-right { + float: none; + margin-left: 0; + } + .navbar-static .navbar-inner { + padding-left: 10px; + padding-right: 10px; + } + .btn-navbar { + display: block; + } + .nav-collapse { + overflow: hidden; + height: 0; + } +} +@media (min-width: 980px) { + .nav-collapse.collapse { + height: auto !important; + overflow: visible !important; + } +} -- cgit v1.2.3 From ee3fc11addc047f82b0e3629e22a9e439fb789b6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 23 Mar 2012 00:38:13 -0700 Subject: fix #2617: add negative margin to fixed-bottom navbar --- docs/assets/css/bootstrap-responsive.css | 3 ++- 1 file changed, 2 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 14d7594d2..78ce60d7f 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -140,7 +140,8 @@ padding-left: 20px; padding-right: 20px; } - .navbar-fixed-top { + .navbar-fixed-top, + .navbar-fixed-bottom { margin-left: -20px; margin-right: -20px; } -- cgit v1.2.3 From a7b8e52f8e08cc821d7324153885c085fad25c1a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 25 Mar 2012 01:12:51 -0700 Subject: Overhaul the responsive utility classes: 1. Rename file from responsive-utility-classes.less to responsive-utilities.less 2. Add additional help text around the documentation for the classes in Scaffolding 3. Remove unnecessary display values on initial classes 4. Drop block values for inherit for better support on inline and table elements 5. Make use of \!important on every class to avoid classes with more specific selectors (e.g., .span* classes for the grid) --- docs/assets/css/bootstrap-responsive.css | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 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 78ce60d7f..1ad16d6fd 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -43,49 +43,40 @@ visibility: hidden; } .visible-phone { - display: none; + display: none !important; } .visible-tablet { - display: none; -} -.visible-desktop { - display: block; -} -.hidden-phone { - display: block; -} -.hidden-tablet { - display: block; + display: none !important; } .hidden-desktop { - display: none; + display: none !important; } @media (max-width: 767px) { .visible-phone { - display: block; + display: inherit !important; } .hidden-phone { - display: none; + display: none !important; } .hidden-desktop { - display: block; + display: inherit !important; } .visible-desktop { - display: none; + display: none !important; } } @media (min-width: 768px) and (max-width: 979px) { .visible-tablet { - display: block; + display: inherit !important; } .hidden-tablet { - display: none; + display: none !important; } .hidden-desktop { - display: block; + display: inherit !important; } .visible-desktop { - display: none; + display: none !important ; } } @media (max-width: 480px) { -- cgit v1.2.3 From a62810918f8a27b5755258521422eb912a1edfd8 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 25 Mar 2012 13:33:36 -0700 Subject: fix responsive navbar --- docs/assets/css/bootstrap-responsive.css | 3 ++- 1 file changed, 2 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 1ad16d6fd..c374fb8e5 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -667,7 +667,8 @@ .btn-navbar { display: block; } - .nav-collapse { + .nav-collapse, + .nav-collapse.collapse { overflow: hidden; height: 0; } -- cgit v1.2.3 From 95c2877ffca46aa5812b0b2b2ace6608d309586d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 25 Mar 2012 16:40:51 -0700 Subject: remove > in fluid grid selectors, fix double padding issue on fluid layout and example --- docs/assets/css/bootstrap-responsive.css | 11 +++++++---- 1 file changed, 7 insertions(+), 4 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 c374fb8e5..560bd7566 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -136,6 +136,9 @@ margin-left: -20px; margin-right: -20px; } + .container-fluid { + padding: 0; + } .container { width: auto; } @@ -282,11 +285,11 @@ .row-fluid:after { clear: both; } - .row-fluid > [class*="span"] { + .row-fluid [class*="span"] { float: left; margin-left: 2.762430939%; } - .row-fluid > [class*="span"]:first-child { + .row-fluid [class*="span"]:first-child { margin-left: 0; } .row-fluid > .span12 { @@ -473,11 +476,11 @@ .row-fluid:after { clear: both; } - .row-fluid > [class*="span"] { + .row-fluid [class*="span"] { float: left; margin-left: 2.564102564%; } - .row-fluid > [class*="span"]:first-child { + .row-fluid [class*="span"]:first-child { margin-left: 0; } .row-fluid > .span12 { -- cgit v1.2.3 From 37745cd8997bdc1d0bb21c276a7aa671bb018eed Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 31 Mar 2012 00:53:38 -0700 Subject: fix fluid grid selectors to remove > in selectors --- docs/assets/css/bootstrap-responsive.css | 70 +++++++++++++++++++++----------- 1 file changed, 46 insertions(+), 24 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 560bd7566..1cd0f2185 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -286,46 +286,57 @@ clear: both; } .row-fluid [class*="span"] { + display: block; + 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; + box-sizing: border-box; float: left; margin-left: 2.762430939%; } .row-fluid [class*="span"]:first-child { margin-left: 0; } - .row-fluid > .span12 { + .row-fluid .span12 { width: 99.999999993%; } - .row-fluid > .span11 { + .row-fluid .span11 { width: 91.436464082%; } - .row-fluid > .span10 { + .row-fluid .span10 { width: 82.87292817100001%; } - .row-fluid > .span9 { + .row-fluid .span9 { width: 74.30939226%; } - .row-fluid > .span8 { + .row-fluid .span8 { width: 65.74585634900001%; } - .row-fluid > .span7 { + .row-fluid .span7 { width: 57.182320438000005%; } - .row-fluid > .span6 { + .row-fluid .span6 { width: 48.618784527%; } - .row-fluid > .span5 { + .row-fluid .span5 { width: 40.055248616%; } - .row-fluid > .span4 { + .row-fluid .span4 { width: 31.491712705%; } - .row-fluid > .span3 { + .row-fluid .span3 { width: 22.928176794%; } - .row-fluid > .span2 { + .row-fluid .span2 { width: 14.364640883%; } - .row-fluid > .span1 { + .row-fluid .span1 { width: 5.801104972%; } input, @@ -477,46 +488,57 @@ clear: both; } .row-fluid [class*="span"] { + display: block; + 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; + box-sizing: border-box; float: left; margin-left: 2.564102564%; } .row-fluid [class*="span"]:first-child { margin-left: 0; } - .row-fluid > .span12 { + .row-fluid .span12 { width: 100%; } - .row-fluid > .span11 { + .row-fluid .span11 { width: 91.45299145300001%; } - .row-fluid > .span10 { + .row-fluid .span10 { width: 82.905982906%; } - .row-fluid > .span9 { + .row-fluid .span9 { width: 74.358974359%; } - .row-fluid > .span8 { + .row-fluid .span8 { width: 65.81196581200001%; } - .row-fluid > .span7 { + .row-fluid .span7 { width: 57.264957265%; } - .row-fluid > .span6 { + .row-fluid .span6 { width: 48.717948718%; } - .row-fluid > .span5 { + .row-fluid .span5 { width: 40.170940171000005%; } - .row-fluid > .span4 { + .row-fluid .span4 { width: 31.623931624%; } - .row-fluid > .span3 { + .row-fluid .span3 { width: 23.076923077%; } - .row-fluid > .span2 { + .row-fluid .span2 { width: 14.529914530000001%; } - .row-fluid > .span1 { + .row-fluid .span1 { width: 5.982905983%; } input, -- cgit v1.2.3 From 2355fd224ddcd571765c5ad2f2242dac65789aa4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 31 Mar 2012 21:06:16 -0700 Subject: remove @shadow instances and replace with escaped values, update mixins to not use a default value at all --- docs/assets/css/bootstrap-responsive.css | 6 +++--- 1 file changed, 3 insertions(+), 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 1cd0f2185..f95e46e16 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -677,9 +677,9 @@ margin: 9px 0; border-top: 1px solid #222222; border-bottom: 1px solid #222222; - -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); + -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1); + -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1); + box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1); } .navbar .nav.pull-right { float: none; -- cgit v1.2.3 From f37d9aeaef12c3019112fa915b7bd4d927652a15 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 31 Mar 2012 21:31:01 -0700 Subject: fix #2856: make inputs using .span* classes responsive at <767px layout --- docs/assets/css/bootstrap-responsive.css | 7 +++++-- 1 file changed, 5 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 f95e46e16..a8457dc45 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -148,8 +148,8 @@ .row { margin-left: 0; } - .row > [class*="span"], - .row-fluid > [class*="span"] { + [class*="span"], + .row-fluid [class*="span"] { float: none; display: block; width: auto; @@ -174,8 +174,11 @@ -ms-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; } } -- cgit v1.2.3 From d652af10971d79cde92336700e156c63ff2c0b24 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 31 Mar 2012 23:53:54 -0700 Subject: fix #2860: truncate .dl-horizontal terms and reset to stacked for <767px layouts --- docs/assets/css/bootstrap-responsive.css | 9 +++++++++ 1 file changed, 9 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 a8457dc45..106fed157 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -139,6 +139,15 @@ .container-fluid { padding: 0; } + .dl-horizontal dt { + float: none; + clear: none; + width: auto; + text-align: left; + } + .dl-horizontal dd { + margin-left: 0; + } .container { width: auto; } -- cgit v1.2.3 From fe05f9aeb259733de4598014db9df9193cc01ea2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 1 Apr 2012 00:59:34 -0700 Subject: fix #2572: streamline thumbnails css to allow for offsets --- docs/assets/css/bootstrap-responsive.css | 6 ------ 1 file changed, 6 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 106fed157..adb1402c0 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -164,9 +164,6 @@ width: auto; margin: 0; } - .thumbnails [class*="span"] { - width: auto; - } input[class*="span"], select[class*="span"], textarea[class*="span"], @@ -597,9 +594,6 @@ .thumbnails { margin-left: -30px; } - .thumbnails > li { - margin-left: 30px; - } } @media (max-width: 979px) { body { -- cgit v1.2.3 From 647f1c98eda0f150e54e9193181acb462a3b9357 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 1 Apr 2012 01:05:00 -0700 Subject: fix #2296: allow fluid thumbnails --- 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 adb1402c0..df663f69f 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -594,6 +594,9 @@ .thumbnails { margin-left: -30px; } + .row-fluid .thumbnails { + margin-left: 0; + } } @media (max-width: 979px) { body { -- cgit v1.2.3 From 4b81c0dff371edad2afd5df77c957265235e34b1 Mon Sep 17 00:00:00 2001 From: Bryan Petty Date: Thu, 5 Apr 2012 13:48:17 -0600 Subject: Changed .nav-collapse to clear both instead of left, and added compiled files. --- docs/assets/css/bootstrap-responsive.css | 49 +++++++++++++++++++------------- 1 file changed, 30 insertions(+), 19 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 df663f69f..1e1488c62 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -619,27 +619,27 @@ margin: 0 0 0 -5px; } .navbar .nav-collapse { - clear: left; + clear: both; } - .navbar .nav { + .navbar .nav-collapse .nav { float: none; margin: 0 0 9px; } - .navbar .nav > li { + .navbar .nav-collapse .nav > li { float: none; } - .navbar .nav > li > a { + .navbar .nav-collapse .nav > li > a { margin-bottom: 2px; } - .navbar .nav > .divider-vertical { + .navbar .nav-collapse .nav > .divider-vertical { display: none; } - .navbar .nav .nav-header { + .navbar .nav-collapse .nav .nav-header { color: #999999; text-shadow: none; } - .navbar .nav > li > a, - .navbar .dropdown-menu a { + .navbar .nav-collapse .nav > li > a, + .navbar .nav-collapse .dropdown-menu a { padding: 6px 15px; font-weight: bold; color: #999999; @@ -647,14 +647,25 @@ -moz-border-radius: 3px; border-radius: 3px; } - .navbar .dropdown-menu li + li a { + .navbar .nav-collapse .btn { + padding: 4px 10px 4px; + font-weight: normal; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + } + .navbar .nav-collapse .dropdown-menu li + li a { margin-bottom: 2px; } - .navbar .nav > li > a:hover, - .navbar .dropdown-menu a:hover { + .navbar .nav-collapse .nav > li > a:hover, + .navbar .nav-collapse .dropdown-menu a:hover { background-color: #222222; } - .navbar .dropdown-menu { + .navbar .nav-collapse.in .btn-group { + margin-top: 5px; + padding: 0; + } + .navbar .nav-collapse .dropdown-menu { position: static; top: auto; left: auto; @@ -672,15 +683,15 @@ -moz-box-shadow: none; box-shadow: none; } - .navbar .dropdown-menu:before, - .navbar .dropdown-menu:after { + .navbar .nav-collapse .dropdown-menu:before, + .navbar .nav-collapse .dropdown-menu:after { display: none; } - .navbar .dropdown-menu .divider { + .navbar .nav-collapse .dropdown-menu .divider { display: none; } - .navbar-form, - .navbar-search { + .nav-collapse .navbar-form, + .nav-collapse .navbar-search { float: none; padding: 9px 15px; margin: 9px 0; @@ -690,7 +701,7 @@ -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1); box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1); } - .navbar .nav.pull-right { + .navbar .nav-collapse .nav.pull-right { float: none; margin-left: 0; } @@ -698,7 +709,7 @@ padding-left: 10px; padding-right: 10px; } - .btn-navbar { + .navbar .btn-navbar { display: block; } .nav-collapse, -- cgit v1.2.3 From 798363eda743f4e04bf8dd30964ee97f49e86a79 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Apr 2012 14:31:55 -0700 Subject: fix left margin on .thumbnails for responsive <767 --- docs/assets/css/bootstrap-responsive.css | 5 +++-- 1 file changed, 3 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 df663f69f..f730fb20c 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -154,7 +154,8 @@ .row-fluid { width: 100%; } - .row { + .row, + .thumbnails { margin-left: 0; } [class*="span"], @@ -162,7 +163,7 @@ float: none; display: block; width: auto; - margin: 0; + margin-left: 0; } input[class*="span"], select[class*="span"], -- cgit v1.2.3 From 0b2d23d4439429cdbd0758d01f4602e6b2afde6d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Apr 2012 23:41:09 -0700 Subject: add larger .input-* to block reset for responsive <767 --- 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 f730fb20c..374c77414 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -165,6 +165,9 @@ width: auto; margin-left: 0; } + .input-large, + .input-xlarge, + .input-xxlarge, input[class*="span"], select[class*="span"], textarea[class*="span"], -- cgit v1.2.3 From a6f27ebed440919aac6f62e73e6748bfecd00ab9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Apr 2012 23:06:00 -0700 Subject: ditch the .navbar in the selectors since it's the same specificity level, and thus superfluous --- docs/assets/css/bootstrap-responsive.css | 48 ++++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 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 eb85ca6c0..57e32da35 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -622,28 +622,28 @@ padding-right: 10px; margin: 0 0 0 -5px; } - .navbar .nav-collapse { + .nav-collapse { clear: both; } - .navbar .nav-collapse .nav { + .nav-collapse .nav { float: none; margin: 0 0 9px; } - .navbar .nav-collapse .nav > li { + .nav-collapse .nav > li { float: none; } - .navbar .nav-collapse .nav > li > a { + .nav-collapse .nav > li > a { margin-bottom: 2px; } - .navbar .nav-collapse .nav > .divider-vertical { + .nav-collapse .nav > .divider-vertical { display: none; } - .navbar .nav-collapse .nav .nav-header { + .nav-collapse .nav .nav-header { color: #999999; text-shadow: none; } - .navbar .nav-collapse .nav > li > a, - .navbar .nav-collapse .dropdown-menu a { + .nav-collapse .nav > li > a, + .nav-collapse .dropdown-menu a { padding: 6px 15px; font-weight: bold; color: #999999; @@ -651,25 +651,25 @@ -moz-border-radius: 3px; border-radius: 3px; } - .navbar .nav-collapse .btn { + .nav-collapse .btn { padding: 4px 10px 4px; font-weight: normal; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; } - .navbar .nav-collapse .dropdown-menu li + li a { + .nav-collapse .dropdown-menu li + li a { margin-bottom: 2px; } - .navbar .nav-collapse .nav > li > a:hover, - .navbar .nav-collapse .dropdown-menu a:hover { + .nav-collapse .nav > li > a:hover, + .nav-collapse .dropdown-menu a:hover { background-color: #222222; } - .navbar .nav-collapse.in .btn-group { + .nav-collapse.in .btn-group { margin-top: 5px; padding: 0; } - .navbar .nav-collapse .dropdown-menu { + .nav-collapse .dropdown-menu { position: static; top: auto; left: auto; @@ -687,11 +687,11 @@ -moz-box-shadow: none; box-shadow: none; } - .navbar .nav-collapse .dropdown-menu:before, - .navbar .nav-collapse .dropdown-menu:after { + .nav-collapse .dropdown-menu:before, + .nav-collapse .dropdown-menu:after { display: none; } - .navbar .nav-collapse .dropdown-menu .divider { + .nav-collapse .dropdown-menu .divider { display: none; } .nav-collapse .navbar-form, @@ -709,18 +709,18 @@ float: none; margin-left: 0; } - .navbar-static .navbar-inner { - padding-left: 10px; - padding-right: 10px; - } - .navbar .btn-navbar { - display: block; - } .nav-collapse, .nav-collapse.collapse { overflow: hidden; height: 0; } + .navbar .btn-navbar { + display: block; + } + .navbar-static .navbar-inner { + padding-left: 10px; + padding-right: 10px; + } } @media (min-width: 980px) { .nav-collapse.collapse { -- cgit v1.2.3 From 498b7d984a8182442e2f543eedff6542c628cd55 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 16 Apr 2012 15:09:05 -0700 Subject: a few property reordering things --- docs/assets/css/bootstrap-responsive.css | 20 ++------------------ 1 file changed, 2 insertions(+), 18 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 57e32da35..ae78d5235 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -19,20 +19,16 @@ clear: both; } .hide-text { - border: 0; font: 0/0 a; - text-shadow: none; color: transparent; + text-shadow: none; background-color: transparent; + border: 0; } .input-block-level { display: block; 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; @@ -175,10 +171,6 @@ display: block; 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; @@ -302,10 +294,6 @@ display: block; 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; @@ -504,10 +492,6 @@ display: block; 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 edb52a82d83d473071c20dfc4d8cb99742421950 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 18 Apr 2012 16:16:42 -0700 Subject: make bootstrap compile with Recess instead of Less --- docs/assets/css/bootstrap-responsive.css | 191 +++++++++++++++++++++---------- 1 file changed, 128 insertions(+), 63 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 ae78d5235..ab336de1e 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -7,17 +7,21 @@ * * Designed and built with all the love in the world @twitter by @mdo and @fat. */ + .clearfix { *zoom: 1; } + .clearfix:before, .clearfix:after { display: table; content: ""; } + .clearfix:after { clear: both; } + .hide-text { font: 0/0 a; color: transparent; @@ -25,28 +29,34 @@ background-color: transparent; border: 0; } + .input-block-level { display: block; width: 100%; min-height: 28px; -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; } + .hidden { display: none; visibility: hidden; } + .visible-phone { display: none !important; } + .visible-tablet { display: none !important; } + .hidden-desktop { display: none !important; } + @media (max-width: 767px) { .visible-phone { display: inherit !important; @@ -61,6 +71,7 @@ display: none !important; } } + @media (min-width: 768px) and (max-width: 979px) { .visible-tablet { display: inherit !important; @@ -75,6 +86,7 @@ display: none !important ; } } + @media (max-width: 480px) { .nav-collapse { -webkit-transform: translate3d(0, 0, 0); @@ -100,14 +112,14 @@ padding-top: 0; } .form-horizontal .form-actions { - padding-left: 10px; padding-right: 10px; + padding-left: 10px; } .modal { position: absolute; top: 10px; - left: 10px; right: 10px; + left: 10px; width: auto; margin: 0; } @@ -122,23 +134,24 @@ position: static; } } + @media (max-width: 767px) { body { - padding-left: 20px; padding-right: 20px; + padding-left: 20px; } .navbar-fixed-top, .navbar-fixed-bottom { - margin-left: -20px; margin-right: -20px; + margin-left: -20px; } .container-fluid { padding: 0; } .dl-horizontal dt { float: none; - clear: none; width: auto; + clear: none; text-align: left; } .dl-horizontal dd { @@ -156,8 +169,8 @@ } [class*="span"], .row-fluid [class*="span"] { - float: none; display: block; + float: none; width: auto; margin-left: 0; } @@ -172,9 +185,9 @@ width: 100%; min-height: 28px; -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; } .input-prepend input, .input-append input, @@ -184,6 +197,7 @@ width: auto; } } + @media (min-width: 768px) and (max-width: 979px) { .row { margin-left: -20px; @@ -292,14 +306,14 @@ } .row-fluid [class*="span"] { display: block; + float: left; width: 100%; min-height: 28px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - float: left; margin-left: 2.762430939%; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; } .row-fluid [class*="span"]:first-child { margin-left: 0; @@ -345,43 +359,68 @@ .uneditable-input { margin-left: 0; } - input.span12, textarea.span12, .uneditable-input.span12 { + input.span12, + textarea.span12, + .uneditable-input.span12 { width: 714px; } - input.span11, textarea.span11, .uneditable-input.span11 { + input.span11, + textarea.span11, + .uneditable-input.span11 { width: 652px; } - input.span10, textarea.span10, .uneditable-input.span10 { + input.span10, + textarea.span10, + .uneditable-input.span10 { width: 590px; } - input.span9, textarea.span9, .uneditable-input.span9 { + input.span9, + textarea.span9, + .uneditable-input.span9 { width: 528px; } - input.span8, textarea.span8, .uneditable-input.span8 { + input.span8, + textarea.span8, + .uneditable-input.span8 { width: 466px; } - input.span7, textarea.span7, .uneditable-input.span7 { + input.span7, + textarea.span7, + .uneditable-input.span7 { width: 404px; } - input.span6, textarea.span6, .uneditable-input.span6 { + input.span6, + textarea.span6, + .uneditable-input.span6 { width: 342px; } - input.span5, textarea.span5, .uneditable-input.span5 { + input.span5, + textarea.span5, + .uneditable-input.span5 { width: 280px; } - input.span4, textarea.span4, .uneditable-input.span4 { + input.span4, + textarea.span4, + .uneditable-input.span4 { width: 218px; } - input.span3, textarea.span3, .uneditable-input.span3 { + input.span3, + textarea.span3, + .uneditable-input.span3 { width: 156px; } - input.span2, textarea.span2, .uneditable-input.span2 { + input.span2, + textarea.span2, + .uneditable-input.span2 { width: 94px; } - input.span1, textarea.span1, .uneditable-input.span1 { + input.span1, + textarea.span1, + .uneditable-input.span1 { width: 32px; } } + @media (min-width: 1200px) { .row { margin-left: -30px; @@ -490,14 +529,14 @@ } .row-fluid [class*="span"] { display: block; + float: left; width: 100%; min-height: 28px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - float: left; margin-left: 2.564102564%; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; } .row-fluid [class*="span"]:first-child { margin-left: 0; @@ -543,40 +582,64 @@ .uneditable-input { margin-left: 0; } - input.span12, textarea.span12, .uneditable-input.span12 { + input.span12, + textarea.span12, + .uneditable-input.span12 { width: 1160px; } - input.span11, textarea.span11, .uneditable-input.span11 { + input.span11, + textarea.span11, + .uneditable-input.span11 { width: 1060px; } - input.span10, textarea.span10, .uneditable-input.span10 { + input.span10, + textarea.span10, + .uneditable-input.span10 { width: 960px; } - input.span9, textarea.span9, .uneditable-input.span9 { + input.span9, + textarea.span9, + .uneditable-input.span9 { width: 860px; } - input.span8, textarea.span8, .uneditable-input.span8 { + input.span8, + textarea.span8, + .uneditable-input.span8 { width: 760px; } - input.span7, textarea.span7, .uneditable-input.span7 { + input.span7, + textarea.span7, + .uneditable-input.span7 { width: 660px; } - input.span6, textarea.span6, .uneditable-input.span6 { + input.span6, + textarea.span6, + .uneditable-input.span6 { width: 560px; } - input.span5, textarea.span5, .uneditable-input.span5 { + input.span5, + textarea.span5, + .uneditable-input.span5 { width: 460px; } - input.span4, textarea.span4, .uneditable-input.span4 { + input.span4, + textarea.span4, + .uneditable-input.span4 { width: 360px; } - input.span3, textarea.span3, .uneditable-input.span3 { + input.span3, + textarea.span3, + .uneditable-input.span3 { width: 260px; } - input.span2, textarea.span2, .uneditable-input.span2 { + input.span2, + textarea.span2, + .uneditable-input.span2 { width: 160px; } - input.span1, textarea.span1, .uneditable-input.span1 { + input.span1, + textarea.span1, + .uneditable-input.span1 { width: 60px; } .thumbnails { @@ -586,6 +649,7 @@ margin-left: 0; } } + @media (max-width: 979px) { body { padding-top: 0; @@ -602,8 +666,8 @@ padding: 0; } .navbar .brand { - padding-left: 10px; padding-right: 10px; + padding-left: 10px; margin: 0 0 0 -5px; } .nav-collapse { @@ -632,15 +696,15 @@ font-weight: bold; color: #999999; -webkit-border-radius: 3px; - -moz-border-radius: 3px; - 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; + -moz-border-radius: 4px; + border-radius: 4px; } .nav-collapse .dropdown-menu li + li a { margin-bottom: 2px; @@ -650,26 +714,26 @@ background-color: #222222; } .nav-collapse.in .btn-group { - margin-top: 5px; padding: 0; + margin-top: 5px; } .nav-collapse .dropdown-menu { position: static; top: auto; left: auto; - float: none; display: block; + float: none; max-width: none; - margin: 0 15px; padding: 0; + margin: 0 15px; background-color: transparent; border: none; -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; } .nav-collapse .dropdown-menu:before, .nav-collapse .dropdown-menu:after { @@ -685,9 +749,9 @@ margin: 9px 0; border-top: 1px solid #222222; border-bottom: 1px solid #222222; - -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1); - -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1); - box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1); + -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 .nav-collapse .nav.pull-right { float: none; @@ -695,17 +759,18 @@ } .nav-collapse, .nav-collapse.collapse { - overflow: hidden; height: 0; + overflow: hidden; } .navbar .btn-navbar { display: block; } .navbar-static .navbar-inner { - padding-left: 10px; padding-right: 10px; + padding-left: 10px; } } + @media (min-width: 980px) { .nav-collapse.collapse { height: auto !important; -- cgit v1.2.3 From d8aaf507981dbecb146bc77e288a3f10387923cd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Apr 2012 02:11:59 -0700 Subject: implement ie7 fluid tests and semantic.gs IE7 hack for rounding in ie7; not perfect, but mostly solid --- docs/assets/css/bootstrap-responsive.css | 26 ++++++++++++++++++++++++++ 1 file changed, 26 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 ab336de1e..4f6eb75ba 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -310,6 +310,7 @@ width: 100%; min-height: 28px; margin-left: 2.762430939%; + *margin-left: 2.709239449638298%; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; -ms-box-sizing: border-box; @@ -320,39 +321,51 @@ } .row-fluid .span12 { width: 99.999999993%; + *width: 99.9468085036383%; } .row-fluid .span11 { width: 91.436464082%; + *width: 91.38327259263829%; } .row-fluid .span10 { width: 82.87292817100001%; + *width: 82.8197366816383%; } .row-fluid .span9 { width: 74.30939226%; + *width: 74.25620077063829%; } .row-fluid .span8 { width: 65.74585634900001%; + *width: 65.6926648596383%; } .row-fluid .span7 { width: 57.182320438000005%; + *width: 57.129128948638304%; } .row-fluid .span6 { width: 48.618784527%; + *width: 48.5655930376383%; } .row-fluid .span5 { width: 40.055248616%; + *width: 40.0020571266383%; } .row-fluid .span4 { width: 31.491712705%; + *width: 31.4385212156383%; } .row-fluid .span3 { width: 22.928176794%; + *width: 22.874985304638297%; } .row-fluid .span2 { width: 14.364640883%; + *width: 14.311449393638298%; } .row-fluid .span1 { width: 5.801104972%; + *width: 5.747913482638298%; } input, textarea, @@ -533,6 +546,7 @@ width: 100%; min-height: 28px; margin-left: 2.564102564%; + *margin-left: 2.510911074638298%; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; -ms-box-sizing: border-box; @@ -543,39 +557,51 @@ } .row-fluid .span12 { width: 100%; + *width: 99.94680851063829%; } .row-fluid .span11 { width: 91.45299145300001%; + *width: 91.3997999636383%; } .row-fluid .span10 { width: 82.905982906%; + *width: 82.8527914166383%; } .row-fluid .span9 { width: 74.358974359%; + *width: 74.30578286963829%; } .row-fluid .span8 { width: 65.81196581200001%; + *width: 65.7587743226383%; } .row-fluid .span7 { width: 57.264957265%; + *width: 57.2117657756383%; } .row-fluid .span6 { width: 48.717948718%; + *width: 48.6647572286383%; } .row-fluid .span5 { width: 40.170940171000005%; + *width: 40.117748681638304%; } .row-fluid .span4 { width: 31.623931624%; + *width: 31.5707401346383%; } .row-fluid .span3 { width: 23.076923077%; + *width: 23.0237315876383%; } .row-fluid .span2 { width: 14.529914530000001%; + *width: 14.4767230406383%; } .row-fluid .span1 { width: 5.982905983%; + *width: 5.929714493638298%; } input, textarea, -- cgit v1.2.3