From ed64276e5be1bbf808f2ab1451aa02522cc3aff0 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 26 Jan 2012 22:05:45 -0800 Subject: move doc building into base make method + build bootstrap to doc assets --- docs/assets/css/bootstrap-responsive.css | 244 +++++++++++++++++++++++++++++++ 1 file changed, 244 insertions(+) create mode 100644 docs/assets/css/bootstrap-responsive.css (limited to 'docs/assets/css/bootstrap-responsive.css') diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css new file mode 100644 index 000000000..02b5c099e --- /dev/null +++ b/docs/assets/css/bootstrap-responsive.css @@ -0,0 +1,244 @@ +.hidden { + display: none; + visibility: hidden; +} +@media (max-width: 480px) { + .navbar .nav { + position: absolute; + top: 0; + left: 0; + width: 180px; + padding-top: 40px; + list-style: none; + } + .navbar .nav, .navbar .nav > li:last-child a { + -webkit-border-radius: 0 0 4px 0; + -moz-border-radius: 0 0 4px 0; + border-radius: 0 0 4px 0; + } + .navbar .nav > li { + float: none; + display: none; + } + .navbar .nav > li > a { + float: none; + background-color: #222; + } + .navbar .nav > .active { + display: block; + position: absolute; + top: 0; + left: 0; + } + .navbar .nav > .active > a { + background-color: transparent; + } + .navbar .nav > .active > a:hover { + background-color: #333; + } + .navbar .nav > .active > a:after { + display: inline-block; + width: 0; + height: 0; + margin-top: 8px; + margin-left: 6px; + text-indent: -99999px; + vertical-align: top; + border-left: 4px solid transparent; + border-right: 4px solid transparent; + border-top: 4px solid #ffffff; + opacity: 1; + filter: alpha(opacity=100); + content: "↓"; + } + .navbar .nav:hover > li { + display: block; + } + .navbar .nav:hover > li > a:hover { + background-color: #333; + } + .form-horizontal .control-group > 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-left: 0; + } + .modal { + position: absolute; + top: 20px; + left: 20px; + right: 20px; + width: auto; + margin: 0; + } + .modal.fade.in { + top: auto; + } + .modal-header .close { + padding: 10px; + } +} +@media (max-width: 768px) { + .navbar-fixed { + position: absolute; + } + .navbar-fixed .nav { + float: none; + } + .container { + width: auto; + padding: 0 20px; + } + .row { + margin-left: 0; + } + .row > [class*="span"] { + float: none; + display: block; + width: auto; + margin: 0; + } +} +@media (min-width: 768px) and (max-width: 940px) { + .container { + width: 748px; + } + .span1 { + width: 44px; + } + .span2 { + width: 108px; + } + .span3 { + width: 172px; + } + .span4 { + width: 236px; + } + .span5 { + width: 300px; + } + .span6 { + width: 364px; + } + .span7 { + width: 428px; + } + .span8 { + width: 492px; + } + .span9 { + width: 556px; + } + .span10 { + width: 620px; + } + .span11 { + width: 684px; + } + .span12 { + width: 748px; + } + .offset1 { + margin-left: 84px; + } + .offset2 { + margin-left: 148px; + } + .offset3 { + margin-left: 212px; + } + .offset4 { + margin-left: 276px; + } + .offset5 { + margin-left: 340px; + } + .offset6 { + margin-left: 404px; + } + .offset7 { + margin-left: 468px; + } + .offset8 { + margin-left: 532px; + } + .offset9 { + margin-left: 596px; + } + .offset10 { + margin-left: 660px; + } + .offset11 { + margin-left: 724px; + } + .offset12 { + margin-left: 788px; + } +} +/* +@media (min-width: 1210px) { + + // Reset grid variables + @gridColumns: 12; + @gridColumnWidth: 70px; + @gridGutterWidth: 30px; + @siteWidth: 1170px; + + // Bring grid mixins to recalculate widths + .columns(@columns: 1) { + width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)); + } + .offset(@columns: 1) { + margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2); + } + + .container { + width: @siteWidth; + } + .row { + margin-left: @gridGutterWidth * -1; + } + [class*="span"] { + margin-left: @gridGutterWidth; + } + + // Default columns + .span1 { .columns(1); } + .span2 { .columns(2); } + .span3 { .columns(3); } + .span4 { .columns(4); } + .span5 { .columns(5); } + .span6 { .columns(6); } + .span7 { .columns(7); } + .span8 { .columns(8); } + .span9 { .columns(9); } + .span10 { .columns(10); } + .span11 { .columns(11); } + .span12 { .columns(12); } + + // Offset column options + .offset1 { .offset(1); } + .offset2 { .offset(2); } + .offset3 { .offset(3); } + .offset4 { .offset(4); } + .offset5 { .offset(5); } + .offset6 { .offset(6); } + .offset7 { .offset(7); } + .offset8 { .offset(8); } + .offset9 { .offset(9); } + .offset10 { .offset(10); } + .offset11 { .offset(11); } + .offset12 { .offset(12); } + +} +*/ -- cgit v1.2.3 From e8647c1b118d2c726a8987e9a41aad82da972b57 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jan 2012 13:20:02 -0800 Subject: huuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuge update to doces and stuff --- docs/assets/css/bootstrap-responsive.css | 2 ++ 1 file changed, 2 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 02b5c099e..6886105cb 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -111,6 +111,8 @@ @media (min-width: 768px) and (max-width: 940px) { .container { width: 748px; + padding-left: 10px; + padding-right: 10px; } .span1 { width: 44px; -- cgit v1.2.3 From f6dc566963c63d5113e72f0098ad9da2c414f33f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jan 2012 16:26:55 -0800 Subject: overhaul navbar behavior in responsive css --- docs/assets/css/bootstrap-responsive.css | 150 ++++++++++++++++++------------- 1 file changed, 90 insertions(+), 60 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 6886105cb..8b1d98b5c 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -3,60 +3,6 @@ visibility: hidden; } @media (max-width: 480px) { - .navbar .nav { - position: absolute; - top: 0; - left: 0; - width: 180px; - padding-top: 40px; - list-style: none; - } - .navbar .nav, .navbar .nav > li:last-child a { - -webkit-border-radius: 0 0 4px 0; - -moz-border-radius: 0 0 4px 0; - border-radius: 0 0 4px 0; - } - .navbar .nav > li { - float: none; - display: none; - } - .navbar .nav > li > a { - float: none; - background-color: #222; - } - .navbar .nav > .active { - display: block; - position: absolute; - top: 0; - left: 0; - } - .navbar .nav > .active > a { - background-color: transparent; - } - .navbar .nav > .active > a:hover { - background-color: #333; - } - .navbar .nav > .active > a:after { - display: inline-block; - width: 0; - height: 0; - margin-top: 8px; - margin-left: 6px; - text-indent: -99999px; - vertical-align: top; - border-left: 4px solid transparent; - border-right: 4px solid transparent; - border-top: 4px solid #ffffff; - opacity: 1; - filter: alpha(opacity=100); - content: "↓"; - } - .navbar .nav:hover > li { - display: block; - } - .navbar .nav:hover > li > a:hover { - background-color: #333; - } .form-horizontal .control-group > label { float: none; width: auto; @@ -88,12 +34,6 @@ } } @media (max-width: 768px) { - .navbar-fixed { - position: absolute; - } - .navbar-fixed .nav { - float: none; - } .container { width: auto; padding: 0 20px; @@ -187,6 +127,96 @@ margin-left: 788px; } } +@media (max-width: 940px) { + body { + padding-top: 0; + } + .navbar-fixed-top { + position: static; + margin-bottom: 36px; + } + .navbar-inner { + padding: 10px; + background-image: none; + } + .navbar .container { + padding: 0; + } + .navbar .brand { + float: none; + display: block; + padding-left: 15px; + padding-right: 15px; + margin: 0; + } + .navbar .nav { + float: none; + margin: 9px 0; + } + .navbar .nav > li { + float: none; + } + .navbar .nav > li > a { + margin-bottom: 2px; + } + .navbar .nav > .vertical-divider { + display: 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; + display: block; + float: none; + 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; + } +} /* @media (min-width: 1210px) { -- cgit v1.2.3 From 15d3a4797f3435d1531804369df87fa4e574b874 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Fri, 27 Jan 2012 21:06:09 -0800 Subject: simplify build process more - remove really annoying date. --- 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 8b1d98b5c..acebb64d3 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -273,4 +273,4 @@ .offset12 { .offset(12); } } -*/ +*/ \ No newline at end of file -- cgit v1.2.3 From 342a99f1d01edfa20d744781cbecffcd4239fa39 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 00:29:38 -0800 Subject: block level page-header h1 small for readability on 480px and under --- 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 acebb64d3..3936d8c20 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -3,6 +3,10 @@ visibility: hidden; } @media (max-width: 480px) { + .page-header h1 small { + display: block; + line-height: 18px; + } .form-horizontal .control-group > label { float: none; width: auto; -- cgit v1.2.3 From 967030cb532c642f076d1e1fc4e5a1e2cee18561 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 00:39:22 -0800 Subject: modal refinements in docs and general responsiveness --- docs/assets/css/bootstrap-responsive.css | 7 ++++--- 1 file changed, 4 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 3936d8c20..e48a234f9 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -24,9 +24,9 @@ } .modal { position: absolute; - top: 20px; - left: 20px; - right: 20px; + top: 10px; + left: 10px; + right: 10px; width: auto; margin: 0; } @@ -35,6 +35,7 @@ } .modal-header .close { padding: 10px; + margin: -10px; } } @media (max-width: 768px) { -- cgit v1.2.3 From f1851ab1338938bf6315e223789e345f20cfb4b1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 00:43:25 -0800 Subject: change text on js docs page to improve rendering on iphone, update responsive for carousel considerations --- 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 e48a234f9..e91f25539 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -37,6 +37,9 @@ padding: 10px; margin: -10px; } + .carousel-caption { + position: static; + } } @media (max-width: 768px) { .container { -- cgit v1.2.3 From 70c6a6cd855a617b086682ef919e02cf67d4e86e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 12:58:26 -0800 Subject: fix border and border radius on radios/checkboxes for iOS, fix forms docs alignment on small devices --- 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 e91f25539..0d975824b 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -20,7 +20,8 @@ padding-top: 0; } .form-horizontal .form-actions { - padding-left: 0; + padding-left: 10px; + padding-right: 10px; } .modal { position: absolute; -- cgit v1.2.3 From 296d06a285d91200b4063f3bdde65c094495ee24 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 13:07:01 -0800 Subject: add checkbox/radio border for ios in responsive --- 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 0d975824b..b991d1242 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -7,6 +7,9 @@ display: block; line-height: 18px; } + input[type="checkbox"], input[type="radio"] { + border: 1px solid #ccc; + } .form-horizontal .control-group > label { float: none; width: auto; -- cgit v1.2.3 From 9db4f2a344ebf452b88ac4af0261192f3a8e9eb6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 14:30:45 -0800 Subject: change .span* inputs to use content-sizing: border-box; to make them behave as block level elements --- docs/assets/css/bootstrap-responsive.css | 27 +++++++++++++++++++++++++++ 1 file changed, 27 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 b991d1242..19c465e44 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -7,6 +7,33 @@ display: block; line-height: 18px; } + input[class*="span"], + select[class*="span"], + textarea[class*="span"], + .uneditable-input { + display: block; + width: 100%; + 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; + /* Older Webkit */ + + -moz-box-sizing: border-box; + /* Older FF */ + + -ms-box-sizing: border-box; + /* IE8 */ + + box-sizing: border-box; + /* CSS3 spec*/ + + } + .input-prepend input[class*="span"], .input-append input[class*="span"] { + width: auto; + } input[type="checkbox"], input[type="radio"] { border: 1px solid #ccc; } -- cgit v1.2.3 From 23e076c1bb73c4950d473cb36218937b2607bc13 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 15:09:23 -0800 Subject: add in a navbar button for toggling the nav items --- 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 19c465e44..3731713e8 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -86,6 +86,9 @@ width: auto; margin: 0; } + .btn-navbar { + display: block; + } } @media (min-width: 768px) and (max-width: 940px) { .container { -- cgit v1.2.3 From b8a683d7f250a11d349a3e5de0d75ace9d67df0c Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 28 Jan 2012 15:42:07 -0800 Subject: turn off brand hover for now + get nav toggling in mobile --- docs/assets/css/bootstrap-responsive.css | 10 +++++++--- 1 file changed, 7 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 3731713e8..631c904e7 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -86,9 +86,6 @@ width: auto; margin: 0; } - .btn-navbar { - display: block; - } } @media (min-width: 768px) and (max-width: 940px) { .container { @@ -258,6 +255,13 @@ padding-left: 10px; padding-right: 10px; } + .btn-navbar { + display: block; + } + .nav-collapse { + overflow: hidden; + height: 0; + } } /* @media (min-width: 1210px) { -- cgit v1.2.3 From 4fa931e403ec3ae2f8f7f690c6c4040365f68ba9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 18:11:31 -0800 Subject: fix the navbar click and a few jank responsive problems --- docs/assets/css/bootstrap-responsive.css | 142 ++++++++++++++++++------------- 1 file changed, 84 insertions(+), 58 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 631c904e7..b0fbd9d7b 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -175,22 +175,23 @@ margin-bottom: 36px; } .navbar-inner { - padding: 10px; + padding: 5px; background-image: none; } .navbar .container { padding: 0; } .navbar .brand { - float: none; - display: block; - padding-left: 15px; - padding-right: 15px; - margin: 0; + padding-left: 10px; + padding-right: 10px; + margin: 0 0 0 -5px; + } + .navbar .nav-collapse { + clear: left; } .navbar .nav { float: none; - margin: 9px 0; + margin: 0 0 9px; } .navbar .nav > li { float: none; @@ -217,8 +218,10 @@ } .navbar .dropdown-menu { position: static; - display: block; + top: auto; + left: auto; float: none; + display: block; max-width: none; margin: 0 15px; padding: 0; @@ -263,60 +266,83 @@ height: 0; } } -/* @media (min-width: 1210px) { - - // Reset grid variables - @gridColumns: 12; - @gridColumnWidth: 70px; - @gridGutterWidth: 30px; - @siteWidth: 1170px; - - // Bring grid mixins to recalculate widths - .columns(@columns: 1) { - width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)); - } - .offset(@columns: 1) { - margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2); - } - .container { - width: @siteWidth; + width: 1170px; } .row { - margin-left: @gridGutterWidth * -1; + margin-left: -30px; } [class*="span"] { - margin-left: @gridGutterWidth; - } - - // Default columns - .span1 { .columns(1); } - .span2 { .columns(2); } - .span3 { .columns(3); } - .span4 { .columns(4); } - .span5 { .columns(5); } - .span6 { .columns(6); } - .span7 { .columns(7); } - .span8 { .columns(8); } - .span9 { .columns(9); } - .span10 { .columns(10); } - .span11 { .columns(11); } - .span12 { .columns(12); } - - // Offset column options - .offset1 { .offset(1); } - .offset2 { .offset(2); } - .offset3 { .offset(3); } - .offset4 { .offset(4); } - .offset5 { .offset(5); } - .offset6 { .offset(6); } - .offset7 { .offset(7); } - .offset8 { .offset(8); } - .offset9 { .offset(9); } - .offset10 { .offset(10); } - .offset11 { .offset(11); } - .offset12 { .offset(12); } - + margin-left: 30px; + } + .span1 { + width: 70px; + } + .span2 { + width: 170px; + } + .span3 { + width: 270px; + } + .span4 { + width: 370px; + } + .span5 { + width: 470px; + } + .span6 { + width: 570px; + } + .span7 { + width: 670px; + } + .span8 { + width: 770px; + } + .span9 { + width: 870px; + } + .span10 { + width: 970px; + } + .span11 { + width: 1070px; + } + .span12 { + width: 1170px; + } + .offset1 { + margin-left: 130px; + } + .offset2 { + margin-left: 230px; + } + .offset3 { + margin-left: 330px; + } + .offset4 { + margin-left: 430px; + } + .offset5 { + margin-left: 530px; + } + .offset6 { + margin-left: 630px; + } + .offset7 { + margin-left: 730px; + } + .offset8 { + margin-left: 830px; + } + .offset9 { + margin-left: 930px; + } + .offset10 { + margin-left: 1030px; + } + .offset11 { + margin-left: 1130px; + } } -*/ \ No newline at end of file -- cgit v1.2.3 From e532228721734492d6f2741f729525cc1bb3c77c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 18:25:05 -0800 Subject: more responsive tweaks for tablet --- docs/assets/css/bootstrap-responsive.css | 55 +++++++++++++++----------------- 1 file changed, 26 insertions(+), 29 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 b0fbd9d7b..bbfc0ac5a 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -89,81 +89,78 @@ } @media (min-width: 768px) and (max-width: 940px) { .container { - width: 748px; - padding-left: 10px; - padding-right: 10px; + width: 724px; + padding-left: 20px; + padding-right: 20px; } .span1 { - width: 44px; + width: 42px; } .span2 { - width: 108px; + width: 104px; } .span3 { - width: 172px; + width: 166px; } .span4 { - width: 236px; + width: 228px; } .span5 { - width: 300px; + width: 290px; } .span6 { - width: 364px; + width: 352px; } .span7 { - width: 428px; + width: 414px; } .span8 { - width: 492px; + width: 476px; } .span9 { - width: 556px; + width: 538px; } .span10 { - width: 620px; + width: 600px; } .span11 { - width: 684px; + width: 662px; } .span12 { - width: 748px; + width: 724px; } .offset1 { - margin-left: 84px; + margin-left: 82px; } .offset2 { - margin-left: 148px; + margin-left: 144px; } .offset3 { - margin-left: 212px; + margin-left: 206px; } .offset4 { - margin-left: 276px; + margin-left: 268px; } .offset5 { - margin-left: 340px; + margin-left: 330px; } .offset6 { - margin-left: 404px; + margin-left: 392px; } .offset7 { - margin-left: 468px; + margin-left: 454px; } .offset8 { - margin-left: 532px; + margin-left: 516px; } .offset9 { - margin-left: 596px; + margin-left: 578px; } .offset10 { - margin-left: 660px; + margin-left: 640px; } .offset11 { - margin-left: 724px; - } - .offset12 { - margin-left: 788px; + margin-left: 702px; } } @media (max-width: 940px) { -- cgit v1.2.3 From f1e520badd51d01ebcd33758966ef868e5cdd1c2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 20:34:07 -0800 Subject: clarify and tweak media queries --- 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 bbfc0ac5a..f40f0c110 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -263,7 +263,7 @@ height: 0; } } -@media (min-width: 1210px) { +@media (min-width: 1200px) { .container { width: 1170px; } -- cgit v1.2.3 From 62f4a1571a3801c867b80c228464cc9c695f1d13 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 22:48:25 -0800 Subject: revamped the thumbnails examples to make them work and look better at higher resolution --- 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 f40f0c110..ca03cecde 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -342,4 +342,10 @@ .offset11 { margin-left: 1130px; } + .thumbnails { + margin-left: -30px; + } + .thumbnails > li { + margin-left: 30px; + } } -- cgit v1.2.3 From 48529ad01fa2a60bfc9179743dcb5379e8ff944f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 29 Jan 2012 13:06:57 -0800 Subject: last minute addition of a simple fluid grid for our fluid examples; it needs work, so we're not documenting it now --- docs/assets/css/bootstrap-responsive.css | 101 +++++++++++++++++++++++++++++-- 1 file changed, 96 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 ca03cecde..44e0125c1 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -77,6 +77,9 @@ width: auto; padding: 0 20px; } + .row-fluid { + width: 100%; + } .row { margin-left: 0; } @@ -162,6 +165,50 @@ .offset11 { margin-left: 702px; } + .row-fluid { + width: 102.76243093919337%; + margin-left: -2.762430939%; + } + .row-fluid [class*="span"] { + float: left; + margin-left: 2.762430939%; + } + .row-fluid .span1 { + width: 5.6451612899588115%; + } + .row-fluid .span2 { + width: 13.978494622708812%; + } + .row-fluid .span3 { + width: 22.31182795545881%; + } + .row-fluid .span4 { + width: 30.64516128820881%; + } + .row-fluid .span5 { + width: 38.97849462095881%; + } + .row-fluid .span6 { + width: 47.311827953708814%; + } + .row-fluid .span7 { + width: 55.645161286458816%; + } + .row-fluid .span8 { + width: 63.97849461920882%; + } + .row-fluid .span9 { + width: 72.31182795195882%; + } + .row-fluid .span10 { + width: 80.64516128470882%; + } + .row-fluid .span11 { + width: 88.97849461745884%; + } + .row-fluid .span12 { + width: 97.31182795020881%; + } } @media (max-width: 940px) { body { @@ -169,7 +216,7 @@ } .navbar-fixed-top { position: static; - margin-bottom: 36px; + margin-bottom: 18px; } .navbar-inner { padding: 5px; @@ -264,6 +311,12 @@ } } @media (min-width: 1200px) { + .thumbnails { + margin-left: -30px; + } + .thumbnails > li { + margin-left: 30px; + } .container { width: 1170px; } @@ -342,10 +395,48 @@ .offset11 { margin-left: 1130px; } - .thumbnails { - margin-left: -30px; + .row-fluid { + width: 102.56143440326584%; + margin-left: -2.56%; } - .thumbnails > li { - margin-left: 30px; + .row-fluid [class*="span"] { + float: left; + margin-left: 2.56%; + } + .row-fluid .span1 { + width: 5.832601732615312%; + } + .row-fluid .span2 { + width: 14.16126839928198%; + } + .row-fluid .span3 { + width: 22.489935065948643%; + } + .row-fluid .span4 { + width: 30.818601732615313%; + } + .row-fluid .span5 { + width: 39.14726839928198%; + } + .row-fluid .span6 { + width: 47.47593506594863%; + } + .row-fluid .span7 { + width: 55.8046017326153%; + } + .row-fluid .span8 { + width: 64.13326839928197%; + } + .row-fluid .span9 { + width: 72.46193506594864%; + } + .row-fluid .span10 { + width: 80.7906017326153%; + } + .row-fluid .span11 { + width: 89.11926839928198%; + } + .row-fluid .span12 { + width: 97.44793506594864%; } } -- cgit v1.2.3 From 9e7f5025b494927e9ffc88119b0b9426f7487a62 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 29 Jan 2012 14:07:14 -0800 Subject: update collapsible nav in navbar --- 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 44e0125c1..68ccf676f 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -218,7 +218,7 @@ position: static; margin-bottom: 18px; } - .navbar-inner { + .navbar-fixed-top .navbar-inner { padding: 5px; background-image: none; } @@ -305,10 +305,13 @@ .btn-navbar { display: block; } - .nav-collapse { + .nav-collapse.collapse { overflow: hidden; height: 0; } + .nav-collapse.collapse.in { + height: auto; + } } @media (min-width: 1200px) { .thumbnails { -- cgit v1.2.3 From 702d3b6dfe7a150deb090f70d7d9c2a2964a3eb2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 29 Jan 2012 16:35:55 -0800 Subject: fix broken navbar collapse --- docs/assets/css/bootstrap-responsive.css | 8 +++++--- 1 file changed, 5 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 68ccf676f..76e27d672 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -305,12 +305,14 @@ .btn-navbar { display: block; } - .nav-collapse.collapse { + .nav-collapse { overflow: hidden; height: 0; } - .nav-collapse.collapse.in { - height: auto; +} +@media (min-width: 940px) { + .nav-collapse.collapse { + height: auto !important; } } @media (min-width: 1200px) { -- cgit v1.2.3 From fae04c8ac1da675338c1cfaf3922223980667281 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 29 Jan 2012 19:04:26 -0800 Subject: add license for responsive and rebuild --- 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 76e27d672..8fadecceb 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -1,3 +1,12 @@ +/*! + * Bootstrap Responsive v2.0.0 + * + * Copyright 2012 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 @twitter by @mdo and @fat. + */ .hidden { display: none; visibility: hidden; -- cgit v1.2.3 From ae7f94eeff733584cbdc80a2d13a85f136a7744e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Jan 2012 00:39:44 -0800 Subject: overhaul grid mixins and variables, standardize fluid grid system and enable it across responsive layouts --- docs/assets/css/bootstrap-responsive.css | 196 ++++++++++++++++++++++++------- 1 file changed, 152 insertions(+), 44 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 76e27d672..fb1d62692 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -83,7 +83,7 @@ .row { margin-left: 0; } - .row > [class*="span"] { + .row > [class*="span"], .row-fluid > [class*="span"] { float: none; display: block; width: auto; @@ -91,10 +91,20 @@ } } @media (min-width: 768px) and (max-width: 940px) { - .container { - width: 724px; - padding-left: 20px; - padding-right: 20px; + .row { + margin-left: -20px; + *zoom: 1; + } + .row:before, .row:after { + display: table; + content: ""; + } + .row:after { + clear: both; + } + [class*="span"] { + float: left; + margin-left: 20px; } .span1 { width: 42px; @@ -129,7 +139,7 @@ .span11 { width: 662px; } - .span12 { + .span12, .container { width: 724px; } .offset1 { @@ -166,48 +176,94 @@ margin-left: 702px; } .row-fluid { - width: 102.76243093919337%; - margin-left: -2.762430939%; + width: 100%; + *zoom: 1; + } + .row-fluid:before, .row-fluid:after { + display: table; + content: ""; + } + .row-fluid:after { + clear: both; } .row-fluid [class*="span"] { float: left; margin-left: 2.762430939%; } + .row-fluid [class*="span"]:first-child { + margin-left: 0; + } .row-fluid .span1 { - width: 5.6451612899588115%; + width: 5.801104972%; } .row-fluid .span2 { - width: 13.978494622708812%; + width: 14.364640883%; } .row-fluid .span3 { - width: 22.31182795545881%; + width: 22.928176794%; } .row-fluid .span4 { - width: 30.64516128820881%; + width: 31.491712705%; } .row-fluid .span5 { - width: 38.97849462095881%; + width: 40.055248616%; } .row-fluid .span6 { - width: 47.311827953708814%; + width: 48.618784527%; } .row-fluid .span7 { - width: 55.645161286458816%; + width: 57.182320438000005%; } .row-fluid .span8 { - width: 63.97849461920882%; + width: 65.74585634900001%; } .row-fluid .span9 { - width: 72.31182795195882%; + width: 74.30939226%; } .row-fluid .span10 { - width: 80.64516128470882%; + width: 82.87292817100001%; } .row-fluid .span11 { - width: 88.97849461745884%; + width: 91.436464082%; } .row-fluid .span12 { - width: 97.31182795020881%; + width: 99.999999993%; + } + input.span1, textarea.span1, .uneditable-input.span1 { + width: 32px; + } + input.span2, textarea.span2, .uneditable-input.span2 { + width: 94px; + } + input.span3, textarea.span3, .uneditable-input.span3 { + width: 156px; + } + input.span4, textarea.span4, .uneditable-input.span4 { + width: 218px; + } + input.span5, textarea.span5, .uneditable-input.span5 { + width: 280px; + } + input.span6, textarea.span6, .uneditable-input.span6 { + width: 342px; + } + input.span7, textarea.span7, .uneditable-input.span7 { + width: 404px; + } + input.span8, textarea.span8, .uneditable-input.span8 { + width: 466px; + } + input.span9, textarea.span9, .uneditable-input.span9 { + width: 528px; + } + input.span10, textarea.span10, .uneditable-input.span10 { + width: 590px; + } + input.span11, textarea.span11, .uneditable-input.span11 { + width: 652px; + } + input.span12, textarea.span12, .uneditable-input.span12 { + width: 714px; } } @media (max-width: 940px) { @@ -316,19 +372,19 @@ } } @media (min-width: 1200px) { - .thumbnails { + .row { margin-left: -30px; + *zoom: 1; } - .thumbnails > li { - margin-left: 30px; + .row:before, .row:after { + display: table; + content: ""; } - .container { - width: 1170px; - } - .row { - margin-left: -30px; + .row:after { + clear: both; } [class*="span"] { + float: left; margin-left: 30px; } .span1 { @@ -364,7 +420,7 @@ .span11 { width: 1070px; } - .span12 { + .span12, .container { width: 1170px; } .offset1 { @@ -401,47 +457,99 @@ margin-left: 1130px; } .row-fluid { - width: 102.56143440326584%; - margin-left: -2.56%; + width: 100%; + *zoom: 1; + } + .row-fluid:before, .row-fluid:after { + display: table; + content: ""; + } + .row-fluid:after { + clear: both; } .row-fluid [class*="span"] { float: left; - margin-left: 2.56%; + margin-left: 2.564102564%; + } + .row-fluid [class*="span"]:first-child { + margin-left: 0; } .row-fluid .span1 { - width: 5.832601732615312%; + width: 5.982905983%; } .row-fluid .span2 { - width: 14.16126839928198%; + width: 14.529914530000001%; } .row-fluid .span3 { - width: 22.489935065948643%; + width: 23.076923077%; } .row-fluid .span4 { - width: 30.818601732615313%; + width: 31.623931624%; } .row-fluid .span5 { - width: 39.14726839928198%; + width: 40.170940171000005%; } .row-fluid .span6 { - width: 47.47593506594863%; + width: 48.717948718%; } .row-fluid .span7 { - width: 55.8046017326153%; + width: 57.264957265%; } .row-fluid .span8 { - width: 64.13326839928197%; + width: 65.81196581200001%; } .row-fluid .span9 { - width: 72.46193506594864%; + width: 74.358974359%; } .row-fluid .span10 { - width: 80.7906017326153%; + width: 82.905982906%; } .row-fluid .span11 { - width: 89.11926839928198%; + width: 91.45299145300001%; } .row-fluid .span12 { - width: 97.44793506594864%; + width: 100%; + } + input.span1, textarea.span1, .uneditable-input.span1 { + width: 60px; + } + input.span2, textarea.span2, .uneditable-input.span2 { + width: 160px; + } + input.span3, textarea.span3, .uneditable-input.span3 { + width: 260px; + } + input.span4, textarea.span4, .uneditable-input.span4 { + width: 360px; + } + input.span5, textarea.span5, .uneditable-input.span5 { + width: 460px; + } + input.span6, textarea.span6, .uneditable-input.span6 { + width: 560px; + } + input.span7, textarea.span7, .uneditable-input.span7 { + width: 660px; + } + input.span8, textarea.span8, .uneditable-input.span8 { + width: 760px; + } + input.span9, textarea.span9, .uneditable-input.span9 { + width: 860px; + } + input.span10, textarea.span10, .uneditable-input.span10 { + width: 960px; + } + input.span11, textarea.span11, .uneditable-input.span11 { + width: 1060px; + } + input.span12, textarea.span12, .uneditable-input.span12 { + width: 1160px; + } + .thumbnails { + margin-left: -30px; + } + .thumbnails > li { + margin-left: 30px; } } -- cgit v1.2.3 From 8f448610a944efd134170f44e305ec6710bcff1a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Jan 2012 01:09:34 -0800 Subject: rename vertical-divider to divider-vertical, add more space around the divider --- 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 da6440bd2..8d2743709 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -308,7 +308,7 @@ .navbar .nav > li > a { margin-bottom: 2px; } - .navbar .nav > .vertical-divider { + .navbar .nav > .divider-vertical { display: none; } .navbar .nav > li > a, .navbar .dropdown-menu a { -- cgit v1.2.3 From 2d40b07afc62ce9d899a290ab33222fd18287190 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Jan 2012 08:15:28 -0800 Subject: adding warning (orange) button, fix responsive navbar problem --- docs/assets/css/bootstrap-responsive.css | 9 +++++---- 1 file changed, 5 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 8d2743709..8fe389563 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -195,11 +195,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 .span1 { @@ -288,6 +288,7 @@ background-image: none; } .navbar .container { + width: auto; padding: 0; } .navbar .brand { @@ -476,11 +477,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 .span1 { -- cgit v1.2.3 From 155047c3e6cfe589f1f244cdeb4e37244ab206ca Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 30 Jan 2012 13:59:05 -0800 Subject: speed up topbar animation for responsive --- 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 8fe389563..f00ec1de3 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -374,6 +374,7 @@ .nav-collapse { overflow: hidden; height: 0; + -webkit-transform: translate3d(0, 0, 0); } } @media (min-width: 940px) { -- cgit v1.2.3 From 1cff29c33f97fc40de1f8d582d7b1a3f4c7783c5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 30 Jan 2012 23:02:24 -0800 Subject: restore a few commented out responsive items --- docs/assets/css/bootstrap-responsive.css | 1 - 1 file changed, 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 f00ec1de3..35e96bbcd 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -285,7 +285,6 @@ } .navbar-fixed-top .navbar-inner { padding: 5px; - background-image: none; } .navbar .container { width: auto; -- cgit v1.2.3