mirror of
https://github.com/twbs/bootstrap.git
synced 2025-08-30 00:29:52 +02:00
Merge branch '3.0.0-wip' into bs3_navbar_overhaul
Conflicts: dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
231
dist/css/bootstrap.css
vendored
231
dist/css/bootstrap.css
vendored
@@ -1704,7 +1704,7 @@ textarea.form-control {
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
.input-lg {
|
||||
.input-sm {
|
||||
height: 45px;
|
||||
padding: 10px 16px;
|
||||
font-size: 18px;
|
||||
@@ -1712,7 +1712,16 @@ textarea.form-control {
|
||||
border-radius: 6px;
|
||||
}
|
||||
|
||||
.input-sm {
|
||||
select.input-sm {
|
||||
height: 45px;
|
||||
line-height: 45px;
|
||||
}
|
||||
|
||||
textarea.input-sm {
|
||||
height: auto;
|
||||
}
|
||||
|
||||
.input-lg {
|
||||
height: 30px;
|
||||
padding: 5px 10px;
|
||||
font-size: 12px;
|
||||
@@ -1721,17 +1730,11 @@ textarea.form-control {
|
||||
}
|
||||
|
||||
select.input-lg {
|
||||
height: 45px;
|
||||
line-height: 45px;
|
||||
}
|
||||
|
||||
select.input-sm {
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
}
|
||||
|
||||
textarea.input-lg,
|
||||
textarea.input-sm {
|
||||
textarea.input-lg {
|
||||
height: auto;
|
||||
}
|
||||
|
||||
@@ -2256,6 +2259,29 @@ input[type="button"].btn-block {
|
||||
|
||||
.input-group-lg > .form-control,
|
||||
.input-group-lg > .input-group-addon,
|
||||
.input-group-lg > .input-group-btn > .btn {
|
||||
height: 30px;
|
||||
padding: 5px 10px;
|
||||
font-size: 12px;
|
||||
line-height: 1.5;
|
||||
border-radius: 3px;
|
||||
}
|
||||
|
||||
select.input-group-lg > .form-control,
|
||||
select.input-group-lg > .input-group-addon,
|
||||
select.input-group-lg > .input-group-btn > .btn {
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
}
|
||||
|
||||
textarea.input-group-lg > .form-control,
|
||||
textarea.input-group-lg > .input-group-addon,
|
||||
textarea.input-group-lg > .input-group-btn > .btn {
|
||||
height: auto;
|
||||
}
|
||||
|
||||
.input-group-sm > .form-control,
|
||||
.input-group-sm > .input-group-addon,
|
||||
.input-group-lg > .input-group-btn > .btn {
|
||||
height: 45px;
|
||||
padding: 10px 16px;
|
||||
@@ -2264,14 +2290,17 @@ input[type="button"].btn-block {
|
||||
border-radius: 6px;
|
||||
}
|
||||
|
||||
.input-group-sm > .form-control,
|
||||
.input-group-sm > .input-group-addon,
|
||||
.input-group-lg > .input-group-btn > .btn {
|
||||
height: 30px;
|
||||
padding: 5px 10px;
|
||||
font-size: 12px;
|
||||
line-height: 1.5;
|
||||
border-radius: 3px;
|
||||
select.input-group-sm > .form-control,
|
||||
select.input-group-sm > .input-group-addon,
|
||||
select.input-group-lg > .input-group-btn > .btn {
|
||||
height: 45px;
|
||||
line-height: 45px;
|
||||
}
|
||||
|
||||
textarea.input-group-sm > .form-control,
|
||||
textarea.input-group-sm > .input-group-addon,
|
||||
textarea.input-group-lg > .input-group-btn > .btn {
|
||||
height: auto;
|
||||
}
|
||||
|
||||
.input-group-addon,
|
||||
@@ -2395,6 +2424,7 @@ input[type="button"].btn-block {
|
||||
min-width: 160px;
|
||||
padding: 5px 0;
|
||||
margin: 2px 0 0;
|
||||
font-size: 14px;
|
||||
list-style: none;
|
||||
background-color: #ffffff;
|
||||
border: 1px solid #cccccc;
|
||||
@@ -2593,7 +2623,6 @@ a.list-group-item:focus {
|
||||
}
|
||||
|
||||
.panel {
|
||||
padding: 15px;
|
||||
margin-bottom: 20px;
|
||||
background-color: #ffffff;
|
||||
border: 1px solid #dddddd;
|
||||
@@ -2602,8 +2631,12 @@ a.list-group-item:focus {
|
||||
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
|
||||
}
|
||||
|
||||
.panel-body {
|
||||
padding: 15px;
|
||||
}
|
||||
|
||||
.panel .list-group {
|
||||
margin: 15px -15px -15px;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.panel .list-group .list-group-item {
|
||||
@@ -2619,17 +2652,12 @@ a.list-group-item:focus {
|
||||
border-bottom: 0;
|
||||
}
|
||||
|
||||
.panel-heading + .list-group {
|
||||
margin-top: -15px;
|
||||
}
|
||||
|
||||
.panel-heading + .list-group .list-group-item:first-child {
|
||||
border-top-width: 0;
|
||||
}
|
||||
|
||||
.panel-heading {
|
||||
padding: 10px 15px;
|
||||
margin: -15px -15px 15px;
|
||||
background-color: #f5f5f5;
|
||||
border-bottom: 1px solid #dddddd;
|
||||
border-top-right-radius: 3px;
|
||||
@@ -2648,13 +2676,38 @@ a.list-group-item:focus {
|
||||
|
||||
.panel-footer {
|
||||
padding: 10px 15px;
|
||||
margin: 15px -15px -15px;
|
||||
background-color: #f5f5f5;
|
||||
border-top: 1px solid #dddddd;
|
||||
border-bottom-right-radius: 3px;
|
||||
border-bottom-left-radius: 3px;
|
||||
}
|
||||
|
||||
.panel-group .panel {
|
||||
margin-bottom: 0;
|
||||
overflow: hidden;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
.panel-group .panel + .panel {
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
.panel-group .panel-heading {
|
||||
border-bottom: 0;
|
||||
}
|
||||
|
||||
.panel-group .panel-heading + .panel-collapse .panel-body {
|
||||
border-top: 1px solid #dddddd;
|
||||
}
|
||||
|
||||
.panel-group .panel-footer {
|
||||
border-top: 0;
|
||||
}
|
||||
|
||||
.panel-group .panel-footer + .panel-collapse .panel-body {
|
||||
border-bottom: 1px solid #dddddd;
|
||||
}
|
||||
|
||||
.panel-primary {
|
||||
border-color: #428bca;
|
||||
}
|
||||
@@ -2665,6 +2718,14 @@ a.list-group-item:focus {
|
||||
border-color: #428bca;
|
||||
}
|
||||
|
||||
.panel-primary .panel-heading + .panel-collapse .panel-body {
|
||||
border-top-color: #428bca;
|
||||
}
|
||||
|
||||
.panel-primary .panel-footer + .panel-collapse .panel-body {
|
||||
border-bottom-color: #428bca;
|
||||
}
|
||||
|
||||
.panel-success {
|
||||
border-color: #d6e9c6;
|
||||
}
|
||||
@@ -2675,6 +2736,14 @@ a.list-group-item:focus {
|
||||
border-color: #d6e9c6;
|
||||
}
|
||||
|
||||
.panel-success .panel-heading + .panel-collapse .panel-body {
|
||||
border-top-color: #d6e9c6;
|
||||
}
|
||||
|
||||
.panel-success .panel-footer + .panel-collapse .panel-body {
|
||||
border-bottom-color: #d6e9c6;
|
||||
}
|
||||
|
||||
.panel-warning {
|
||||
border-color: #fbeed5;
|
||||
}
|
||||
@@ -2685,6 +2754,14 @@ a.list-group-item:focus {
|
||||
border-color: #fbeed5;
|
||||
}
|
||||
|
||||
.panel-warning .panel-heading + .panel-collapse .panel-body {
|
||||
border-top-color: #fbeed5;
|
||||
}
|
||||
|
||||
.panel-warning .panel-footer + .panel-collapse .panel-body {
|
||||
border-bottom-color: #fbeed5;
|
||||
}
|
||||
|
||||
.panel-danger {
|
||||
border-color: #eed3d7;
|
||||
}
|
||||
@@ -2695,6 +2772,14 @@ a.list-group-item:focus {
|
||||
border-color: #eed3d7;
|
||||
}
|
||||
|
||||
.panel-danger .panel-heading + .panel-collapse .panel-body {
|
||||
border-top-color: #eed3d7;
|
||||
}
|
||||
|
||||
.panel-danger .panel-footer + .panel-collapse .panel-body {
|
||||
border-bottom-color: #eed3d7;
|
||||
}
|
||||
|
||||
.panel-info {
|
||||
border-color: #bce8f1;
|
||||
}
|
||||
@@ -2705,6 +2790,14 @@ a.list-group-item:focus {
|
||||
border-color: #bce8f1;
|
||||
}
|
||||
|
||||
.panel-info .panel-heading + .panel-collapse .panel-body {
|
||||
border-top-color: #bce8f1;
|
||||
}
|
||||
|
||||
.panel-info .panel-footer + .panel-collapse .panel-body {
|
||||
border-bottom-color: #bce8f1;
|
||||
}
|
||||
|
||||
.well {
|
||||
min-height: 20px;
|
||||
padding: 19px;
|
||||
@@ -3562,7 +3655,10 @@ button.close {
|
||||
outline: none;
|
||||
}
|
||||
|
||||
.btn-group .btn + .btn {
|
||||
.btn-group .btn + .btn,
|
||||
.btn-group .btn + .btn-group,
|
||||
.btn-group .btn-group + .btn,
|
||||
.btn-group .btn-group + .btn-group {
|
||||
margin-left: -1px;
|
||||
}
|
||||
|
||||
@@ -3689,27 +3785,73 @@ button.close {
|
||||
border-bottom-width: 5px;
|
||||
}
|
||||
|
||||
.btn-group-vertical > .btn {
|
||||
.btn-group-vertical > .btn,
|
||||
.btn-group-vertical > .btn-group {
|
||||
display: block;
|
||||
float: none;
|
||||
width: 100%;
|
||||
max-width: 100%;
|
||||
}
|
||||
|
||||
.btn-group-vertical > .btn + .btn {
|
||||
margin-top: -1px;
|
||||
.btn-group-vertical > .btn-group:before,
|
||||
.btn-group-vertical > .btn-group:after {
|
||||
display: table;
|
||||
content: " ";
|
||||
}
|
||||
|
||||
.btn-group-vertical .btn:not(:first-child):not(:last-child) {
|
||||
.btn-group-vertical > .btn-group:after {
|
||||
clear: both;
|
||||
}
|
||||
|
||||
.btn-group-vertical > .btn-group:before,
|
||||
.btn-group-vertical > .btn-group:after {
|
||||
display: table;
|
||||
content: " ";
|
||||
}
|
||||
|
||||
.btn-group-vertical > .btn-group:after {
|
||||
clear: both;
|
||||
}
|
||||
|
||||
.btn-group-vertical > .btn-group > .btn {
|
||||
float: none;
|
||||
}
|
||||
|
||||
.btn-group-vertical > .btn + .btn,
|
||||
.btn-group-vertical > .btn + .btn-group,
|
||||
.btn-group-vertical > .btn-group + .btn,
|
||||
.btn-group-vertical > .btn-group + .btn-group {
|
||||
margin-top: -1px;
|
||||
margin-left: 0;
|
||||
}
|
||||
|
||||
.btn-group-vertical > .btn:not(:first-child):not(:last-child) {
|
||||
border-radius: 0;
|
||||
}
|
||||
|
||||
.btn-group-vertical .btn:first-child:not(:last-child) {
|
||||
.btn-group-vertical > .btn:first-child:not(:last-child) {
|
||||
border-top-right-radius: 4px;
|
||||
border-bottom-right-radius: 0;
|
||||
border-bottom-left-radius: 0;
|
||||
}
|
||||
|
||||
.btn-group-vertical .btn:last-child:not(:first-child) {
|
||||
.btn-group-vertical > .btn:last-child:not(:first-child) {
|
||||
border-top-right-radius: 0;
|
||||
border-bottom-left-radius: 4px;
|
||||
border-top-left-radius: 0;
|
||||
}
|
||||
|
||||
.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
|
||||
border-radius: 0;
|
||||
}
|
||||
|
||||
.btn-group-vertical > .btn-group:first-child > .btn:last-child,
|
||||
.btn-group-vertical > .btn-group:first-child > .dropdown-toggle {
|
||||
border-bottom-right-radius: 0;
|
||||
border-bottom-left-radius: 0;
|
||||
}
|
||||
|
||||
.btn-group-vertical > .btn-group:last-child > .btn:first-child {
|
||||
border-top-right-radius: 0;
|
||||
border-top-left-radius: 0;
|
||||
}
|
||||
@@ -4696,31 +4838,6 @@ a.list-group-item.active > .badge,
|
||||
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);
|
||||
}
|
||||
|
||||
.accordion {
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.accordion-group {
|
||||
margin-bottom: 2px;
|
||||
border: 1px solid #e5e5e5;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
.accordion-heading {
|
||||
border-bottom: 0;
|
||||
}
|
||||
|
||||
.accordion-heading .accordion-toggle {
|
||||
display: block;
|
||||
padding: 8px 15px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.accordion-inner {
|
||||
padding: 9px 15px;
|
||||
border-top: 1px solid #e5e5e5;
|
||||
}
|
||||
|
||||
.carousel {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user