Merge pull request #9767 from twbs/bs3_restore_glyphicons

BS3: Restore Glyphicons

Gruntfile.js

@@ -97,6 +97,14 @@ module.exports = function(grunt) {
       }
     },
 
+    copy: {
+      fonts: {
+        expand: true,
+        src: ["fonts/*"],
+        dest: 'dist/'
+      }
+    },
+
     qunit: {
       options: {
         inject: 'js/tests/unit/phantom.js'
@@ -147,6 +155,7 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-clean');
   grunt.loadNpmTasks('grunt-contrib-concat');
   grunt.loadNpmTasks('grunt-contrib-connect');
+  grunt.loadNpmTasks('grunt-contrib-copy');
   grunt.loadNpmTasks('grunt-contrib-jshint');
   grunt.loadNpmTasks('grunt-contrib-qunit');
   grunt.loadNpmTasks('grunt-contrib-uglify');
@@ -176,8 +185,11 @@ module.exports = function(grunt) {
   // CSS distribution task.
   grunt.registerTask('dist-css', ['recess']);
 
+  // Fonts distribution task.
+  grunt.registerTask('dist-fonts', ['copy']);
+
   // Full distribution task.
-  grunt.registerTask('dist', ['clean', 'dist-css', 'dist-js']);
+  grunt.registerTask('dist', ['clean', 'dist-css', 'dist-fonts', 'dist-js']);
 
   // Default task.
   grunt.registerTask('default', ['test', 'dist', 'build-customizer']);

_config.yml

@@ -15,9 +15,6 @@ repo:             https://github.com/twbs/bootstrap
 download:         https://github.com/twbs/bootstrap/archive/3.0.0-wip.zip
 download_dist:    http://getbootstrap.com/bs-v3.0.0-rc.2-dist.zip
 
-glyphicons:       http://glyphicons.getbootstrap.com
-glyphicons_repo:  https://github.com/twbs/bootstrap-glyphicons
-
 blog:             http://blog.getbootstrap.com
 expo:             http://expo.getbootstrap.com
 

_includes/nav-components.html

+<li>
+  <a href="#glyphicons">Glyphicons</a>
+  <ul class="nav">
+    <li><a href="#glyphicons-glyphs">Available glyphs</a></li>
+    <li><a href="#glyphicons-how-to-use">How ot use</a></li>
+    <li><a href="#glyphicons-examples">Examples</a></li>
+  </ul>
+</li>
 <li>
   <a href="#dropdowns">Dropdowns</a>
   <ul class="nav">

_includes/nav-css.html

@@ -9,9 +9,6 @@
     <li><a href="#overview-container">Containers</a></li>
   </ul>
 </li>
-<li>
-  <a href="#glyphicons">Glyphicons</a>
-</li>
 <li>
   <a href="#grid">Grid system</a>
   <ul class="nav">

_layouts/home.html

@@ -25,10 +25,10 @@
           <a href="{{ site.repo }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'GitHub project']);">GitHub project</a>
         </li>
         <li>
-          <a href="{{ page.base_url }}getting-started#examples" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Examples']);">Examples</a>
+          <a href="{{ page.base_url }}getting-started#/examples" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Examples']);">Examples</a>
         </li>
         <li>
-          <a href="{{ site.glyphicons }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Glyphicons']);">Glyphicons</a>
+          <a href="{{ page.base_url }}components/#glyphicons" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Glyphicons']);">Glyphicons</a>
         </li>
         <li>
           <a href="{{ site.expo }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Expo']);">Expo</a>

css.html

@@ -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">

examples/carousel/index.html

@@ -11,7 +11,6 @@
 
     <!-- Bootstrap core CSS -->
     <link href="../../dist/css/bootstrap.css" rel="stylesheet">
-    <link href="../../dist/css/bootstrap-glyphicons.css" rel="stylesheet">
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>

javascript.html

@@ -1681,7 +1681,7 @@ $('#myCollapsible').on('hidden.bs.collapse', function () {
 {% endhighlight %}
 <div class="bs-callout bs-callout-info">
   <h4>Glyphicon Alternative</h4>
-  <p>With <a href="{{ site.glyphicons }}">Glyphicons</a> available, you may choose to style the left and right toggle buttons with <code>.glyphicon .glyphicon-chevron-left</code> and <code>.glyphicon .glyphicon-chevron-right</code>.</p>
+  <p>With <a href="{{ page.base_url }}components/#glyphicons">Glyphicons</a> available, you may choose to style the left and right toggle buttons with <code>.glyphicon .glyphicon-chevron-left</code> and <code>.glyphicon .glyphicon-chevron-right</code>.</p>
 </div>
 
     <h3>Optional captions</h3>

less/bootstrap.less

@@ -27,6 +27,7 @@
 
 // Components
 @import "component-animations.less";
+@import "glyphicons.less";
 @import "dropdowns.less";
 @import "button-groups.less";
 @import "input-groups.less";

less/variables.less

@@ -55,6 +55,12 @@
 @headings-font-weight:    500;
 @headings-line-height:    1.1;
 
+// Iconography
+// -------------------------
+
+@icon-font-path:          "../fonts/";
+@icon-font-name:          "glyphicons-halflings-regular";
+
 
 // Components
 // -------------------------

package.json

@@ -18,9 +18,10 @@
   ]
   , "devDependencies": {
       "grunt": "~0.4.1"
-    , "grunt-contrib-connect": "~0.3.0"
     , "grunt-contrib-clean": "~0.5.0"
+    , "grunt-contrib-connect": "~0.3.0"
     , "grunt-contrib-concat": "~0.3.0"
+    , "grunt-contrib-copy": "~0.4.0"
     , "grunt-contrib-jshint": "~0.6.0"
     , "grunt-contrib-uglify": "~0.2.2"
     , "grunt-contrib-qunit": "~0.2.2"