From: Mark Otto Date: Fri, 18 Jan 2013 04:23:33 +0000 (-0800) Subject: Merge branch '2.3.0-wip' into 3.0.0-wip X-Git-Tag: v3.0.0-rc1~750 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d9b35c2602b18c78a72ba4b1698b3ec93ccb868d;p=thirdparty%2Fbootstrap.git Merge branch '2.3.0-wip' into 3.0.0-wip Conflicts: docs/assets/css/bootstrap.css docs/components.html docs/css.html docs/customize.html docs/examples/fluid.html docs/extend.html docs/getting-started.html docs/index.html docs/javascript.html docs/scaffolding.html docs/templates/layout.mustache docs/templates/pages/base-css.mustache docs/templates/pages/components.mustache less/navbar.less --- d9b35c2602b18c78a72ba4b1698b3ec93ccb868d diff --cc docs/assets/css/bootstrap.css index 46cd2bc4bc,71c42f3196..a625ec51ac --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@@ -318,362 -221,396 +318,374 @@@ img } } -body { - margin: 0; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 14px; - line-height: 20px; - color: #333333; - background-color: #ffffff; -} - -a { - color: #0088cc; - text-decoration: none; +p { + margin: 0 0 10px; } -a:hover { - color: #005580; - text-decoration: underline; +.lead { + margin-bottom: 20px; + font-size: 21px; + font-weight: 200; + line-height: 1.25; } -.img-rounded { - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; +small { + font-size: 85%; } -.img-polaroid { - padding: 4px; - background-color: #fff; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.2); - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); +strong { + font-weight: bold; } -.img-circle { - -webkit-border-radius: 500px; - -moz-border-radius: 500px; - border-radius: 500px; +em { + font-style: italic; } -.row { - margin-left: -20px; - *zoom: 1; +cite { + font-style: normal; } -.row:before, -.row:after { - display: table; - line-height: 0; - content: ""; +.muted { + color: #999999; } -.row:after { - clear: both; +a.muted:hover { + color: #808080; } -[class*="span"] { - float: left; - min-height: 1px; - margin-left: 20px; +.text-warning { + color: #c09853; } -.container, -.navbar-static-top .container, -.navbar-fixed-top .container, -.navbar-fixed-bottom .container { - width: 940px; +a.text-warning:hover { + color: #a47e3c; } -.span12 { - width: 940px; +.text-error { + color: #b94a48; } -.span11 { - width: 860px; +a.text-error:hover { + color: #953b39; } -.span10 { - width: 780px; +.text-success { + color: #468847; } -.span9 { - width: 700px; +a.text-success:hover { + color: #356635; } -.span8 { - width: 620px; +.text-left { + text-align: left; } -.span7 { - width: 540px; +.text-right { + text-align: right; } -.span6 { - width: 460px; +.text-center { + text-align: center; } -.span5 { - width: 380px; ++.text-left { ++ text-align: left; + } + -.span4 { - width: 300px; ++.text-right { ++ text-align: right; + } + -.span3 { - width: 220px; ++.text-center { ++ text-align: center; + } + -.span2 { - width: 140px; +h1, +h2, +h3, +h4, +h5, +h6 { + font-family: inherit; + font-weight: 500; + line-height: 20px; + text-rendering: optimizelegibility; } -.span1 { - width: 60px; +h1 small, +h2 small, +h3 small, +h4 small, +h5 small, +h6 small { + font-weight: normal; + line-height: 1; + color: #999999; } -.offset12 { - margin-left: 980px; +h1, +h2, +h3 { + margin-top: 20px; + margin-bottom: 10px; + line-height: 40px; } -.offset11 { - margin-left: 900px; +h4, +h5, +h6 { + margin-top: 10px; + margin-bottom: 10px; } -.offset10 { - margin-left: 820px; +h1 { + font-size: 38.5px; + font-size: 4rem; } -.offset9 { - margin-left: 740px; +h2 { + font-size: 31.5px; + font-size: 3rem; } -.offset8 { - margin-left: 660px; +h3 { + font-size: 24.5px; + font-size: 2.5rem; } -.offset7 { - margin-left: 580px; +h4 { + font-size: 17.5px; + font-size: 2rem; } -.offset6 { - margin-left: 500px; +h5 { + font-size: 14px; + font-size: 1.6rem; } -.offset5 { - margin-left: 420px; +h6 { + font-size: 11.9px; + font-size: 1.2rem; } -.offset4 { - margin-left: 340px; +h1 small { + font-size: 24.5px; } -.offset3 { - margin-left: 260px; +h2 small { + font-size: 17.5px; } -.offset2 { - margin-left: 180px; +h3 small { + font-size: 14px; } -.offset1 { - margin-left: 100px; +h4 small { + font-size: 14px; } -.row-fluid { - width: 100%; - *zoom: 1; +.page-header { + padding-bottom: 9px; + margin: 40px 0 20px; + border-bottom: 1px solid #eeeeee; } -.row-fluid:before, -.row-fluid:after { - display: table; - line-height: 0; - content: ""; +ul, +ol { + padding: 0; + margin: 0 0 10px 25px; } -.row-fluid:after { - clear: both; +ul ul, +ul ol, +ol ol, +ol ul { + margin-bottom: 0; } -.row-fluid [class*="span"] { - display: block; - float: left; - width: 100%; - min-height: 30px; - margin-left: 2.127659574468085%; - *margin-left: 2.074468085106383%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; +li { + line-height: 20px; } -.row-fluid [class*="span"]:first-child { +.list-unstyled, +.list-inline { margin-left: 0; + list-style: none; } -.row-fluid .controls-row [class*="span"] + [class*="span"] { - margin-left: 2.127659574468085%; -} - -.row-fluid .span12 { - width: 100%; - *width: 99.94680851063829%; -} - -.row-fluid .span11 { - width: 91.48936170212765%; - *width: 91.43617021276594%; -} - -.row-fluid .span10 { - width: 82.97872340425532%; - *width: 82.92553191489361%; -} - -.row-fluid .span9 { - width: 74.46808510638297%; - *width: 74.41489361702126%; -} - -.row-fluid .span8 { - width: 65.95744680851064%; - *width: 65.90425531914893%; -} - -.row-fluid .span7 { - width: 57.44680851063829%; - *width: 57.39361702127659%; -} - -.row-fluid .span6 { - width: 48.93617021276595%; - *width: 48.88297872340425%; -} - -.row-fluid .span5 { - width: 40.42553191489362%; - *width: 40.37234042553192%; -} - -.row-fluid .span4 { - width: 31.914893617021278%; - *width: 31.861702127659576%; -} - -.row-fluid .span3 { - width: 23.404255319148934%; - *width: 23.351063829787233%; -} - -.row-fluid .span2 { - width: 14.893617021276595%; - *width: 14.840425531914894%; +.list-inline > li { + display: inline-block; + padding-right: 5px; + padding-left: 5px; } -.row-fluid .span1 { - width: 6.382978723404255%; - *width: 6.329787234042553%; +dl { + margin-bottom: 20px; } -.row-fluid .offset12 { - margin-left: 104.25531914893617%; - *margin-left: 104.14893617021275%; +dt, +dd { + line-height: 20px; } -.row-fluid .offset12:first-child { - margin-left: 102.12765957446808%; - *margin-left: 102.02127659574467%; +dt { + font-weight: bold; } -.row-fluid .offset11 { - margin-left: 95.74468085106382%; - *margin-left: 95.6382978723404%; +dd { + margin-left: 10px; } -.row-fluid .offset11:first-child { - margin-left: 93.61702127659574%; - *margin-left: 93.51063829787232%; +.dl-horizontal:before, +.dl-horizontal:after { + display: table; + content: " "; } -.row-fluid .offset10 { - margin-left: 87.23404255319149%; - *margin-left: 87.12765957446807%; +.dl-horizontal:after { + clear: both; } -.row-fluid .offset10:first-child { - margin-left: 85.1063829787234%; - *margin-left: 84.99999999999999%; +.dl-horizontal dt { + float: left; + width: 160px; + overflow: hidden; + clear: left; + text-align: right; + text-overflow: ellipsis; + white-space: nowrap; } -.row-fluid .offset9 { - margin-left: 78.72340425531914%; - *margin-left: 78.61702127659572%; +.dl-horizontal dd { + margin-left: 180px; } -.row-fluid .offset9:first-child { - margin-left: 76.59574468085106%; - *margin-left: 76.48936170212764%; +hr { + margin: 20px 0; + border: 0; + border-top: 1px solid #eeeeee; + border-bottom: 1px solid #fff; } -.row-fluid .offset8 { - margin-left: 70.2127659574468%; - *margin-left: 70.10638297872339%; +abbr[title], +abbr[data-original-title] { + cursor: help; + border-bottom: 1px dotted #999999; } -.row-fluid .offset8:first-child { - margin-left: 68.08510638297872%; - *margin-left: 67.9787234042553%; +abbr.initialism { + font-size: 90%; + text-transform: uppercase; } -.row-fluid .offset7 { - margin-left: 61.70212765957446%; - *margin-left: 61.59574468085106%; +blockquote { + padding: 0 0 0 15px; + margin: 0 0 20px; + border-left: 5px solid #eeeeee; } -.row-fluid .offset7:first-child { - margin-left: 59.574468085106375%; - *margin-left: 59.46808510638297%; +blockquote p { + margin-bottom: 0; + font-size: 17.5px; + font-weight: 300; + line-height: 1.25; } -.row-fluid .offset6 { - margin-left: 53.191489361702125%; - *margin-left: 53.085106382978715%; +blockquote small { + display: block; + line-height: 20px; + color: #999999; } -.row-fluid .offset6:first-child { - margin-left: 51.063829787234035%; - *margin-left: 50.95744680851063%; +blockquote small:before { + content: '\2014 \00A0'; } -.row-fluid .offset5 { - margin-left: 44.68085106382979%; - *margin-left: 44.57446808510638%; +blockquote.pull-right { + float: right; + padding-right: 15px; + padding-left: 0; + border-right: 5px solid #eeeeee; + border-left: 0; } -.row-fluid .offset5:first-child { - margin-left: 42.5531914893617%; - *margin-left: 42.4468085106383%; +blockquote.pull-right p, +blockquote.pull-right small { + text-align: right; } -.row-fluid .offset4 { - margin-left: 36.170212765957444%; - *margin-left: 36.06382978723405%; +blockquote.pull-right small:before { + content: ''; } -.row-fluid .offset4:first-child { - margin-left: 34.04255319148936%; - *margin-left: 33.93617021276596%; +blockquote.pull-right small:after { + content: '\00A0 \2014'; } -.row-fluid .offset3 { - margin-left: 27.659574468085104%; - *margin-left: 27.5531914893617%; +q:before, +q:after, +blockquote:before, +blockquote:after { + content: ""; } -.row-fluid .offset3:first-child { - margin-left: 25.53191489361702%; - *margin-left: 25.425531914893618%; +address { + display: block; + margin-bottom: 20px; + font-style: normal; + line-height: 20px; } -.row-fluid .offset2 { - margin-left: 19.148936170212764%; - *margin-left: 19.04255319148936%; +code, +pre { + padding: 0 3px 2px; + font-family: Monaco, Menlo, Consolas, "Courier New", monospace; + font-size: 12px; + color: #333333; + border-radius: 4px; } -.row-fluid .offset2:first-child { - margin-left: 17.02127659574468%; - *margin-left: 16.914893617021278%; +code { + padding: 2px 4px; + font-size: 90%; + color: #c7254e; + white-space: nowrap; + background-color: #f9f2f4; } -.row-fluid .offset1 { - margin-left: 10.638297872340425%; - *margin-left: 10.53191489361702%; +pre { + display: block; + padding: 9.5px; + margin: 0 0 10px; + font-size: 13px; + line-height: 20px; + word-break: break-all; + word-wrap: break-word; + white-space: pre; + white-space: pre-wrap; + background-color: #f5f5f5; + border: 1px solid #ccc; + border: 1px solid rgba(0, 0, 0, 0.15); + border-radius: 4px; } -.row-fluid .offset1:first-child { - margin-left: 8.51063829787234%; - *margin-left: 8.404255319148938%; +pre.prettyprint { + margin-bottom: 20px; } -[class*="span"].hide, -.row-fluid [class*="span"].hide { - display: none; +pre code { + padding: 0; + color: inherit; + white-space: pre; + white-space: pre-wrap; + background-color: transparent; + border: 0; } -[class*="span"].pull-right, -.row-fluid [class*="span"].pull-right { - float: right; +.pre-scrollable { + max-height: 340px; + overflow-y: scroll; } .container { diff --cc docs/base-css.html index 0000000000,3294336b6e..35b5b964ed mode 000000,100644..100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@@ -1,0 -1,2215 +1,2231 @@@ + + + + + Base · Bootstrap + + + + + + - + + + - ++ + + + + + + + + + + + + + + +