From 2fccf927c5320a4dfe3ad58b0a2752ed8f15354e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Jun 2013 16:00:38 -0700 Subject: Run make on last commit --- 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 e192672a0..012cf717b 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -425,6 +425,7 @@ h6, .h4, .h5, .h6 { + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-weight: 500; line-height: 1.1; } -- cgit v1.2.3 From 2aec6dae597b69502d09aec983598e5f955ca558 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Jun 2013 16:01:59 -0700 Subject: Fixes #7730: Better hiding of empty titles in popovers If the popover's title contains no text, hide it via JS. Previously was done via CSS's `:empty` property, but that doesn't work in IE8, so JS it is. /cc @fat becaue I probably did this wrong <3 --- docs/assets/css/bootstrap.css | 4 ---- 1 file changed, 4 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 012cf717b..3eb92c2b1 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4376,10 +4376,6 @@ button.close { border-radius: 5px 5px 0 0; } -.popover-title:empty { - display: none; -} - .popover-content { padding: 9px 14px; } -- cgit v1.2.3 From 4db90244c41c26492b4efa5d3a8694fc61cd1f9b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Jun 2013 16:27:39 -0700 Subject: run make on previous commit --- docs/assets/css/bootstrap.css | 3 ++- 1 file changed, 2 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 3eb92c2b1..574ba1662 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1491,6 +1491,7 @@ input[type="url"].input-large, input[type="search"].input-large, input[type="tel"].input-large, input[type="color"].input-large { + min-height: 56px; padding: 14px 16px; font-size: 18px; border-radius: 6px; @@ -1512,7 +1513,7 @@ input[type="url"].input-small, input[type="search"].input-small, input[type="tel"].input-small, input[type="color"].input-small { - min-height: 32px; + min-height: 30px; padding: 5px 10px; font-size: 12px; border-radius: 3px; -- cgit v1.2.3 From 90d4343f66d1cdafe24b6de0dbb6ae64312df323 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Jun 2013 16:42:05 -0700 Subject: Fixes #8093: Removes invalid focus styles on inputs --- docs/assets/css/bootstrap.css | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 574ba1662..21439fdde 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1610,21 +1610,6 @@ fieldset[disabled] input[type="checkbox"] { border-color: #468847; } -input:focus:invalid, -textarea:focus:invalid, -select:focus:invalid { - color: #b94a48; - border-color: #ee5f5b; -} - -input:focus:invalid:focus, -textarea:focus:invalid:focus, -select:focus:invalid:focus { - border-color: #e9322d; - -webkit-box-shadow: 0 0 6px #f8b9b7; - box-shadow: 0 0 6px #f8b9b7; -} - .help-block { display: block; margin-top: 5px; -- cgit v1.2.3 From 82f9de94593ea5dd8a8efd6a317a6c8b319cfff2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Jun 2013 17:02:10 -0700 Subject: Fixes #8159: Be more specific about disabled inputs to avoid iOS bug Attached disabled styles to the exact input types rather than all inputs and reseting the checkbox/radios. If setting `background-color: transparent;`, iOS renders no background on the disabled control. --- docs/assets/css/bootstrap.css | 74 ++++++++++++++++++++++++++++++------------- 1 file changed, 52 insertions(+), 22 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 21439fdde..9379177da 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1338,6 +1338,58 @@ input[type="color"]:focus { box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); } +select[disabled], +textarea[disabled], +input[type="text"][disabled], +input[type="password"][disabled], +input[type="datetime"][disabled], +input[type="datetime-local"][disabled], +input[type="date"][disabled], +input[type="month"][disabled], +input[type="time"][disabled], +input[type="week"][disabled], +input[type="number"][disabled], +input[type="email"][disabled], +input[type="url"][disabled], +input[type="search"][disabled], +input[type="tel"][disabled], +input[type="color"][disabled], +select[readonly], +textarea[readonly], +input[type="text"][readonly], +input[type="password"][readonly], +input[type="datetime"][readonly], +input[type="datetime-local"][readonly], +input[type="date"][readonly], +input[type="month"][readonly], +input[type="time"][readonly], +input[type="week"][readonly], +input[type="number"][readonly], +input[type="email"][readonly], +input[type="url"][readonly], +input[type="search"][readonly], +input[type="tel"][readonly], +input[type="color"][readonly], +fieldset[disabled] select, +fieldset[disabled] textarea, +fieldset[disabled] input[type="text"], +fieldset[disabled] input[type="password"], +fieldset[disabled] input[type="datetime"], +fieldset[disabled] input[type="datetime-local"], +fieldset[disabled] input[type="date"], +fieldset[disabled] input[type="month"], +fieldset[disabled] input[type="time"], +fieldset[disabled] input[type="week"], +fieldset[disabled] input[type="number"], +fieldset[disabled] input[type="email"], +fieldset[disabled] input[type="url"], +fieldset[disabled] input[type="search"], +fieldset[disabled] input[type="tel"], +fieldset[disabled] input[type="color"] { + cursor: not-allowed; + background-color: #eeeeee; +} + input, select, textarea { @@ -1519,28 +1571,6 @@ input[type="color"].input-small { border-radius: 3px; } -input[disabled], -select[disabled], -textarea[disabled], -input[readonly], -select[readonly], -textarea[readonly], -fieldset[disabled] input, -fieldset[disabled] select, -fieldset[disabled] textarea { - cursor: not-allowed; - background-color: #eeeeee; -} - -input[type="radio"][disabled], -input[type="checkbox"][disabled], -input[type="radio"][readonly], -input[type="checkbox"][readonly], -fieldset[disabled] input[type="radio"], -fieldset[disabled] input[type="checkbox"] { - background-color: transparent; -} - .has-warning .control-label { color: #c09853; } -- cgit v1.2.3 From ef8e5853cbfc4f4babacd3527ab3eb0e4b741acc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Jun 2013 17:15:09 -0700 Subject: Fixes #8154: enforce full width `.navbar-nav.pull-right` in mobile Prevents an odd alignment issue in mobile views by forcing the nav links to be full width without undoing the float. --- docs/assets/css/bootstrap.css | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 9379177da..685e2e984 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3481,6 +3481,10 @@ button.close { background-color: transparent; } +.navbar-nav.pull-right { + width: 100%; +} + .navbar-static-top { border-radius: 0; } @@ -3709,6 +3713,7 @@ button.close { } .navbar-nav.pull-right { float: right; + width: auto; } .navbar-toggle { position: relative; -- cgit v1.2.3 From b0e943399df374b03f9ed5f676f33e42f5e53a74 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 21 Jun 2013 17:21:44 -0700 Subject: Improve alignment of navbar brand and fix up left padding on list groups --- docs/assets/css/bootstrap.css | 5 +++-- 1 file changed, 3 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 685e2e984..68b40ca7c 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2956,7 +2956,8 @@ input[type="button"].btn-block { } .list-group { - margin: 0 0 20px; + padding-left: 0; + margin-bottom: 20px; background-color: #ffffff; } @@ -3698,7 +3699,7 @@ button.close { .navbar-brand { float: left; margin-right: 5px; - margin-left: -5px; + margin-left: -15px; } .navbar-nav { float: left; -- cgit v1.2.3 From 976322b2a682c1faf141f7f2241069defee790c6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 22 Jun 2013 18:56:55 -0700 Subject: run make on previous merge --- 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 68b40ca7c..de5494c57 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5043,6 +5043,7 @@ a.list-group-item.active > .badge, left: 50%; z-index: 15; width: 100px; + padding-left: 0; margin: 0 0 0 -50px; text-align: center; list-style: none; -- cgit v1.2.3 From 164e88781bc4437d654ab458e6393a8d15807d37 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 23 Jun 2013 15:05:58 -0700 Subject: Make on previous commits --- docs/assets/css/bootstrap.css | 59 +++++++++++++++++++++++++++++++++---------- 1 file changed, 46 insertions(+), 13 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index de5494c57..48d6815b2 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -353,14 +353,6 @@ small { font-size: 85%; } -strong { - font-weight: bold; -} - -em { - font-style: italic; -} - cite { font-style: normal; } @@ -819,13 +811,26 @@ pre code { .col-lg-11, .col-lg-12 { position: relative; - float: left; - width: 100%; min-height: 1px; padding-right: 15px; padding-left: 15px; } +.col-1, +.col-2, +.col-3, +.col-4, +.col-5, +.col-6, +.col-7, +.col-8, +.col-9, +.col-10, +.col-11, +.col-12 { + float: left; +} + .col-1 { width: 8.333333333333332%; } @@ -878,6 +883,20 @@ pre code { .container { max-width: 728px; } + .col-sm-1, + .col-sm-2, + .col-sm-3, + .col-sm-4, + .col-sm-5, + .col-sm-6, + .col-sm-7, + .col-sm-8, + .col-sm-9, + .col-sm-10, + .col-sm-11, + .col-sm-12 { + float: left; + } .col-sm-1 { width: 8.333333333333332%; } @@ -1019,6 +1038,20 @@ pre code { .container { max-width: 940px; } + .col-lg-1, + .col-lg-2, + .col-lg-3, + .col-lg-4, + .col-lg-5, + .col-lg-6, + .col-lg-7, + .col-lg-8, + .col-lg-9, + .col-lg-10, + .col-lg-11, + .col-lg-12 { + float: left; + } .col-lg-1 { width: 8.333333333333332%; } @@ -1201,13 +1234,13 @@ th { background-color: #f5f5f5; } -table col[class*="col-span-"] { +table col[class^="col-"] { display: table-column; float: none; } -table td[class*="col-span-"], -table th[class*="col-span-"] { +table td[class^="col-"], +table th[class^="col-"] { display: table-cell; float: none; } -- cgit v1.2.3 From 573a19741770338b9e08838d908f51b7a82cddd3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 23 Jun 2013 15:15:42 -0700 Subject: Move grid offsets to desktop only (fixes #8229) --- docs/assets/css/bootstrap.css | 66 +++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 33 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 48d6815b2..b7e026dbb 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -933,39 +933,6 @@ pre code { .col-sm-12 { width: 100%; } - .col-offset-1 { - margin-left: 8.333333333333332%; - } - .col-offset-2 { - margin-left: 16.666666666666664%; - } - .col-offset-3 { - margin-left: 25%; - } - .col-offset-4 { - margin-left: 33.33333333333333%; - } - .col-offset-5 { - margin-left: 41.66666666666667%; - } - .col-offset-6 { - margin-left: 50%; - } - .col-offset-7 { - margin-left: 58.333333333333336%; - } - .col-offset-8 { - margin-left: 66.66666666666666%; - } - .col-offset-9 { - margin-left: 75%; - } - .col-offset-10 { - margin-left: 83.33333333333334%; - } - .col-offset-11 { - margin-left: 91.66666666666666%; - } .col-push-1 { left: 8.333333333333332%; } @@ -1088,6 +1055,39 @@ pre code { .col-lg-12 { width: 100%; } + .col-offset-1 { + margin-left: 8.333333333333332%; + } + .col-offset-2 { + margin-left: 16.666666666666664%; + } + .col-offset-3 { + margin-left: 25%; + } + .col-offset-4 { + margin-left: 33.33333333333333%; + } + .col-offset-5 { + margin-left: 41.66666666666667%; + } + .col-offset-6 { + margin-left: 50%; + } + .col-offset-7 { + margin-left: 58.333333333333336%; + } + .col-offset-8 { + margin-left: 66.66666666666666%; + } + .col-offset-9 { + margin-left: 75%; + } + .col-offset-10 { + margin-left: 83.33333333333334%; + } + .col-offset-11 { + margin-left: 91.66666666666666%; + } } @media (min-width: 1200px) { -- cgit v1.2.3 From 9ed5b5e6534b45f29f318d983a7e09be1f7ac946 Mon Sep 17 00:00:00 2001 From: Luis Hdez Date: Tue, 25 Jun 2013 14:34:57 +0200 Subject: Fix line breaks on add-ons with spaces --- 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 b7e026dbb..487d7eb2f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1711,6 +1711,7 @@ input[type="color"].input-small { .input-group-addon, .input-group-btn { width: 1%; + white-space: nowrap; vertical-align: middle; } -- cgit v1.2.3 From 94761c221648c0968328bee1fc5970ad7b481bea Mon Sep 17 00:00:00 2001 From: fat Date: Thu, 27 Jun 2013 18:47:35 -0700 Subject: use collapse in dropdown js example --- docs/assets/css/bootstrap.css | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 487d7eb2f..f2aefb773 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -691,8 +691,6 @@ pre { line-height: 1.428571429; 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); @@ -706,7 +704,6 @@ pre.prettyprint { pre code { padding: 0; color: inherit; - white-space: pre; white-space: pre-wrap; background-color: transparent; border: 0; @@ -1540,7 +1537,7 @@ textarea::-webkit-input-placeholder { // Move the options list down to align with labels .controls > .radio:first-child, .controls > .checkbox:first-child { - padding-top: 5px; // has to be padding because margin collaspes + padding-top: 5px; // has to be padding because margin collapses } */ -- cgit v1.2.3 From 81b5e74057da4a891419083f343b15090162e801 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 27 Jun 2013 19:36:09 -0700 Subject: remove glyphicons from compiled css --- docs/assets/css/bootstrap.css | 658 +----------------------------------------- 1 file changed, 2 insertions(+), 656 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index f2aefb773..b8c121245 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2133,660 +2133,6 @@ input[type="button"].btn-block { height: auto; } -@font-face { - font-family: 'Glyphicons Halflings'; - src: url('../fonts/glyphiconshalflings-regular.eot'); - src: url('../fonts/glyphiconshalflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphiconshalflings-regular.woff') format('woff'), url('../fonts/glyphiconshalflings-regular.ttf') format('truetype'), url('../fonts/glyphiconshalflings-regular.svg#glyphicons_halflingsregular') format('svg'); -} - -.glyphicon:before { - font-family: 'Glyphicons Halflings'; - -webkit-font-smoothing: antialiased; - font-style: normal; - font-weight: normal; - line-height: 1; -} - -.glyphicon-glass:before { - content: "\e001"; -} - -.glyphicon-music:before { - content: "\e002"; -} - -.glyphicon-search:before { - content: "\e003"; -} - -.glyphicon-envelope:before { - content: "\2709"; -} - -.glyphicon-heart:before { - content: "\e005"; -} - -.glyphicon-star:before { - content: "\e006"; -} - -.glyphicon-star-empty:before { - content: "\e007"; -} - -.glyphicon-user:before { - content: "\e008"; -} - -.glyphicon-film:before { - content: "\e009"; -} - -.glyphicon-th-large:before { - content: "\e010"; -} - -.glyphicon-th:before { - content: "\e011"; -} - -.glyphicon-th-list:before { - content: "\e012"; -} - -.glyphicon-ok:before { - content: "\e013"; -} - -.glyphicon-remove:before { - content: "\e014"; -} - -.glyphicon-zoom-in:before { - content: "\e015"; -} - -.glyphicon-zoom-out:before { - content: "\e016"; -} - -.glyphicon-off:before { - content: "\e017"; -} - -.glyphicon-signal:before { - content: "\e018"; -} - -.glyphicon-cog:before { - content: "\e019"; -} - -.glyphicon-trash:before { - content: "\e020"; -} - -.glyphicon-home:before { - content: "\e021"; -} - -.glyphicon-file:before { - content: "\e022"; -} - -.glyphicon-time:before { - content: "\e023"; -} - -.glyphicon-road:before { - content: "\e024"; -} - -.glyphicon-download-alt:before { - content: "\e025"; -} - -.glyphicon-download:before { - content: "\e026"; -} - -.glyphicon-upload:before { - content: "\e027"; -} - -.glyphicon-inbox:before { - content: "\e028"; -} - -.glyphicon-play-circle:before { - content: "\e029"; -} - -.glyphicon-repeat:before { - content: "\e030"; -} - -.glyphicon-refresh:before { - content: "\e031"; -} - -.glyphicon-list-alt:before { - content: "\e032"; -} - -.glyphicon-lock:before { - content: "\e033"; -} - -.glyphicon-flag:before { - content: "\e034"; -} - -.glyphicon-headphones:before { - content: "\e035"; -} - -.glyphicon-volume-off:before { - content: "\e036"; -} - -.glyphicon-volume-down:before { - content: "\e037"; -} - -.glyphicon-volume-up:before { - content: "\e038"; -} - -.glyphicon-qrcode:before { - content: "\e039"; -} - -.glyphicon-barcode:before { - content: "\e040"; -} - -.glyphicon-tag:before { - content: "\e041"; -} - -.glyphicon-tags:before { - content: "\e042"; -} - -.glyphicon-book:before { - content: "\e043"; -} - -.glyphicon-bookmark:before { - content: "\e044"; -} - -.glyphicon-print:before { - content: "\e045"; -} - -.glyphicon-camera:before { - content: "\e046"; -} - -.glyphicon-font:before { - content: "\e047"; -} - -.glyphicon-bold:before { - content: "\e048"; -} - -.glyphicon-italic:before { - content: "\e049"; -} - -.glyphicon-text-height:before { - content: "\e050"; -} - -.glyphicon-text-width:before { - content: "\e051"; -} - -.glyphicon-align-left:before { - content: "\e052"; -} - -.glyphicon-align-center:before { - content: "\e053"; -} - -.glyphicon-align-right:before { - content: "\e054"; -} - -.glyphicon-align-justify:before { - content: "\e055"; -} - -.glyphicon-list:before { - content: "\e056"; -} - -.glyphicon-indent-left:before { - content: "\e057"; -} - -.glyphicon-indent-right:before { - content: "\e058"; -} - -.glyphicon-facetime-video:before { - content: "\e059"; -} - -.glyphicon-picture:before { - content: "\e060"; -} - -.glyphicon-pencil:before { - content: "\270f"; -} - -.glyphicon-map-marker:before { - content: "\e062"; -} - -.glyphicon-adjust:before { - content: "\e063"; -} - -.glyphicon-tint:before { - content: "\e064"; -} - -.glyphicon-edit:before { - content: "\e065"; -} - -.glyphicon-share:before { - content: "\e066"; -} - -.glyphicon-check:before { - content: "\e067"; -} - -.glyphicon-move:before { - content: "\e068"; -} - -.glyphicon-step-backward:before { - content: "\e069"; -} - -.glyphicon-fast-backward:before { - content: "\e070"; -} - -.glyphicon-backward:before { - content: "\e071"; -} - -.glyphicon-play:before { - content: "\e072"; -} - -.glyphicon-pause:before { - content: "\e073"; -} - -.glyphicon-stop:before { - content: "\e074"; -} - -.glyphicon-forward:before { - content: "\e075"; -} - -.glyphicon-fast-forward:before { - content: "\e076"; -} - -.glyphicon-step-forward:before { - content: "\e077"; -} - -.glyphicon-eject:before { - content: "\e078"; -} - -.glyphicon-chevron-left:before { - content: "\e079"; -} - -.glyphicon-chevron-right:before { - content: "\e080"; -} - -.glyphicon-plus-sign:before { - content: "\e081"; -} - -.glyphicon-minus-sign:before { - content: "\e082"; -} - -.glyphicon-remove-sign:before { - content: "\e083"; -} - -.glyphicon-ok-sign:before { - content: "\e084"; -} - -.glyphicon-question-sign:before { - content: "\e085"; -} - -.glyphicon-info-sign:before { - content: "\e086"; -} - -.glyphicon-screenshot:before { - content: "\e087"; -} - -.glyphicon-remove-circle:before { - content: "\e088"; -} - -.glyphicon-ok-circle:before { - content: "\e089"; -} - -.glyphicon-ban-circle:before { - content: "\e090"; -} - -.glyphicon-arrow-left:before { - content: "\e091"; -} - -.glyphicon-arrow-right:before { - content: "\e092"; -} - -.glyphicon-arrow-up:before { - content: "\e093"; -} - -.glyphicon-arrow-down:before { - content: "\e094"; -} - -.glyphicon-share-alt:before { - content: "\e095"; -} - -.glyphicon-resize-full:before { - content: "\e096"; -} - -.glyphicon-resize-small:before { - content: "\e097"; -} - -.glyphicon-plus:before { - content: "\002b"; -} - -.glyphicon-minus:before { - content: "\2212"; -} - -.glyphicon-asterisk:before { - content: "\002a"; -} - -.glyphicon-exclamation-sign:before { - content: "\e101"; -} - -.glyphicon-gift:before { - content: "\e102"; -} - -.glyphicon-leaf:before { - content: "\e103"; -} - -.glyphicon-fire:before { - content: "\e104"; -} - -.glyphicon-eye-open:before { - content: "\e105"; -} - -.glyphicon-eye-close:before { - content: "\e106"; -} - -.glyphicon-warning-sign:before { - content: "\e107"; -} - -.glyphicon-plane:before { - content: "\e108"; -} - -.glyphicon-calendar:before { - content: "\e109"; -} - -.glyphicon-random:before { - content: "\e110"; -} - -.glyphicon-comment:before { - content: "\e111"; -} - -.glyphicon-magnet:before { - content: "\e112"; -} - -.glyphicon-chevron-up:before { - content: "\e113"; -} - -.glyphicon-chevron-down:before { - content: "\e114"; -} - -.glyphicon-retweet:before { - content: "\e115"; -} - -.glyphicon-shopping-cart:before { - content: "\e116"; -} - -.glyphicon-folder-close:before { - content: "\e117"; -} - -.glyphicon-folder-open:before { - content: "\e118"; -} - -.glyphicon-resize-vertical:before { - content: "\e119"; -} - -.glyphicon-resize-horizontal:before { - content: "\e120"; -} - -.glyphicon-hdd:before { - content: "\e121"; -} - -.glyphicon-bullhorn:before { - content: "\e122"; -} - -.glyphicon-bell:before { - content: "\e123"; -} - -.glyphicon-certificate:before { - content: "\e124"; -} - -.glyphicon-thumbs-up:before { - content: "\e125"; -} - -.glyphicon-thumbs-down:before { - content: "\e126"; -} - -.glyphicon-hand-right:before { - content: "\e127"; -} - -.glyphicon-hand-left:before { - content: "\e128"; -} - -.glyphicon-hand-up:before { - content: "\e129"; -} - -.glyphicon-hand-down:before { - content: "\e130"; -} - -.glyphicon-circle-arrow-right:before { - content: "\e131"; -} - -.glyphicon-circle-arrow-left:before { - content: "\e132"; -} - -.glyphicon-circle-arrow-up:before { - content: "\e133"; -} - -.glyphicon-circle-arrow-down:before { - content: "\e134"; -} - -.glyphicon-globe:before { - content: "\e135"; -} - -.glyphicon-wrench:before { - content: "\e136"; -} - -.glyphicon-tasks:before { - content: "\e137"; -} - -.glyphicon-filter:before { - content: "\e138"; -} - -.glyphicon-briefcase:before { - content: "\e139"; -} - -.glyphicon-fullscreen:before { - content: "\e140"; -} - -.glyphicon-dashboard:before { - content: "\e141"; -} - -.glyphicon-paperclip:before { - content: "\e142"; -} - -.glyphicon-heart-empty:before { - content: "\e143"; -} - -.glyphicon-link:before { - content: "\e144"; -} - -.glyphicon-phone:before { - content: "\e145"; -} - -.glyphicon-pushpin:before { - content: "\e146"; -} - -.glyphicon-euro:before { - content: "\20ac"; -} - -.glyphicon-usd:before { - content: "\e148"; -} - -.glyphicon-gbp:before { - content: "\e149"; -} - -.glyphicon-sort:before { - content: "\e150"; -} - -.glyphicon-sort-by-alphabet:before { - content: "\e151"; -} - -.glyphicon-sort-by-alphabet-alt:before { - content: "\e152"; -} - -.glyphicon-sort-by-order:before { - content: "\e153"; -} - -.glyphicon-sort-by-order-alt:before { - content: "\e154"; -} - -.glyphicon-sort-by-attributes:before { - content: "\e155"; -} - -.glyphicon-sort-by-attributes-alt:before { - content: "\e156"; -} - -.glyphicon-unchecked:before { - content: "\e157"; -} - -.glyphicon-expand:before { - content: "\e158"; -} - -.glyphicon-collapse:before { - content: "\e159"; -} - -.glyphicon-collapse-top:before { - content: "\e160"; -} - .caret { display: inline-block; width: 0; @@ -5210,8 +4556,8 @@ a.list-group-item.active > .badge, } .hidden { - display: none; - visibility: hidden; + display: none !important; + visibility: hidden !important; } .visible-sm { -- cgit v1.2.3 From ca8ca2177fd5b8e6523bd1599784b129c2d75937 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 27 Jun 2013 19:36:56 -0700 Subject: fixes #4852: popover carets fully functional in ie8 holy carp wtfbqq huge shoutout to @PumaOmaR --- docs/assets/css/bootstrap.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b8c121245..c362c1f09 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3812,6 +3812,7 @@ button.close { margin-left: -10px; border-top-color: #ffffff; border-bottom-width: 0; + content: " "; } .popover.right .arrow { @@ -3828,6 +3829,7 @@ button.close { left: 1px; border-right-color: #ffffff; border-left-width: 0; + content: " "; } .popover.bottom .arrow { @@ -3844,6 +3846,7 @@ button.close { margin-left: -10px; border-bottom-color: #ffffff; border-top-width: 0; + content: " "; } .popover.left .arrow { @@ -3860,6 +3863,7 @@ button.close { bottom: -10px; border-left-color: #ffffff; border-right-width: 0; + content: " "; } .alert { -- cgit v1.2.3 From d9a662ed1dbe3dbfe30980d45c831e3b454bff86 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 27 Jun 2013 20:15:44 -0700 Subject: fixes #7977: prevent some table bullshit on input groups --- 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 c362c1f09..dc62bef97 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1679,6 +1679,7 @@ input[type="color"].input-small { .input-group { display: table; + border-collapse: separate; } .input-group.col { -- cgit v1.2.3 From 89117ec6b2c814c9629f2a2a0763a64582af1cce Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 27 Jun 2013 20:18:16 -0700 Subject: run make on last commit --- docs/assets/css/bootstrap.css | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index dc62bef97..040ee62ba 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1873,6 +1873,9 @@ fieldset[disabled] .btn { border-color: #2e2f2f; } +.btn-default.disabled, +.btn-default[disabled], +fieldset[disabled] .btn-default, .btn-default.disabled:hover, .btn-default[disabled]:hover, fieldset[disabled] .btn-default:hover, @@ -1903,6 +1906,9 @@ fieldset[disabled] .btn-default.active { border-color: #3071a9; } +.btn-primary.disabled, +.btn-primary[disabled], +fieldset[disabled] .btn-primary, .btn-primary.disabled:hover, .btn-primary[disabled]:hover, fieldset[disabled] .btn-primary:hover, @@ -1933,6 +1939,9 @@ fieldset[disabled] .btn-primary.active { border-color: #ec971f; } +.btn-warning.disabled, +.btn-warning[disabled], +fieldset[disabled] .btn-warning, .btn-warning.disabled:hover, .btn-warning[disabled]:hover, fieldset[disabled] .btn-warning:hover, @@ -1963,6 +1972,9 @@ fieldset[disabled] .btn-warning.active { border-color: #c9302c; } +.btn-danger.disabled, +.btn-danger[disabled], +fieldset[disabled] .btn-danger, .btn-danger.disabled:hover, .btn-danger[disabled]:hover, fieldset[disabled] .btn-danger:hover, @@ -1993,6 +2005,9 @@ fieldset[disabled] .btn-danger.active { border-color: #449d44; } +.btn-success.disabled, +.btn-success[disabled], +fieldset[disabled] .btn-success, .btn-success.disabled:hover, .btn-success[disabled]:hover, fieldset[disabled] .btn-success:hover, @@ -2023,6 +2038,9 @@ fieldset[disabled] .btn-success.active { border-color: #31b0d5; } +.btn-info.disabled, +.btn-info[disabled], +fieldset[disabled] .btn-info, .btn-info.disabled:hover, .btn-info[disabled]:hover, fieldset[disabled] .btn-info:hover, -- cgit v1.2.3 From bf3c5e070e2ee74181aa8b2c75f32387827b01c2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 27 Jun 2013 20:49:29 -0700 Subject: remove submenus. for more context: http://www.youtube.com/watch?v=ggWyUEuGcWY&feature=youtu.be&t=48s --- docs/assets/css/bootstrap.css | 56 +------------------------------------------ 1 file changed, 1 insertion(+), 55 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 040ee62ba..ec8af9204 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2210,9 +2210,7 @@ input[type="button"].btn-block { } .dropdown-menu > li > a:hover, -.dropdown-menu > li > a:focus, -.dropdown-submenu:hover > a, -.dropdown-submenu:focus > a { +.dropdown-menu > li > a:focus { color: #ffffff; text-decoration: none; background-color: #357ebd; @@ -2290,58 +2288,6 @@ input[type="button"].btn-block { margin-bottom: 1px; } -.dropdown-submenu { - position: relative; -} - -.dropdown-submenu > .dropdown-menu { - top: 0; - left: 100%; - margin-top: -6px; - margin-left: -1px; - border-top-left-radius: 0; -} - -.dropdown-submenu:hover > .dropdown-menu { - display: block; -} - -.dropup .dropdown-submenu > .dropdown-menu { - top: auto; - bottom: 0; - margin-top: 0; - margin-bottom: -2px; - border-bottom-left-radius: 0; -} - -.dropdown-submenu > a:after { - display: block; - float: right; - width: 0; - height: 0; - margin-top: 5px; - margin-right: -10px; - border-color: transparent; - border-left-color: #cccccc; - border-style: solid; - border-width: 5px 0 5px 5px; - content: " "; -} - -.dropdown-submenu:hover > a:after { - border-left-color: #ffffff; -} - -.dropdown-submenu.pull-left { - float: none; -} - -.dropdown-submenu.pull-left > .dropdown-menu { - left: -100%; - margin-left: 10px; - border-top-right-radius: 0; -} - .dropdown .dropdown-menu .nav-header { padding-right: 20px; padding-left: 20px; -- cgit v1.2.3 From 88ece4fc5902f7dd9582fb4e5956062fe97af84c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 27 Jun 2013 20:50:00 -0700 Subject: fixes #7961 a bit: adds css for extra tooltip placement options. /cc @fat you just need dat js prolly --- docs/assets/css/bootstrap.css | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index ec8af9204..bffe638ee 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3668,6 +3668,20 @@ button.close { border-width: 5px 5px 0; } +.tooltip.top-left .tooltip-arrow { + bottom: 0; + left: 5px; + border-top-color: rgba(0, 0, 0, 0.9); + border-width: 5px 5px 0; +} + +.tooltip.top-right .tooltip-arrow { + right: 5px; + bottom: 0; + border-top-color: rgba(0, 0, 0, 0.9); + border-width: 5px 5px 0; +} + .tooltip.right .tooltip-arrow { top: 50%; left: 0; @@ -3692,6 +3706,20 @@ button.close { border-width: 0 5px 5px; } +.tooltip.bottom-left .tooltip-arrow { + top: 0; + left: 5px; + border-bottom-color: rgba(0, 0, 0, 0.9); + border-width: 0 5px 5px; +} + +.tooltip.bottom-right .tooltip-arrow { + top: 0; + right: 5px; + border-bottom-color: rgba(0, 0, 0, 0.9); + border-width: 0 5px 5px; +} + .popover { position: absolute; top: 0; -- cgit v1.2.3 From 09cdee2f03aaad5c5a767fbec2e3896ad3d1f980 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 28 Jun 2013 00:09:10 -0700 Subject: Overall responsive `img` styles `img`s are no longer responsive by default. Instead, use `.img-responsive` as a class or mixin. Existing `.thumbnail > img` and `.img-thumbnail` classes now make use of this as a mixin as well. --- docs/assets/css/bootstrap.css | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index bffe638ee..9f037b333 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -325,9 +325,13 @@ a:focus { } img { + vertical-align: middle; +} + +.img-responsive { + display: block; height: auto; max-width: 100%; - vertical-align: middle; } .img-rounded { @@ -3958,6 +3962,13 @@ button.close { transition: all 0.2s ease-in-out; } +.thumbnail > img, +.img-thumbnail { + display: block; + height: auto; + max-width: 100%; +} + .thumbnail { display: block; } @@ -3972,8 +3983,6 @@ a.thumbnail:focus { } .thumbnail > img { - display: block; - max-width: 100%; margin-right: auto; margin-left: auto; } -- cgit v1.2.3 From 0a92efce0cbded7b664a5e198bfe6bca3b13bcac Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 28 Jun 2013 09:24:46 -0700 Subject: Nuke hella things * Any mentions of .btn-mini * Old docs page that somehow found it's way back --- docs/assets/css/bootstrap.css | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 9f037b333..c76723b99 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3210,11 +3210,6 @@ button.close { padding-left: 8px; } -.btn-group > .btn-mini + .dropdown-toggle { - padding-right: 5px; - padding-left: 5px; -} - .btn-group > .btn-large + .dropdown-toggle { padding-right: 12px; padding-left: 12px; @@ -4117,10 +4112,6 @@ a.badge:focus { top: -1px; } -.btn-mini .badge { - top: 0; -} - a.list-group-item.active > .badge, .nav-pills > .active > a > .badge { color: #428bca; @@ -4321,6 +4312,8 @@ a.list-group-item.active > .badge, .carousel-inner > .item > img, .carousel-inner > .item > a > img { display: block; + height: auto; + max-width: 100%; line-height: 1; } -- cgit v1.2.3 From 6a20810ca4970a681bd34274851365af011694e3 Mon Sep 17 00:00:00 2001 From: Francis Brunelle Date: Sat, 29 Jun 2013 16:06:14 -0400 Subject: reset left padding for .media-list, .pagination and .pager --- docs/assets/css/bootstrap.css | 4 +++- 1 file changed, 3 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 c76723b99..28f561a32 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3303,6 +3303,7 @@ button.close { .pagination { display: inline-block; + padding-left: 0; margin: 20px 0; border-radius: 4px; } @@ -3394,6 +3395,7 @@ button.close { } .pager { + padding-left: 0; margin: 20px 0; text-align: center; list-style: none; @@ -4019,7 +4021,7 @@ a.thumbnail:focus { } .media-list { - margin-left: 0; + padding-left: 0; list-style: none; } -- cgit v1.2.3 From fea69df80c3d304868d816a85a8b027b40a13f3d Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Mon, 1 Jul 2013 21:13:57 +0200 Subject: Fix responsive utilities for table elements This change prevents situations where specificity causes some rules to be overridden by the ones intended for mobile. * Added mixin `responsive-invisibility()` * Swapped out `display: none !important;` for new mixin --- docs/assets/css/bootstrap.css | 76 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 28f561a32..708ea42ea 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4578,14 +4578,41 @@ td.visible-sm { display: none !important; } +tr.visible-md { + display: none !important; +} + +th.visible-md, +td.visible-md { + display: none !important; +} + .visible-lg { display: none !important; } +tr.visible-lg { + display: none !important; +} + +th.visible-lg, +td.visible-lg { + display: none !important; +} + .hidden-sm { display: none !important; } +tr.hidden-sm { + display: none !important; +} + +th.hidden-sm, +td.hidden-sm { + display: none !important; +} + .hidden-md { display: block !important; } @@ -4616,6 +4643,13 @@ td.hidden-lg { .visible-sm { display: none !important; } + tr.visible-sm { + display: none !important; + } + th.visible-sm, + td.visible-sm { + display: none !important; + } .visible-md { display: block !important; } @@ -4629,6 +4663,13 @@ td.hidden-lg { .visible-lg { display: none !important; } + tr.visible-lg { + display: none !important; + } + th.visible-lg, + td.visible-lg { + display: none !important; + } .hidden-sm { display: block !important; } @@ -4642,6 +4683,13 @@ td.hidden-lg { .hidden-md { display: none !important; } + tr.hidden-md { + display: none !important; + } + th.hidden-md, + td.hidden-md { + display: none !important; + } .hidden-lg { display: block !important; } @@ -4658,9 +4706,23 @@ td.hidden-lg { .visible-sm { display: none !important; } + tr.visible-sm { + display: none !important; + } + th.visible-sm, + td.visible-sm { + display: none !important; + } .visible-md { display: none !important; } + tr.visible-md { + display: none !important; + } + th.visible-md, + td.visible-md { + display: none !important; + } .visible-lg { display: block !important; } @@ -4694,11 +4756,25 @@ td.hidden-lg { .hidden-lg { display: none !important; } + tr.hidden-lg { + display: none !important; + } + th.hidden-lg, + td.hidden-lg { + display: none !important; + } } .visible-print { display: none !important; } +tr.visible-print { + display: none !important; +} +th.visible-print, +td.visible-print { + display: none !important; +} @media print { .visible-print { -- cgit v1.2.3 From a27ecfccf301f8996d7ddf6bd6f7f46f358a5a31 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Jul 2013 17:32:07 -0700 Subject: Make more components mixin-friendly --- docs/assets/css/bootstrap.css | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c76723b99..e721aaa80 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2326,6 +2326,11 @@ input[type="button"].btn-block { border-bottom-left-radius: 4px; } +.list-group-item > .badge { + float: right; + margin-right: -15px; +} + .list-group-item-heading { margin-top: 0; margin-bottom: 5px; @@ -2365,16 +2370,6 @@ a.list-group-item.active .list-group-item-text { color: #e1edf7; } -.list-group-item > .badge, -.list-group-item > .glyphicon-chevron-right { - float: right; - margin-right: -15px; -} - -.list-group-item > .glyphicon + .badge { - margin-right: 5px; -} - .panel { padding: 15px; margin-bottom: 20px; @@ -4279,9 +4274,6 @@ a.list-group-item.active > .badge, .accordion-heading .accordion-toggle { display: block; padding: 8px 15px; -} - -.accordion-toggle { cursor: pointer; } -- cgit v1.2.3 From c9df1db50221fe033a0b7bc216fa2de5b6eea17a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Jul 2013 18:16:59 -0700 Subject: fixes #7367: slightly larger carousel indicators --- docs/assets/css/bootstrap.css | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 1ec4304d6..f09e4789c 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4414,24 +4414,26 @@ a.list-group-item.active > .badge, z-index: 15; width: 100px; padding-left: 0; - margin: 0 0 0 -50px; + margin-left: -50px; text-align: center; list-style: none; } .carousel-indicators li { display: inline-block; - width: 8px; - height: 8px; - margin-right: 0; - margin-left: 0; + width: 10px; + height: 10px; + margin: 1px; text-indent: -999px; cursor: pointer; border: 1px solid #fff; - border-radius: 5px; + border-radius: 10px; } .carousel-indicators .active { + width: 12px; + height: 12px; + margin: 0; background-color: #fff; } -- cgit v1.2.3 From 9da90adb4ca09e4c3b5ec549211c07292ec38d71 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Jul 2013 18:21:19 -0700 Subject: fixes #8068: add .help-block to form field state mixin --- 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 f09e4789c..24d2b690c 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1605,6 +1605,7 @@ input[type="color"].input-small { border-radius: 3px; } +.has-warning .help-block, .has-warning .control-label { color: #c09853; } @@ -1628,6 +1629,7 @@ input[type="color"].input-small { border-color: #c09853; } +.has-error .help-block, .has-error .control-label { color: #b94a48; } @@ -1651,6 +1653,7 @@ input[type="color"].input-small { border-color: #b94a48; } +.has-success .help-block, .has-success .control-label { color: #468847; } -- cgit v1.2.3 From 08b3515fd7dfa76cdbb92d52a15d6797f3a1c4ed Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Jul 2013 19:42:26 -0700 Subject: fixes #8345: use inline-block on .img-responsive --- docs/assets/css/bootstrap.css | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 24d2b690c..cb80d5c36 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -329,7 +329,7 @@ img { } .img-responsive { - display: block; + display: inline-block; height: auto; max-width: 100%; } @@ -3957,19 +3957,15 @@ button.close { transition: all 0.2s ease-in-out; } -.thumbnail > img, -.img-thumbnail { - display: block; - height: auto; - max-width: 100%; -} - .thumbnail { display: block; } +.thumbnail > img, .img-thumbnail { display: inline-block; + height: auto; + max-width: 100%; } a.thumbnail:hover, @@ -4308,7 +4304,7 @@ a.list-group-item.active > .badge, .carousel-inner > .item > img, .carousel-inner > .item > a > img { - display: block; + display: inline-block; height: auto; max-width: 100%; line-height: 1; -- cgit v1.2.3 From 5b2d933524616c9948c9e5229c14e109aa83727a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Jul 2013 19:49:29 -0700 Subject: Fixes #8350: unfuck Chrome number input element cursor /cc @cvrebert @eintnohick --- docs/assets/css/bootstrap.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index cb80d5c36..6a426850a 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1486,6 +1486,10 @@ input[type="checkbox"]:focus { outline-offset: -2px; } +input[type="number"]::-webkit-outer-spin-button input[type="number"]::-webkit-inner-spin-button { + height: auto; +} + input:-moz-placeholder, textarea:-moz-placeholder { color: #999999; -- cgit v1.2.3 From 749dc35328862896d613bfe72fc961e490037fad Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Jul 2013 20:18:44 -0700 Subject: comma for the guardian angel /cc @cvrebert --- docs/assets/css/bootstrap.css | 3 ++- 1 file changed, 2 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 90482621e..87b021ee7 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1486,7 +1486,8 @@ input[type="checkbox"]:focus { outline-offset: -2px; } -input[type="number"]::-webkit-outer-spin-button input[type="number"]::-webkit-inner-spin-button { +input[type="number"]::-webkit-outer-spin-button, +input[type="number"]::-webkit-inner-spin-button { height: auto; } -- cgit v1.2.3 From da072fff21f565521d3dbe1f5f4f42550ecc989e Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 2 Jul 2013 11:25:57 -0700 Subject: refactor tables.less to use nesting more --- docs/assets/css/bootstrap.css | 8 ++++---- 1 file changed, 4 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 87b021ee7..a28f94f06 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1126,10 +1126,10 @@ th { } .table caption + thead tr:first-child th, -.table caption + thead tr:first-child td, .table colgroup + thead tr:first-child th, -.table colgroup + thead tr:first-child td, .table thead:first-child tr:first-child th, +.table caption + thead tr:first-child td, +.table colgroup + thead tr:first-child td, .table thead:first-child tr:first-child td { border-top: 0; } @@ -1212,15 +1212,15 @@ th { } .table-bordered > caption + thead > tr:first-child > th:first-child, -.table-bordered > caption + tbody > tr:first-child > td:first-child, .table-bordered > colgroup + thead > tr:first-child > th:first-child, +.table-bordered > caption + tbody > tr:first-child > td:first-child, .table-bordered > colgroup + tbody > tr:first-child > td:first-child { border-top-left-radius: 4px; } .table-bordered > caption + thead > tr:first-child > th:last-child, -.table-bordered > caption + tbody > tr:first-child > td:last-child, .table-bordered > colgroup + thead > tr:first-child > th:last-child, +.table-bordered > caption + tbody > tr:first-child > td:last-child, .table-bordered > colgroup + tbody > tr:first-child > td:last-child { border-top-right-radius: 4px; } -- cgit v1.2.3 From 5b69d3405301ebf9f7047a459f727cbe5f73aedd Mon Sep 17 00:00:00 2001 From: liuyl Date: Wed, 3 Jul 2013 20:37:36 +0800 Subject: use sibling selector instead of pseudo selector --- docs/assets/css/bootstrap.css | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 87b021ee7..dbe48cbaf 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3289,15 +3289,11 @@ button.close { text-shadow: 0 1px 0 #fff; } -.breadcrumb > li:after { +.breadcrumb > li + li:before { display: inline-block; padding: 0 5px; color: #ccc; - content: "\00a0 /"; -} - -.breadcrumb > li:last-child:after { - display: none; + content: "/\00a0"; } .breadcrumb > .active { -- cgit v1.2.3 From e6529e9588bed07af84daeb7af2651f05cb9220e Mon Sep 17 00:00:00 2001 From: liuyl Date: Fri, 5 Jul 2013 15:09:16 +0800 Subject: delete typeahead style --- docs/assets/css/bootstrap.css | 4 ---- 1 file changed, 4 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index a28f94f06..a576aa968 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2305,10 +2305,6 @@ input[type="button"].btn-block { padding-left: 20px; } -.typeahead { - z-index: 1051; -} - .list-group { padding-left: 0; margin-bottom: 20px; -- cgit v1.2.3 From 88a266b800a74b8445d06ac2fcb70ab97f035dfd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 5 Jul 2013 14:15:00 -0500 Subject: Add tfoot back (addresses more than #8387) --- docs/assets/css/bootstrap.css | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index a28f94f06..55888527c 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1113,8 +1113,10 @@ th { .table thead > tr > th, .table tbody > tr > th, +.table tfoot > tr > th, .table thead > tr > td, -.table tbody > tr > td { +.table tbody > tr > td, +.table tfoot > tr > td { padding: 8px; line-height: 1.428571429; vertical-align: top; @@ -1144,8 +1146,10 @@ th { .table-condensed thead > tr > th, .table-condensed tbody > tr > th, +.table-condensed tfoot > tr > th, .table-condensed thead > tr > td, -.table-condensed tbody > tr > td { +.table-condensed tbody > tr > td, +.table-condensed tfoot > tr > td { padding: 4px 5px; } @@ -1158,8 +1162,10 @@ th { .table-bordered > thead > tr > th, .table-bordered > tbody > tr > th, +.table-bordered > tfoot > tr > th, .table-bordered > thead > tr > td, -.table-bordered > tbody > tr > td { +.table-bordered > tbody > tr > td, +.table-bordered > tfoot > tr > td { border-left: 1px solid #dddddd; } -- cgit v1.2.3 From 61823dbff1377443203f6ef6a98b8202b57abb29 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 5 Jul 2013 14:21:05 -0500 Subject: Move `hr` to scaffolding.less (out of type.less) and simplify styles --- docs/assets/css/bootstrap.css | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 55888527c..c11879433 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -342,6 +342,13 @@ img { border-radius: 500px; } +hr { + margin-top: 20px; + margin-bottom: 20px; + border: 0; + border-top: 1px solid #eeeeee; +} + p { margin: 0 0 10px; } @@ -590,14 +597,6 @@ dd { clear: both; } -hr { - margin: 20px 0; - border: 0; - border-top: 1px solid #eeeeee; - border-bottom: 1px solid #fff; - border-bottom: 1px solid rgba(255, 255, 255, 0.5); -} - abbr[title], abbr[data-original-title] { cursor: help; -- cgit v1.2.3 From 6e03639af22e2c1c06c5e146192c79b41f1d7385 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 6 Jul 2013 22:13:37 -0700 Subject: more nesting in buttons.less --- docs/assets/css/bootstrap.css | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index d3bea53f3..cad42745c 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2074,6 +2074,13 @@ fieldset[disabled] .btn-info.active { border-color: #5bc0de; } +.btn-link { + font-weight: normal; + color: #428bca; + cursor: pointer; + border-radius: 0; +} + .btn-link, .btn-link:active, .btn-link[disabled], @@ -2091,13 +2098,6 @@ fieldset[disabled] .btn-link { border-color: transparent; } -.btn-link { - font-weight: normal; - color: #428bca; - cursor: pointer; - border-radius: 0; -} - .btn-link:hover, .btn-link:focus { color: #2a6496; -- cgit v1.2.3 From d9cd5e4e0c252ca7db3bc8a217a576ad9e8e6257 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 7 Jul 2013 14:40:18 -0700 Subject: more nesting in navbar.less --- docs/assets/css/bootstrap.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index d3bea53f3..076ead20f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2948,11 +2948,6 @@ button.close { background-color: #d5d5d5; } -.navbar-nav > .dropdown > a .caret { - border-top-color: #777777; - border-bottom-color: #777777; -} - .navbar-nav > .open > a .caret, .navbar-nav > .open > a:hover .caret, .navbar-nav > .open > a:focus .caret { @@ -2960,6 +2955,11 @@ button.close { border-bottom-color: #555555; } +.navbar-nav > .dropdown > a .caret { + border-top-color: #777777; + border-bottom-color: #777777; +} + .navbar-nav.pull-right > li > .dropdown-menu, .navbar-nav > li > .dropdown-menu.pull-right { right: 0; -- cgit v1.2.3 From 6bda16f6beb9db168d52b5e1f291328d8fd5d7c9 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 7 Jul 2013 14:52:00 -0700 Subject: use nesting more in pagination.less --- docs/assets/css/bootstrap.css | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index d3bea53f3..88eaf2cfa 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3323,6 +3323,19 @@ button.close { border-left-width: 0; } +.pagination > li:first-child > a, +.pagination > li:first-child > span { + border-left-width: 1px; + border-bottom-left-radius: 4px; + border-top-left-radius: 4px; +} + +.pagination > li:last-child > a, +.pagination > li:last-child > span { + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; +} + .pagination > li > a:hover, .pagination > li > a:focus, .pagination > .active > a, @@ -3345,19 +3358,6 @@ button.close { background-color: #ffffff; } -.pagination > li:first-child > a, -.pagination > li:first-child > span { - border-left-width: 1px; - border-bottom-left-radius: 4px; - border-top-left-radius: 4px; -} - -.pagination > li:last-child > a, -.pagination > li:last-child > span { - border-top-right-radius: 4px; - border-bottom-right-radius: 4px; -} - .pagination-large > li > a, .pagination-large > li > span { padding: 14px 16px; -- cgit v1.2.3 From e40aee9c9e3e80b03ebe00e812262da09c43bc11 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 6 Jul 2013 22:24:03 -0700 Subject: code.less: cleanup styles that get immediately overriden later in the file --- 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 d3bea53f3..d59e30e9f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -671,11 +671,7 @@ address { code, pre { - padding: 0 3px 2px; font-family: Monaco, Menlo, Consolas, "Courier New", monospace; - font-size: 12px; - color: #333333; - border-radius: 4px; } code { @@ -684,6 +680,7 @@ code { color: #c7254e; white-space: nowrap; background-color: #f9f2f4; + border-radius: 4px; } pre { @@ -692,6 +689,7 @@ pre { margin: 0 0 10px; font-size: 13px; line-height: 1.428571429; + color: #333333; word-break: break-all; word-wrap: break-word; background-color: #f5f5f5; -- cgit v1.2.3 From 0d5c3c2ecf35d9bcbe4bd1ad67f3144f5341eb20 Mon Sep 17 00:00:00 2001 From: liuyl Date: Tue, 9 Jul 2013 09:22:36 +0800 Subject: simplify type.less --- 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 d3d334a97..168d6c389 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -524,9 +524,9 @@ ol { } ul ul, +ol ul, ul ol, -ol ol, -ol ul { +ol ol { margin-bottom: 0; } -- cgit v1.2.3 From 522004e67ae72d48ae6a2aadc304cfdb2af4e92e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 16 Jul 2013 11:26:48 -0700 Subject: remove webkit-overflow-scrolling from modal for now /cc #8495 --- docs/assets/css/bootstrap.css | 1 - 1 file changed, 1 deletion(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 168d6c389..0bd1dba15 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3471,7 +3471,6 @@ button.close { display: none; overflow: auto; overflow-y: scroll; - -webkit-overflow-scrolling: touch; } .modal.fade { -- cgit v1.2.3 From 5967ef64a3b91b76b6e1ac6e7e61c8306a954f4a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 16 Jul 2013 11:49:04 -0700 Subject: remove margin from left side of navs since it's no longer being set --- docs/assets/css/bootstrap.css | 1 - 1 file changed, 1 deletion(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 0bd1dba15..83e16a613 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2531,7 +2531,6 @@ button.close { .nav { padding-left: 0; margin-bottom: 0; - margin-left: 0; list-style: none; } -- cgit v1.2.3