diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index ce365b8bc4..3ac4cf8e69 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1968,7 +1968,7 @@ fieldset[disabled] .btn-link:focus { src: url('../fonts/glyphiconshalflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphiconshalflings-regular.woff') format('woff'), url('../fonts/glyphiconshalflings-regular.ttf') format('truetype'), url('../fonts/glyphiconshalflings-regular.svg#glyphicons_halflingsregular') format('svg'); } -[class^="glyphicon-"]:before { +.glyphicon:before { font-family: 'Glyphicons Halflings'; font-style: normal; line-height: 1; diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 2c99da3fc7..e2cc921b87 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -331,7 +331,7 @@ section > ul li { -webkit-box-sizing: border-box; margin: 0 -1px -1px 0; } -.the-icons [class^="glyphicon-"] { +.the-icons .glyphicon { display: block; margin: 5px auto; vertical-align: middle; diff --git a/docs/components.html b/docs/components.html index 0aea4113ec..bc5d7a2b37 100644 --- a/docs/components.html +++ b/docs/components.html @@ -21,20 +21,20 @@ title: Components
@@ -163,10 +163,10 @@ title: Components

Make a set of buttons appear vertically stacked rather than horizontally.

- - - - + + + +
{% highlight html linenos %} diff --git a/docs/css.html b/docs/css.html index b05cfbc1b4..297b4ea336 100644 --- a/docs/css.html +++ b/docs/css.html @@ -20,16 +20,16 @@ title: CSS
@@ -1908,171 +1908,171 @@ For example, <section> should be wrapped as inline.

Bootstrap comes with all 160 of Glyphicons Halflings set, all available in font formats for easy coloring, sizing, and placement.

    -
  • glyphicon-glass
    • -
  • glyphicon-music
    • -
  • glyphicon-search
    • -
  • glyphicon-envelope
    • -
  • 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-glass
    • +
  • glyphicon-music
    • +
  • glyphicon-search
    • +
  • glyphicon-envelope
    • +
  • 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-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-pencil
    • -
  • 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-indent-left
    • +
  • glyphicon-indent-right
    • +
  • glyphicon-facetime-video
    • +
  • glyphicon-picture
    • +
  • glyphicon-pencil
    • +
  • 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-plus
    • -
  • glyphicon-minus
    • -
  • glyphicon-asterisk
    • -
  • 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-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-plus
    • +
  • glyphicon-minus
    • +
  • glyphicon-asterisk
    • +
  • 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-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-euro
    • -
  • 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
    • -
  • glyphicon-collapse-top
    • +
  • glyphicon-dashboard
    • +
  • glyphicon-paperclip
    • +
  • glyphicon-heart-empty
    • +
  • glyphicon-link
    • +
  • glyphicon-phone
    • +
  • glyphicon-pushpin
    • +
  • glyphicon-euro
    • +
  • 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
    • +
  • glyphicon-collapse-top
@@ -2083,7 +2083,7 @@ For example, <section> should be wrapped as inline.

How to use

Add the appropriate class to any inline element. All icon classes are prefixed with glyphicon- for easy styling. To use, place the following code just about anywhere:

{% highlight html linenos %} - + {% endhighlight %}

Want to change the icon color? Just change the color of the parent element.

When using beside strings of text, as in buttons or nav links, be sure to leave a space after the icon for proper spacing.

@@ -2098,20 +2098,20 @@ For example, <section> should be wrapped as inline.
- - - - + + + +
{% highlight html linenos %}
- - - - + + + +
{% endhighlight %} @@ -2119,63 +2119,63 @@ For example, <section> should be wrapped as inline.
Dropdown in a button group
- User + User
{% highlight html linenos %}
- User + User
{% endhighlight %}
Large button
- Star + Star
{% highlight html linenos %} - Star + Star {% endhighlight %}
Small button
- +
{% highlight html linenos %} - + {% endhighlight %}

Navigation

{% highlight html linenos %} {% endhighlight %} @@ -2185,7 +2185,7 @@ For example, <section> should be wrapped as inline.
- +
@@ -2196,7 +2196,7 @@ For example, <section> should be wrapped as inline.
- +
diff --git a/docs/customize.html b/docs/customize.html index 4f3e7fe2db..9a503ff8f4 100644 --- a/docs/customize.html +++ b/docs/customize.html @@ -21,10 +21,10 @@ title: Customize and download
diff --git a/docs/getting-started.html b/docs/getting-started.html index 9f63c5b4c6..08a51ee103 100644 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@ -21,12 +21,12 @@ description: Overview of the project, its contents, and how to get started with
diff --git a/docs/javascript.html b/docs/javascript.html index 3306392671..0b3fc3e423 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -19,20 +19,20 @@ title: JavaScript plugins
@@ -1491,10 +1491,10 @@ $('#myCollapsible').on('hidden', function () {
- + - +
diff --git a/less/glyphicons.less b/less/glyphicons.less index bfe481734c..6bdae20472 100644 --- a/less/glyphicons.less +++ b/less/glyphicons.less @@ -11,9 +11,9 @@ // Basic usage // // Since icons are fonts, they can be placed anywhere text is placed. To use, -// create an inline element with the appropriate class, like so: +// create an inline element with the appropriate classes, like so: // -// Star +// Star // // Use them in links, buttons, headings, and more. @@ -31,7 +31,7 @@ } // Catchall baseclass -[class^="glyphicon-"]:before { +.glyphicon:before { font-family: 'Glyphicons Halflings'; font-style: normal; line-height: 1; diff --git a/less/tests/buttons.html b/less/tests/buttons.html index 5025655f8b..f73877b058 100644 --- a/less/tests/buttons.html +++ b/less/tests/buttons.html @@ -40,13 +40,13 @@ Profile

@@ -54,13 +54,13 @@ Profile

@@ -68,13 +68,13 @@ Profile

@@ -82,22 +82,22 @@ Profile

- - - - + + + +