From: Mark Otto Date: Fri, 2 Nov 2012 16:36:51 +0000 (-0700) Subject: Merge branch '2.2.2-wip' into exploratory X-Git-Tag: v3.0.0-rc1~902 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1477e081d46ebf6a5e6acb06debb7edb1a324918;p=thirdparty%2Fbootstrap.git Merge branch '2.2.2-wip' into exploratory Conflicts: docs/assets/css/bootstrap.css docs/getting-started.html docs/templates/pages/getting-started.mustache less/accordion.less less/alerts.less less/breadcrumbs.less less/buttons.less less/code.less less/dropdowns.less less/forms.less less/navbar.less less/progress-bars.less less/responsive-navbar.less less/tables.less less/thumbnails.less less/tooltip.less less/wells.less --- 1477e081d46ebf6a5e6acb06debb7edb1a324918 diff --cc docs/assets/css/bootstrap.css index 2e9ca173e6,142df455aa..309b07b28c --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@@ -629,6 -915,9 +645,7 @@@ pre background-color: #f5f5f5; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.15); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; ++ border-radius: 4px; } pre.prettyprint { @@@ -792,10 -1082,8 +809,9 @@@ input[type="radio"] input[type="checkbox"] { margin: 4px 0 0; margin-top: 1px \9; - *margin-top: 0; + /* IE8-9 */ + line-height: normal; - cursor: pointer; } input[type="file"], @@@ -900,72 -1193,28 +916,72 @@@ textarea::-webkit-input-placeholder margin-left: 10px; } -.input-mini { - width: 60px; -} - -.input-small { - width: 90px; -} - -.input-medium { - width: 150px; -} - -.input-large { - width: 210px; -} - -.input-xlarge { - width: 270px; -} - -.input-xxlarge { - width: 530px; +select.input-large, +textarea.input-large, +input[type="text"].input-large, +input[type="password"].input-large, +input[type="datetime"].input-large, +input[type="datetime-local"].input-large, +input[type="date"].input-large, +input[type="month"].input-large, +input[type="time"].input-large, +input[type="week"].input-large, +input[type="number"].input-large, +input[type="email"].input-large, +input[type="url"].input-large, +input[type="search"].input-large, +input[type="tel"].input-large, +input[type="color"].input-large, +.uneditable-input.input-large { + padding: 11px 19px; + padding-right: 14px; + padding-left: 14px; + font-size: 17.5px; - border-radius: 5px; ++ border-radius: 6px; +} + +select.input-small, +textarea.input-small, +input[type="text"].input-small, +input[type="password"].input-small, +input[type="datetime"].input-small, +input[type="datetime-local"].input-small, +input[type="date"].input-small, +input[type="month"].input-small, +input[type="time"].input-small, +input[type="week"].input-small, +input[type="number"].input-small, +input[type="email"].input-small, +input[type="url"].input-small, +input[type="search"].input-small, +input[type="tel"].input-small, +input[type="color"].input-small, +.uneditable-input.input-small { + padding: 2px 10px; + font-size: 11.9px; + border-radius: 3px; +} + +select.input-mini, +textarea.input-mini, +input[type="text"].input-mini, +input[type="password"].input-mini, +input[type="datetime"].input-mini, +input[type="datetime-local"].input-mini, +input[type="date"].input-mini, +input[type="month"].input-mini, +input[type="time"].input-mini, +input[type="week"].input-mini, +input[type="number"].input-mini, +input[type="email"].input-mini, +input[type="url"].input-mini, +input[type="search"].input-mini, +input[type="tel"].input-mini, +input[type="color"].input-mini, +.uneditable-input.input-mini { + padding: 1px 6px; + font-size: 10.5px; + border-radius: 3px; } input[class*="span"], @@@ -2507,11 -2791,16 +2525,11 @@@ table th[class*="span"] background-color: #ffffff; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.2); - border-radius: 6px; - *border-right-width: 2px; - *border-bottom-width: 2px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; ++ border-radius: 4px; -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); -webkit-background-clip: padding-box; - -moz-background-clip: padding; + -moz-background-clip: padding-box; background-clip: padding-box; } @@@ -2579,8 -2868,13 +2595,9 @@@ text-decoration: none; cursor: default; background-color: transparent; + background-image: none; } -.open { - *z-index: 1000; -} - .open > .dropdown-menu { display: block; } @@@ -2613,9 -2907,9 +2630,7 @@@ left: 100%; margin-top: -6px; margin-left: -1px; -- -webkit-border-radius: 0 6px 6px 6px; -- -moz-border-radius: 0 6px 6px 6px; -- border-radius: 0 6px 6px 6px; ++ border-radius: 0 4px 4px 4px; } .dropdown-submenu:hover > .dropdown-menu { @@@ -2627,9 -2921,9 +2642,7 @@@ bottom: 0; margin-top: 0; margin-bottom: -2px; -- -webkit-border-radius: 5px 5px 5px 0; -- -moz-border-radius: 5px 5px 5px 0; -- border-radius: 5px 5px 5px 0; ++ border-radius: 4px 4px 4px 0; } .dropdown-submenu > a:after { @@@ -2657,9 -2951,9 +2670,7 @@@ .dropdown-submenu.pull-left > .dropdown-menu { left: -100%; margin-left: 10px; -- -webkit-border-radius: 6px 0 6px 6px; -- -moz-border-radius: 6px 0 6px 6px; -- border-radius: 6px 0 6px 6px; ++ border-radius: 4px 0 4px 4px; } .dropdown .dropdown-menu .nav-header { @@@ -2669,7 -2963,9 +2680,6 @@@ .typeahead { margin-top: 2px; - border-radius: 4px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; } .well { @@@ -2773,10 -3080,15 +2783,10 @@@ button.close border-color: #e6e6e6 #e6e6e6 #bfbfbf; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); border-bottom-color: #a2a2a2; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + border-radius: 4px; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); - *zoom: 1; -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); } @@@ -2835,7 -3157,9 +2845,7 @@@ .btn-large { padding: 11px 19px; font-size: 17.5px; - border-radius: 5px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; ++ border-radius: 6px; } .btn-large [class^="icon-"], @@@ -3639,9 -4196,13 +3649,9 @@@ input[type="button"].btn-block background-image: linear-gradient(to bottom, #ffffff, #f2f2f2); background-repeat: repeat-x; border: 1px solid #d4d4d4; - border-radius: 6px; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; ++ border-radius: 4px; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0); - *zoom: 1; -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); - -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065); } @@@ -3882,9 -4468,10 +3892,9 @@@ background-repeat: repeat-x; border-color: #e5e5e5 #e5e5e5 #bfbfbf; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); } @@@ -4381,8 -4991,13 +4391,9 @@@ background-color: #ffffff; border: 1px solid #999; border: 1px solid rgba(0, 0, 0, 0.3); - *border: 1px solid #999; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; + border-radius: 6px; + outline: none; -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); -webkit-background-clip: padding-box; -moz-background-clip: padding-box; @@@ -4889,9 -5551,12 +4900,9 @@@ a.badge:hover background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9); background-repeat: repeat-x; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + border-radius: 4px; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0); -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); } @@@ -4910,8 -5575,9 +4921,8 @@@ background-image: -o-linear-gradient(top, #149bdf, #0480be); background-image: linear-gradient(to bottom, #149bdf, #0480be); background-repeat: repeat-x; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0); -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); -webkit-box-sizing: border-box; -moz-box-sizing: border-box; @@@ -5138,30 -5818,9 +5149,30 @@@ filter: alpha(opacity=50); } +.carousel-control.left { + background-color: rgba(0, 0, 0, 0.001); + background-color: transparent; + background-image: -moz-linear-gradient(left, rgba(0, 0, 0, 0.75), rgba(0, 0, 0, 0.001)); + background-image: -webkit-gradient(linear, 0 0, 100% 0, from(rgba(0, 0, 0, 0.75)), to(rgba(0, 0, 0, 0.001))); + background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.75), rgba(0, 0, 0, 0.001)); + background-image: -o-linear-gradient(left, rgba(0, 0, 0, 0.75), rgba(0, 0, 0, 0.001)); + background-image: linear-gradient(to right, rgba(0, 0, 0, 0.75), rgba(0, 0, 0, 0.001)); + background-repeat: repeat-x; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#bf000000', endColorstr='#00000000', GradientType=1); ++ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bf000000', endColorstr='#00000000', GradientType=1); +} + .carousel-control.right { - right: 15px; + right: 0; left: auto; + background-color: rgba(0, 0, 0, 0.75); + background-color: transparent; - background-image: -webkit-gradient(linear, 0 0, 100% 0, from(rgba(0, 0, 0, 0.001)), to(rgba(0, 0, 0, 0.75))); + background-image: -moz-linear-gradient(left, rgba(0, 0, 0, 0.001), rgba(0, 0, 0, 0.75)); ++ background-image: -webkit-gradient(linear, 0 0, 100% 0, from(rgba(0, 0, 0, 0.001)), to(rgba(0, 0, 0, 0.75))); ++ background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.001), rgba(0, 0, 0, 0.75)); + background-image: -o-linear-gradient(left, rgba(0, 0, 0, 0.001), rgba(0, 0, 0, 0.75)); + background-image: linear-gradient(to right, rgba(0, 0, 0, 0.001), rgba(0, 0, 0, 0.75)); - background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.001), rgba(0, 0, 0, 0.75)); + background-repeat: repeat-x; - filter: progid:dximagetransform.microsoft.gradient(startColorstr='#00000000', endColorstr='#bf000000', GradientType=1); ++ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#bf000000', GradientType=1); } .carousel-control:hover { @@@ -5216,8 -5857,14 +5227,12 @@@ .hero-unit { padding: 60px; margin-bottom: 30px; + font-size: 18px; + font-weight: 200; + line-height: 30px; + color: inherit; background-color: #eeeeee; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; + border-radius: 6px; } .hero-unit h1 { @@@ -5228,24 -5875,10 +5243,21 @@@ color: inherit; } - .hero-unit p { - font-size: 18px; - font-weight: 200; + .hero-unit li { line-height: 30px; - color: inherit; } +.clear:before, +.clear:after { + display: table; + line-height: 0; + content: ""; +} + +.clear:after { + clear: both; +} + .pull-right { float: right; } @@@ -5277,684 -5902,3 +5289,691 @@@ .affix { position: fixed; } + +.control-block-level { + display: block; + width: 100%; +} + +.hidden { + display: none; + visibility: hidden; +} + +.visible-phone { + display: none !important; +} + +.visible-tablet { + display: none !important; +} + +.hidden-desktop { + display: none !important; +} + +.visible-desktop { + display: inherit !important; +} + +@media (min-width: 768px) and (max-width: 979px) { + .hidden-desktop { + display: inherit !important; + } + .visible-desktop { + display: none !important ; + } + .visible-tablet { + display: inherit !important; + } + .hidden-tablet { + display: none !important; + } +} + +@media (max-width: 767px) { + .hidden-desktop { + display: inherit !important; + } + .visible-desktop { + display: none !important; + } + .visible-phone { + display: inherit !important; + } + .hidden-phone { + display: none !important; + } +} + +@media (min-width: 1200px) { + .container, + .navbar-fixed-top .container, + .navbar-fixed-bottom .container { + width: 1170px; + } + .row { + margin-right: -15px; + margin-left: -15px; + } + .row:before, + .row:after { + display: table; + line-height: 0; + content: ""; + } + .row:after { + clear: both; + } + [class*="span"] { + float: left; + min-height: 1px; + padding-right: 15px; + padding-left: 15px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + } + .span12 { + width: 100%; + } + .span11 { + width: 91.66666666666666%; + } + .span10 { + width: 83.33333333333334%; + } + .span9 { + width: 75%; + } + .span8 { + width: 66.66666666666666%; + } + .span7 { + width: 58.333333333333336%; + } + .span6 { + width: 50%; + } + .span5 { + width: 41.66666666666667%; + } + .span4 { + width: 33.33333333333333%; + } + .span3 { + width: 25%; + } + .span2 { + width: 16.666666666666664%; + } + .span1 { + width: 8.333333333333332%; + } + .offset12 { + margin-left: 100%; + } + .offset11 { + margin-left: 91.66666666666666%; + } + .offset10 { + margin-left: 83.33333333333334%; + } + .offset9 { + margin-left: 75%; + } + .offset8 { + margin-left: 66.66666666666666%; + } + .offset7 { + margin-left: 58.333333333333336%; + } + .offset6 { + margin-left: 50%; + } + .offset5 { + margin-left: 41.66666666666667%; + } + .offset4 { + margin-left: 33.33333333333333%; + } + .offset3 { + margin-left: 25%; + } + .offset2 { + margin-left: 16.666666666666664%; + } + .offset1 { + margin-left: 8.333333333333332%; + } + input.span12, + textarea.span12, + select.span12, + .uneditable-input.span12 { + width: 97.43589743589743%; + margin-right: 1.282051282051282%; + margin-left: 1.282051282051282%; + } + input.span11, + textarea.span11, + select.span11, + .uneditable-input.span11 { + width: 89.10256410256409%; + margin-right: 1.282051282051282%; + margin-left: 1.282051282051282%; + } + input.span10, + textarea.span10, + select.span10, + .uneditable-input.span10 { + width: 80.76923076923077%; + margin-right: 1.282051282051282%; + margin-left: 1.282051282051282%; + } + input.span9, + textarea.span9, + select.span9, + .uneditable-input.span9 { + width: 72.43589743589743%; + margin-right: 1.282051282051282%; + margin-left: 1.282051282051282%; + } + input.span8, + textarea.span8, + select.span8, + .uneditable-input.span8 { + width: 64.10256410256409%; + margin-right: 1.282051282051282%; + margin-left: 1.282051282051282%; + } + input.span7, + textarea.span7, + select.span7, + .uneditable-input.span7 { + width: 55.769230769230774%; + margin-right: 1.282051282051282%; + margin-left: 1.282051282051282%; + } + input.span6, + textarea.span6, + select.span6, + .uneditable-input.span6 { + width: 47.43589743589744%; + margin-right: 1.282051282051282%; + margin-left: 1.282051282051282%; + } + input.span5, + textarea.span5, + select.span5, + .uneditable-input.span5 { + width: 39.10256410256411%; + margin-right: 1.282051282051282%; + margin-left: 1.282051282051282%; + } + input.span4, + textarea.span4, + select.span4, + .uneditable-input.span4 { + width: 30.769230769230766%; + margin-right: 1.282051282051282%; + margin-left: 1.282051282051282%; + } + input.span3, + textarea.span3, + select.span3, + .uneditable-input.span3 { + width: 22.435897435897438%; + margin-right: 1.282051282051282%; + margin-left: 1.282051282051282%; + } + input.span2, + textarea.span2, + select.span2, + .uneditable-input.span2 { + width: 14.1025641025641%; + margin-right: 1.282051282051282%; + margin-left: 1.282051282051282%; + } + input.span1, + textarea.span1, + select.span1, + .uneditable-input.span1 { + width: 5.769230769230768%; + margin-right: 1.282051282051282%; + margin-left: 1.282051282051282%; + } + input.offset12, + textarea.offset12, + select.offset12, + uneditable-input.offset12 { + margin-left: 101.28205128205128%; + } + input.offset11, + textarea.offset11, + select.offset11, + uneditable-input.offset11 { + margin-left: 92.94871794871794%; + } + input.offset10, + textarea.offset10, + select.offset10, + uneditable-input.offset10 { + margin-left: 84.61538461538463%; + } + input.offset9, + textarea.offset9, + select.offset9, + uneditable-input.offset9 { + margin-left: 76.28205128205128%; + } + input.offset8, + textarea.offset8, + select.offset8, + uneditable-input.offset8 { + margin-left: 67.94871794871794%; + } + input.offset7, + textarea.offset7, + select.offset7, + uneditable-input.offset7 { + margin-left: 59.61538461538462%; + } + input.offset6, + textarea.offset6, + select.offset6, + uneditable-input.offset6 { + margin-left: 51.282051282051285%; + } + input.offset5, + textarea.offset5, + select.offset5, + uneditable-input.offset5 { + margin-left: 42.948717948717956%; + } + input.offset4, + textarea.offset4, + select.offset4, + uneditable-input.offset4 { + margin-left: 34.61538461538461%; + } + input.offset3, + textarea.offset3, + select.offset3, + uneditable-input.offset3 { + margin-left: 26.28205128205128%; + } + input.offset2, + textarea.offset2, + select.offset2, + uneditable-input.offset2 { + margin-left: 17.948717948717945%; + } + input.offset1, + textarea.offset1, + select.offset1, + uneditable-input.offset1 { + margin-left: 9.615384615384613%; + } +} + +@media (min-width: 768px) and (max-width: 979px) { + .row { + margin-right: -10px; + margin-left: -10px; + } + .row:before, + .row:after { + display: table; + line-height: 0; + content: ""; + } + .row:after { + clear: both; + } + [class*="span"] { + float: left; + min-height: 1px; + padding-right: 10px; + padding-left: 10px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + } + .span12 { + width: 100%; + } + .span11 { + width: 91.66666666666666%; + } + .span10 { + width: 83.33333333333334%; + } + .span9 { + width: 75%; + } + .span8 { + width: 66.66666666666666%; + } + .span7 { + width: 58.333333333333336%; + } + .span6 { + width: 50%; + } + .span5 { + width: 41.66666666666667%; + } + .span4 { + width: 33.33333333333333%; + } + .span3 { + width: 25%; + } + .span2 { + width: 16.666666666666664%; + } + .span1 { + width: 8.333333333333332%; + } + .offset12 { + margin-left: 100%; + } + .offset11 { + margin-left: 91.66666666666666%; + } + .offset10 { + margin-left: 83.33333333333334%; + } + .offset9 { + margin-left: 75%; + } + .offset8 { + margin-left: 66.66666666666666%; + } + .offset7 { + margin-left: 58.333333333333336%; + } + .offset6 { + margin-left: 50%; + } + .offset5 { + margin-left: 41.66666666666667%; + } + .offset4 { + margin-left: 33.33333333333333%; + } + .offset3 { + margin-left: 25%; + } + .offset2 { + margin-left: 16.666666666666664%; + } + .offset1 { + margin-left: 8.333333333333332%; + } +} + +@media (max-width: 767px) { + body { + padding-right: 20px; + padding-left: 20px; + } + .navbar-fixed-top, + .navbar-fixed-bottom, + .navbar-static-top { + margin-right: -20px; + margin-left: -20px; + } + .container-fluid { + padding: 0; + } + .dl-horizontal dt { + float: none; + width: auto; + clear: none; + text-align: left; + } + .dl-horizontal dd { + margin-left: 0; + } + .container { + width: auto; + } + [class*="span"], + .uneditable-input[class*="span"] { + display: block; + float: none; + width: 100%; + margin-left: 0; + } + input[class*="span"], + select[class*="span"], + textarea[class*="span"], + .uneditable-input { + display: block; + width: 100%; + } + .input-prepend input, + .input-append input, + .input-prepend input[class*="span"], + .input-append input[class*="span"] { + display: inline-block; + width: auto; + } + .controls-row [class*="span"] + [class*="span"] { + margin-left: 0; + } + .modal { + position: fixed; + top: 20px; + right: 20px; + left: 20px; + width: auto; + margin: 0; + } + .modal.fade { + top: -100px; + } + .modal.fade.in { + top: 20px; + } +} + +@media (max-width: 480px) { + .nav-collapse { + -webkit-transform: translate3d(0, 0, 0); + } + .page-header h1 small { + display: block; + line-height: 20px; + } + input[type="checkbox"], + input[type="radio"] { + border: 1px solid #ccc; + } + .form-horizontal .control-label { + float: none; + width: auto; + padding-top: 0; + text-align: left; + } + .form-horizontal .controls { + margin-left: 0; + } + .form-horizontal .control-list { + padding-top: 0; + } + .form-horizontal .form-actions { + padding-right: 10px; + padding-left: 10px; + } + .media .pull-left, + .media .pull-right { + display: block; + float: none; + margin-bottom: 10px; + } + .media-object { + margin-right: 0; + margin-left: 0; + } + .modal { + top: 10px; + right: 10px; + left: 10px; + } + .modal-header .close { + padding: 10px; + margin: -10px; + } + .carousel-caption { + position: static; + } +} + +@media (max-width: 979px) { + body { + padding-top: 0; + } + .navbar-fixed-top, + .navbar-fixed-bottom { + position: static; + } + .navbar-fixed-top { + margin-bottom: 20px; + } + .navbar-fixed-bottom { + margin-top: 20px; + } + .navbar-fixed-top, + .navbar-fixed-bottom { + padding: 5px; + } + .navbar .container { + width: auto; + padding: 0; + } + .navbar .brand { + padding-right: 10px; + padding-left: 10px; + margin: 0 0 0 -5px; + } + .nav-collapse { + clear: both; + } + .nav-collapse .nav { + float: none; + margin: 0 0 10px; + } + .nav-collapse .nav > li { + float: none; + } + .nav-collapse .nav > li > a { + margin-bottom: 2px; + } + .nav-collapse .nav > .divider-vertical { + display: none; + } + .nav-collapse .nav .nav-header { + color: #777777; + text-shadow: none; + } + .nav-collapse .nav > li > a, + .nav-collapse .dropdown-menu a { + padding: 9px 15px; + font-weight: bold; + color: #777777; + border-radius: 3px; + } + .nav-collapse .btn { + padding: 4px 10px 4px; + font-weight: normal; + border-radius: 4px; + } + .nav-collapse .dropdown-menu li + li a { + margin-bottom: 2px; + } + .nav-collapse .nav > li > a:hover, + .nav-collapse .dropdown-menu a:hover { + background-color: #f2f2f2; + } ++ .navbar-inverse .nav-collapse .nav > li > a, ++ .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; + } + .nav-collapse.in .btn-group { + padding: 0; + margin-top: 5px; + } + .nav-collapse .dropdown-menu { + position: static; + top: auto; + left: auto; - display: block; ++ display: none; + float: none; + max-width: none; + padding: 0; + margin: 0 15px; + background-color: transparent; + border: none; + border-radius: 0; + -webkit-box-shadow: none; + box-shadow: none; + } ++ .nav-collapse .open > .dropdown-menu { ++ display: block; ++ } + .nav-collapse .dropdown-menu:before, + .nav-collapse .dropdown-menu:after { + display: none; + } + .nav-collapse .dropdown-menu .divider { + display: none; + } + .nav-collapse .nav > li > .dropdown-menu:before, + .nav-collapse .nav > li > .dropdown-menu:after { + display: none; + } + .nav-collapse .navbar-form, + .nav-collapse .navbar-search { + float: none; + padding: 10px 15px; + margin: 10px 0; + border-top: 1px solid #f2f2f2; + border-bottom: 1px solid #f2f2f2; + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); + } + .navbar-inverse .nav-collapse .navbar-form, + .navbar-inverse .nav-collapse .navbar-search { + border-top-color: #111111; + border-bottom-color: #111111; + } + .navbar .nav-collapse .nav.pull-right { + float: none; + margin-left: 0; + } + .nav-collapse, + .nav-collapse.collapse { + height: 0; + overflow: hidden; + } + .navbar .btn-navbar { + display: block; + } + .navbar-static { + padding-right: 10px; + padding-left: 10px; + } +} + +@media (min-width: 980px) { + .nav-collapse.collapse { + height: auto !important; + overflow: visible !important; + } +} diff --cc docs/base-css.html index 1070ef2f45,4d27a6d69d..7fe561b97e --- a/docs/base-css.html +++ b/docs/base-css.html @@@ -1333,16 -1334,29 +1333,27 @@@ For example, <code><section> </form> -

