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

grunt

Browse Source
This commit is contained in:
Mark Otto 2015-01-18 12:22:43 -08:00
parent bf69fbdf1f
commit 22b79dae3c
6 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/assets/js/customize.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
docs/assets/js/raw-files.min.js vendored
View File

File diff suppressed because one or more lines are too long

20
docs/dist/css/bootstrap.css vendored
View File

@ -2297,7 +2297,7 @@ th {
.table-bordered > thead > tr > td { .table-bordered > thead > tr > td {
border-bottom-width: 2px; border-bottom-width: 2px;
} }
.table-striped > tbody > tr:nth-child(odd) { .table-striped > tbody > tr:nth-of-type(odd) {
background-color: #f9f9f9; background-color: #f9f9f9;
} }
.table-hover > tbody > tr:hover { .table-hover > tbody > tr:hover {
@ -2706,6 +2706,12 @@ textarea.form-group-sm .form-control,
select[multiple].form-group-sm .form-control { select[multiple].form-group-sm .form-control {
height: auto; height: auto;
} }
.form-group-sm .form-control-static {
height: 30px;
padding: 5px 10px;
font-size: 12px;
line-height: 1.5;
}
.input-lg { .input-lg {
height: 46px; height: 46px;
padding: 10px 16px; padding: 10px 16px;
@ -2736,6 +2742,12 @@ textarea.form-group-lg .form-control,
select[multiple].form-group-lg .form-control { select[multiple].form-group-lg .form-control {
height: auto; height: auto;
} }
.form-group-lg .form-control-static {
height: 46px;
padding: 10px 16px;
font-size: 18px;
line-height: 1.33;
}
.has-feedback { .has-feedback {
position: relative; position: relative;
} }
@ -5299,7 +5311,11 @@ a.list-group-item-danger.active:focus {
font-size: 16px; font-size: 16px;
color: inherit; color: inherit;
} }
.panel-title > a { .panel-title > a,
.panel-title > small,
.panel-title > .small,
.panel-title > small > a,
.panel-title > .small > a {
color: inherit; color: inherit;
} }
.panel-footer { .panel-footer {

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

6
docs/dist/js/bootstrap.js vendored
View File

@ -1573,10 +1573,10 @@ if (typeof jQuery === 'undefined') {
} }
Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) { Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) {
return placement == 'bottom' ? { top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2 } : return placement == 'bottom' ? { top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2 } :
placement == 'top' ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } : placement == 'top' ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } :
placement == 'left' ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } : placement == 'left' ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } :
/* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width } /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width }
} }