rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity

Merge branch 'master' into bg-variant

Browse Source 
Conflicts:
	less/mixins.less
This commit is contained in:
Mark Otto 2014-01-18 14:40:17 -08:00
commit 3b6ab5075e
8 changed files with 117 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
dist/css/bootstrap.css vendored
View File

@ -4771,14 +4771,22 @@ a.list-group-item-danger.active:focus {
}
.panel > .list-group .list-group-item {
border-width: 1px 0;
border-radius: 0;
}
.panel > .list-group .list-group-item:first-child {
border-top-left-radius: 0;
border-top-right-radius: 0;
border-top: 0;
}
.panel > .list-group .list-group-item:last-child {
border-bottom: 0;
}
.panel > .list-group:first-child .list-group-item:first-child {
border-top-left-radius: 3px;
border-top-right-radius: 3px;
}
.panel > .list-group:last-child .list-group-item:last-child {
border-bottom-right-radius: 3px;
border-bottom-left-radius: 3px;
}
.panel-heading + .list-group .list-group-item:first-child {
border-top-width: 0;
}
@ -4786,24 +4794,44 @@ a.list-group-item-danger.active:focus {
.panel > .table-responsive > .table {
margin-bottom: 0;
}
.panel > .table > tbody:last-child > tr:last-child td:first-child,
.panel > .table-responsive > .table > tbody:last-child > tr:last-child td:first-child,
.panel > .table > tfoot:last-child > tr:last-child td:first-child,
.panel > .table-responsive > .table > tfoot:last-child > tr:last-child td:first-child,
.panel > .table > tbody:last-child > tr:last-child th:first-child,
.panel > .table-responsive > .table > tbody:last-child > tr:last-child th:first-child,
.panel > .table > tfoot:last-child > tr:last-child th:first-child,
.panel > .table-responsive > .table > tfoot:last-child > tr:last-child th:first-child {
.panel > .table:first-child > thead:first-child > tr:first-child td:first-child,
.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:first-child,
.panel > .table:first-child > tbody:first-child > tr:first-child td:first-child,
.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:first-child,
.panel > .table:first-child > thead:first-child > tr:first-child th:first-child,
.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:first-child,
.panel > .table:first-child > tbody:first-child > tr:first-child th:first-child,
.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:first-child {
border-top-left-radius: 3px;
}
.panel > .table:first-child > thead:first-child > tr:first-child td:last-child,
.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:last-child,
.panel > .table:first-child > tbody:first-child > tr:first-child td:last-child,
.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:last-child,
.panel > .table:first-child > thead:first-child > tr:first-child th:last-child,
.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:last-child,
.panel > .table:first-child > tbody:first-child > tr:first-child th:last-child,
.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:last-child {
border-top-right-radius: 3px;
}
.panel > .table:last-child > tbody:last-child > tr:last-child td:first-child,
.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child,
.panel > .table:last-child > tfoot:last-child > tr:last-child td:first-child,
.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:first-child,
.panel > .table:last-child > tbody:last-child > tr:last-child th:first-child,
.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:first-child,
.panel > .table:last-child > tfoot:last-child > tr:last-child th:first-child,
.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:first-child {
border-bottom-left-radius: 3px;
}
.panel > .table > tbody:last-child > tr:last-child td:last-child,
.panel > .table-responsive > .table > tbody:last-child > tr:last-child td:last-child,
.panel > .table > tfoot:last-child > tr:last-child td:last-child,
.panel > .table-responsive > .table > tfoot:last-child > tr:last-child td:last-child,
.panel > .table > tbody:last-child > tr:last-child th:last-child,
.panel > .table-responsive > .table > tbody:last-child > tr:last-child th:last-child,
.panel > .table > tfoot:last-child > tr:last-child th:last-child,
.panel > .table-responsive > .table > tfoot:last-child > tr:last-child th:last-child {
.panel > .table:last-child > tbody:last-child > tr:last-child td:last-child,
.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:last-child,
.panel > .table:last-child > tfoot:last-child > tr:last-child td:last-child,
.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:last-child,
.panel > .table:last-child > tbody:last-child > tr:last-child th:last-child,
.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:last-child,
.panel > .table:last-child > tfoot:last-child > tr:last-child th:last-child,
.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:last-child {
border-bottom-right-radius: 3px;
}
.panel > .panel-body + .table,
@ -4846,6 +4874,20 @@ a.list-group-item-danger.active:focus {
.panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child {
border-right: 0;
}
.panel > .table-bordered > thead > tr:first-child > th,
.panel > .table-responsive > .table-bordered > thead > tr:first-child > th,
.panel > .table-bordered > tbody > tr:first-child > th,
.panel > .table-responsive > .table-bordered > tbody > tr:first-child > th,
.panel > .table-bordered > tfoot > tr:first-child > th,
.panel > .table-responsive > .table-bordered > tfoot > tr:first-child > th,
.panel > .table-bordered > thead > tr:first-child > td,
.panel > .table-responsive > .table-bordered > thead > tr:first-child > td,
.panel > .table-bordered > tbody > tr:first-child > td,
.panel > .table-responsive > .table-bordered > tbody > tr:first-child > td,
.panel > .table-bordered > tfoot > tr:first-child > td,
.panel > .table-responsive > .table-bordered > tfoot > tr:first-child > td {
border-top: 0;
}
.panel > .table-bordered > thead > tr:last-child > th,
.panel > .table-responsive > .table-bordered > thead > tr:last-child > th,
.panel > .table-bordered > tbody > tr:last-child > th,

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

9
less/mixins.less
View File

@ -586,6 +586,15 @@
}
}
// Typography
// -------------------------
.text-emphasis-variant(@color) {
color: @color;
a&:hover {
color: darken(@color, 10%);
}
}
// Navbar vertical align
// -------------------------
// Vertically center elements in the navbar.

2
less/modals.less
View File

@ -124,7 +124,7 @@
// Automatically set modal's width for larger viewports
.modal-dialog {
width: 600px;
width: @modal-md;
margin: 30px auto;
}
.modal-content {

46
less/panels.less
View File

@ -27,19 +27,28 @@
.panel {
> .list-group {
margin-bottom: 0;
.list-group-item {
border-width: 1px 0;
// Remove border radius for top one
border-radius: 0;
&:first-child {
.border-top-radius(0);
border-top: 0;
}
// But keep it for the last one
&:last-child {
border-bottom: 0;
}
}
// Add border top radius for first one
&:first-child {
.list-group-item:first-child {
.border-top-radius((@panel-border-radius - 1));
}
}
// Add border bottom radius for last one
&:last-child {
.list-group-item:last-child {
.border-bottom-radius((@panel-border-radius - 1));
}
}
}
}
// Collapse space between when there's no additional content.
@ -59,7 +68,27 @@
> .table,
> .table-responsive > .table {
margin-bottom: 0;
}
// Add border top radius for first one
> .table:first-child,
> .table-responsive:first-child > .table:first-child {
> thead:first-child,
> tbody:first-child {
> tr:first-child {
td:first-child,
th:first-child {
border-top-left-radius: (@panel-border-radius - 1);
}
td:last-child,
th:last-child {
border-top-right-radius: (@panel-border-radius - 1);
}
}
}
}
// Add border bottom radius for last one
> .table:last-child,
> .table-responsive:last-child > .table:last-child {
> tbody:last-child,
> tfoot:last-child {
> tr:last-child {
@ -97,7 +126,10 @@
> td:last-child {
border-right: 0;
}
&:first-child > th,
&:first-child > td {
border-top: 0;
}
&:last-child > th,
&:last-child > td {
border-bottom: 0;

25
less/type.less
View File

@ -92,34 +92,19 @@ cite { font-style: normal; }
color: @text-muted;
}
.text-primary {
color: @brand-primary;
&:hover {
color: darken(@brand-primary, 10%);
}
.text-emphasis-variant(@brand-primary);
}
.text-success {
color: @state-success-text;
&:hover {
color: darken(@state-success-text, 10%);
}
.text-emphasis-variant(@state-success-text);
}
.text-info {
color: @state-info-text;
&:hover {
color: darken(@state-info-text, 10%);
}
.text-emphasis-variant(@state-info-text);
}
.text-warning {
color: @state-warning-text;
&:hover {
color: darken(@state-warning-text, 10%);
}
.text-emphasis-variant(@state-warning-text);
}
.text-danger {
color: @state-danger-text;
&:hover {
color: darken(@state-danger-text, 10%);
}
.text-emphasis-variant(@state-danger-text);
}
// Contextual backgrounds

1
less/variables.less
View File

@ -561,6 +561,7 @@
@modal-footer-border-color: @modal-header-border-color;
@modal-lg: 900px;
@modal-md: 600px;
@modal-sm: 300px;