rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-06 04:08:22 +01:00
Code Issues Actions Packages Releases Activity

Merge branch '3.0.0-wip' into reset-FF-Android-default-background-image

Browse Source 
Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto 2013-08-14 16:24:39 -07:00
commit a9d6b7ee0b
5 changed files with 30 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
assets/css/docs.css
View File

@ -437,6 +437,12 @@ body {
margin: 0; margin: 0;
} }
/* Buttons */
.bs-example > .btn {
margin-top: 5px;
margin-bottom: 5px;
}
/* Forms */ /* Forms */
.bs-example-control-sizing select, .bs-example-control-sizing select,
.bs-example-control-sizing input[type="text"] + input[type="text"] { .bs-example-control-sizing input[type="text"] + input[type="text"] {
@ -553,19 +559,6 @@ body {
} }
/* Example templates
-------------------------------------------------- */
.bs-examples h4 {
margin-bottom: 5px;
}
.bs-examples p {
margin-bottom: 20px;
}
/* Responsive docs /* Responsive docs
-------------------------------------------------- */ -------------------------------------------------- */
@ -578,9 +571,6 @@ body {
overflow-x: scroll; overflow-x: scroll;
border: 1px solid #ddd; border: 1px solid #ddd;
} }
.bs-table-scrollable .highlight pre {
white-space: normal;
}
.bs-table-scrollable .table { .bs-table-scrollable .table {
margin-bottom: 0; margin-bottom: 0;
border: 0; border: 0;
@ -602,6 +592,10 @@ body {
border-bottom: 0; border-bottom: 0;
} }
} }
.bs-table-scrollable .highlight pre {
white-space: normal;
}
/* Related: responsive utilities tables */ /* Related: responsive utilities tables */
.table code { .table code {

31
dist/css/bootstrap.css vendored
View File

@ -2719,17 +2719,17 @@ a.list-group-item:focus {
border-color: #428bca; border-color: #428bca;
} }
.panel-primary .panel-heading { .panel-primary > .panel-heading {
color: #ffffff; color: #ffffff;
background-color: #428bca; background-color: #428bca;
border-color: #428bca; border-color: #428bca;
} }
.panel-primary .panel-heading + .panel-collapse .panel-body { .panel-primary > .panel-heading + .panel-collapse .panel-body {
border-top-color: #428bca; border-top-color: #428bca;
} }
.panel-primary .panel-footer + .panel-collapse .panel-body { .panel-primary > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #428bca; border-bottom-color: #428bca;
} }
@ -2737,17 +2737,17 @@ a.list-group-item:focus {
border-color: #d6e9c6; border-color: #d6e9c6;
} }
.panel-success .panel-heading { .panel-success > .panel-heading {
color: #468847; color: #468847;
background-color: #dff0d8; background-color: #dff0d8;
border-color: #d6e9c6; border-color: #d6e9c6;
} }
.panel-success .panel-heading + .panel-collapse .panel-body { .panel-success > .panel-heading + .panel-collapse .panel-body {
border-top-color: #d6e9c6; border-top-color: #d6e9c6;
} }
.panel-success .panel-footer + .panel-collapse .panel-body { .panel-success > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #d6e9c6; border-bottom-color: #d6e9c6;
} }
@ -2755,17 +2755,17 @@ a.list-group-item:focus {
border-color: #fbeed5; border-color: #fbeed5;
} }
.panel-warning .panel-heading { .panel-warning > .panel-heading {
color: #c09853; color: #c09853;
background-color: #fcf8e3; background-color: #fcf8e3;
border-color: #fbeed5; border-color: #fbeed5;
} }
.panel-warning .panel-heading + .panel-collapse .panel-body { .panel-warning > .panel-heading + .panel-collapse .panel-body {
border-top-color: #fbeed5; border-top-color: #fbeed5;
} }
.panel-warning .panel-footer + .panel-collapse .panel-body { .panel-warning > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #fbeed5; border-bottom-color: #fbeed5;
} }
@ -2773,17 +2773,17 @@ a.list-group-item:focus {
border-color: #eed3d7; border-color: #eed3d7;
} }
.panel-danger .panel-heading { .panel-danger > .panel-heading {
color: #b94a48; color: #b94a48;
background-color: #f2dede; background-color: #f2dede;
border-color: #eed3d7; border-color: #eed3d7;
} }
.panel-danger .panel-heading + .panel-collapse .panel-body { .panel-danger > .panel-heading + .panel-collapse .panel-body {
border-top-color: #eed3d7; border-top-color: #eed3d7;
} }
.panel-danger .panel-footer + .panel-collapse .panel-body { .panel-danger > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #eed3d7; border-bottom-color: #eed3d7;
} }
@ -2791,17 +2791,17 @@ a.list-group-item:focus {
border-color: #bce8f1; border-color: #bce8f1;
} }
.panel-info .panel-heading { .panel-info > .panel-heading {
color: #3a87ad; color: #3a87ad;
background-color: #d9edf7; background-color: #d9edf7;
border-color: #bce8f1; border-color: #bce8f1;
} }
.panel-info .panel-heading + .panel-collapse .panel-body { .panel-info > .panel-heading + .panel-collapse .panel-body {
border-top-color: #bce8f1; border-top-color: #bce8f1;
} }
.panel-info .panel-footer + .panel-collapse .panel-body { .panel-info > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #bce8f1; border-bottom-color: #bce8f1;
} }
@ -3878,6 +3878,7 @@ button.close {
.btn-group-justified { .btn-group-justified {
display: table; display: table;
width: 100%; width: 100%;
border-collapse: separate;
table-layout: fixed; table-layout: fixed;
} }

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

1
less/button-groups.less
View File

@ -229,6 +229,7 @@
display: table; display: table;
width: 100%; width: 100%;
table-layout: fixed; table-layout: fixed;
border-collapse: separate;
.btn { .btn {
float: none; float: none;
display: table-cell; display: table-cell;

4
less/mixins.less
View File

@ -331,7 +331,7 @@
// ------------------------- // -------------------------
.panel-variant(@border; @heading-text-color; @heading-bg-color; @heading-border) { .panel-variant(@border; @heading-text-color; @heading-bg-color; @heading-border) {
border-color: @border; border-color: @border;
.panel-heading { & > .panel-heading {
color: @heading-text-color; color: @heading-text-color;
background-color: @heading-bg-color; background-color: @heading-bg-color;
border-color: @heading-border; border-color: @heading-border;
@ -339,7 +339,7 @@
border-top-color: @border; border-top-color: @border;
} }
} }
.panel-footer { & > .panel-footer {
+ .panel-collapse .panel-body { + .panel-collapse .panel-body {
border-bottom-color: @border; border-bottom-color: @border;
} }