Skip to content

B
bootstrap
Commit 326f6b2b authored by Mark Otto's avatar Mark Otto
Browse files
Options

Merge branch 'master' into docs-theme-toggler 

Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/css/docs.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
parents 12b5d46f fab9ab8f
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 26 deletions
dist/css/bootstrap.css
View file @ 326f6b2b
......@@ -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;
......
dist/css/bootstrap.css.map
View file @ 326f6b2b
This diff was suppressed by a .gitattributes entry.
dist/css/bootstrap.min.css
View file @ 326f6b2b
This source diff could not be displayed because it is too large. You can view the blob instead.
docs/_includes/header.html
View file @ 326f6b2b
......@@ -35,7 +35,7 @@
<!-- Favicons -->
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
<link rel="icon" href="../assets/ico/favicon.ico">
<link rel="shortcut icon" href="../assets/ico/favicon.ico">
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
......
docs/dist/css/bootstrap.css.map
View file @ 326f6b2b
This diff was suppressed by a .gitattributes entry.
docs/dist/css/bootstrap.min.css
View file @ 326f6b2b
This source diff could not be displayed because it is too large. You can view the blob instead.
docs/examples/blog/index.html
View file @ 326f6b2b
......@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="">
<meta name="author" content="">
<link rel="icon" href="../../assets/ico/favicon.ico">
<link rel="shortcut icon" href="../../assets/ico/favicon.ico">
<title>Blog Template for Bootstrap</title>
......
docs/examples/carousel/index.html
View file @ 326f6b2b
......@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="">
<meta name="author" content="">
<link rel="icon" href="../../assets/ico/favicon.ico">
<link rel="shortcut icon" href="../../assets/ico/favicon.ico">
<title>Carousel Template for Bootstrap</title>
......
docs/examples/cover/index.html
View file @ 326f6b2b
......@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="">
<meta name="author" content="">
<link rel="icon" href="../../assets/ico/favicon.ico">
<link rel="shortcut icon" href="../../assets/ico/favicon.ico">
<title>Cover Template for Bootstrap</title>
......
docs/examples/dashboard/index.html
View file @ 326f6b2b
......@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="">
<meta name="author" content="">
<link rel="icon" href="../../assets/ico/favicon.ico">
<link rel="shortcut icon" href="../../assets/ico/favicon.ico">
<title>Dashboard Template for Bootstrap</title>
......
docs/examples/equal-height-columns/index.html
View file @ 326f6b2b
......@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="">
<meta name="author" content="">
<link rel="icon" href="../../assets/ico/favicon.ico">
<link rel="shortcut icon" href="../../assets/ico/favicon.ico">
<title>Equal Height Columns Example for Bootstrap</title>
......
docs/examples/grid/index.html
View file @ 326f6b2b
......@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="">
<meta name="author" content="">
<link rel="icon" href="../../assets/ico/favicon.ico">
<link rel="shortcut icon" href="../../assets/ico/favicon.ico">
<title>Grid Template for Bootstrap</title>
......
docs/examples/jumbotron-narrow/index.html
View file @ 326f6b2b
......@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="">
<meta name="author" content="">
<link rel="icon" href="../../assets/ico/favicon.ico">
<link rel="shortcut icon" href="../../assets/ico/favicon.ico">
<title>Narrow Jumbotron Template for Bootstrap</title>
......
docs/examples/jumbotron/index.html
View file @ 326f6b2b
......@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="">
<meta name="author" content="">
<link rel="icon" href="../../assets/ico/favicon.ico">
<link rel="shortcut icon" href="../../assets/ico/favicon.ico">
<title>Jumbotron Template for Bootstrap</title>
......
docs/examples/justified-nav/index.html
View file @ 326f6b2b
......@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="">
<meta name="author" content="">
<link rel="icon" href="../../assets/ico/favicon.ico">
<link rel="shortcut icon" href="../../assets/ico/favicon.ico">
<title>Justified Nav Template for Bootstrap</title>
......
docs/examples/navbar-fixed-top/index.html
View file @ 326f6b2b
......@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="">
<meta name="author" content="">
<link rel="icon" href="../../assets/ico/favicon.ico">
<link rel="shortcut icon" href="../../assets/ico/favicon.ico">
<title>Fixed Top Navbar Example for Bootstrap</title>
......
docs/examples/navbar-static-top/index.html
View file @ 326f6b2b
......@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="">
<meta name="author" content="">
<link rel="icon" href="../../assets/ico/favicon.ico">
<link rel="shortcut icon" href="../../assets/ico/favicon.ico">
<title>Static Top Navbar Example for Bootstrap</title>
......
docs/examples/navbar/index.html
View file @ 326f6b2b
......@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="">
<meta name="author" content="">
<link rel="icon" href="../../assets/ico/favicon.ico">
<link rel="shortcut icon" href="../../assets/ico/favicon.ico">
<title>Navbar Template for Bootstrap</title>
......
docs/examples/non-responsive/index.html
View file @ 326f6b2b
......@@ -8,7 +8,7 @@
<!-- Note there is no responsive meta tag here -->
<link rel="icon" href="../../assets/ico/favicon.ico">
<link rel="shortcut icon" href="../../assets/ico/favicon.ico">
<title>Non-responsive Template for Bootstrap</title>
......
docs/examples/offcanvas/index.html
View file @ 326f6b2b
......@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="">
<meta name="author" content="">
<link rel="icon" href="../../assets/ico/favicon.ico">
<link rel="shortcut icon" href="../../assets/ico/favicon.ico">
<title>Off Canvas Template for Bootstrap</title>
......
docs/examples/signin/index.html
View file @ 326f6b2b
......@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="">
<meta name="author" content="">
<link rel="icon" href="../../assets/ico/favicon.ico">
<link rel="shortcut icon" href="../../assets/ico/favicon.ico">
<title>Signin Template for Bootstrap</title>
......
docs/examples/starter-template/index.html
View file @ 326f6b2b
......@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="">
<meta name="author" content="">
<link rel="icon" href="../../assets/ico/favicon.ico">
<link rel="shortcut icon" href="../../assets/ico/favicon.ico">
<title>Starter Template for Bootstrap</title>
......
docs/examples/sticky-footer-navbar/index.html
View file @ 326f6b2b
......@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="">
<meta name="author" content="">
<link rel="icon" href="../../assets/ico/favicon.ico">
<link rel="shortcut icon" href="../../assets/ico/favicon.ico">
<title>Sticky Footer Navbar Template for Bootstrap</title>
......
docs/examples/sticky-footer/index.html
View file @ 326f6b2b
......@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="">
<meta name="author" content="">
<link rel="icon" href="../../assets/ico/favicon.ico">
<link rel="shortcut icon" href="../../assets/ico/favicon.ico">
<title>Sticky Footer Template for Bootstrap</title>
......
docs/examples/theme/index.html
View file @ 326f6b2b
......@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="">
<meta name="author" content="">
<link rel="icon" href="../../assets/ico/favicon.ico">
<link rel="shortcut icon" href="../../assets/ico/favicon.ico">
<title>Theme Template for Bootstrap</title>
......
docs/examples/tooltip-viewport/index.html
View file @ 326f6b2b
......@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="">
<meta name="author" content="">
<link rel="icon" href="../../assets/ico/favicon.ico">
<link rel="shortcut icon" href="../../assets/ico/favicon.ico">
<title>Tooltip Viewport Example for Bootstrap</title>
......
less/forms.less
View file @ 326f6b2b
......@@ -410,8 +410,11 @@ input[type="checkbox"],
display: inline-block;
margin-top: 0;
margin-bottom: 0;
padding-left: 0;
vertical-align: middle;
label {
padding-left: 0;
}
}
.radio input[type="radio"],
.checkbox input[type="checkbox"] {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment