From 1e0453f825cb7d6e14807b121210a594f242bc35 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 18 Aug 2013 00:36:51 -0700 Subject: Restore glyphicons --- components.html | 345 +++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 318 insertions(+), 27 deletions(-) (limited to 'components.html') diff --git a/components.html b/components.html index 147f05984..32b0e2a6e 100644 --- a/components.html +++ b/components.html @@ -7,6 +7,297 @@ base_url: "../" --- + +
+
+

Glyphicons

+
+ +

Available icon glyphs

+

180 icons in font format, provided by Glyphicons.

+ + +

Glyphicons attribution

+

Glyphicons Halflings are normally not available for free, but an arrangement between Bootstrap and the Glyphicons creators have made this possible at no cost to you as developers. As a thank you, we ask you to include an optional link back to Glyphicons whenever practical.

+ + +
+ + +

How to use

+

All icons require an <i> tag with a unique class, prefixed with glyphicon glyphicon-. To use, place the following code just about anywhere:

+
+<i class="glyphicon glyphicon-search"></i>
+
+

There are also styles available for inverted (white) icons, made ready with one extra class. We will specifically enforce this class on hover and active states for nav and dropdown links.

+
+<i class="glyphicon glyphicon-search glyphicon glyphicon-white"></i>
+
+

+ Heads up! + When using beside strings of text, as in buttons or nav links, be sure to leave a space after the <i> tag for proper spacing. +

+ + +

Icon examples

+

Use them in buttons, button groups for a toolbar, navigation, or prepended form inputs.

+ +

Buttons

+ +
Button group in a button toolbar
+
+
+
+ + + + +
+
+
+
+<div class="btn-toolbar">
+  <div class="btn-group">
+    <a class="btn" href="#"><i class="glyphicon glyphicon-align-left"></i></a>
+    <a class="btn" href="#"><i class="glyphicon glyphicon-align-center"></i></a>
+    <a class="btn" href="#"><i class="glyphicon glyphicon-align-right"></i></a>
+    <a class="btn" href="#"><i class="glyphicon glyphicon-align-justify"></i></a>
+  </div>
+</div>
+
+ +
Dropdown in a button group
+
+
+ User + + +
+
+
+<div class="btn-group">
+  <a class="btn btn-primary" href="#"><i class="glyphicon glyphicon-user glyphicon glyphicon-white"></i> User</a>
+  <a class="btn btn-primary dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a>
+  <ul class="dropdown-menu">
+    <li><a href="#"><i class="glyphicon glyphicon-pencil"></i> Edit</a></li>
+    <li><a href="#"><i class="glyphicon glyphicon-trash"></i> Delete</a></li>
+    <li><a href="#"><i class="glyphicon glyphicon-ban-circle"></i> Ban</a></li>
+    <li class="divider"></li>
+    <li><a href="#"><i class="i"></i> Make admin</a></li>
+  </ul>
+</div>
+
+ +
Button sizes
+
+ Star + Star + Star +
+
+<a class="btn btn-large" href="#"><i class="glyphicon glyphicon-star"></i> Star</a>
+<a class="btn btn-small" href="#"><i class="glyphicon glyphicon-star"></i> Star</a>
+<a class="btn btn-mini" href="#"><i class="glyphicon glyphicon-star"></i> Star</a>
+
+ +

Navigation

+
+
+ +
+
+
+<ul class="nav nav-list">
+  <li class="active"><a href="#"><i class="glyphicon glyphicon-home glyphicon glyphicon-white"></i> Home</a></li>
+  <li><a href="#"><i class="glyphicon glyphicon-book"></i> Library</a></li>
+  <li><a href="#"><i class="glyphicon glyphicon-pencil"></i> Applications</a></li>
+  <li><a href="#"><i class="i"></i> Misc</a></li>
+</ul>
+
+ +

Form fields

