From 0b122bc5c526724992036a8e286079188ade3b10 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 28 Aug 2012 13:33:06 -0700 Subject: remake the box-size grid, nuke fluid grid docs, fix up examples, clean up form styles --- docs/assets/css/bootstrap-responsive.css | 612 ++++--------------------------- 1 file changed, 67 insertions(+), 545 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 fcc496760..9b8a2e41e 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -92,8 +92,14 @@ } @media (min-width: 1200px) { + .container, + .navbar-fixed-top .container, + .navbar-fixed-bottom .container { + width: 1170px; + } .row { - margin-left: -30px; + margin-right: -15px; + margin-left: -15px; *zoom: 1; } .row:before, @@ -108,324 +114,83 @@ [class*="span"] { float: left; min-height: 1px; - margin-left: 30px; - } - .container, - .navbar-static-top .container, - .navbar-fixed-top .container, - .navbar-fixed-bottom .container { - width: 1170px; + padding-right: 15px; + padding-left: 15px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } .span12 { - width: 1170px; + width: 100%; } .span11 { - width: 1070px; + width: 91.66666666666666%; } .span10 { - width: 970px; + width: 83.33333333333334%; } .span9 { - width: 870px; + width: 75%; } .span8 { - width: 770px; + width: 66.66666666666666%; } .span7 { - width: 670px; + width: 58.333333333333336%; } .span6 { - width: 570px; + width: 50%; } .span5 { - width: 470px; + width: 41.66666666666667%; } .span4 { - width: 370px; + width: 33.33333333333333%; } .span3 { - width: 270px; + width: 25%; } .span2 { - width: 170px; + width: 16.666666666666664%; } .span1 { - width: 70px; + width: 8.333333333333332%; } .offset12 { - margin-left: 1230px; + margin-left: 100%; } .offset11 { - margin-left: 1130px; + margin-left: 91.66666666666666%; } .offset10 { - margin-left: 1030px; + margin-left: 83.33333333333334%; } .offset9 { - margin-left: 930px; + margin-left: 75%; } .offset8 { - margin-left: 830px; + margin-left: 66.66666666666666%; } .offset7 { - margin-left: 730px; + margin-left: 58.333333333333336%; } .offset6 { - margin-left: 630px; + margin-left: 50%; } .offset5 { - margin-left: 530px; + margin-left: 41.66666666666667%; } .offset4 { - margin-left: 430px; + margin-left: 33.33333333333333%; } .offset3 { - margin-left: 330px; + margin-left: 25%; } .offset2 { - margin-left: 230px; + margin-left: 16.666666666666664%; } .offset1 { - margin-left: 130px; - } - .row-fluid { - width: 100%; - *zoom: 1; - } - .row-fluid:before, - .row-fluid:after { - display: table; - line-height: 0; - content: ""; - } - .row-fluid:after { - clear: both; - } - .row-fluid [class*="span"] { - display: block; - float: left; - width: 100%; - min-height: 30px; - margin-left: 2.564102564102564%; - *margin-left: 2.5109110747408616%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - } - .row-fluid [class*="span"]:first-child { - margin-left: 0; - } - .row-fluid .span12 { - width: 100%; - *width: 99.94680851063829%; - } - .row-fluid .span11 { - width: 91.45299145299145%; - *width: 91.39979996362975%; - } - .row-fluid .span10 { - width: 82.90598290598291%; - *width: 82.8527914166212%; - } - .row-fluid .span9 { - width: 74.35897435897436%; - *width: 74.30578286961266%; - } - .row-fluid .span8 { - width: 65.81196581196582%; - *width: 65.75877432260411%; - } - .row-fluid .span7 { - width: 57.26495726495726%; - *width: 57.21176577559556%; - } - .row-fluid .span6 { - width: 48.717948717948715%; - *width: 48.664757228587014%; - } - .row-fluid .span5 { - width: 40.17094017094017%; - *width: 40.11774868157847%; - } - .row-fluid .span4 { - width: 31.623931623931625%; - *width: 31.570740134569924%; - } - .row-fluid .span3 { - width: 23.076923076923077%; - *width: 23.023731587561375%; - } - .row-fluid .span2 { - width: 14.52991452991453%; - *width: 14.476723040552828%; - } - .row-fluid .span1 { - width: 5.982905982905983%; - *width: 5.929714493544281%; - } - .row-fluid .offset12 { - margin-left: 105.12820512820512%; - *margin-left: 105.02182214948171%; - } - .row-fluid .offset12:first-child { - margin-left: 102.56410256410257%; - *margin-left: 102.45771958537915%; - } - .row-fluid .offset11 { - margin-left: 96.58119658119658%; - *margin-left: 96.47481360247316%; - } - .row-fluid .offset11:first-child { - margin-left: 94.01709401709402%; - *margin-left: 93.91071103837061%; - } - .row-fluid .offset10 { - margin-left: 88.03418803418803%; - *margin-left: 87.92780505546462%; - } - .row-fluid .offset10:first-child { - margin-left: 85.47008547008548%; - *margin-left: 85.36370249136206%; - } - .row-fluid .offset9 { - margin-left: 79.48717948717949%; - *margin-left: 79.38079650845607%; - } - .row-fluid .offset9:first-child { - margin-left: 76.92307692307693%; - *margin-left: 76.81669394435352%; - } - .row-fluid .offset8 { - margin-left: 70.94017094017094%; - *margin-left: 70.83378796144753%; - } - .row-fluid .offset8:first-child { - margin-left: 68.37606837606839%; - *margin-left: 68.26968539734497%; - } - .row-fluid .offset7 { - margin-left: 62.393162393162385%; - *margin-left: 62.28677941443899%; - } - .row-fluid .offset7:first-child { - margin-left: 59.82905982905982%; - *margin-left: 59.72267685033642%; - } - .row-fluid .offset6 { - margin-left: 53.84615384615384%; - *margin-left: 53.739770867430444%; - } - .row-fluid .offset6:first-child { - margin-left: 51.28205128205128%; - *margin-left: 51.175668303327875%; - } - .row-fluid .offset5 { - margin-left: 45.299145299145295%; - *margin-left: 45.1927623204219%; - } - .row-fluid .offset5:first-child { - margin-left: 42.73504273504273%; - *margin-left: 42.62865975631933%; - } - .row-fluid .offset4 { - margin-left: 36.75213675213675%; - *margin-left: 36.645753773413354%; - } - .row-fluid .offset4:first-child { - margin-left: 34.18803418803419%; - *margin-left: 34.081651209310785%; - } - .row-fluid .offset3 { - margin-left: 28.205128205128204%; - *margin-left: 28.0987452264048%; - } - .row-fluid .offset3:first-child { - margin-left: 25.641025641025642%; - *margin-left: 25.53464266230224%; - } - .row-fluid .offset2 { - margin-left: 19.65811965811966%; - *margin-left: 19.551736679396257%; - } - .row-fluid .offset2:first-child { - margin-left: 17.094017094017094%; - *margin-left: 16.98763411529369%; - } - .row-fluid .offset1 { - margin-left: 11.11111111111111%; - *margin-left: 11.004728132387708%; - } - .row-fluid .offset1:first-child { - margin-left: 8.547008547008547%; - *margin-left: 8.440625568285142%; - } - input, - textarea, - .uneditable-input { - margin-left: 0; - } - .controls-row [class*="span"] + [class*="span"] { - margin-left: 30px; - } - input.span12, - textarea.span12, - .uneditable-input.span12 { - width: 1156px; - } - input.span11, - textarea.span11, - .uneditable-input.span11 { - width: 1056px; - } - input.span10, - textarea.span10, - .uneditable-input.span10 { - width: 956px; - } - input.span9, - textarea.span9, - .uneditable-input.span9 { - width: 856px; - } - input.span8, - textarea.span8, - .uneditable-input.span8 { - width: 756px; - } - input.span7, - textarea.span7, - .uneditable-input.span7 { - width: 656px; - } - input.span6, - textarea.span6, - .uneditable-input.span6 { - width: 556px; - } - input.span5, - textarea.span5, - .uneditable-input.span5 { - width: 456px; - } - input.span4, - textarea.span4, - .uneditable-input.span4 { - width: 356px; - } - input.span3, - textarea.span3, - .uneditable-input.span3 { - width: 256px; - } - input.span2, - textarea.span2, - .uneditable-input.span2 { - width: 156px; - } - input.span1, - textarea.span1, - .uneditable-input.span1 { - width: 56px; + margin-left: 8.333333333333332%; } .thumbnails { margin-left: -30px; @@ -433,14 +198,12 @@ .thumbnails > li { margin-left: 30px; } - .row-fluid .thumbnails { - margin-left: 0; - } } @media (min-width: 768px) and (max-width: 979px) { .row { - margin-left: -20px; + margin-right: -10px; + margin-left: -10px; *zoom: 1; } .row:before, @@ -455,324 +218,83 @@ [class*="span"] { float: left; min-height: 1px; - margin-left: 20px; - } - .container, - .navbar-static-top .container, - .navbar-fixed-top .container, - .navbar-fixed-bottom .container { - width: 724px; + padding-right: 10px; + padding-left: 10px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } .span12 { - width: 724px; + width: 100%; } .span11 { - width: 662px; + width: 91.66666666666666%; } .span10 { - width: 600px; + width: 83.33333333333334%; } .span9 { - width: 538px; + width: 75%; } .span8 { - width: 476px; + width: 66.66666666666666%; } .span7 { - width: 414px; + width: 58.333333333333336%; } .span6 { - width: 352px; + width: 50%; } .span5 { - width: 290px; + width: 41.66666666666667%; } .span4 { - width: 228px; + width: 33.33333333333333%; } .span3 { - width: 166px; + width: 25%; } .span2 { - width: 104px; + width: 16.666666666666664%; } .span1 { - width: 42px; + width: 8.333333333333332%; } .offset12 { - margin-left: 764px; + margin-left: 100%; } .offset11 { - margin-left: 702px; + margin-left: 91.66666666666666%; } .offset10 { - margin-left: 640px; + margin-left: 83.33333333333334%; } .offset9 { - margin-left: 578px; + margin-left: 75%; } .offset8 { - margin-left: 516px; + margin-left: 66.66666666666666%; } .offset7 { - margin-left: 454px; + margin-left: 58.333333333333336%; } .offset6 { - margin-left: 392px; + margin-left: 50%; } .offset5 { - margin-left: 330px; + margin-left: 41.66666666666667%; } .offset4 { - margin-left: 268px; + margin-left: 33.33333333333333%; } .offset3 { - margin-left: 206px; + margin-left: 25%; } .offset2 { - margin-left: 144px; + margin-left: 16.666666666666664%; } .offset1 { - margin-left: 82px; - } - .row-fluid { - width: 100%; - *zoom: 1; - } - .row-fluid:before, - .row-fluid:after { - display: table; - line-height: 0; - content: ""; - } - .row-fluid:after { - clear: both; - } - .row-fluid [class*="span"] { - display: block; - float: left; - width: 100%; - min-height: 30px; - margin-left: 2.7624309392265194%; - *margin-left: 2.709239449864817%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - } - .row-fluid [class*="span"]:first-child { - margin-left: 0; - } - .row-fluid .span12 { - width: 100%; - *width: 99.94680851063829%; - } - .row-fluid .span11 { - width: 91.43646408839778%; - *width: 91.38327259903608%; - } - .row-fluid .span10 { - width: 82.87292817679558%; - *width: 82.81973668743387%; - } - .row-fluid .span9 { - width: 74.30939226519337%; - *width: 74.25620077583166%; - } - .row-fluid .span8 { - width: 65.74585635359117%; - *width: 65.69266486422946%; - } - .row-fluid .span7 { - width: 57.18232044198895%; - *width: 57.12912895262725%; - } - .row-fluid .span6 { - width: 48.61878453038674%; - *width: 48.56559304102504%; - } - .row-fluid .span5 { - width: 40.05524861878453%; - *width: 40.00205712942283%; - } - .row-fluid .span4 { - width: 31.491712707182323%; - *width: 31.43852121782062%; - } - .row-fluid .span3 { - width: 22.92817679558011%; - *width: 22.87498530621841%; - } - .row-fluid .span2 { - width: 14.3646408839779%; - *width: 14.311449394616199%; - } - .row-fluid .span1 { - width: 5.801104972375691%; - *width: 5.747913483013988%; - } - .row-fluid .offset12 { - margin-left: 105.52486187845304%; - *margin-left: 105.41847889972962%; - } - .row-fluid .offset12:first-child { - margin-left: 102.76243093922652%; - *margin-left: 102.6560479605031%; - } - .row-fluid .offset11 { - margin-left: 96.96132596685082%; - *margin-left: 96.8549429881274%; - } - .row-fluid .offset11:first-child { - margin-left: 94.1988950276243%; - *margin-left: 94.09251204890089%; - } - .row-fluid .offset10 { - margin-left: 88.39779005524862%; - *margin-left: 88.2914070765252%; - } - .row-fluid .offset10:first-child { - margin-left: 85.6353591160221%; - *margin-left: 85.52897613729868%; - } - .row-fluid .offset9 { - margin-left: 79.8342541436464%; - *margin-left: 79.72787116492299%; - } - .row-fluid .offset9:first-child { - margin-left: 77.07182320441989%; - *margin-left: 76.96544022569647%; - } - .row-fluid .offset8 { - margin-left: 71.2707182320442%; - *margin-left: 71.16433525332079%; - } - .row-fluid .offset8:first-child { - margin-left: 68.50828729281768%; - *margin-left: 68.40190431409427%; - } - .row-fluid .offset7 { - margin-left: 62.70718232044199%; - *margin-left: 62.600799341718584%; - } - .row-fluid .offset7:first-child { - margin-left: 59.94475138121547%; - *margin-left: 59.838368402492065%; - } - .row-fluid .offset6 { - margin-left: 54.14364640883978%; - *margin-left: 54.037263430116376%; - } - .row-fluid .offset6:first-child { - margin-left: 51.38121546961326%; - *margin-left: 51.27483249088986%; - } - .row-fluid .offset5 { - margin-left: 45.58011049723757%; - *margin-left: 45.47372751851417%; - } - .row-fluid .offset5:first-child { - margin-left: 42.81767955801105%; - *margin-left: 42.71129657928765%; - } - .row-fluid .offset4 { - margin-left: 37.01657458563536%; - *margin-left: 36.91019160691196%; - } - .row-fluid .offset4:first-child { - margin-left: 34.25414364640884%; - *margin-left: 34.14776066768544%; - } - .row-fluid .offset3 { - margin-left: 28.45303867403315%; - *margin-left: 28.346655695309746%; - } - .row-fluid .offset3:first-child { - margin-left: 25.69060773480663%; - *margin-left: 25.584224756083227%; - } - .row-fluid .offset2 { - margin-left: 19.88950276243094%; - *margin-left: 19.783119783707537%; - } - .row-fluid .offset2:first-child { - margin-left: 17.12707182320442%; - *margin-left: 17.02068884448102%; - } - .row-fluid .offset1 { - margin-left: 11.32596685082873%; - *margin-left: 11.219583872105325%; - } - .row-fluid .offset1:first-child { - margin-left: 8.56353591160221%; - *margin-left: 8.457152932878806%; - } - input, - textarea, - .uneditable-input { - margin-left: 0; - } - .controls-row [class*="span"] + [class*="span"] { - margin-left: 20px; - } - input.span12, - textarea.span12, - .uneditable-input.span12 { - width: 710px; - } - input.span11, - textarea.span11, - .uneditable-input.span11 { - width: 648px; - } - input.span10, - textarea.span10, - .uneditable-input.span10 { - width: 586px; - } - input.span9, - textarea.span9, - .uneditable-input.span9 { - width: 524px; - } - input.span8, - textarea.span8, - .uneditable-input.span8 { - width: 462px; - } - input.span7, - textarea.span7, - .uneditable-input.span7 { - width: 400px; - } - input.span6, - textarea.span6, - .uneditable-input.span6 { - width: 338px; - } - input.span5, - textarea.span5, - .uneditable-input.span5 { - width: 276px; - } - input.span4, - textarea.span4, - .uneditable-input.span4 { - width: 214px; - } - input.span3, - textarea.span3, - .uneditable-input.span3 { - width: 152px; - } - input.span2, - textarea.span2, - .uneditable-input.span2 { - width: 90px; - } - input.span1, - textarea.span1, - .uneditable-input.span1 { - width: 28px; + margin-left: 8.333333333333332%; } } -- cgit v1.2.3 From dd1bce2611a83365c0b2fd14b14512180ec09ec1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 8 Sep 2012 12:50:37 -0700 Subject: latest tweaks to grid classes for forms --- docs/assets/css/bootstrap-responsive.css | 94 ++++++++++++++++++++++++++++++++ 1 file changed, 94 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 16ea44aa2..5abdc180d 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -192,6 +192,100 @@ .offset1 { margin-left: 8.333333333333332%; } + input[class*="span"]:first-child, + textarea[class*="span"]:first-child, + .uneditable-input[class*="span"]:first-child { + margin-left: 0; + } + input[class*="span"]:last-child, + textarea[class*="span"]:last-child, + .uneditable-input[class*="span"]:last-child { + margin-right: 0; + } + input.span12, + textarea.span12, + .uneditable-input.span12 { + width: 97.43589743589743%; + margin-right: 1.282051282051282%; + margin-left: 1.282051282051282%; + } + input.span11, + textarea.span11, + .uneditable-input.span11 { + width: 89.10256410256409%; + margin-right: 1.282051282051282%; + margin-left: 1.282051282051282%; + } + input.span10, + textarea.span10, + .uneditable-input.span10 { + width: 80.76923076923077%; + margin-right: 1.282051282051282%; + margin-left: 1.282051282051282%; + } + input.span9, + textarea.span9, + .uneditable-input.span9 { + width: 72.43589743589743%; + margin-right: 1.282051282051282%; + margin-left: 1.282051282051282%; + } + input.span8, + textarea.span8, + .uneditable-input.span8 { + width: 64.10256410256409%; + margin-right: 1.282051282051282%; + margin-left: 1.282051282051282%; + } + input.span7, + textarea.span7, + .uneditable-input.span7 { + width: 55.769230769230774%; + margin-right: 1.282051282051282%; + margin-left: 1.282051282051282%; + } + input.span6, + textarea.span6, + .uneditable-input.span6 { + width: 47.43589743589744%; + margin-right: 1.282051282051282%; + margin-left: 1.282051282051282%; + } + input.span5, + textarea.span5, + .uneditable-input.span5 { + width: 39.10256410256411%; + margin-right: 1.282051282051282%; + margin-left: 1.282051282051282%; + } + input.span4, + textarea.span4, + .uneditable-input.span4 { + width: 30.769230769230766%; + margin-right: 1.282051282051282%; + margin-left: 1.282051282051282%; + } + input.span3, + textarea.span3, + .uneditable-input.span3 { + width: 22.435897435897438%; + margin-right: 1.282051282051282%; + margin-left: 1.282051282051282%; + } + input.span2, + textarea.span2, + .uneditable-input.span2 { + width: 14.1025641025641%; + margin-right: 1.282051282051282%; + margin-left: 1.282051282051282%; + } + input.span1, + textarea.span1, + .uneditable-input.span1 { + width: 5.769230769230768%; + margin-right: 1.282051282051282%; + margin-left: 1.282051282051282%; + } .thumbnails { margin-left: -30px; } -- cgit v1.2.3 From 7110b243f5c88274742477c80c2d08be3f259566 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 10 Sep 2012 10:11:02 -0700 Subject: more tests and experiments --- docs/assets/css/bootstrap-responsive.css | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 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 5abdc180d..3f372560c 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -205,84 +205,84 @@ input.span12, textarea.span12, .uneditable-input.span12 { - width: 97.43589743589743%; + width: 99.97589305281613%; margin-right: 1.282051282051282%; margin-left: 1.282051282051282%; } input.span11, textarea.span11, .uneditable-input.span11 { - width: 89.10256410256409%; + width: 91.64657754401344%; margin-right: 1.282051282051282%; margin-left: 1.282051282051282%; } input.span10, textarea.span10, .uneditable-input.span10 { - width: 80.76923076923077%; + width: 83.31689677843524%; margin-right: 1.282051282051282%; margin-left: 1.282051282051282%; } input.span9, textarea.span9, .uneditable-input.span9 { - width: 72.43589743589743%; + width: 74.98685075608152%; margin-right: 1.282051282051282%; margin-left: 1.282051282051282%; } input.span8, textarea.span8, .uneditable-input.span8 { - width: 64.10256410256409%; + width: 66.6564394769523%; margin-right: 1.282051282051282%; margin-left: 1.282051282051282%; } input.span7, textarea.span7, .uneditable-input.span7 { - width: 55.769230769230774%; + width: 58.325662941047554%; margin-right: 1.282051282051282%; margin-left: 1.282051282051282%; } input.span6, textarea.span6, .uneditable-input.span6 { - width: 47.43589743589744%; + width: 49.994521148367305%; margin-right: 1.282051282051282%; margin-left: 1.282051282051282%; } input.span5, textarea.span5, .uneditable-input.span5 { - width: 39.10256410256411%; + width: 41.663014098911525%; margin-right: 1.282051282051282%; margin-left: 1.282051282051282%; } input.span4, textarea.span4, .uneditable-input.span4 { - width: 30.769230769230766%; + width: 33.33114179268025%; margin-right: 1.282051282051282%; margin-left: 1.282051282051282%; } input.span3, textarea.span3, .uneditable-input.span3 { - width: 22.435897435897438%; + width: 24.998904229673464%; margin-right: 1.282051282051282%; margin-left: 1.282051282051282%; } input.span2, textarea.span2, .uneditable-input.span2 { - width: 14.1025641025641%; + width: 16.66630140989115%; margin-right: 1.282051282051282%; margin-left: 1.282051282051282%; } input.span1, textarea.span1, .uneditable-input.span1 { - width: 5.769230769230768%; + width: 8.333333333333332%; margin-right: 1.282051282051282%; margin-left: 1.282051282051282%; } -- cgit v1.2.3 From 527d01ce99a0cae8eae7868c0649dca60cda338c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 25 Sep 2012 15:01:03 -0700 Subject: headway, cleanup, and tests --- docs/assets/css/bootstrap-responsive.css | 118 +++++++++++++++++++++++++------ 1 file changed, 96 insertions(+), 22 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 3f372560c..4de21bbf3 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -192,100 +192,174 @@ .offset1 { margin-left: 8.333333333333332%; } - input[class*="span"]:first-child, - textarea[class*="span"]:first-child, - .uneditable-input[class*="span"]:first-child { - margin-left: 0; - } - input[class*="span"]:last-child, - textarea[class*="span"]:last-child, - .uneditable-input[class*="span"]:last-child { - margin-right: 0; - } input.span12, textarea.span12, + select.span12, .uneditable-input.span12 { - width: 99.97589305281613%; + width: 97.43589743589743%; margin-right: 1.282051282051282%; margin-left: 1.282051282051282%; } input.span11, textarea.span11, + select.span11, .uneditable-input.span11 { - width: 91.64657754401344%; + width: 89.10256410256409%; margin-right: 1.282051282051282%; margin-left: 1.282051282051282%; } input.span10, textarea.span10, + select.span10, .uneditable-input.span10 { - width: 83.31689677843524%; + width: 80.76923076923077%; margin-right: 1.282051282051282%; margin-left: 1.282051282051282%; } input.span9, textarea.span9, + select.span9, .uneditable-input.span9 { - width: 74.98685075608152%; + width: 72.43589743589743%; margin-right: 1.282051282051282%; margin-left: 1.282051282051282%; } input.span8, textarea.span8, + select.span8, .uneditable-input.span8 { - width: 66.6564394769523%; + width: 64.10256410256409%; margin-right: 1.282051282051282%; margin-left: 1.282051282051282%; } input.span7, textarea.span7, + select.span7, .uneditable-input.span7 { - width: 58.325662941047554%; + width: 55.769230769230774%; margin-right: 1.282051282051282%; margin-left: 1.282051282051282%; } input.span6, textarea.span6, + select.span6, .uneditable-input.span6 { - width: 49.994521148367305%; + width: 47.43589743589744%; margin-right: 1.282051282051282%; margin-left: 1.282051282051282%; } input.span5, textarea.span5, + select.span5, .uneditable-input.span5 { - width: 41.663014098911525%; + width: 39.10256410256411%; margin-right: 1.282051282051282%; margin-left: 1.282051282051282%; } input.span4, textarea.span4, + select.span4, .uneditable-input.span4 { - width: 33.33114179268025%; + width: 30.769230769230766%; margin-right: 1.282051282051282%; margin-left: 1.282051282051282%; } input.span3, textarea.span3, + select.span3, .uneditable-input.span3 { - width: 24.998904229673464%; + width: 22.435897435897438%; margin-right: 1.282051282051282%; margin-left: 1.282051282051282%; } input.span2, textarea.span2, + select.span2, .uneditable-input.span2 { - width: 16.66630140989115%; + width: 14.1025641025641%; margin-right: 1.282051282051282%; margin-left: 1.282051282051282%; } input.span1, textarea.span1, + select.span1, .uneditable-input.span1 { - width: 8.333333333333332%; + 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%; + } .thumbnails { margin-left: -30px; } -- cgit v1.2.3 From 0220015edd1c06e0475a346ca5882e3b1758af48 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 25 Sep 2012 22:07:53 -0700 Subject: remove all ie7 conditionals and mixins --- 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 8155f0f54..800c17560 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -8,10 +8,6 @@ * Designed and built with all the love in the world @twitter by @mdo and @fat. */ -.clearfix { - *zoom: 1; -} - .clearfix:before, .clearfix:after { display: table; @@ -100,7 +96,6 @@ .row { margin-right: -15px; margin-left: -15px; - *zoom: 1; } .row:before, .row:after { @@ -372,7 +367,6 @@ .row { margin-right: -10px; margin-left: -10px; - *zoom: 1; } .row:before, .row:after { -- cgit v1.2.3 From 151ed38cdcd938d4495482fb848736ee7b885c64 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 25 Sep 2012 22:18:34 -0700 Subject: remove references to row fluid elsewhere --- docs/assets/css/bootstrap-responsive.css | 12 ++---------- 1 file changed, 2 insertions(+), 10 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 800c17560..3a1e9e697 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -486,9 +486,6 @@ .container { width: auto; } - .row-fluid { - width: 100%; - } .row, .thumbnails { margin-left: 0; @@ -498,8 +495,7 @@ margin-left: 0; } [class*="span"], - .uneditable-input[class*="span"], - .row-fluid [class*="span"] { + .uneditable-input[class*="span"] { display: block; float: none; width: 100%; @@ -508,16 +504,12 @@ -moz-box-sizing: border-box; box-sizing: border-box; } - .span12, - .row-fluid .span12 { + .span12 { width: 100%; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } - .row-fluid [class*="offset"]:first-child { - margin-left: 0; - } .input-large, .input-xlarge, .input-xxlarge, -- cgit v1.2.3 From f12946be5a8e8529f64606ca73fe06e48f9fd583 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 25 Sep 2012 22:40:48 -0700 Subject: thumbnails cleanup: no more UL or LI elements needed, instead just use standard grid markup --- docs/assets/css/bootstrap-responsive.css | 25 +------------------------ 1 file changed, 1 insertion(+), 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 3a1e9e697..f456bc213 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -355,12 +355,6 @@ uneditable-input.offset1 { margin-left: 9.615384615384613%; } - .thumbnails { - margin-left: -30px; - } - .thumbnails > li { - margin-left: 30px; - } } @media (min-width: 768px) and (max-width: 979px) { @@ -486,12 +480,7 @@ .container { width: auto; } - .row, - .thumbnails { - margin-left: 0; - } - .thumbnails > li { - float: none; + .row { margin-left: 0; } [class*="span"], @@ -500,19 +489,7 @@ float: none; width: 100%; margin-left: 0; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - } - .span12 { - width: 100%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; } - .input-large, - .input-xlarge, - .input-xxlarge, input[class*="span"], select[class*="span"], textarea[class*="span"], -- cgit v1.2.3 From c59e5251e12a57b5f305b4996d6f164b71c7f22c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 25 Sep 2012 22:48:02 -0700 Subject: initial pass at removing navbar-inner from .navbar component --- 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 f456bc213..671cdd3c7 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -590,8 +590,8 @@ .navbar-fixed-bottom { margin-top: 20px; } - .navbar-fixed-top .navbar-inner, - .navbar-fixed-bottom .navbar-inner { + .navbar-fixed-top, + .navbar-fixed-bottom { padding: 5px; } .navbar .container { @@ -711,7 +711,7 @@ .navbar .btn-navbar { display: block; } - .navbar-static .navbar-inner { + .navbar-static { padding-right: 10px; padding-left: 10px; } -- cgit v1.2.3 From 6b578ec8de0865c6c5b3e12c7824037a7d422789 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 26 Sep 2012 08:59:57 -0700 Subject: move mixins that generate css to utilities.less with different class names, but the same mixins --- docs/assets/css/bootstrap-responsive.css | 28 ---------------------------- 1 file changed, 28 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 671cdd3c7..d749708d2 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -8,34 +8,6 @@ * Designed and built with all the love in the world @twitter by @mdo and @fat. */ -.clearfix:before, -.clearfix:after { - display: table; - line-height: 0; - content: ""; -} - -.clearfix:after { - clear: both; -} - -.hide-text { - font: 0/0 a; - color: transparent; - text-shadow: none; - background-color: transparent; - border: 0; -} - -.input-block-level { - display: block; - width: 100%; - min-height: 30px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - .hidden { display: none; visibility: hidden; -- cgit v1.2.3 From 9872902e4784220f3add1a1af256dfc89cd6e31a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 30 Sep 2012 23:11:54 -0700 Subject: remove .border-radius mixin and replace with standard border-radius property, since -webkit-* and -moz-* are only needed for older versions --- docs/assets/css/bootstrap-responsive.css | 12 +++--------- 1 file changed, 3 insertions(+), 9 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 d749708d2..879a8dd33 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -600,16 +600,12 @@ padding: 9px 15px; font-weight: bold; color: #777777; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - 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; + border-radius: 4px; } .nav-collapse .dropdown-menu li + li a { margin-bottom: 2px; @@ -637,9 +633,7 @@ margin: 0 15px; background-color: transparent; border: none; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; + border-radius: 0; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; -- cgit v1.2.3 From 443b6052463285b36752f97a656be95c01650fca Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 30 Sep 2012 23:17:07 -0700 Subject: remove -moz-box-shadow from .box-shadow() mixin, but keep -webkit since that's needed for most iOS and Android mobile browsers --- docs/assets/css/bootstrap-responsive.css | 2 -- 1 file changed, 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 879a8dd33..c79f34c9c 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -635,7 +635,6 @@ border: none; border-radius: 0; -webkit-box-shadow: none; - -moz-box-shadow: none; box-shadow: none; } .nav-collapse .dropdown-menu:before, @@ -657,7 +656,6 @@ 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); - -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-inverse .nav-collapse .navbar-form, -- cgit v1.2.3 From de6ec034dbf08a2e9facb995c638ed6a9c156dcd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 30 Sep 2012 23:24:07 -0700 Subject: single CSS file for all css, including responsive --- docs/assets/css/bootstrap-responsive.css | 689 ------------------------------- 1 file changed, 689 deletions(-) delete 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 deleted file mode 100644 index c79f34c9c..000000000 --- a/docs/assets/css/bootstrap-responsive.css +++ /dev/null @@ -1,689 +0,0 @@ -/*! - * Bootstrap Responsive v2.1.2 - * - * 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; -} - -.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; - } - .row { - margin-left: 0; - } - [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%; - min-height: 30px; - -webkit-box-sizing: border-box; - -moz-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; - } - .controls-row [class*="span"] + [class*="span"] { - margin-left: 0; - } - .modal { - position: fixed; - top: 20px; - right: 20px; - left: 20px; - width: auto; - margin: 0; - } - .modal.fade.in { - top: auto; - } -} - -@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: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; - 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 .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; - } -} -- cgit v1.2.3 From 98b0d475ae9db023cc22b011388f1bea1c88c537 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 30 Nov 2012 22:30:50 -0800 Subject: version bump to 3.0 --- 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 04ba99554..4342ec3ec 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -1,5 +1,5 @@ /*! - * Bootstrap Responsive v2.2.2 + * Bootstrap Responsive v3.0.0 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 -- cgit v1.2.3