From 8bee6549ade7103b7de805ae92ccff50102008b0 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 17 Jun 2014 18:23:14 -0700 Subject: grunt dist --- dist/css/bootstrap.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 6bd664017..3d2dae1c5 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4612,10 +4612,12 @@ a.thumbnail.active { .alert > p + p { margin-top: 5px; } -.alert-dismissable { +.alert-dismissable, +.alert-dismissible { padding-right: 35px; } -.alert-dismissable .close { +.alert-dismissable .close, +.alert-dismissible .close { position: relative; top: -2px; right: -21px; -- cgit v1.2.3 From fdf174e498d8fbd9a73c45ccd805099a25e790f9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Jun 2014 15:46:38 -0700 Subject: grunt dist --- dist/css/bootstrap.css | 54 +++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 3d2dae1c5..894605714 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -1025,7 +1025,7 @@ h6 .small, .h6 .small { font-weight: normal; line-height: 1; - color: #999; + color: #777; } h1, .h1, @@ -1148,7 +1148,7 @@ mark, text-transform: capitalize; } .text-muted { - color: #999; + color: #777; } .text-primary { color: #428bca; @@ -1272,7 +1272,7 @@ dd { abbr[title], abbr[data-original-title] { cursor: help; - border-bottom: 1px dotted #999; + border-bottom: 1px dotted #777; } .initialism { font-size: 90%; @@ -1295,7 +1295,7 @@ blockquote .small { display: block; font-size: 80%; line-height: 1.42857143; - color: #999; + color: #777; } blockquote footer:before, blockquote small:before, @@ -2373,14 +2373,14 @@ output { box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6); } .form-control::-moz-placeholder { - color: #999; + color: #777; opacity: 1; } .form-control:-ms-input-placeholder { - color: #999; + color: #777; } .form-control::-webkit-input-placeholder { - color: #999; + color: #777; } .form-control[disabled], .form-control[readonly], @@ -3027,7 +3027,7 @@ fieldset[disabled] .btn-link { fieldset[disabled] .btn-link:hover, .btn-link[disabled]:focus, fieldset[disabled] .btn-link:focus { - color: #999; + color: #777; text-decoration: none; } .btn-lg, @@ -3168,7 +3168,7 @@ tbody.collapse.in { .dropdown-menu > .disabled > a, .dropdown-menu > .disabled > a:hover, .dropdown-menu > .disabled > a:focus { - color: #999; + color: #777; } .dropdown-menu > .disabled > a:hover, .dropdown-menu > .disabled > a:focus { @@ -3197,7 +3197,7 @@ tbody.collapse.in { padding: 3px 20px; font-size: 12px; line-height: 1.42857143; - color: #999; + color: #777; } .dropdown-backdrop { position: fixed; @@ -3578,11 +3578,11 @@ select[multiple].input-group-sm > .input-group-btn > .btn { background-color: #eee; } .nav > li.disabled > a { - color: #999; + color: #777; } .nav > li.disabled > a:hover, .nav > li.disabled > a:focus { - color: #999; + color: #777; text-decoration: none; cursor: not-allowed; background-color: transparent; @@ -4176,7 +4176,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { border-color: #080808; } .navbar-inverse .navbar-brand { - color: #999; + color: #777; } .navbar-inverse .navbar-brand:hover, .navbar-inverse .navbar-brand:focus { @@ -4184,10 +4184,10 @@ fieldset[disabled] .navbar-default .btn-link:focus { background-color: transparent; } .navbar-inverse .navbar-text { - color: #999; + color: #777; } .navbar-inverse .navbar-nav > li > a { - color: #999; + color: #777; } .navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus { @@ -4234,7 +4234,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { background-color: #080808; } .navbar-inverse .navbar-nav .open .dropdown-menu > li > a { - color: #999; + color: #777; } .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus { @@ -4255,13 +4255,13 @@ fieldset[disabled] .navbar-default .btn-link:focus { } } .navbar-inverse .navbar-link { - color: #999; + color: #777; } .navbar-inverse .navbar-link:hover { color: #fff; } .navbar-inverse .btn-link { - color: #999; + color: #777; } .navbar-inverse .btn-link:hover, .navbar-inverse .btn-link:focus { @@ -4289,7 +4289,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { content: "/\00a0"; } .breadcrumb > .active { - color: #999; + color: #777; } .pagination { display: inline-block; @@ -4349,7 +4349,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { .pagination > .disabled > a, .pagination > .disabled > a:hover, .pagination > .disabled > a:focus { - color: #999; + color: #777; cursor: not-allowed; background-color: #fff; border-color: #ddd; @@ -4418,7 +4418,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus { .pager .disabled > a:hover, .pager .disabled > a:focus, .pager .disabled > span { - color: #999; + color: #777; cursor: not-allowed; background-color: #fff; } @@ -4448,11 +4448,11 @@ a.label:focus { top: -1px; } .label-default { - background-color: #999; + background-color: #777; } .label-default[href]:hover, .label-default[href]:focus { - background-color: #808080; + background-color: #5e5e5e; } .label-primary { background-color: #428bca; @@ -4500,7 +4500,7 @@ a.label:focus { text-align: center; white-space: nowrap; vertical-align: baseline; - background-color: #999; + background-color: #777; border-radius: 10px; } .badge:empty { @@ -4733,7 +4733,7 @@ a.thumbnail.active { } .progress-bar[aria-valuenow="0"] { min-width: 30px; - color: #999; + color: #777; background-color: transparent; background-image: none; -webkit-box-shadow: none; @@ -4841,7 +4841,7 @@ a.list-group-item:focus { .list-group-item.disabled, .list-group-item.disabled:hover, .list-group-item.disabled:focus { - color: #999; + color: #777; background-color: #eee; } .list-group-item.disabled .list-group-item-heading, @@ -4852,7 +4852,7 @@ a.list-group-item:focus { .list-group-item.disabled .list-group-item-text, .list-group-item.disabled:hover .list-group-item-text, .list-group-item.disabled:focus .list-group-item-text { - color: #999; + color: #777; } .list-group-item.active, .list-group-item.active:hover, -- cgit v1.2.3 From 46e8a5817d0ddb98343dde1e0f0f8b335aba41e3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Jun 2014 17:34:09 -0700 Subject: fixes #10073: add width: 100%; for ie10 and below to size svg.img-responsive correctly --- dist/css/bootstrap.css | 2 ++ 1 file changed, 2 insertions(+) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 894605714..a3c5f9474 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -935,6 +935,7 @@ img { .carousel-inner > .item > img, .carousel-inner > .item > a > img { display: block; + width: 100% \9; max-width: 100%; height: auto; } @@ -943,6 +944,7 @@ img { } .img-thumbnail { display: inline-block; + width: 100% \9; max-width: 100%; height: auto; padding: 4px; -- cgit v1.2.3 From 74a264fb98ced0228d385d601e9edd913bb1b173 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Jun 2014 18:19:17 -0700 Subject: fixes #13021: add .form-group-sm/-lg --- dist/css/bootstrap.css | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index a3c5f9474..e78f38c4e 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2480,7 +2480,8 @@ fieldset[disabled] .radio label, fieldset[disabled] .checkbox label { cursor: not-allowed; } -.input-sm { +.input-sm, +.form-horizontal .form-group-sm .form-control { height: 30px; padding: 5px 10px; font-size: 12px; @@ -2495,7 +2496,8 @@ textarea.input-sm, select[multiple].input-sm { height: auto; } -.input-lg { +.input-lg, +.form-horizontal .form-group-lg .form-control { height: 46px; padding: 10px 16px; font-size: 18px; @@ -2705,6 +2707,16 @@ select[multiple].input-lg { top: 0; right: 15px; } +@media (min-width: 768px) { + .form-horizontal .form-group-lg .control-label { + padding-top: 14.3px; + } +} +@media (min-width: 768px) { + .form-horizontal .form-group-sm .control-label { + padding-top: 6px; + } +} .btn { display: inline-block; padding: 6px 12px; -- cgit v1.2.3 From 74982cf101a8ca8e15c04e4f873d6b56e02c6c7c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Jun 2014 22:23:25 -0700 Subject: grunt --- dist/css/bootstrap.css | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index a3c5f9474..8650c3f6e 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3200,6 +3200,7 @@ tbody.collapse.in { font-size: 12px; line-height: 1.42857143; color: #777; + white-space: nowrap; } .dropdown-backdrop { position: fixed; @@ -4866,7 +4867,13 @@ a.list-group-item:focus { } .list-group-item.active .list-group-item-heading, .list-group-item.active:hover .list-group-item-heading, -.list-group-item.active:focus .list-group-item-heading { +.list-group-item.active:focus .list-group-item-heading, +.list-group-item.active .list-group-item-heading > small, +.list-group-item.active:hover .list-group-item-heading > small, +.list-group-item.active:focus .list-group-item-heading > small, +.list-group-item.active .list-group-item-heading > .small, +.list-group-item.active:hover .list-group-item-heading > .small, +.list-group-item.active:focus .list-group-item-heading > .small { color: inherit; } .list-group-item.active .list-group-item-text, -- cgit v1.2.3 From 99f176e7ec678b4c9ea4fc973135d39a4553feab Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Jun 2014 22:35:05 -0700 Subject: rewrite striped and active to deprecate the parent selectors, change the docs --- dist/css/bootstrap.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 8650c3f6e..087c2a97c 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4718,14 +4718,16 @@ a.thumbnail.active { -o-transition: width .6s ease; transition: width .6s ease; } -.progress-striped .progress-bar { +.progress-striped .progress-bar, +.progress-bar-striped { background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent); -webkit-background-size: 40px 40px; background-size: 40px 40px; } -.progress.active .progress-bar { +.progress.active .progress-bar, +.progress-bar.active { -webkit-animation: progress-bar-stripes 2s linear infinite; -o-animation: progress-bar-stripes 2s linear infinite; animation: progress-bar-stripes 2s linear infinite; -- cgit v1.2.3 From 1e53dcd137e7d8c8abe26af610ebb14c26de1043 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 19 Jun 2014 18:33:41 -0700 Subject: Fixes #13872: Always apply padding to .form-control-static for that vertical alignment --- dist/css/bootstrap.css | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 70431c368..b7e6f64c1 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2621,6 +2621,8 @@ select[multiple].input-lg { top: 0; } .form-control-static { + padding-top: 7px; + padding-bottom: 7px; margin-bottom: 0; } .help-block { @@ -2692,10 +2694,6 @@ select[multiple].input-lg { margin-right: -15px; margin-left: -15px; } -.form-horizontal .form-control-static { - padding-top: 7px; - padding-bottom: 7px; -} @media (min-width: 768px) { .form-horizontal .control-label { padding-top: 7px; -- cgit v1.2.3 From e98fc373e3ef6e4a884a0142d50c765a9db5bd01 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 20 Jun 2014 13:24:14 -0700 Subject: Fixes #13872 more: add overrides for lg and sm input modifiers --- dist/css/bootstrap.css | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index b7e6f64c1..4b1923789 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2480,6 +2480,16 @@ fieldset[disabled] .radio label, fieldset[disabled] .checkbox label { cursor: not-allowed; } +.form-control-static { + padding-top: 7px; + padding-bottom: 7px; + margin-bottom: 0; +} +.form-control-static.input-lg, +.form-control-static.input-sm { + padding-right: 0; + padding-left: 0; +} .input-sm, .form-horizontal .form-group-sm .form-control { height: 30px; @@ -2620,11 +2630,6 @@ select[multiple].input-lg { .has-feedback label.sr-only ~ .form-control-feedback { top: 0; } -.form-control-static { - padding-top: 7px; - padding-bottom: 7px; - margin-bottom: 0; -} .help-block { display: block; margin-top: 5px; -- cgit v1.2.3 From df7cfe86525252034cf85a365d09a4c2485116b4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 23 Jun 2014 10:38:45 -0700 Subject: Fixes #13903: Restore side padding on .btn-block --- dist/css/bootstrap.css | 2 -- 1 file changed, 2 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 4b1923789..f26735075 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -3071,8 +3071,6 @@ fieldset[disabled] .btn-link:focus { .btn-block { display: block; width: 100%; - padding-right: 0; - padding-left: 0; } .btn-block + .btn-block { margin-top: 5px; -- cgit v1.2.3