mirror of
https://github.com/twbs/bootstrap.git
synced 2025-08-18 19:31:35 +02:00
Greater standardization of sizing terminology
In class names: * large => lg * small => sm * mini => xs ("Extra small") In screen size categories: * Tiny => Extra small
This commit is contained in:
58
dist/css/bootstrap.css
vendored
58
dist/css/bootstrap.css
vendored
@@ -1537,7 +1537,7 @@ textarea.form-control {
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
.input-large {
|
||||
.input-lg {
|
||||
height: 45px;
|
||||
padding: 10px 16px;
|
||||
font-size: 18px;
|
||||
@@ -1545,7 +1545,7 @@ textarea.form-control {
|
||||
border-radius: 6px;
|
||||
}
|
||||
|
||||
.input-small {
|
||||
.input-sm {
|
||||
height: 30px;
|
||||
padding: 5px 10px;
|
||||
font-size: 12px;
|
||||
@@ -1553,18 +1553,18 @@ textarea.form-control {
|
||||
border-radius: 3px;
|
||||
}
|
||||
|
||||
select.input-large {
|
||||
select.input-lg {
|
||||
height: 45px;
|
||||
line-height: 45px;
|
||||
}
|
||||
|
||||
select.input-small {
|
||||
select.input-sm {
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
}
|
||||
|
||||
textarea.input-large,
|
||||
textarea.input-small {
|
||||
textarea.input-lg,
|
||||
textarea.input-sm {
|
||||
height: auto;
|
||||
}
|
||||
|
||||
@@ -1989,22 +1989,22 @@ fieldset[disabled] .btn-link:focus {
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.btn-large {
|
||||
.btn-lg {
|
||||
padding: 10px 16px;
|
||||
font-size: 18px;
|
||||
line-height: 1.33;
|
||||
border-radius: 6px;
|
||||
}
|
||||
|
||||
.btn-small,
|
||||
.btn-mini {
|
||||
.btn-sm,
|
||||
.btn-xs {
|
||||
padding: 5px 10px;
|
||||
font-size: 12px;
|
||||
line-height: 1.5;
|
||||
border-radius: 3px;
|
||||
}
|
||||
|
||||
.btn-mini {
|
||||
.btn-xs {
|
||||
padding: 3px 5px;
|
||||
}
|
||||
|
||||
@@ -2101,14 +2101,14 @@ input[type="button"].btn-block {
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.input-group-addon.input-small {
|
||||
.input-group-addon.input-sm {
|
||||
padding: 5px 10px;
|
||||
font-size: 12px;
|
||||
line-height: 1.5;
|
||||
border-radius: 3px;
|
||||
}
|
||||
|
||||
.input-group-addon.input-large {
|
||||
.input-group-addon.input-lg {
|
||||
padding: 10px 16px;
|
||||
font-size: 18px;
|
||||
line-height: 1.33;
|
||||
@@ -2496,12 +2496,12 @@ a.list-group-item.active .list-group-item-text {
|
||||
border-color: rgba(0, 0, 0, 0.15);
|
||||
}
|
||||
|
||||
.well-large {
|
||||
.well-lg {
|
||||
padding: 24px;
|
||||
border-radius: 6px;
|
||||
}
|
||||
|
||||
.well-small {
|
||||
.well-sm {
|
||||
padding: 9px;
|
||||
border-radius: 3px;
|
||||
}
|
||||
@@ -3220,7 +3220,7 @@ button.close {
|
||||
padding-left: 8px;
|
||||
}
|
||||
|
||||
.btn-group > .btn-large + .dropdown-toggle {
|
||||
.btn-group > .btn-lg + .dropdown-toggle {
|
||||
padding-right: 12px;
|
||||
padding-left: 12px;
|
||||
}
|
||||
@@ -3234,11 +3234,11 @@ button.close {
|
||||
margin-left: 0;
|
||||
}
|
||||
|
||||
.btn-large .caret {
|
||||
.btn-lg .caret {
|
||||
border-width: 5px;
|
||||
}
|
||||
|
||||
.dropup .btn-large .caret {
|
||||
.dropup .btn-lg .caret {
|
||||
border-bottom-width: 5px;
|
||||
}
|
||||
|
||||
@@ -3363,38 +3363,38 @@ button.close {
|
||||
background-color: #ffffff;
|
||||
}
|
||||
|
||||
.pagination-large > li > a,
|
||||
.pagination-large > li > span {
|
||||
.pagination-lg > li > a,
|
||||
.pagination-lg > li > span {
|
||||
padding: 10px 16px;
|
||||
font-size: 18px;
|
||||
}
|
||||
|
||||
.pagination-large > li:first-child > a,
|
||||
.pagination-large > li:first-child > span {
|
||||
.pagination-lg > li:first-child > a,
|
||||
.pagination-lg > li:first-child > span {
|
||||
border-bottom-left-radius: 6px;
|
||||
border-top-left-radius: 6px;
|
||||
}
|
||||
|
||||
.pagination-large > li:last-child > a,
|
||||
.pagination-large > li:last-child > span {
|
||||
.pagination-lg > li:last-child > a,
|
||||
.pagination-lg > li:last-child > span {
|
||||
border-top-right-radius: 6px;
|
||||
border-bottom-right-radius: 6px;
|
||||
}
|
||||
|
||||
.pagination-small > li > a,
|
||||
.pagination-small > li > span {
|
||||
.pagination-sm > li > a,
|
||||
.pagination-sm > li > span {
|
||||
padding: 5px 10px;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.pagination-small > li:first-child > a,
|
||||
.pagination-small > li:first-child > span {
|
||||
.pagination-sm > li:first-child > a,
|
||||
.pagination-sm > li:first-child > span {
|
||||
border-bottom-left-radius: 3px;
|
||||
border-top-left-radius: 3px;
|
||||
}
|
||||
|
||||
.pagination-small > li:last-child > a,
|
||||
.pagination-small > li:last-child > span {
|
||||
.pagination-sm > li:last-child > a,
|
||||
.pagination-sm > li:last-child > span {
|
||||
border-top-right-radius: 3px;
|
||||
border-bottom-right-radius: 3px;
|
||||
}
|
||||
|
2
dist/css/bootstrap.min.css
vendored
2
dist/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user