Commit 2af67238 authored by Mark Otto's avatar Mark Otto

Merge pull request #8332 from twitter/bs3_remove_icons

BS3: Remove Glyphicons
parents b06ec345 8cd5d0be
<li>
<a href="#icons">Glyphicons</a>
<ul class="nav">
<li><a href="#icons-list">Icon list</a></li>
<li><a href="#icons-how-to">How to use</a></li>
<li><a href="#icons-examples">Examples</a></li>
</ul>
</li>
<li> <li>
<a href="#dropdowns">Dropdowns</a> <a href="#dropdowns">Dropdowns</a>
<ul class="nav"> <ul class="nav">
......
...@@ -9,6 +9,9 @@ ...@@ -9,6 +9,9 @@
<li><a href="#overview-container">Container</a></li> <li><a href="#overview-container">Container</a></li>
</ul> </ul>
</li> </li>
<li>
<a href="#glyphicons">Glyphicons</a>
</li>
<li> <li>
<a href="#grid">Grid system</a> <a href="#grid">Grid system</a>
<ul class="nav"> <ul class="nav">
......
...@@ -95,7 +95,6 @@ body { ...@@ -95,7 +95,6 @@ body {
} }
/* Customize and Download button /* Customize and Download button
-------------------------------------------------- */ -------------------------------------------------- */
......
This diff is collapsed.
This diff is collapsed.
...@@ -57,6 +57,20 @@ lead: "Fundamental HTML elements styled and enhanced with extensible classes." ...@@ -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 <!-- Grid system
================================================== --> ================================================== -->
<div class="bs-docs-section" id="grid"> <div class="bs-docs-section" id="grid">
......
...@@ -15,15 +15,15 @@ title: Bootstrap ...@@ -15,15 +15,15 @@ title: Bootstrap
{% include social-buttons.html %} {% include social-buttons.html %}
<ul class="bs-masthead-links"> <ul class="bs-masthead-links">
<li>
<a href="./customize/" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Customize']);">Customize</a>
</li>
<li> <li>
<a href="http://github.com/twitter/bootstrap" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'GitHub project']);">GitHub project</a> <a href="http://github.com/twitter/bootstrap" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'GitHub project']);">GitHub project</a>
</li> </li>
<li> <li>
<a href="./getting-started/#examples" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Examples']);">Examples</a> <a href="./getting-started/#examples" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Examples']);">Examples</a>
</li> </li>
<li>
<a href="http://glyphicons.getbootstrap.com" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Glyphicons']);">Glyphicons</a>
</li>
<li> <li>
<a href="http://expo.getbootstrap.com" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Expo']);">Bootstrap Expo</a> <a href="http://expo.getbootstrap.com" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Expo']);">Bootstrap Expo</a>
</li> </li>
......
This diff is collapsed.
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
// Components: common // Components: common
@import "component-animations.less"; @import "component-animations.less";
@import "glyphicons.less";
@import "dropdowns.less"; @import "dropdowns.less";
@import "list-group.less"; @import "list-group.less";
@import "panels.less"; @import "panels.less";
......
This diff is collapsed.
...@@ -166,11 +166,6 @@ ...@@ -166,11 +166,6 @@
@zindex-modal: 1050; @zindex-modal: 1050;
// Glyphicons font path
// -------------------------
@glyphicons-font-path: "../fonts";
// Navbar // Navbar
// ------------------------- // -------------------------
......
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