From 93fea1f1cf7902261a3743acadd9bb2a196e2190 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 4 Feb 2012 23:21:56 -0800 Subject: The < and > escapes have nothing to do with Unicode. --- docs/base-css.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 1e9f6e8c4..c37db8884 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -375,7 +375,7 @@ For example, <code>section</code> should be wrapped as inline.

Basic block

-

Use <pre> for multiple lines of code. Be sure to turn any angle brackets into unicode characters for proper rendering.

+

Use <pre> for multiple lines of code. Be sure to escape any angle brackets in the code for proper rendering.

 <p>Sample text here...</p>
-- cgit v1.2.3 From d7aefe67e3df78bde61eaa7ecab807bb03aeb1ef Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 10 Feb 2012 23:07:32 -0800 Subject: scope th bottom vertical-align to only thead, update code styles to include more comments in less file and scrollable option for pre tag --- docs/base-css.html | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 3317f9321..ac260bffb 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -385,6 +385,7 @@ For example, <code>section</code> should be wrapped as inline. </pre>

Note: Be sure to keep code within <pre> tags as close to the left as possible; it will render all tabs.

+

You may optionally add the .pre-scrollable class which will set a max-height of 350px and provide a y-axis scrollbar.

Google Prettify

-- cgit v1.2.3 From 722c75d1b19fbb9ed98be0afa54f4f79c9f7ee48 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 11 Feb 2012 00:07:05 -0800 Subject: update selectors for icons to include matcher for icon class in middle of class attr, remove docs mention of requiring icon-* first --- docs/base-css.html | 4 ---- 1 file changed, 4 deletions(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index ac260bffb..c0ad882a5 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1515,10 +1515,6 @@ For example, <code>section</code> should be wrapped as inline. <i class="icon-search icon-white"></i>

There are 120 classes to choose from for your icons. Just add an <i> tag with the right classes and you're set. You can find the full list in sprites.less or right here in this document.

-
- Heads up! - The .icon- class must be listed first in the class tag for proper CSS targeting. -

Use cases

-- cgit v1.2.3 From 8f1db4321a35851d5b726290b2d99e7ea1ec7239 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 11 Feb 2012 00:24:06 -0800 Subject: fix inline form checkbox/radios --- docs/base-css.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index c0ad882a5..09614af2a 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -907,7 +907,10 @@ For example, <code>section</code> should be wrapped as inline.
- + + 
 <form class="well form-inline">
-- 
cgit v1.2.3


From 2679c3ebe3bb21599826dd204b1c9df44d217497 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sat, 11 Feb 2012 10:13:53 -0800
Subject: remove the reset type from cancel buttons in forms examples per #1844

---
 docs/base-css.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 09614af2a..678504b72 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -984,7 +984,7 @@ For example, <code>section</code> should be wrapped as inline.
- +
@@ -1093,7 +1093,7 @@ For example, <code>section</code> should be wrapped as inline.
- +
@@ -1217,7 +1217,7 @@ For example, <code>section</code> should be wrapped as inline.
- +
-- cgit v1.2.3 From a497e9010a5fcf4fce7e7112a0d3f32da57e8adb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 11 Feb 2012 17:12:32 -0800 Subject: make button examples button element and add upgrade note on tooltip positions per #1532 --- docs/base-css.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 678504b72..2ee0f2d29 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1301,23 +1301,23 @@ For example, <code>section</code> should be wrapped as inline.

Multiple sizes

Fancy larger or smaller buttons? Add .btn-large or .btn-small for two additional sizes.

- Primary action - Action + +

- Primary action - Action + +


Disabled state

For disabled buttons, use .btn-disabled for links and :disabled for <button> elements.

- Primary action - Action + Primary link + Link

- - + +

-- cgit v1.2.3 From a84092d2257ba8e000e2c656e6cb1b8415d0d9ac Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 11 Feb 2012 17:25:47 -0800 Subject: update buttons docs for .disabled class per #1774 --- docs/base-css.html | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 2ee0f2d29..46cf982c6 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1310,15 +1310,19 @@ For example, <code>section</code> should be wrapped as inline.


Disabled state

-

For disabled buttons, use .btn-disabled for links and :disabled for <button> elements.

+

For disabled buttons, add the .disabled class to links and the disabled attribute for <button> elements.

Primary link Link

-

+

+

+ Heads up! + We use .disabled as a utility class here, similar to the common .active class, so no prefix is required. +

One class, multiple tags

-- cgit v1.2.3 From 2eedf60d6284f8eef256999d2a59dd18bcbd2b2a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 11 Feb 2012 22:34:41 -0800 Subject: write out icon classes explicitly to enable find via browser --- docs/base-css.html | 260 ++++++++++++++++++++++++++--------------------------- 1 file changed, 128 insertions(+), 132 deletions(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 88d98851c..845f0460e 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1358,144 +1358,140 @@ For example, <code>section</code> should be wrapped as inline.
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
    +
  • icon-glass
    • +
  • icon-music
    • +
  • icon-search
    • +
  • icon-envelope
    • +
  • icon-heart
    • +
  • icon-star
    • +
  • icon-star-empty
    • +
  • icon-user
    • +
  • icon-film
    • +
  • icon-th-large
    • +
  • icon-th
    • +
  • icon-th-list
    • +
  • icon-ok
    • +
  • icon-remove
    • +
  • icon-zoom-in
    • +
  • icon-zoom-out
    • +
  • icon-off
    • +
  • icon-signal
    • +
  • icon-cog
    • +
  • icon-trash
    • +
  • icon-home
    • +
  • icon-file
    • +
  • icon-time
    • +
  • icon-road
    • +
  • icon-download-alt
    • +
  • icon-download
    • +
  • icon-upload
    • +
  • icon-inbox
    • +
  • icon-play-circle
    • +
  • icon-repeat
    • +
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
    +
  • icon-refresh
    • +
  • icon-list-alt
    • +
  • icon-lock
    • +
  • icon-flag
    • +
  • icon-headphones
    • +
  • icon-volume-off
    • +
  • icon-volume-down
    • +
  • icon-volume-up
    • +
  • icon-qrcode
    • +
  • icon-barcode
    • +
  • icon-tag
    • +
  • icon-tags
    • +
  • icon-book
    • +
  • icon-bookmark
    • +
  • icon-print
    • +
  • icon-camera
    • +
  • icon-font
    • +
  • icon-bold
    • +
  • icon-italic
    • +
  • icon-text-height
    • +
  • icon-text-width
    • +
  • icon-align-left
    • +
  • icon-align-center
    • +
  • icon-align-right
    • +
  • icon-align-justify
    • +
  • icon-list
    • +
  • icon-indent-left
    • +
  • icon-indent-right
    • +
  • icon-facetime-video
    • +
  • icon-picture
    • +
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
    +
  • icon-pencil
    • +
  • icon-map-marker
    • +
  • icon-adjust
    • +
  • icon-tint
    • +
  • icon-edit
    • +
  • icon-share
    • +
  • icon-check
    • +
  • icon-move
    • +
  • icon-step-backward
    • +
  • icon-fast-backward
    • +
  • icon-backward
    • +
  • icon-play
    • +
  • icon-pause
    • +
  • icon-stop
    • +
  • icon-forward
    • +
  • icon-fast-forward
    • +
  • icon-step-forward
    • +
  • icon-eject
    • +
  • icon-chevron-left
    • +
  • icon-chevron-right
    • +
  • icon-plus-sign
    • +
  • icon-minus-sign
    • +
  • icon-remove-sign
    • +
  • icon-ok-sign
    • +
  • icon-question-sign
    • +
  • icon-info-sign
    • +
  • icon-screenshot
    • +
  • icon-remove-circle
    • +
  • icon-ok-circle
    • +
  • icon-ban-circle
    • +
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
    +
  • icon-arrow-left
    • +
  • icon-arrow-right
    • +
  • icon-arrow-up
    • +
  • icon-arrow-down
    • +
  • icon-share-alt
    • +
  • icon-resize-full
    • +
  • icon-resize-small
    • +
  • icon-plus
    • +
  • icon-minus
    • +
  • icon-asterisk
    • +
  • icon-exclamation-sign
    • +
  • icon-gift
    • +
  • icon-leaf
    • +
  • icon-fire
    • +
  • icon-eye-open
    • +
  • icon-eye-close
    • +
  • icon-warning-sign
    • +
  • icon-plane
    • +
  • icon-calendar
    • +
  • icon-random
    • +
  • icon-comment
    • +
  • icon-magnet
    • +
  • icon-chevron-up
    • +
  • icon-chevron-down
    • +
  • icon-retweet
    • +
  • icon-shopping-cart
    • +
  • icon-folder-close
    • +
  • icon-folder-open
    • +
  • icon-resize-vertical
    • +
  • icon-resize-horizontal
    • +
-- cgit v1.2.3