Drop Glyphicons

Gruntfile.js

@@ -412,7 +412,7 @@ module.exports = function (grunt) {
   var testSubtasks = [];
   // Skip core tests if running a different subset of the test suite
   if (runSubset('core')) {
-    testSubtasks = testSubtasks.concat(['dist-css', 'csslint', 'jshint', 'jscs', 'qunit', 'build-customizer-html']);
+    testSubtasks = testSubtasks.concat(['dist-css', 'csslint', 'jshint', 'jscs', 'qunit']);
   }
   // Skip HTML validation if running a different subset of the test suite
   if (runSubset('validate-html') &&
@@ -445,7 +445,7 @@ module.exports = function (grunt) {
   grunt.registerTask('dist', ['clean', 'dist-css', 'copy:fonts', 'dist-js', 'dist-docs']);
 
   // Default task.
-  grunt.registerTask('default', ['test', 'dist', 'build-customizer']);
+  grunt.registerTask('default', ['test', 'dist']);
 
   // Version numbering task.
   // grunt change-version-number --oldver=A.B.C --newver=X.Y.Z

bower.json

@@ -16,11 +16,7 @@
   "main": [
     "less/bootstrap.less",
     "dist/css/bootstrap.css",
-    "dist/js/bootstrap.js",
-    "dist/fonts/glyphicons-halflings-regular.eot",
-    "dist/fonts/glyphicons-halflings-regular.svg",
-    "dist/fonts/glyphicons-halflings-regular.ttf",
-    "dist/fonts/glyphicons-halflings-regular.woff"
+    "dist/js/bootstrap.js"
   ],
   "ignore": [
     "/.*",

docs/_data/glyphicons.yml

-# This file is generated via Grunt task. **Do not edit directly.**
-# See the 'build-glyphicons-data' task in Gruntfile.js.
-
-- glyphicon-asterisk
-- glyphicon-plus
-- glyphicon-euro
-- glyphicon-minus
-- glyphicon-cloud
-- glyphicon-envelope
-- glyphicon-pencil
-- glyphicon-glass
-- glyphicon-music
-- glyphicon-search
-- glyphicon-heart
-- glyphicon-star
-- glyphicon-star-empty
-- glyphicon-user
-- glyphicon-film
-- glyphicon-th-large
-- glyphicon-th
-- glyphicon-th-list
-- glyphicon-ok
-- glyphicon-remove
-- glyphicon-zoom-in
-- glyphicon-zoom-out
-- glyphicon-off
-- glyphicon-signal
-- glyphicon-cog
-- glyphicon-trash
-- glyphicon-home
-- glyphicon-file
-- glyphicon-time
-- glyphicon-road
-- glyphicon-download-alt
-- glyphicon-download
-- glyphicon-upload
-- glyphicon-inbox
-- glyphicon-play-circle
-- glyphicon-repeat
-- glyphicon-refresh
-- glyphicon-list-alt
-- glyphicon-lock
-- glyphicon-flag
-- glyphicon-headphones
-- glyphicon-volume-off
-- glyphicon-volume-down
-- glyphicon-volume-up
-- glyphicon-qrcode
-- glyphicon-barcode
-- glyphicon-tag
-- glyphicon-tags
-- glyphicon-book
-- glyphicon-bookmark
-- glyphicon-print
-- glyphicon-camera
-- glyphicon-font
-- glyphicon-bold
-- glyphicon-italic
-- glyphicon-text-height
-- glyphicon-text-width
-- glyphicon-align-left
-- glyphicon-align-center
-- glyphicon-align-right
-- glyphicon-align-justify
-- glyphicon-list
-- glyphicon-indent-left
-- glyphicon-indent-right
-- glyphicon-facetime-video
-- glyphicon-picture
-- glyphicon-map-marker
-- glyphicon-adjust
-- glyphicon-tint
-- glyphicon-edit
-- glyphicon-share
-- glyphicon-check
-- glyphicon-move
-- glyphicon-step-backward
-- glyphicon-fast-backward
-- glyphicon-backward
-- glyphicon-play
-- glyphicon-pause
-- glyphicon-stop
-- glyphicon-forward
-- glyphicon-fast-forward
-- glyphicon-step-forward
-- glyphicon-eject
-- glyphicon-chevron-left
-- glyphicon-chevron-right
-- glyphicon-plus-sign
-- glyphicon-minus-sign
-- glyphicon-remove-sign
-- glyphicon-ok-sign
-- glyphicon-question-sign
-- glyphicon-info-sign
-- glyphicon-screenshot
-- glyphicon-remove-circle
-- glyphicon-ok-circle
-- glyphicon-ban-circle
-- glyphicon-arrow-left
-- glyphicon-arrow-right
-- glyphicon-arrow-up
-- glyphicon-arrow-down
-- glyphicon-share-alt
-- glyphicon-resize-full
-- glyphicon-resize-small
-- glyphicon-exclamation-sign
-- glyphicon-gift
-- glyphicon-leaf
-- glyphicon-fire
-- glyphicon-eye-open
-- glyphicon-eye-close
-- glyphicon-warning-sign
-- glyphicon-plane
-- glyphicon-calendar
-- glyphicon-random
-- glyphicon-comment
-- glyphicon-magnet
-- glyphicon-chevron-up
-- glyphicon-chevron-down
-- glyphicon-retweet
-- glyphicon-shopping-cart
-- glyphicon-folder-close
-- glyphicon-folder-open
-- glyphicon-resize-vertical
-- glyphicon-resize-horizontal
-- glyphicon-hdd
-- glyphicon-bullhorn
-- glyphicon-bell
-- glyphicon-certificate
-- glyphicon-thumbs-up
-- glyphicon-thumbs-down
-- glyphicon-hand-right
-- glyphicon-hand-left
-- glyphicon-hand-up
-- glyphicon-hand-down
-- glyphicon-circle-arrow-right
-- glyphicon-circle-arrow-left
-- glyphicon-circle-arrow-up
-- glyphicon-circle-arrow-down
-- glyphicon-globe
-- glyphicon-wrench
-- glyphicon-tasks
-- glyphicon-filter
-- glyphicon-briefcase
-- glyphicon-fullscreen
-- glyphicon-dashboard
-- glyphicon-paperclip
-- glyphicon-heart-empty
-- glyphicon-link
-- glyphicon-phone
-- glyphicon-pushpin
-- glyphicon-usd
-- glyphicon-gbp
-- glyphicon-sort
-- glyphicon-sort-by-alphabet
-- glyphicon-sort-by-alphabet-alt
-- glyphicon-sort-by-order
-- glyphicon-sort-by-order-alt
-- glyphicon-sort-by-attributes
-- glyphicon-sort-by-attributes-alt
-- glyphicon-unchecked
-- glyphicon-expand
-- glyphicon-collapse-down
-- glyphicon-collapse-up
-- glyphicon-log-in
-- glyphicon-flash
-- glyphicon-log-out
-- glyphicon-new-window
-- glyphicon-record
-- glyphicon-save
-- glyphicon-open
-- glyphicon-saved
-- glyphicon-import
-- glyphicon-export
-- glyphicon-send
-- glyphicon-floppy-disk
-- glyphicon-floppy-saved
-- glyphicon-floppy-remove
-- glyphicon-floppy-save
-- glyphicon-floppy-open
-- glyphicon-credit-card
-- glyphicon-transfer
-- glyphicon-cutlery
-- glyphicon-header
-- glyphicon-compressed
-- glyphicon-earphone
-- glyphicon-phone-alt
-- glyphicon-tower
-- glyphicon-stats
-- glyphicon-sd-video
-- glyphicon-hd-video
-- glyphicon-subtitles
-- glyphicon-sound-stereo
-- glyphicon-sound-dolby
-- glyphicon-sound-5-1
-- glyphicon-sound-6-1
-- glyphicon-sound-7-1
-- glyphicon-copyright-mark
-- glyphicon-registration-mark
-- glyphicon-cloud-download
-- glyphicon-cloud-upload
-- glyphicon-tree-conifer
-- glyphicon-tree-deciduous

docs/_includes/components/glyphicons.html

-<div class="bs-docs-section">
-  <h1 id="glyphicons" class="page-header">Glyphicons</h1>
-
-  <h2 id="glyphicons-glyphs">Available glyphs</h2>
-  <p>Includes 200 glyphs in font format from the Glyphicon Halflings set. <a href="http://glyphicons.com/">Glyphicons</a> Halflings are normally not available for free, but their creator has made them available for Bootstrap free of cost. As a thank you, we only ask that you include a link back to <a href="http://glyphicons.com/">Glyphicons</a> whenever possible.</p>
-  <div class="bs-glyphicons">
-    <ul class="bs-glyphicons-list">
-      {% for iconClassName in site.data.glyphicons %}
-        <li>
-          <span class="glyphicon {{ iconClassName }}"></span>
-          <span class="glyphicon-class">glyphicon {{ iconClassName }}</span>
-        </li>
-      {% endfor %}
-    </ul>
-  </div>
-
-
-  <h2 id="glyphicons-how-to-use">How to use</h2>
-  <p>For performance reasons, all icons require a base class and individual icon class. To use, place the following code just about anywhere. Be sure to leave a space between the icon and text for proper padding.</p>
-  <div class="bs-callout bs-callout-danger">
-    <h4>Don't mix with other components</h4>
-    <p>Icon classes cannot be directly combined with other components. They should not be used along with other classes on the same element. Instead, add a nested <code>&lt;span&gt;</code> and apply the icon classes to the <code>&lt;span&gt;</code>.</p>
-  </div>
-  <div class="bs-callout bs-callout-danger">
-    <h4>Only for use on empty elements</h4>
-    <p>Icon classes should only be used on elements that contain no text content and have no child elements.</p>
-  </div>
-  <div class="bs-callout bs-callout-info">
-    <h4>Changing the icon font location</h4>
-    <p>Bootstrap assumes icon font files will be located in the <code>../fonts/</code> directory, relative to the compiled CSS files. Moving or renaming those font files means updating the CSS in one of three ways:</p>
-    <ul>
-      <li>Change the <code>@icon-font-path</code> and/or <code>@icon-font-name</code> variables in the source Less files.</li>
-      <li>Utilize the <a href="http://lesscss.org/usage/#command-line-usage-relative-urls">relative URLs option</a> provided by the Less compiler.</li>
-      <li>Change the <code>url()</code> paths in the compiled CSS.</li>
-    </ul>
-    <p>Use whatever option best suits your specific development setup.</p>
-  </div>
-{% highlight html %}
-<span class="glyphicon glyphicon-search"></span>
-{% endhighlight %}
-
-
-  <h2 id="glyphicons-examples">Examples</h2>
-  <p>Use them in buttons, button groups for a toolbar, navigation, or prepended form inputs.</p>
-  <div class="bs-example">
-    <div class="btn-toolbar" role="toolbar">
-      <div class="btn-group">
-        <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-align-left"></span></button>
-        <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-align-center"></span></button>
-        <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-align-right"></span></button>
-        <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-align-justify"></span></button>
-      </div>
-    </div>
-    <div class="btn-toolbar" role="toolbar">
-      <button type="button" class="btn btn-default btn-lg"><span class="glyphicon glyphicon-star"></span> Star</button>
-      <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-star"></span> Star</button>
-      <button type="button" class="btn btn-default btn-sm"><span class="glyphicon glyphicon-star"></span> Star</button>
-      <button type="button" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-star"></span> Star</button>
-    </div>
-  </div>
-{% highlight html %}
-<button type="button" class="btn btn-default btn-lg">
-  <span class="glyphicon glyphicon-star"></span> Star
-</button>
-{% endhighlight %}
-</div>

docs/components.html

@@ -5,7 +5,6 @@ slug: components
 lead: "Over a dozen reusable components built to provide iconography, dropdowns, input groups, navigation, alerts, and much more."
 ---
 
-{% include components/glyphicons.html %}
 {% include components/dropdowns.html %}
 {% include components/button-groups.html %}
 {% include components/button-dropdowns.html %}

less/bootstrap.less

@@ -5,7 +5,6 @@
 // Reset and dependencies
 @import "normalize.less";
 @import "print.less";
-@import "glyphicons.less";
 
 // Core CSS
 @import "scaffolding.less";

less/carousel.less

@@ -101,31 +101,24 @@
 
   // Toggles
   .icon-prev,
-  .icon-next,
-  .glyphicon-chevron-left,
-  .glyphicon-chevron-right {
+  .icon-next {
     position: absolute;
     top: 50%;
     z-index: 5;
     display: inline-block;
+    width:  20px;
+    height: 20px;
+    margin-top: -10px;
+    font-family: serif;
   }
-  .icon-prev,
-  .glyphicon-chevron-left {
+  .icon-prev {
     left: 50%;
     margin-left: -10px;
   }
-  .icon-next,
-  .glyphicon-chevron-right {
+  .icon-next {
     right: 50%;
     margin-right: -10px;
   }
-  .icon-prev,
-  .icon-next {
-    width:  20px;
-    height: 20px;
-    margin-top: -10px;
-    font-family: serif;
-  }
 
 
   .icon-prev {
@@ -210,8 +203,6 @@
 
   // Scale up the controls a smidge
   .carousel-control {
-    .glyphicon-chevron-left,
-    .glyphicon-chevron-right,
     .icon-prev,
     .icon-next {
       width: 30px;
@@ -219,11 +210,9 @@
       margin-top: -15px;
       font-size: 30px;
     }
-    .glyphicon-chevron-left,
     .icon-prev {
       margin-left: -15px;
     }
-    .glyphicon-chevron-right,
     .icon-next {
       margin-right: -15px;
     }

less/forms.less

@@ -330,7 +330,7 @@ input[type="checkbox"] {
     padding-right: (@input-height-base * 1.25);
   }
 }
-// Feedback icon (requires .glyphicon classes)
+// Feedback icon
 .form-control-feedback {
   position: absolute;
   top: 0;