rev/bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '3.0.0-wip' into bs3_homepage

Browse source 
Conflicts:
	customize.html
	examples/justified-nav/justified-nav.css
This commit is contained in:
Mark Otto 2013-08-18 19:02:42 -07:00
commit 9dcae610e9
59 changed files with 3196 additions and 417 deletions
Download patch file Download diff file Expand all files Collapse all files

16
css.html
View file

@ -65,20 +65,6 @@ base_url: "../"
<!-- Glyphicons icon font
================================================== -->
<div class="bs-docs-section">
<div class="page-header">
<h1 id="glyphicons">Glyphicons</h1>
</div>
<p class="lead">With the launch of Bootstrap 3, icons have been moved to a <a href="https://github.com/twbs/bootstrap-glyphicons">separate repository</a>. This keeps the primary project as lean as possible, makes it easier for folks to swap icon libraries, and makes Glyphicons icon fonts more readily available to more people outside Bootstrap.</p>
<p class="lead">
<a href="http://glyphicons.getbootstrap.com/" class="btn btn-default btn-lg">Visit Glyphicons for Bootstrap</a> or <a href="https://github.com/twbs/bootstrap-glyphicons">download from GitHub</a>
</p>
</div>
<!-- Grid system
================================================== -->
<div class="bs-docs-section">
@ -920,7 +906,7 @@ base_url: "../"
{% endhighlight %}
<h3>Inline</h3>
<p>Place all list items on a single line with <code>inline-block</code> and some light padding.</p>
<p>Place all list items on a single line with <code>display: inline-block;</code> and some light padding.</p>
<div class="bs-example">
<ul class="list-inline">
<li>Lorem ipsum</li>