+
+
+ +
+
+ +
+
+
+
+
+<div class="control-group">
+  <label class="control-label" for="inputIcon">Email address</label>
+  <div class="controls">
+    <div class="input-prepend">
+      <span class="add-on"><i class="glyphicon glyphicon-envelope"></i></span>
+      <input class="span2" id="inputIcon" type="text">
+    </div>
+  </div>
+</div>
+
+ + + +
@@ -1134,9 +1425,9 @@ base_url: "../"
Brand
@@ -1184,9 +1475,9 @@ base_url: "../"
Brand
@@ -1247,9 +1538,9 @@ base_url: "../"
Brand
@@ -1270,9 +1561,9 @@ base_url: "../"
Brand
@@ -1293,9 +1584,9 @@ base_url: "../"
Brand
@@ -1322,9 +1613,9 @@ base_url: "../"
Brand
@@ -1363,9 +1654,9 @@ body { padding-top: 70px; }
Brand
@@ -1404,9 +1695,9 @@ body { padding-bottom: 70px; }
Brand
@@ -1436,9 +1727,9 @@ body { padding-bottom: 70px; }
Brand
-- cgit v1.2.3 From f2e35bf7027e8274e28e46b41efb93f4c03184eb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 18 Aug 2013 01:23:45 -0700 Subject: docs layout and alignment refinement --- components.html | 477 ++++++++++++++++++++++++-------------------------------- 1 file changed, 208 insertions(+), 269 deletions(-) (limited to 'components.html') diff --git a/components.html b/components.html index 32b0e2a6e..4d84bed33 100644 --- a/components.html +++ b/components.html @@ -7,293 +7,232 @@ base_url: "../" --- + + + -
+

Glyphicons

-

Available icon glyphs

-

180 icons in font format, provided by Glyphicons.

