mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-28 07:39:57 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into responsive-visibility-table

Browse Source 
Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2013-12-03 22:58:25 -08:00
parent 303f8a33c3 ed0d556847
commit a42e9163cb
12 changed files with 117 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dist/css/bootstrap.css vendored
View File

@@ -2622,8 +2622,7 @@ fieldset[disabled] .btn-link:focus {
border-radius: 6px;
}
.btn-sm,
.btn-xs {
.btn-sm {
padding: 5px 10px;
font-size: 12px;
line-height: 1.5;
@@ -2632,6 +2631,9 @@ fieldset[disabled] .btn-link:focus {
.btn-xs {
padding: 1px 5px;
font-size: 12px;
line-height: 1.5;
border-radius: 3px;
}
.btn-block {
@@ -3754,7 +3756,6 @@ input[type="button"].btn-block {
}
.btn-group-xs > .btn {
padding: 5px 10px;
padding: 1px 5px;
font-size: 12px;
line-height: 1.5;

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

File diff suppressed because one or more lines are too long