mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-18 12:39:41 +03:00
Code Activity

Merge branch 'master' into derp

Browse Source 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/_includes/components/navs.html
	docs/_includes/css/images.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/tabs.html
	docs/assets/css/docs.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2014-07-09 22:19:23 -07:00
parent 216bc3d68b 643effe382
commit dae1a68fb1
25 changed files with 807 additions and 1998 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/_includes/components/badges.html
+7 -7
View File
@@ -22,20 +22,20 @@
<p>Built-in styles are included for placing badges in active states in pill navigations.</p>
<div class="bs-example">
<ul class="nav nav-pills" role="tablist">
<li class="active"><a href="#">Home <span class="badge">42</span></a></li>
<li><a href="#">Profile</a></li>
<li><a href="#">Messages <span class="badge">3</span></a></li>
<li role="presentation" class="active"><a href="#">Home <span class="badge">42</span></a></li>
<li role="presentation"><a href="#">Profile</a></li>
<li role="presentation"><a href="#">Messages <span class="badge">3</span></a></li>
</ul>
<br>
<ul class="nav nav-pills nav-stacked" role="tablist" style="max-width: 260px;">
<li class="active">
<li role="presentation" class="active">
<a href="#">
<span class="badge pull-right">42</span>
Home
</a>
</li>
<li><a href="#">Profile</a></li>
<li>
<li role="presentation"><a href="#">Profile</a></li>
<li role="presentation">
<a href="#">
<span class="badge pull-right">3</span>
Messages
@@ -60,7 +60,7 @@
</div>
{% highlight html %}
<ul class="nav nav-pills nav-stacked" role="tablist">
<li class="active">
<li role="presentation" class="active">
<a href="#">
<span class="badge pull-right">42</span>
Home
docs/_includes/components/navs.html
+32 -32
View File
@@ -46,32 +46,32 @@
<p>Takes the basic nav from above and adds the <code>.nav-tabs</code> class to generate a tabbed interface.</p>
<div class="bs-example">
<ul class="nav nav-tabs" role="tablist">
<li class="nav-item active">
<li role="presentation" class="nav-item active">
<a href="#" class="nav-link">Active</a>
</li>
<li class="nav-item">
<li role="presentation" class="nav-item">
<a href="#" class="nav-link">Link</a>
</li>
<li class="nav-item">
<li role="presentation" class="nav-item">
<a href="#" class="nav-link">Another link</a>
</li>
<li class="nav-item disabled">
<li role="presentation" class="nav-item disabled">
<a href="#" class="nav-link">Disabled</a>
</li>
</ul>
</div>
{% highlight html %}
<ul class="nav nav-tabs" role="tablist">
<li class="nav-item active">
<li role="presentation" class="nav-item active">
<a href="#" class="nav-link">Active</a>
</li>
<li class="nav-item">
<li role="presentation" class="nav-item">
<a href="#" class="nav-link">Link</a>
</li>
<li class="nav-item">
<li role="presentation" class="nav-item">
<a href="#" class="nav-link">Another link</a>
</li>
<li class="nav-item disabled">
<li role="presentation" class="nav-item disabled">
<a href="#" class="nav-link">Disabled</a>
</li>
</ul>
@@ -85,32 +85,32 @@
<p>Take that same HTML, but use <code>.nav-pills</code> instead:</p>
<div class="bs-example">
<ul class="nav nav-pills" role="tablist">
<li class="nav-item active">
<li role="presentation" class="nav-item active">
<a href="#" class="nav-link">Active</a>
</li>
<li class="nav-item">
<li role="presentation" class="nav-item">
<a href="#" class="nav-link">Link</a>
</li>
<li class="nav-item">
<li role="presentation" class="nav-item">
<a href="#" class="nav-link">Another link</a>
</li>
<li class="nav-item disabled">
<li role="presentation" class="nav-item disabled">
<a href="#" class="nav-link">Disabled</a>
</li>
</ul>
</div>
{% highlight html %}
<ul class="nav nav-pills" role="tablist">
<li class="nav-item active">
<li role="presentation" class="nav-item active">
<a href="#" class="nav-link">Active</a>
</li>
<li class="nav-item">
<li role="presentation" class="nav-item">
<a href="#" class="nav-link">Link</a>
</li>
<li class="nav-item">
<li role="presentation" class="nav-item">
<a href="#" class="nav-link">Another link</a>
</li>
<li class="nav-item disabled">
<li role="presentation" class="nav-item disabled">
<a href="#" class="nav-link">Disabled</a>
</li>
</ul>
@@ -120,32 +120,32 @@
<p>Just add <code>.nav-stacked</code>.</p>
<div class="bs-example">
<ul class="nav nav-pills nav-stacked" role="tablist">
<li class="nav-item active">
<li role="presentation" class="nav-item active">
<a href="#" class="nav-link">Active</a>
</li>
<li class="nav-item">
<li role="presentation" class="nav-item">
<a href="#" class="nav-link">Link</a>
</li>
<li class="nav-item">
<li role="presentation" class="nav-item">
<a href="#" class="nav-link">Another link</a>
</li>
<li class="nav-item disabled">
<li role="presentation" class="nav-item disabled">
<a href="#" class="nav-link">Disabled</a>
</li>
</ul>
</div>
{% highlight html %}
<ul class="nav nav-pills nav-stacked" role="tablist">
<li class="nav-item active">
<li role="presentation" class="nav-item active">
<a href="#" class="nav-link">Active</a>
</li>
<li class="nav-item">
<li role="presentation" class="nav-item">
<a href="#" class="nav-link">Link</a>
</li>
<li class="nav-item">
<li role="presentation" class="nav-item">
<a href="#" class="nav-link">Another link</a>
</li>
<li class="nav-item disabled">
<li role="presentation" class="nav-item disabled">
<a href="#" class="nav-link">Disabled</a>
</li>
</ul>
@@ -158,10 +158,10 @@
<h3>Tabs with dropdowns</h3>
<div class="bs-example">
<ul class="nav nav-tabs" role="tablist">
<li class="nav-item active">
<li role="presentation" class="nav-item active">
<a href="#" class="nav-link">Active</a>
</li>
<li class="nav-item">
<li role="presentation" class="nav-item">
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#">Dropdown</a>
<ul class="dropdown-menu" role="menu">
<li><a href="#">Action</a></li>
@@ -171,10 +171,10 @@
<li><a href="#">Separated link</a></li>
</ul>
</li>
<li class="nav-item">
<li role="presentation" class="nav-item">
<a href="#" class="nav-link">Another link</a>
</li>
<li class="nav-item disabled">
<li role="presentation" class="nav-item disabled">
<a href="#" class="nav-link">Disabled</a>
</li>
</ul>
@@ -182,7 +182,7 @@
{% highlight html %}
<ul class="nav nav-tabs" role="tablist">
...
<li class="nav-item">
<li role="presentation" class="nav-item">
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#">
Dropdown
</a>
@@ -197,10 +197,10 @@
<h3>Pills with dropdowns</h3>
<div class="bs-example">
<ul class="nav nav-pills" role="tablist">
<li class="nav-item active">
<li role="presentation" class="nav-item active">
<a href="#" class="nav-link">Active</a>
</li>
<li class="nav-item">
<li role="presentation" class="nav-item">
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#">Dropdown</a>
<ul class="dropdown-menu" role="menu">
<li><a href="#">Action</a></li>
@@ -221,7 +221,7 @@
{% highlight html %}
<ul class="nav nav-pills" role="tablist">
...
<li class="nav-item">
<li role="presentation" class="nav-item">
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#">
Dropdown
</a>