-
    -
  • glyphicon glyphicon-glass
    • -
  • glyphicon glyphicon-music
    • -
  • glyphicon glyphicon-search
    • -
  • glyphicon glyphicon-envelope
    • -
  • glyphicon glyphicon-heart
    • -
  • glyphicon glyphicon-star
    • -
  • glyphicon glyphicon-star-empty
    • -
  • glyphicon glyphicon-user
    • -
  • glyphicon glyphicon-film
    • -
  • glyphicon glyphicon-th-large
    • -
  • glyphicon glyphicon-th
    • -
  • glyphicon glyphicon-th-list
    • -
  • glyphicon glyphicon-ok
    • -
  • glyphicon glyphicon-remove
    • -
  • glyphicon glyphicon-zoom-in
    • -
  • glyphicon glyphicon-zoom-out
    • -
  • glyphicon glyphicon-off
    • -
  • glyphicon glyphicon-signal
    • -
  • glyphicon glyphicon-cog
    • -
  • glyphicon glyphicon-trash
    • -
  • glyphicon glyphicon-home
    • -
  • glyphicon glyphicon-file
    • -
  • glyphicon glyphicon-time
    • -
  • glyphicon glyphicon-road
    • -
  • glyphicon glyphicon-download-alt
    • -
  • glyphicon glyphicon-download
    • -
  • glyphicon glyphicon-upload
    • -
  • glyphicon glyphicon-inbox
    • - -
  • glyphicon glyphicon-play-circle
    • -
  • glyphicon glyphicon-repeat
    • -
  • glyphicon glyphicon-refresh
    • -
  • glyphicon glyphicon-list-alt
    • -
  • glyphicon glyphicon-lock
    • -
  • glyphicon glyphicon-flag
    • -
  • glyphicon glyphicon-headphones
    • -
  • glyphicon glyphicon-volume-off
    • -
  • glyphicon glyphicon-volume-down
    • -
  • glyphicon glyphicon-volume-up
    • -
  • glyphicon glyphicon-qrcode
    • -
  • glyphicon glyphicon-barcode
    • -
  • glyphicon glyphicon-tag
    • -
  • glyphicon glyphicon-tags
    • -
  • glyphicon glyphicon-book
    • -
  • glyphicon glyphicon-bookmark
    • -
  • glyphicon glyphicon-print
    • -
  • glyphicon glyphicon-camera
    • -
  • glyphicon glyphicon-font
    • -
  • glyphicon glyphicon-bold
    • -
  • glyphicon glyphicon-italic
    • -
  • glyphicon glyphicon-text-height
    • -
  • glyphicon glyphicon-text-width
    • -
  • glyphicon glyphicon-align-left
    • -
  • glyphicon glyphicon-align-center
    • -
  • glyphicon glyphicon-align-right
    • -
  • glyphicon glyphicon-align-justify
    • -
  • glyphicon glyphicon-list
    • - -
  • glyphicon glyphicon-indent-left
    • -
  • glyphicon glyphicon-indent-right
    • -
  • glyphicon glyphicon-facetime-video
    • -
  • glyphicon glyphicon-picture
    • -
  • glyphicon glyphicon-pencil
    • -
  • glyphicon glyphicon-map-marker
    • -
  • glyphicon glyphicon-adjust
    • -
  • glyphicon glyphicon-tint
    • -
  • glyphicon glyphicon-edit
    • -
  • glyphicon glyphicon-share
    • -
  • glyphicon glyphicon-check
    • -
  • glyphicon glyphicon-move
    • -
  • glyphicon glyphicon-step-backward
    • -
  • glyphicon glyphicon-fast-backward
    • -
  • glyphicon glyphicon-backward
    • -
  • glyphicon glyphicon-play
    • -
  • glyphicon glyphicon-pause
    • -
  • glyphicon glyphicon-stop
    • -
  • glyphicon glyphicon-forward
    • -
  • glyphicon glyphicon-fast-forward
    • -
  • glyphicon glyphicon-step-forward
    • -
  • glyphicon glyphicon-eject
    • -
  • glyphicon glyphicon-chevron-left
    • -
  • glyphicon glyphicon-chevron-right
    • -
  • glyphicon glyphicon-plus-sign
    • -
  • glyphicon glyphicon-minus-sign
    • -
  • glyphicon glyphicon-remove-sign
    • -
  • glyphicon glyphicon-ok-sign
    • - -
  • glyphicon glyphicon-question-sign
    • -
  • glyphicon glyphicon-info-sign
    • -
  • glyphicon glyphicon-screenshot
    • -
  • glyphicon glyphicon-remove-circle
    • -
  • glyphicon glyphicon-ok-circle
    • -
  • glyphicon glyphicon-ban-circle
    • -
  • glyphicon glyphicon-arrow-left
    • -
  • glyphicon glyphicon-arrow-right
    • -
  • glyphicon glyphicon-arrow-up
    • -
  • glyphicon glyphicon-arrow-down
    • -
  • glyphicon glyphicon-share-alt
    • -
  • glyphicon glyphicon-resize-full
    • -
  • glyphicon glyphicon-resize-small
    • -
  • glyphicon glyphicon-plus
    • -
  • glyphicon glyphicon-minus
    • -
  • glyphicon glyphicon-asterisk
    • -
  • glyphicon glyphicon-exclamation-sign
    • -
  • glyphicon glyphicon-gift
    • -
  • glyphicon glyphicon-leaf
    • -
  • glyphicon glyphicon-fire
    • -
  • glyphicon glyphicon-eye-open
    • -
  • glyphicon glyphicon-eye-close
    • -
  • glyphicon glyphicon-warning-sign
    • -
  • glyphicon glyphicon-plane
    • -
  • glyphicon glyphicon-calendar
    • -
  • glyphicon glyphicon-random
    • -
  • glyphicon glyphicon-comment
    • -
  • glyphicon glyphicon-magnet
    • - -
  • glyphicon glyphicon-chevron-up
    • -
  • glyphicon glyphicon-chevron-down
    • -
  • glyphicon glyphicon-retweet
    • -
  • glyphicon glyphicon-shopping-cart
    • -
  • glyphicon glyphicon-folder-close
    • -
  • glyphicon glyphicon-folder-open
    • -
  • glyphicon glyphicon-resize-vertical
    • -
  • glyphicon glyphicon-resize-horizontal
    • -
  • glyphicon glyphicon-hdd
    • -
  • glyphicon glyphicon-bullhorn
    • -
  • glyphicon glyphicon-bell
    • -
  • glyphicon glyphicon-certificate
    • -
  • glyphicon glyphicon-thumbs-up
    • -
  • glyphicon glyphicon-thumbs-down
    • -
  • glyphicon glyphicon-hand-right
    • -
  • glyphicon glyphicon-hand-left
    • -
  • glyphicon glyphicon-hand-up
    • -
  • glyphicon glyphicon-hand-down
    • -
  • glyphicon glyphicon-circle-arrow-right
    • -
  • glyphicon glyphicon-circle-arrow-left
    • -
  • glyphicon glyphicon-circle-arrow-up
    • -
  • glyphicon glyphicon-circle-arrow-down
    • -
  • glyphicon glyphicon-globe
    • -
  • glyphicon glyphicon-wrench
    • -
  • glyphicon glyphicon-tasks
    • -
  • glyphicon glyphicon-filter
    • -
  • glyphicon glyphicon-briefcase
    • -
  • glyphicon glyphicon-fullscreen
    • +

    Available glyphs

    +

    Includes 180 glyphs in font format from the Glyphicon Halflings set. Glyphicons 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 to include a link back to Glyphicons whenever possible.

    +
      +
    • .glyphicon .glyphicon-glass
      • +
    • .glyphicon .glyphicon-music
      • +
    • .glyphicon .glyphicon-search
      • +
    • .glyphicon .glyphicon-envelope
      • +
    • .glyphicon .glyphicon-heart
      • +
    • .glyphicon .glyphicon-star
      • +
    • .glyphicon .glyphicon-star-empty
      • +
    • .glyphicon .glyphicon-user
      • +
    • .glyphicon .glyphicon-film
      • +
    • .glyphicon .glyphicon-th-large
      • +
    • .glyphicon .glyphicon-th
      • +
    • .glyphicon .glyphicon-th-list
      • +
    • .glyphicon .glyphicon-ok
      • +
    • .glyphicon .glyphicon-remove
      • +
    • .glyphicon .glyphicon-zoom-in
      • +
    • .glyphicon .glyphicon-zoom-out
      • +
    • .glyphicon .glyphicon-off
      • +
    • .glyphicon .glyphicon-signal
      • +
    • .glyphicon .glyphicon-cog
      • +
    • .glyphicon .glyphicon-trash
      • +
    • .glyphicon .glyphicon-home
      • +
    • .glyphicon .glyphicon-file
      • +
    • .glyphicon .glyphicon-time
      • +
    • .glyphicon .glyphicon-road
      • +
    • .glyphicon .glyphicon-download-alt
      • +
    • .glyphicon .glyphicon-download
      • +
    • .glyphicon .glyphicon-upload
      • +
    • .glyphicon .glyphicon-inbox
      • + +
    • .glyphicon .glyphicon-play-circle
      • +
    • .glyphicon .glyphicon-repeat
      • +
    • .glyphicon .glyphicon-refresh
      • +
    • .glyphicon .glyphicon-list-alt
      • +
    • .glyphicon .glyphicon-lock
      • +
    • .glyphicon .glyphicon-flag
      • +
    • .glyphicon .glyphicon-headphones
      • +
    • .glyphicon .glyphicon-volume-off
      • +
    • .glyphicon .glyphicon-volume-down
      • +
    • .glyphicon .glyphicon-volume-up
      • +
    • .glyphicon .glyphicon-qrcode
      • +
    • .glyphicon .glyphicon-barcode
      • +
    • .glyphicon .glyphicon-tag
      • +
    • .glyphicon .glyphicon-tags
      • +
    • .glyphicon .glyphicon-book
      • +
    • .glyphicon .glyphicon-bookmark
      • +
    • .glyphicon .glyphicon-print
      • +
    • .glyphicon .glyphicon-camera
      • +
    • .glyphicon .glyphicon-font
      • +
    • .glyphicon .glyphicon-bold
      • +
    • .glyphicon .glyphicon-italic
      • +
    • .glyphicon .glyphicon-text-height
      • +
    • .glyphicon .glyphicon-text-width
      • +
    • .glyphicon .glyphicon-align-left
      • +
    • .glyphicon .glyphicon-align-center
      • +
    • .glyphicon .glyphicon-align-right
      • +
    • .glyphicon .glyphicon-align-justify
      • +
    • .glyphicon .glyphicon-list
      • + +
    • .glyphicon .glyphicon-indent-left
      • +
    • .glyphicon .glyphicon-indent-right
      • +
    • .glyphicon .glyphicon-facetime-video
      • +
    • .glyphicon .glyphicon-picture
      • +
    • .glyphicon .glyphicon-pencil
      • +
    • .glyphicon .glyphicon-map-marker
      • +
    • .glyphicon .glyphicon-adjust
      • +
    • .glyphicon .glyphicon-tint
      • +
    • .glyphicon .glyphicon-edit
      • +
    • .glyphicon .glyphicon-share
      • +
    • .glyphicon .glyphicon-check
      • +
    • .glyphicon .glyphicon-move
      • +
    • .glyphicon .glyphicon-step-backward
      • +
    • .glyphicon .glyphicon-fast-backward
      • +
    • .glyphicon .glyphicon-backward
      • +
    • .glyphicon .glyphicon-play
      • +
    • .glyphicon .glyphicon-pause
      • +
    • .glyphicon .glyphicon-stop
      • +
    • .glyphicon .glyphicon-forward
      • +
    • .glyphicon .glyphicon-fast-forward
      • +
    • .glyphicon .glyphicon-step-forward
      • +
    • .glyphicon .glyphicon-eject
      • +
    • .glyphicon .glyphicon-chevron-left
      • +
    • .glyphicon .glyphicon-chevron-right
      • +
    • .glyphicon .glyphicon-plus-sign
      • +
    • .glyphicon .glyphicon-minus-sign
      • +
    • .glyphicon .glyphicon-remove-sign
      • +
    • .glyphicon .glyphicon-ok-sign
      • + +
    • .glyphicon .glyphicon-question-sign
      • +
    • .glyphicon .glyphicon-info-sign
      • +
    • .glyphicon .glyphicon-screenshot
      • +
    • .glyphicon .glyphicon-remove-circle
      • +
    • .glyphicon .glyphicon-ok-circle
      • +
    • .glyphicon .glyphicon-ban-circle
      • +
    • .glyphicon .glyphicon-arrow-left
      • +
    • .glyphicon .glyphicon-arrow-right
      • +
    • .glyphicon .glyphicon-arrow-up
      • +
    • .glyphicon .glyphicon-arrow-down
      • +
    • .glyphicon .glyphicon-share-alt
      • +
    • .glyphicon .glyphicon-resize-full
      • +
    • .glyphicon .glyphicon-resize-small
      • +
    • .glyphicon .glyphicon-plus
      • +
    • .glyphicon .glyphicon-minus
      • +
    • .glyphicon .glyphicon-asterisk
      • +
    • .glyphicon .glyphicon-exclamation-sign
      • +
    • .glyphicon .glyphicon-gift
      • +
    • .glyphicon .glyphicon-leaf
      • +
    • .glyphicon .glyphicon-fire
      • +
    • .glyphicon .glyphicon-eye-open
      • +
    • .glyphicon .glyphicon-eye-close
      • +
    • .glyphicon .glyphicon-warning-sign
      • +
    • .glyphicon .glyphicon-plane
      • +
    • .glyphicon .glyphicon-calendar
      • +
    • .glyphicon .glyphicon-random
      • +
    • .glyphicon .glyphicon-comment
      • +
    • .glyphicon .glyphicon-magnet
      • + +
    • .glyphicon .glyphicon-chevron-up
      • +
    • .glyphicon .glyphicon-chevron-down
      • +
    • .glyphicon .glyphicon-retweet
      • +
    • .glyphicon .glyphicon-shopping-cart
      • +
    • .glyphicon .glyphicon-folder-close
      • +
    • .glyphicon .glyphicon-folder-open
      • +
    • .glyphicon .glyphicon-resize-vertical
      • +
    • .glyphicon .glyphicon-resize-horizontal
      • +
    • .glyphicon .glyphicon-hdd
      • +
    • .glyphicon .glyphicon-bullhorn
      • +
    • .glyphicon .glyphicon-bell
      • +
    • .glyphicon .glyphicon-certificate
      • +
    • .glyphicon .glyphicon-thumbs-up
      • +
    • .glyphicon .glyphicon-thumbs-down
      • +
    • .glyphicon .glyphicon-hand-right
      • +
    • .glyphicon .glyphicon-hand-left
      • +
    • .glyphicon .glyphicon-hand-up
      • +
    • .glyphicon .glyphicon-hand-down
      • +
    • .glyphicon .glyphicon-circle-arrow-right
      • +
    • .glyphicon .glyphicon-circle-arrow-left
      • +
    • .glyphicon .glyphicon-circle-arrow-up
      • +
    • .glyphicon .glyphicon-circle-arrow-down
      • +
    • .glyphicon .glyphicon-globe
      • +
    • .glyphicon .glyphicon-wrench
      • +
    • .glyphicon .glyphicon-tasks
      • +
    • .glyphicon .glyphicon-filter
      • +
    • .glyphicon .glyphicon-briefcase
      • +
    • .glyphicon .glyphicon-fullscreen
    -

    Glyphicons attribution

    -

    Glyphicons Halflings are normally not available for free, but an arrangement between Bootstrap and the Glyphicons creators have made this possible at no cost to you as developers. As a thank you, we ask you to include an optional link back to Glyphicons whenever practical.

    - -
    - - -

    How to use

    -

    All icons require an <i> tag with a unique class, prefixed with glyphicon glyphicon-. To use, place the following code just about anywhere:

    -
    -<i class="glyphicon glyphicon-search"></i>
