mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-05-27 14:46:01 +03:00
Merge branch 'master' into pr/11648
Conflicts: dist/css/bootstrap.min.css less/grid.less
This commit is contained in:
Mark Otto
Vendored
+113
-122
@@ -1,9 +1,7 @@
|
||||
/*!
|
||||
* Bootstrap v3.0.2 by @fat and @mdo
|
||||
* Bootstrap v3.0.2 (http://getbootstrap.com)
|
||||
* Copyright 2013 Twitter, Inc.
|
||||
* Licensed under http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Designed and built with all the love in the world by @mdo and @fat.
|
||||
*/
|
||||
|
||||
/*! normalize.css v2.1.3 | MIT License | git.io/normalize */
|
||||
@@ -426,35 +424,35 @@ cite {
|
||||
}
|
||||
|
||||
.text-warning {
|
||||
color: #c09853;
|
||||
color: #8a6d3b;
|
||||
}
|
||||
|
||||
.text-warning:hover {
|
||||
color: #a47e3c;
|
||||
color: #66512c;
|
||||
}
|
||||
|
||||
.text-danger {
|
||||
color: #b94a48;
|
||||
color: #a94442;
|
||||
}
|
||||
|
||||
.text-danger:hover {
|
||||
color: #953b39;
|
||||
color: #843534;
|
||||
}
|
||||
|
||||
.text-success {
|
||||
color: #468847;
|
||||
color: #3c763d;
|
||||
}
|
||||
|
||||
.text-success:hover {
|
||||
color: #356635;
|
||||
color: #2b542c;
|
||||
}
|
||||
|
||||
.text-info {
|
||||
color: #3a87ad;
|
||||
color: #31708f;
|
||||
}
|
||||
|
||||
.text-info:hover {
|
||||
color: #2d6987;
|
||||
color: #245269;
|
||||
}
|
||||
|
||||
.text-left {
|
||||
@@ -1731,84 +1729,75 @@ table th[class*="col-"] {
|
||||
float: none;
|
||||
}
|
||||
|
||||
.table > thead > tr > td.active,
|
||||
.table > tbody > tr > td.active,
|
||||
.table > tfoot > tr > td.active,
|
||||
.table > thead > tr > th.active,
|
||||
.table > tbody > tr > th.active,
|
||||
.table > tfoot > tr > th.active,
|
||||
.table > thead > tr.active > td,
|
||||
.table > tbody > tr.active > td,
|
||||
.table > tfoot > tr.active > td,
|
||||
.table > thead > tr.active > th,
|
||||
.table > tbody > tr.active > th,
|
||||
.table > tfoot > tr.active > th {
|
||||
.table > thead > tr > .active,
|
||||
.table > tbody > tr > .active,
|
||||
.table > tfoot > tr > .active,
|
||||
.table > thead > .active > td,
|
||||
.table > tbody > .active > td,
|
||||
.table > tfoot > .active > td,
|
||||
.table > thead > .active > th,
|
||||
.table > tbody > .active > th,
|
||||
.table > tfoot > .active > th {
|
||||
background-color: #f5f5f5;
|
||||
}
|
||||
|
||||
.table > thead > tr > td.success,
|
||||
.table > tbody > tr > td.success,
|
||||
.table > tfoot > tr > td.success,
|
||||
.table > thead > tr > th.success,
|
||||
.table > tbody > tr > th.success,
|
||||
.table > tfoot > tr > th.success,
|
||||
.table > thead > tr.success > td,
|
||||
.table > tbody > tr.success > td,
|
||||
.table > tfoot > tr.success > td,
|
||||
.table > thead > tr.success > th,
|
||||
.table > tbody > tr.success > th,
|
||||
.table > tfoot > tr.success > th {
|
||||
.table-hover > tbody > tr > .active:hover,
|
||||
.table-hover > tbody > .active:hover > td,
|
||||
.table-hover > tbody > .active:hover > th {
|
||||
background-color: #e8e8e8;
|
||||
}
|
||||
|
||||
.table > thead > tr > .success,
|
||||
.table > tbody > tr > .success,
|
||||
.table > tfoot > tr > .success,
|
||||
.table > thead > .success > td,
|
||||
.table > tbody > .success > td,
|
||||
.table > tfoot > .success > td,
|
||||
.table > thead > .success > th,
|
||||
.table > tbody > .success > th,
|
||||
.table > tfoot > .success > th {
|
||||
background-color: #dff0d8;
|
||||
}
|
||||
|
||||
.table-hover > tbody > tr > td.success:hover,
|
||||
.table-hover > tbody > tr > th.success:hover,
|
||||
.table-hover > tbody > tr.success:hover > td,
|
||||
.table-hover > tbody > tr.success:hover > th {
|
||||
.table-hover > tbody > tr > .success:hover,
|
||||
.table-hover > tbody > .success:hover > td,
|
||||
.table-hover > tbody > .success:hover > th {
|
||||
background-color: #d0e9c6;
|
||||
}
|
||||
|
||||
.table > thead > tr > td.danger,
|
||||
.table > tbody > tr > td.danger,
|
||||
.table > tfoot > tr > td.danger,
|
||||
.table > thead > tr > th.danger,
|
||||
.table > tbody > tr > th.danger,
|
||||
.table > tfoot > tr > th.danger,
|
||||
.table > thead > tr.danger > td,
|
||||
.table > tbody > tr.danger > td,
|
||||
.table > tfoot > tr.danger > td,
|
||||
.table > thead > tr.danger > th,
|
||||
.table > tbody > tr.danger > th,
|
||||
.table > tfoot > tr.danger > th {
|
||||
.table > thead > tr > .danger,
|
||||
.table > tbody > tr > .danger,
|
||||
.table > tfoot > tr > .danger,
|
||||
.table > thead > .danger > td,
|
||||
.table > tbody > .danger > td,
|
||||
.table > tfoot > .danger > td,
|
||||
.table > thead > .danger > th,
|
||||
.table > tbody > .danger > th,
|
||||
.table > tfoot > .danger > th {
|
||||
background-color: #f2dede;
|
||||
}
|
||||
|
||||
.table-hover > tbody > tr > td.danger:hover,
|
||||
.table-hover > tbody > tr > th.danger:hover,
|
||||
.table-hover > tbody > tr.danger:hover > td,
|
||||
.table-hover > tbody > tr.danger:hover > th {
|
||||
.table-hover > tbody > tr > .danger:hover,
|
||||
.table-hover > tbody > .danger:hover > td,
|
||||
.table-hover > tbody > .danger:hover > th {
|
||||
background-color: #ebcccc;
|
||||
}
|
||||
|
||||
.table > thead > tr > td.warning,
|
||||
.table > tbody > tr > td.warning,
|
||||
.table > tfoot > tr > td.warning,
|
||||
.table > thead > tr > th.warning,
|
||||
.table > tbody > tr > th.warning,
|
||||
.table > tfoot > tr > th.warning,
|
||||
.table > thead > tr.warning > td,
|
||||
.table > tbody > tr.warning > td,
|
||||
.table > tfoot > tr.warning > td,
|
||||
.table > thead > tr.warning > th,
|
||||
.table > tbody > tr.warning > th,
|
||||
.table > tfoot > tr.warning > th {
|
||||
.table > thead > tr > .warning,
|
||||
.table > tbody > tr > .warning,
|
||||
.table > tfoot > tr > .warning,
|
||||
.table > thead > .warning > td,
|
||||
.table > tbody > .warning > td,
|
||||
.table > tfoot > .warning > td,
|
||||
.table > thead > .warning > th,
|
||||
.table > tbody > .warning > th,
|
||||
.table > tfoot > .warning > th {
|
||||
background-color: #fcf8e3;
|
||||
}
|
||||
|
||||
.table-hover > tbody > tr > td.warning:hover,
|
||||
.table-hover > tbody > tr > th.warning:hover,
|
||||
.table-hover > tbody > tr.warning:hover > td,
|
||||
.table-hover > tbody > tr.warning:hover > th {
|
||||
.table-hover > tbody > tr > .warning:hover,
|
||||
.table-hover > tbody > .warning:hover > td,
|
||||
.table-hover > tbody > .warning:hover > th {
|
||||
background-color: #faf2cc;
|
||||
}
|
||||
|
||||
@@ -2074,7 +2063,7 @@ textarea.input-sm {
|
||||
}
|
||||
|
||||
.input-lg {
|
||||
height: 45px;
|
||||
height: 46px;
|
||||
padding: 10px 16px;
|
||||
font-size: 18px;
|
||||
line-height: 1.33;
|
||||
@@ -2082,8 +2071,8 @@ textarea.input-sm {
|
||||
}
|
||||
|
||||
select.input-lg {
|
||||
height: 45px;
|
||||
line-height: 45px;
|
||||
height: 46px;
|
||||
line-height: 46px;
|
||||
}
|
||||
|
||||
textarea.input-lg {
|
||||
@@ -2096,25 +2085,25 @@ textarea.input-lg {
|
||||
.has-warning .checkbox,
|
||||
.has-warning .radio-inline,
|
||||
.has-warning .checkbox-inline {
|
||||
color: #c09853;
|
||||
color: #8a6d3b;
|
||||
}
|
||||
|
||||
.has-warning .form-control {
|
||||
border-color: #c09853;
|
||||
border-color: #8a6d3b;
|
||||
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
|
||||
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
|
||||
}
|
||||
|
||||
.has-warning .form-control:focus {
|
||||
border-color: #a47e3c;
|
||||
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
|
||||
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
|
||||
border-color: #66512c;
|
||||
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b;
|
||||
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b;
|
||||
}
|
||||
|
||||
.has-warning .input-group-addon {
|
||||
color: #c09853;
|
||||
color: #8a6d3b;
|
||||
background-color: #fcf8e3;
|
||||
border-color: #c09853;
|
||||
border-color: #8a6d3b;
|
||||
}
|
||||
|
||||
.has-error .help-block,
|
||||
@@ -2123,25 +2112,25 @@ textarea.input-lg {
|
||||
.has-error .checkbox,
|
||||
.has-error .radio-inline,
|
||||
.has-error .checkbox-inline {
|
||||
color: #b94a48;
|
||||
color: #a94442;
|
||||
}
|
||||
|
||||
.has-error .form-control {
|
||||
border-color: #b94a48;
|
||||
border-color: #a94442;
|
||||
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
|
||||
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
|
||||
}
|
||||
|
||||
.has-error .form-control:focus {
|
||||
border-color: #953b39;
|
||||
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
|
||||
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
|
||||
border-color: #843534;
|
||||
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483;
|
||||
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483;
|
||||
}
|
||||
|
||||
.has-error .input-group-addon {
|
||||
color: #b94a48;
|
||||
color: #a94442;
|
||||
background-color: #f2dede;
|
||||
border-color: #b94a48;
|
||||
border-color: #a94442;
|
||||
}
|
||||
|
||||
.has-success .help-block,
|
||||
@@ -2150,25 +2139,25 @@ textarea.input-lg {
|
||||
.has-success .checkbox,
|
||||
.has-success .radio-inline,
|
||||
.has-success .checkbox-inline {
|
||||
color: #468847;
|
||||
color: #3c763d;
|
||||
}
|
||||
|
||||
.has-success .form-control {
|
||||
border-color: #468847;
|
||||
border-color: #3c763d;
|
||||
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
|
||||
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
|
||||
}
|
||||
|
||||
.has-success .form-control:focus {
|
||||
border-color: #356635;
|
||||
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
|
||||
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
|
||||
border-color: #2b542c;
|
||||
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;
|
||||
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;
|
||||
}
|
||||
|
||||
.has-success .input-group-addon {
|
||||
color: #468847;
|
||||
color: #3c763d;
|
||||
background-color: #dff0d8;
|
||||
border-color: #468847;
|
||||
border-color: #3c763d;
|
||||
}
|
||||
|
||||
.form-control-static {
|
||||
@@ -3780,7 +3769,8 @@ input[type="button"].btn-block {
|
||||
}
|
||||
|
||||
.btn-group-vertical > .btn,
|
||||
.btn-group-vertical > .btn-group {
|
||||
.btn-group-vertical > .btn-group,
|
||||
.btn-group-vertical > .btn-group > .btn {
|
||||
display: block;
|
||||
float: none;
|
||||
width: 100%;
|
||||
@@ -3874,7 +3864,7 @@ input[type="button"].btn-block {
|
||||
border-collapse: separate;
|
||||
}
|
||||
|
||||
.input-group.col {
|
||||
.input-group[class*="col-"] {
|
||||
float: none;
|
||||
padding-right: 0;
|
||||
padding-left: 0;
|
||||
@@ -3888,7 +3878,7 @@ input[type="button"].btn-block {
|
||||
.input-group-lg > .form-control,
|
||||
.input-group-lg > .input-group-addon,
|
||||
.input-group-lg > .input-group-btn > .btn {
|
||||
height: 45px;
|
||||
height: 46px;
|
||||
padding: 10px 16px;
|
||||
font-size: 18px;
|
||||
line-height: 1.33;
|
||||
@@ -3898,8 +3888,8 @@ input[type="button"].btn-block {
|
||||
select.input-group-lg > .form-control,
|
||||
select.input-group-lg > .input-group-addon,
|
||||
select.input-group-lg > .input-group-btn > .btn {
|
||||
height: 45px;
|
||||
line-height: 45px;
|
||||
height: 46px;
|
||||
line-height: 46px;
|
||||
}
|
||||
|
||||
textarea.input-group-lg > .form-control,
|
||||
@@ -4479,6 +4469,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
|
||||
margin-right: 15px;
|
||||
margin-bottom: 8px;
|
||||
background-color: transparent;
|
||||
background-image: none;
|
||||
border: 1px solid transparent;
|
||||
border-radius: 4px;
|
||||
}
|
||||
@@ -5169,7 +5160,8 @@ a.list-group-item.active > .badge,
|
||||
background-color: #eeeeee;
|
||||
}
|
||||
|
||||
.jumbotron h1 {
|
||||
.jumbotron h1,
|
||||
.jumbotron .h1 {
|
||||
line-height: 1;
|
||||
color: inherit;
|
||||
}
|
||||
@@ -5182,6 +5174,10 @@ a.list-group-item.active > .badge,
|
||||
border-radius: 6px;
|
||||
}
|
||||
|
||||
.jumbotron .container {
|
||||
max-width: 100%;
|
||||
}
|
||||
|
||||
@media screen and (min-width: 768px) {
|
||||
.jumbotron {
|
||||
padding-top: 48px;
|
||||
@@ -5191,16 +5187,14 @@ a.list-group-item.active > .badge,
|
||||
padding-right: 60px;
|
||||
padding-left: 60px;
|
||||
}
|
||||
.jumbotron h1 {
|
||||
.jumbotron h1,
|
||||
.jumbotron .h1 {
|
||||
font-size: 63px;
|
||||
}
|
||||
}
|
||||
|
||||
.thumbnail {
|
||||
display: inline-block;
|
||||
display: block;
|
||||
height: auto;
|
||||
max-width: 100%;
|
||||
padding: 4px;
|
||||
margin-bottom: 20px;
|
||||
line-height: 1.428571429;
|
||||
@@ -5267,7 +5261,7 @@ a.thumbnail.active {
|
||||
}
|
||||
|
||||
.alert-success {
|
||||
color: #468847;
|
||||
color: #3c763d;
|
||||
background-color: #dff0d8;
|
||||
border-color: #d6e9c6;
|
||||
}
|
||||
@@ -5277,11 +5271,11 @@ a.thumbnail.active {
|
||||
}
|
||||
|
||||
.alert-success .alert-link {
|
||||
color: #356635;
|
||||
color: #2b542c;
|
||||
}
|
||||
|
||||
.alert-info {
|
||||
color: #3a87ad;
|
||||
color: #31708f;
|
||||
background-color: #d9edf7;
|
||||
border-color: #bce8f1;
|
||||
}
|
||||
@@ -5291,11 +5285,11 @@ a.thumbnail.active {
|
||||
}
|
||||
|
||||
.alert-info .alert-link {
|
||||
color: #2d6987;
|
||||
color: #245269;
|
||||
}
|
||||
|
||||
.alert-warning {
|
||||
color: #c09853;
|
||||
color: #8a6d3b;
|
||||
background-color: #fcf8e3;
|
||||
border-color: #faebcc;
|
||||
}
|
||||
@@ -5305,11 +5299,11 @@ a.thumbnail.active {
|
||||
}
|
||||
|
||||
.alert-warning .alert-link {
|
||||
color: #a47e3c;
|
||||
color: #66512c;
|
||||
}
|
||||
|
||||
.alert-danger {
|
||||
color: #b94a48;
|
||||
color: #a94442;
|
||||
background-color: #f2dede;
|
||||
border-color: #ebccd1;
|
||||
}
|
||||
@@ -5319,7 +5313,7 @@ a.thumbnail.active {
|
||||
}
|
||||
|
||||
.alert-danger .alert-link {
|
||||
color: #953b39;
|
||||
color: #843534;
|
||||
}
|
||||
|
||||
@-webkit-keyframes progress-bar-stripes {
|
||||
@@ -5751,7 +5745,7 @@ a.list-group-item.active:focus .list-group-item-text {
|
||||
}
|
||||
|
||||
.panel-success > .panel-heading {
|
||||
color: #468847;
|
||||
color: #3c763d;
|
||||
background-color: #dff0d8;
|
||||
border-color: #d6e9c6;
|
||||
}
|
||||
@@ -5769,7 +5763,7 @@ a.list-group-item.active:focus .list-group-item-text {
|
||||
}
|
||||
|
||||
.panel-warning > .panel-heading {
|
||||
color: #c09853;
|
||||
color: #8a6d3b;
|
||||
background-color: #fcf8e3;
|
||||
border-color: #faebcc;
|
||||
}
|
||||
@@ -5787,7 +5781,7 @@ a.list-group-item.active:focus .list-group-item-text {
|
||||
}
|
||||
|
||||
.panel-danger > .panel-heading {
|
||||
color: #b94a48;
|
||||
color: #a94442;
|
||||
background-color: #f2dede;
|
||||
border-color: #ebccd1;
|
||||
}
|
||||
@@ -5805,7 +5799,7 @@ a.list-group-item.active:focus .list-group-item-text {
|
||||
}
|
||||
|
||||
.panel-info > .panel-heading {
|
||||
color: #3a87ad;
|
||||
color: #31708f;
|
||||
background-color: #d9edf7;
|
||||
border-color: #bce8f1;
|
||||
}
|
||||
@@ -5908,9 +5902,7 @@ button.close {
|
||||
position: relative;
|
||||
z-index: 1050;
|
||||
width: auto;
|
||||
padding: 10px;
|
||||
margin-right: auto;
|
||||
margin-left: auto;
|
||||
margin: 10px;
|
||||
}
|
||||
|
||||
.modal-content {
|
||||
@@ -6008,8 +6000,7 @@ button.close {
|
||||
@media screen and (min-width: 768px) {
|
||||
.modal-dialog {
|
||||
width: 600px;
|
||||
padding-top: 30px;
|
||||
padding-bottom: 30px;
|
||||
margin: 30px auto;
|
||||
}
|
||||
.modal-content {
|
||||
-webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
|
||||
|
||||
Reference in New Issue
Block a user