mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-23 05:33:02 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into icon_paths

Browse Source 
Conflicts:
	dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.css.map
This commit is contained in:
Mark Otto
2014-05-22 23:01:42 -07:00
parent 91d51d3fba 10e9fef85c
commit d66b65ddde
39 changed files with 113 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

10
dist/css/bootstrap.css vendored
View File

@@ -2629,11 +2629,14 @@ select[multiple].input-lg {
.form-inline .radio,
.form-inline .checkbox {
display: inline-block;
padding-left: 0;
margin-top: 0;
margin-bottom: 0;
vertical-align: middle;
}
.form-inline .radio label,
.form-inline .checkbox label {
padding-left: 0;
}
.form-inline .radio input[type="radio"],
.form-inline .checkbox input[type="checkbox"] {
float: none;
@@ -3971,11 +3974,14 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.navbar-form .radio,
.navbar-form .checkbox {
display: inline-block;
padding-left: 0;
margin-top: 0;
margin-bottom: 0;
vertical-align: middle;
}
.navbar-form .radio label,
.navbar-form .checkbox label {
padding-left: 0;
}
.navbar-form .radio input[type="radio"],
.navbar-form .checkbox input[type="checkbox"] {
float: none;

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