-
    -

    There are also styles available for inverted (white) icons, made ready with one extra class. We will specifically enforce this class on hover and active states for nav and dropdown links.

    -
    -<i class="glyphicon glyphicon-search glyphicon glyphicon-white"></i>
-
    -

    - Heads up! - When using beside strings of text, as in buttons or nav links, be sure to leave a space after the <i> tag for proper spacing. -

    +

    How to use

    +

    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.

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

    Icon examples

    +

    Examples

    Use them in buttons, button groups for a toolbar, navigation, or prepended form inputs.

    - -

    Buttons

    - -
    Button group in a button toolbar
    -
    +
    - - - - +
    -
    -
    -<div class="btn-toolbar">
-  <div class="btn-group">
-    <a class="btn" href="#"><i class="glyphicon glyphicon-align-left"></i></a>
-    <a class="btn" href="#"><i class="glyphicon glyphicon-align-center"></i></a>
-    <a class="btn" href="#"><i class="glyphicon glyphicon-align-right"></i></a>
-    <a class="btn" href="#"><i class="glyphicon glyphicon-align-justify"></i></a>
-  </div>
-</div>
-
    - -
    Dropdown in a button group
    -
    -
    - User - - -
    -
    -
    -<div class="btn-group">
-  <a class="btn btn-primary" href="#"><i class="glyphicon glyphicon-user glyphicon glyphicon-white"></i> User</a>
-  <a class="btn btn-primary dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a>
-  <ul class="dropdown-menu">
-    <li><a href="#"><i class="glyphicon glyphicon-pencil"></i> Edit</a></li>
-    <li><a href="#"><i class="glyphicon glyphicon-trash"></i> Delete</a></li>
-    <li><a href="#"><i class="glyphicon glyphicon-ban-circle"></i> Ban</a></li>
-    <li class="divider"></li>
-    <li><a href="#"><i class="i"></i> Make admin</a></li>
-  </ul>
-</div>
-
    - -
    Button sizes
    -
    - Star - Star - Star -
    -
    -<a class="btn btn-large" href="#"><i class="glyphicon glyphicon-star"></i> Star</a>
