aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-06-27 19:22:11 -0700
committerMark Otto <[email protected]>2013-06-27 19:22:11 -0700
commit8cd5d0be71f51a857848b6c28b3f97dbbb838dee (patch)
tree0aba1039635661d350e33537481e344a8e090dd4 /docs
parent2981f0089f917deb39a6dd61a784c01aa2732e92 (diff)
downloadbootstrap-8cd5d0be71f51a857848b6c28b3f97dbbb838dee.tar.xz
bootstrap-8cd5d0be71f51a857848b6c28b3f97dbbb838dee.zip
add docs callout for glyphicons on homepage and CSS page
Diffstat (limited to 'docs')
-rw-r--r--docs/_includes/nav-css.html3
-rw-r--r--docs/assets/css/docs.css1
-rw-r--r--docs/css.html14
-rw-r--r--docs/index.html6
4 files changed, 20 insertions, 4 deletions
diff --git a/docs/_includes/nav-css.html b/docs/_includes/nav-css.html
index 534c9c2ed..a52285b29 100644
--- a/docs/_includes/nav-css.html
+++ b/docs/_includes/nav-css.html
@@ -10,6 +10,9 @@
</ul>
</li>
<li>
+ <a href="#glyphicons">Glyphicons</a>
+</li>
+<li>
<a href="#grid">Grid system</a>
<ul class="nav">
<li><a href="#grid-options">Available options</a></li>
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index cef5f3334..8eeaea3b7 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -95,7 +95,6 @@ body {
}
-
/* Customize and Download button
-------------------------------------------------- */
diff --git a/docs/css.html b/docs/css.html
index 9c85d35f6..95295a359 100644
--- a/docs/css.html
+++ b/docs/css.html
@@ -57,6 +57,20 @@ lead: "Fundamental HTML elements styled and enhanced with extensible classes."
+ <!-- Glyphicons icont font
+ ================================================== -->
+ <div class="bs-docs-section" id="glyphicons">
+ <div class="page-header">
+ <h1>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-large">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" id="grid">
diff --git a/docs/index.html b/docs/index.html
index 24a0220f2..ae38cb979 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -16,15 +16,15 @@ title: Bootstrap
<ul class="bs-masthead-links">
<li>
- <a href="./customize/" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Customize']);">Customize</a>
- </li>
- <li>
<a href="http://github.com/twitter/bootstrap" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'GitHub project']);">GitHub project</a>
</li>
<li>
<a href="./getting-started/#examples" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Examples']);">Examples</a>
</li>
<li>
+ <a href="http://glyphicons.getbootstrap.com" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Glyphicons']);">Glyphicons</a>
+ </li>
+ <li>
<a href="http://expo.getbootstrap.com" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Expo']);">Bootstrap Expo</a>
</li>
<li>Version 3.0.0</li>