From 475b985a0efaf534b56089f12c570d7861ce72f5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 16:37:43 -0800 Subject: remove padding from first-child of inline radios/checkboxes --- docs/assets/css/bootstrap.css | 3 +++ 1 file changed, 3 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e928bb6d1..1b572090c 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -596,6 +596,9 @@ input[type="hidden"] { .radio.inline + .radio.inline, .checkbox.inline + .checkbox.inline { margin-left: 10px; } +.controls > .radio.inline:first-child, .controls > .checkbox.inline:first-child { + padding-top: 5px; +} input, textarea { -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -- cgit v1.2.3 From 06df91ac559686e947c3c1fbfbdd2b7dcfc5a56b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 16:48:03 -0800 Subject: remove background from accordion, and use border instead --- docs/assets/css/bootstrap.css | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 1b572090c..bf1116f53 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3165,7 +3165,8 @@ a.thumbnail:hover { margin-bottom: 18px; } .accordion-group { - background-color: #f5f5f5; + margin-bottom: 2px; + border: 1px solid #e5e5e5; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -3177,9 +3178,6 @@ a.thumbnail:hover { display: block; padding: 8px 15px; } -.accordion-body { - margin-bottom: 2px; -} .accordion-inner { padding: 9px 15px; border-top: 1px solid #e5e5e5; -- 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.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index bf1116f53..6916e9361 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2315,8 +2315,8 @@ button.btn.small, input[type="submit"].btn.small { display: none; float: right; padding: 7px 10px; - margin-left: 10px; - margin-right: 10px; + margin-left: 5px; + margin-right: 5px; background-color: #2c2c2c; background-image: -moz-linear-gradient(top, #333333, #222222); background-image: -ms-linear-gradient(top, #333333, #222222); -- cgit v1.2.3 From cf1b46bda4853e8501c2b9587219535376a9cc36 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 18:46:41 -0800 Subject: fix alert close position --- docs/assets/css/bootstrap.css | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 6916e9361..43ef8547f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2002,6 +2002,7 @@ button.btn.small, input[type="submit"].btn.small { } .alert .close { position: relative; + top: -2px; right: -21px; line-height: 18px; } -- cgit v1.2.3 From 59d9983ebcc889b5e5626d672311e92657bfe3e8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 22:03:14 -0800 Subject: updates to responsive and docs for responsive navbar --- docs/assets/css/bootstrap.css | 3 +++ 1 file changed, 3 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 43ef8547f..e09e58a82 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2359,6 +2359,9 @@ button.btn.small, input[type="submit"].btn.small { .btn-navbar .i-bar + .i-bar { margin-top: 3px; } +.nav-collapse.collapse { + height: auto !important; +} .navbar .brand:hover { text-decoration: none; } -- cgit v1.2.3 From 487dbfdda4692e3212f13d5e6282d7818b4c9934 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 22:14:51 -0800 Subject: namespace progress bars and labels classes --- docs/assets/css/bootstrap.css | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e09e58a82..a17a4475d 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3003,16 +3003,16 @@ a.thumbnail:hover { -moz-border-radius: 3px; border-radius: 3px; } -.label.important { +.label-important { background-color: #b94a48; } -.label.warning { +.label-warning { background-color: #f89406; } -.label.success { +.label-success { background-color: #468847; } -.label.info { +.label-info { background-color: #3a87ad; } @-webkit-keyframes progress-bar-stripes { @@ -3105,7 +3105,7 @@ a.thumbnail:hover { -moz-animation: progress-bar-stripes 2s linear infinite; animation: progress-bar-stripes 2s linear infinite; } -.progress.danger .bar { +.progress-danger .bar { background-color: #dd514c; background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); @@ -3116,7 +3116,7 @@ a.thumbnail:hover { background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); } -.progress.danger.striped .bar { +.progress-danger.progress-striped .bar { background-color: #ee5f5b; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); @@ -3125,7 +3125,7 @@ a.thumbnail:hover { background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } -.progress.success .bar { +.progress-success .bar { background-color: #5eb95e; background-image: -moz-linear-gradient(top, #62c462, #57a957); background-image: -ms-linear-gradient(top, #62c462, #57a957); @@ -3136,7 +3136,7 @@ a.thumbnail:hover { background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); } -.progress.success.striped .bar { +.progress-success.progress-striped .bar { background-color: #62c462; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); @@ -3145,7 +3145,7 @@ a.thumbnail:hover { background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); } -.progress.info .bar { +.progress-info .bar { background-color: #4bb1cf; background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); @@ -3156,7 +3156,7 @@ a.thumbnail:hover { background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0); } -.progress.info.striped .bar { +.progress-info.progress-striped .bar { background-color: #5bc0de; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -- 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.css | 2 ++ 1 file changed, 2 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index a17a4475d..37b774fb9 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2988,6 +2988,8 @@ a.thumbnail:hover { .thumbnail > img { display: block; max-width: 100%; + margin-left: auto; + margin-right: auto; } .thumbnail .caption { padding: 9px; -- cgit v1.2.3 From bca269299b242c55a2511e752429c07d7639f7d2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Jan 2012 23:40:52 -0800 Subject: removing required .navbar-static class, rewrote docs to reflect the change, and updated the upgrade docs page to include the navbar section --- docs/assets/css/bootstrap.css | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 37b774fb9..efd221991 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2296,9 +2296,11 @@ button.btn.small, input[type="submit"].btn.small { } .navbar { overflow: visible; + margin-bottom: 18px; } .navbar-inner { - background-color: #222222; + padding-left: 20px; + padding-right: 20px; background-color: #2c2c2c; background-image: -moz-linear-gradient(top, #333333, #222222); background-image: -ms-linear-gradient(top, #333333, #222222); @@ -2308,6 +2310,9 @@ button.btn.small, input[type="submit"].btn.small { background-image: linear-gradient(top, #333333, #222222); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); @@ -2452,16 +2457,6 @@ button.btn.small, input[type="submit"].btn.small { box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); outline: 0; } -.navbar-static { - margin-bottom: 18px; -} -.navbar-static .navbar-inner { - padding-left: 20px; - padding-right: 20px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} .navbar-fixed-top { position: fixed; top: 0; @@ -2469,6 +2464,13 @@ button.btn.small, input[type="submit"].btn.small { left: 0; z-index: 1030; } +.navbar-fixed-top .navbar-inner { + padding-left: 0; + padding-right: 0; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} .navbar .nav { position: relative; left: 0; -- cgit v1.2.3 From 7bf27674523c35f8803311a964dc72a7093351c0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 29 Jan 2012 00:07:01 -0800 Subject: remove form docs from the styles and markup, it's no longer needed --- docs/assets/css/bootstrap.css | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index efd221991..c96818a56 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -943,9 +943,20 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec display: inline-block; margin-bottom: 0; } -.form-search label, .form-inline label { +.form-search label, +.form-inline label, +.form-search .input-append, +.form-inline .input-append, +.form-search .input-prepend, +.form-inline .input-prepend { display: inline-block; } +.form-search .input-append .add-on, +.form-inline .input-prepend .add-on, +.form-search .input-append .add-on, +.form-inline .input-prepend .add-on { + vertical-align: middle; +} .control-group { margin-bottom: 9px; } -- 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.css | 76 +++++++++++++++++++++++++++---------------- 1 file changed, 48 insertions(+), 28 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c96818a56..60383fba0 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -126,7 +126,7 @@ a:hover { margin-left: 20px; } .span1 { - width: 60px; + width: 59.99999999999999px; } .span2 { width: 140px; @@ -194,6 +194,50 @@ a:hover { .offset11 { margin-left: 900px; } +.row-fluid { + width: 102.12765957421277%; + margin-left: -2.127659574%; +} +.row-fluid [class*="span"] { + float: left; + margin-left: 2.127659574%; +} +.row-fluid .span1 { + width: 6.249999999619791%; +} +.row-fluid .span2 { + width: 14.58333333211979%; +} +.row-fluid .span3 { + width: 22.91666666461979%; +} +.row-fluid .span4 { + width: 31.24999999711979%; +} +.row-fluid .span5 { + width: 39.58333332961979%; +} +.row-fluid .span6 { + width: 47.91666666211979%; +} +.row-fluid .span7 { + width: 56.24999999461979%; +} +.row-fluid .span8 { + width: 64.58333332711977%; +} +.row-fluid .span9 { + width: 72.91666665961978%; +} +.row-fluid .span10 { + width: 81.24999999211977%; +} +.row-fluid .span11 { + width: 89.58333332461977%; +} +.row-fluid .span12 { + width: 97.91666665711978%; +} .container { width: 940px; margin-left: auto; @@ -207,42 +251,18 @@ a:hover { .container:after { clear: both; } -.fluid-container { - position: relative; - min-width: 940px; +.container-fluid { padding-left: 20px; padding-right: 20px; *zoom: 1; } -.fluid-container:before, .fluid-container:after { +.container-fluid:before, .container-fluid:after { display: table; content: ""; } -.fluid-container:after { +.container-fluid:after { clear: both; } -.fluid-sidebar { - width: 220px; - margin: 0 20px 18px; -} -.sidebar-left { - padding-left: 260px; -} -.sidebar-right { - padding-right: 260px; -} -.sidebar-left .fluid-sidebar { - float: left; - margin-left: -240px; -} -.sidebar-right .fluid-sidebar { - float: right; - margin-right: -240px; -} -.fluid-content { - float: left; - width: 100%; -} p { margin: 0 0 9px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; -- cgit v1.2.3 From 4e5b0e185e8cc9df3a77361380a44b16689fd2f7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 29 Jan 2012 13:12:13 -0800 Subject: refined pager styles to give a border on the links and improved hover state --- docs/assets/css/bootstrap.css | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 60383fba0..3f36aaa4d 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2707,12 +2707,17 @@ button.btn.small, input[type="submit"].btn.small { } .pager a { display: inline-block; - padding: 6px 15px; - background-color: #f5f5f5; + padding: 5px 14px; + background-color: #fff; + border: 1px solid #ddd; -webkit-border-radius: 15px; -moz-border-radius: 15px; border-radius: 15px; } +.pager a:hover { + text-decoration: none; + background-color: #f5f5f5; +} .pager .next a { float: right; } -- cgit v1.2.3 From 9fa8bde44d9bb6f26b16c7633a01bbe5ce7b20a4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 29 Jan 2012 13:15:38 -0800 Subject: fix animated/striped gradients in progress bars --- docs/assets/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 3f36aaa4d..675446f62 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3127,7 +3127,7 @@ a.thumbnail:hover { -o-transition: width 0.6s ease; transition: width 0.6s ease; } -.progress.striped .bar { +.progress-striped .bar { background-color: #62c462; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -- cgit v1.2.3