-<a class="btn btn-small" href="#"><i class="glyphicon glyphicon-star"></i> Star</a>
-<a class="btn btn-mini" href="#"><i class="glyphicon glyphicon-star"></i> Star</a>
-
    - -

    Navigation

    -
    -
    - +
    +
    -
    -<ul class="nav nav-list">
-  <li class="active"><a href="#"><i class="glyphicon glyphicon-home glyphicon glyphicon-white"></i> Home</a></li>
-  <li><a href="#"><i class="glyphicon glyphicon-book"></i> Library</a></li>
-  <li><a href="#"><i class="glyphicon glyphicon-pencil"></i> Applications</a></li>
-  <li><a href="#"><i class="i"></i> Misc</a></li>
-</ul>
-
    - -

    Form fields

    -
    -
    - -
    -
    - -
    -
    -
    -
    -
    -<div class="control-group">
-  <label class="control-label" for="inputIcon">Email address</label>
-  <div class="controls">
-    <div class="input-prepend">
-      <span class="add-on"><i class="glyphicon glyphicon-envelope"></i></span>
-      <input class="span2" id="inputIcon" type="text">
-    </div>
-  </div>
-</div>
-
    +{% highlight html %} +
    -- cgit v1.2.3 From e13ca6d38494e69ed1faeddbb12b469a778ade06 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 18 Aug 2013 01:46:26 -0700 Subject: Upgrade to latest glyphicons --- components.html | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'components.html') diff --git a/components.html b/components.html index 4d84bed33..30e6eaf10 100644 --- a/components.html +++ b/components.html @@ -200,6 +200,47 @@ base_url: "../"
  • .glyphicon .glyphicon-filter
  • .glyphicon .glyphicon-briefcase
  • .glyphicon .glyphicon-fullscreen
    • + +
  • .glyphicon .glyphicon-log-in
    • +
  • .glyphicon .glyphicon-flash
    • +
  • .glyphicon .glyphicon-log-out
    • +
  • .glyphicon .glyphicon-new-window
    • +
  • .glyphicon .glyphicon-record
    • +
  • .glyphicon .glyphicon-save
    • +
  • .glyphicon .glyphicon-open
    • +
  • .glyphicon .glyphicon-saved
    • +
  • .glyphicon .glyphicon-import
    • +
  • .glyphicon .glyphicon-export
    • +
  • .glyphicon .glyphicon-send
    • +
  • .glyphicon .glyphicon-floppy-disk
    • +
  • .glyphicon .glyphicon-floppy-saved
    • +
  • .glyphicon .glyphicon-floppy-remove
    • +
  • .glyphicon .glyphicon-floppy-save
    • +
  • .glyphicon .glyphicon-floppy-open
    • +
  • .glyphicon .glyphicon-credit-card
    • +
  • .glyphicon .glyphicon-transfer
    • +
  • .glyphicon .glyphicon-cutlery
    • +
  • .glyphicon .glyphicon-header
    • +
  • .glyphicon .glyphicon-compressed
    • +
  • .glyphicon .glyphicon-earphone
    • +
  • .glyphicon .glyphicon-phone-alt
    • +
  • .glyphicon .glyphicon-tower
    • +
  • .glyphicon .glyphicon-stats
    • +
  • .glyphicon .glyphicon-sd-video
    • +
  • .glyphicon .glyphicon-hd-video
    • +
  • .glyphicon .glyphicon-subtitles
    • +
  • .glyphicon .glyphicon-sound-stereo
    • +
  • .glyphicon .glyphicon-sound-dolby
    • +
  • .glyphicon .glyphicon-sound-5-1
    • +
  • .glyphicon .glyphicon-sound-6-1
    • +
  • .glyphicon .glyphicon-sound-7-1
    • +
  • .glyphicon .glyphicon-copyright-mark
    • +
  • .glyphicon .glyphicon-registration-mark
    • +
  • .glyphicon .glyphicon-cloud
    • +
  • .glyphicon .glyphicon-cloud-download
    • +
  • .glyphicon .glyphicon-cloud-upload
    • +
  • .glyphicon .glyphicon-tree-conifer
    • +
  • .glyphicon .glyphicon-tree-deciduous