Control sizing

+

Control sizing

Use relative sizing classes like .input-large or match your inputs to the grid column sizes using .span* classes.

+

Block level inputs

+

Make any <input> or <textarea> element behave like a block level element.

+
+
+ +
+
+
+ <input class="input-block-level" type="text" placeholder=".input-block-level">
+ 
+

Relative sizing

+

Create larger or smaller form controls that match button sizes.

- - - - - + +
diff --cc docs/getting-started.html
index c37c037bd6,6142508440..cfc61cc791
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@@ -238,8 -240,15 +238,15 @@@
              

5. Examples

Move beyond the base template with a few example layouts. We encourage folks to iterate on these examples and not simply use them as an end result.

-
-

{{_i}}Control sizing{{/i}}

+

{{_i}}Control sizing{{/i}}

{{_i}}Use relative sizing classes like .input-large or match your inputs to the grid column sizes using .span* classes.{{/i}}

+

{{_i}}Block level inputs{{/i}}

+

{{_i}}Make any <input> or <textarea> element behave like a block level element.{{/i}}

+
+
+ +
+
+
+ <input class="input-block-level" type="text" placeholder=".input-block-level">
+ 
+

{{_i}}Relative sizing{{/i}}

+

{{_i}}Create larger or smaller form controls that match button sizes.{{/i}}

- - - - - + +
diff --cc docs/templates/pages/getting-started.mustache
index 5086c56321,2eec7ff769..81dab1c5b3
--- a/docs/templates/pages/getting-started.mustache
+++ b/docs/templates/pages/getting-started.mustache
@@@ -169,8 -169,15 +169,15 @@@
              

{{_i}}5. Examples{{/i}}

{{_i}}Move beyond the base template with a few example layouts. We encourage folks to iterate on these examples and not simply use them as an end result.{{/i}}

-