2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-27 14:46:01 +03:00

Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev

This commit is contained in:
Mark Otto
2015-12-07 09:25:28 -08:00
6 changed files with 24 additions and 10 deletions
+1 -1
View File
@@ -35,7 +35,7 @@
<a class="nav-item nav-link" href="#">Profile</a>
<a class="nav-item nav-link" href="#">Help</a>
</nav>
<form class="navbar-form pull-xs-right">
<form class="pull-xs-right">
<input type="text" class="form-control" placeholder="Search...">
</form>
</div>
+1 -1
View File
@@ -41,7 +41,7 @@
<a class="nav-link" href="#">About</a>
</li>
</ul>
<form class="form-inline navbar-form pull-xs-right">
<form class="form-inline pull-xs-right">
<input class="form-control" type="text" placeholder="Search">
<button class="btn btn-success-outline" type="submit">Search</button>
</form>