-- cgit v1.2.3 From fd97c2fce4c86bf64ae3f6afde2e37e124932ea4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 18 Aug 2013 02:04:39 -0700 Subject: bad copypasta --- components.html | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'components.html') diff --git a/components.html b/components.html index 30e6eaf10..d7f791b84 100644 --- a/components.html +++ b/components.html @@ -1405,9 +1405,9 @@ base_url: "../"
Brand
@@ -1455,9 +1455,9 @@ base_url: "../"
Brand
@@ -1518,9 +1518,9 @@ base_url: "../"
Brand
@@ -1541,9 +1541,9 @@ base_url: "../"
Brand
@@ -1564,9 +1564,9 @@ base_url: "../"
Brand
@@ -1593,9 +1593,9 @@ base_url: "../"
Brand
@@ -1634,9 +1634,9 @@ body { padding-top: 70px; }
Brand
@@ -1675,9 +1675,9 @@ body { padding-bottom: 70px; }
Brand
@@ -1707,9 +1707,9 @@ body { padding-bottom: 70px; }
Brand
-- cgit v1.2.3 From 142ada4219dd3da53a421f65940012cb7be2ab02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20Gro=C3=9F?= Date: Sun, 18 Aug 2013 17:17:07 +0200 Subject: Update progressbar there is no gradient in 3.x --- components.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components.html') diff --git a/components.html b/components.html index 147f05984..23776fa16 100644 --- a/components.html +++ b/components.html @@ -2016,7 +2016,7 @@ body { padding-bottom: 70px; }

