From 16cf6b30cd0ea82dda210f021dfc163a3783fe1c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 9 Jul 2012 00:17:36 -0700 Subject: [PATCH] docs changes for icons --- docs/assets/css/bootstrap.css | 1 - docs/assets/css/docs.css | 2 ++ docs/base-css.html | 28 ++++++-------------------- docs/templates/pages/base-css.mustache | 26 +++++------------------- 4 files changed, 13 insertions(+), 44 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 61398812e..5af92fad1 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5198,7 +5198,6 @@ a.badge:hover { .carousel { position: relative; - display: table; margin-bottom: 20px; line-height: 1; } diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index fd2a01d46..e2b6aeba1 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -483,6 +483,8 @@ h2 + .row { list-style: none; } .the-icons li { + float: left; + width: 25%; line-height: 25px; } .the-icons i:hover { diff --git a/docs/base-css.html b/docs/base-css.html index 8c2879907..455a61d57 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -122,7 +122,7 @@

Body copy

-

Bootstrap's global default font-size is 13px, with a line-height of 18px. This is applied to the <body> and all paragraphs. In addition, <p> (paragraphs) receive a bottom margin of half their line-height (9px by default).

+

Bootstrap's global default font-size is 14px, with a line-height of 20px. This is applied to the <body> and all paragraphs. In addition, <p> (paragraphs) receive a bottom margin of half their line-height (9px by default).

Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula.

Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec ullamcorper nulla non metus auctor fringilla. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec ullamcorper nulla non metus auctor fringilla.

@@ -1399,9 +1399,7 @@ For example, <code>section</code> should be wrapped as inline.

Icon glyphs

140 icons in sprite form, available in dark gray (default) and white, provided by Glyphicons.

-
-
-
    +
    • icon-glass
    • icon-music
    • icon-search
      • @@ -1430,10 +1428,7 @@ For example, <code>section</code> should be wrapped as inline.
    • icon-download
    • icon-upload
    • icon-inbox
      • -
    -
-
-
    +
  • icon-play-circle
  • icon-repeat
  • icon-refresh
    • @@ -1462,10 +1457,7 @@ For example, <code>section</code> should be wrapped as inline.
  • icon-align-right
  • icon-align-justify
  • icon-list
    • -
-
-
-
    +
  • icon-indent-left
  • icon-indent-right
  • icon-facetime-video
    • @@ -1494,10 +1486,7 @@ For example, <code>section</code> should be wrapped as inline.
  • icon-minus-sign
  • icon-remove-sign
  • icon-ok-sign
    • -
-
-
-
    +
  • icon-question-sign
  • icon-info-sign
  • icon-screenshot
    • @@ -1526,10 +1515,7 @@ For example, <code>section</code> should be wrapped as inline.
  • icon-random
  • icon-comment
  • icon-magnet
    • -
-
-
-
    +
  • icon-chevron-up
  • icon-chevron-down
  • icon-retweet
    • @@ -1559,8 +1545,6 @@ For example, <code>section</code> should be wrapped as inline.
  • icon-briefcase
  • icon-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 not cost to you as developers. As a thank you, we ask you to include an optional link back to Glyphicons whenever practical.

diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index a474ac861..76550fd79 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1337,9 +1337,7 @@

{{_i}}Icon glyphs{{/i}}

{{_i}}140 icons in sprite form, available in dark gray (default) and white, provided by Glyphicons.{{/i}}

-
-
-
    +
    • icon-glass
    • icon-music
    • icon-search
      • @@ -1368,10 +1366,7 @@
    • icon-download
    • icon-upload
    • icon-inbox
      • -
    -
-
-
    +
  • icon-play-circle
  • icon-repeat
  • icon-refresh
    • @@ -1400,10 +1395,7 @@
  • icon-align-right
  • icon-align-justify
  • icon-list
    • -
-
-
-
    +
  • icon-indent-left
  • icon-indent-right
  • icon-facetime-video
    • @@ -1432,10 +1424,7 @@
  • icon-minus-sign
  • icon-remove-sign
  • icon-ok-sign
    • -
-
-
-
    +
  • icon-question-sign
  • icon-info-sign
  • icon-screenshot
    • @@ -1464,10 +1453,7 @@
  • icon-random
  • icon-comment
  • icon-magnet
    • -
-
-
-
    +
  • icon-chevron-up
  • icon-chevron-down
  • icon-retweet
    • @@ -1497,8 +1483,6 @@
  • icon-briefcase
  • icon-fullscreen
-
-

Glyphicons attribution

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