Basic example

-

Default progress bar with a vertical gradient.

+

Default progress bar.

60% Complete
-- cgit v1.2.3 From 0989babe5daa14a91b80f6347efa493bc100e28d Mon Sep 17 00:00:00 2001 From: Bruno Amaral Date: Sun, 18 Aug 2013 18:47:40 +0100 Subject: fixes two type-os in glyphicons --- components.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components.html') diff --git a/components.html b/components.html index 4e531e6a8..b4e6c18f1 100644 --- a/components.html +++ b/components.html @@ -244,7 +244,7 @@ base_url: "../" -

How to use

+

How to use

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.

{% highlight html %} -- cgit v1.2.3 From ef4590dfb461036c915d8fbc5b6fbf3ad7ba9c86 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 18 Aug 2013 11:08:20 -0700 Subject: fixes #9786: enable tables in panels --- components.html | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) (limited to 'components.html') diff --git a/components.html b/components.html index 4e531e6a8..52a85cf03 100644 --- a/components.html +++ b/components.html @@ -2779,6 +2779,117 @@ body { padding-bottom: 70px; }
...
{% endhighlight %} +

With tables

+

Add any non-bordered .table within a panel for a seamless design. If there is a .panel-body, we add an extra border to the top of the table for separation.

+
+
+ +
Panel heading
+
+

Some default panel content here. Nulla vitae elit libero, a pharetra augue. Aenean lacinia bibendum nulla sed consectetur. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Nullam id dolor id nibh ultricies vehicula ut id elit.

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#First NameLast NameUsername
1MarkOtto@mdo
2JacobThornton@fat
3Larrythe Bird@twitter
+
+
+{% highlight html %} +
+ +
Panel heading
+
+

...

+
+ + + + ... +
+
+{% endhighlight %} + +

If there is no panel body, the component moves from panel header to table without interruption.

+
+
+ +
Panel heading
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#First NameLast NameUsername
1MarkOtto@mdo
2JacobThornton@fat
3Larrythe Bird@twitter
+
+
+{% highlight html %} +
+ +
Panel heading
+ + + + ... +
+
+{% endhighlight %} + + +

With list groups

Easily include full-width list groups within any panel.

-- cgit v1.2.3 From 1b49b42683e4192a39f3d3d045a98b262a498097 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 18 Aug 2013 13:40:39 -0700 Subject: fix wrong closing tag on Glyphicons-in-buttons examples --- components.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'components.html') diff --git a/components.html b/components.html index 6b3ca7053..f8b12daf8 100644 --- a/components.html +++ b/components.html @@ -256,17 +256,17 @@ base_url: "../"
- + + +
- + + +
{% highlight html %} -- cgit v1.2.3 From abca00870f862d024a943b2c563bd42ff3f8418f Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Sun, 18 Aug 2013 23:05:56 +0200 Subject: Add a .navbar-default class for default colors * Extract color styles from .navbar { } and put them into .navbar-default { } * Change variable names * Change the docs accordingly (i.e., add the .navbar-default class to all default navbars) * Change customizer accordingly --- components.html | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'components.html') diff --git a/components.html b/components.html index 6b3ca7053..0c84d60a6 100644 --- a/components.html +++ b/components.html @@ -1312,7 +1312,7 @@ base_url: "../"

Tabs with dropdowns

-
-
{% highlight html %} -
{% highlight html %} -