From 1ec6628e8005b17ecf16b194450874d8e988a45d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 1 Feb 2012 23:10:00 -0800 Subject: add note for icon class usage per #1501 --- docs/base-css.html | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index a198064f8..f6fcda10c 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1469,6 +1469,10 @@ 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 99f395bcd7ad18ec1ef63b88516e98b294b5bc12 Mon Sep 17 00:00:00 2001 From: Kyle Robinson Young Date: Wed, 1 Feb 2012 23:30:37 -0800 Subject: Typo fixes --- docs/base-css.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 5176c3ecf..efe55cbcf 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -530,7 +530,7 @@ For example, <code>section</code> should be wrapped as inline. .table-bordered - Rounds corners and adds outter border + Rounds corners and adds outer border Zebra-stripe @@ -1446,7 +1446,7 @@ For example, <code>section</code> should be wrapped as inline.
- Heads up! Icon classes are echoed via CSS :after. In the docs, we show a light red background color on hover to hightlight the icon's size. + Heads up! Icon classes are echoed via CSS :after. In the docs, we show a light red background color on hover to highlight the icon's size.

-- cgit v1.2.3 From dfdc63e87293efec9196897079ce3826a1a57275 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 2 Feb 2012 09:31:07 -0800 Subject: fix incorrect use of 'caret' --- 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 f6fcda10c..38f851164 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 carets into their unicode characters for proper rendering.

+

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

 <p>Sample text here...</p>
-- cgit v1.2.3 From cf488c2800293f4f243f59658b691741f4b78175 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 2 Feb 2012 09:33:18 -0800 Subject: fix incorrect uses of it's in the docs --- 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 38f851164..ac297c645 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1056,7 +1056,7 @@ For example, <code>section</code> should be wrapped as inline.

Redesigned browser states

-

Bootstrap features styles for browser-supported focused and disabled states. We remove the default Webkit outline and apply a box-shadow in it's place for :focus.

+

Bootstrap features styles for browser-supported focused and disabled states. We remove the default Webkit outline and apply a box-shadow in its place for :focus.

Form validation

It also includes validation styles for errors, warnings, and success. To use, add the error class to the surrounding .control-group.

-- cgit v1.2.3 From 9ab843b936a6bc9889f0f55a83f13cb25a3990bd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 2 Feb 2012 09:57:22 -0800 Subject: add mention of classes to use for button sizes --- 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 8c504d814..3c9e9a187 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1262,7 +1262,7 @@ For example, <code>section</code> should be wrapped as inline.

Multiple sizes

-

Fancy larger or smaller buttons? Have at it!

+

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

Primary action Action -- cgit v1.2.3 From ac98cee6092738eb431ebd4c944886358dab721f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 4 Feb 2012 18:26:04 -0800 Subject: allow alternate form layouts to hide inputs with .hide on them --- 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 3c9e9a187..48f042417 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -886,7 +886,7 @@ For example, <code>section</code> should be wrapped as inline.

Inputs are block level to start. For .form-inline and .form-horizontal, we use inline-block.

-
+ -- cgit v1.2.3 From 679cd5ea02ca83d9c3755d6ac74f4a0bacd02897 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 4 Feb 2012 22:38:49 -0800 Subject: #1706: protocol independent html5shim added, and moved after the CSS for loading time's sake --- docs/base-css.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 48f042417..1e9f6e8c4 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -7,17 +7,17 @@ - - - + + + -- cgit v1.2.3 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 83cb1053178241d95b0f53da062a4b742d0313cc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Feb 2012 01:36:11 -0800 Subject: adding code snippets to form examples --- docs/base-css.html | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 7f409e019..f84cbe774 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -852,9 +852,9 @@ For example, <code>section</code> should be wrapped as inline.

Example forms using just form controls, no extra markup

-

Basic form

+

Basic form

With v2.0, we have lighter and smarter defaults for form styles. No extra markup, just form controls.

@@ -866,11 +866,21 @@ For example, <code>section</code> should be wrapped as inline. +
+<form class="well">
+  <label>Label name</label>
+  <input type="text" class="span3" placeholder="Type something…"> <span class="help-inline">Associated help text!</span>
+  <label class="checkbox">
+    <input type="checkbox"> Check me out
+  </label>
+  <button type="submit" class="btn">Submit</button>
+</form>
+
-

Search form

+

Search form

Reflecting default WebKit styles, just add .form-search for extra rounded search fields.

@@ -878,11 +888,17 @@ For example, <code>section</code> should be wrapped as inline. +
+<form class="well form-search">
+  <input type="text" class="input-medium search-query">
+  <button type="submit" class="btn">Search</button>
+</form>
+
-

Inline form

+

Inline form

Inputs are block level to start. For .form-inline and .form-horizontal, we use inline-block.

@@ -891,6 +907,13 @@ For example, <code>section</code> should be wrapped as inline. +
+<form class="well form-inline">
+  <input type="text" class="input-small" placeholder="Email">
+  <input type="password" class="input-small" placeholder="Password">
+  <button type="submit" class="btn">Go</button>
+</form>
+
-- cgit v1.2.3 From abf4ecac4dbd378a4985880e27f2897ebca75e7b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Feb 2012 01:41:45 -0800 Subject: add another code example for horizontal forms --- docs/base-css.html | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index f84cbe774..22025bbb2 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -869,7 +869,8 @@ For example, <code>section</code> should be wrapped as inline. 
 <form class="well">
   <label>Label name</label>
-  <input type="text" class="span3" placeholder="Type something…"> <span class="help-inline">Associated help text!</span>
+  <input type="text" class="span3" placeholder="Type something…">
+  <span class="help-inline">Associated help text!</span>
   <label class="checkbox">
     <input type="checkbox"> Check me out
   </label>
@@ -983,6 +984,22 @@ For example, <code>section</code> should be wrapped as inline.
+

Example markup

+

Given the above example form layout, here's the markup associated with the first input and control group.

+
+<form class="form-horizontal">
+  <fieldset>
+    <legend>Legend text</legend>
+    <div class="control-group">
+      <label class="control-label" for="input01">Text input</label>
+      <div class="controls">
+        <input type="text" class="input-xlarge" id="input01">
+        <p class="help-block">Supporting help text</p>
+      </div>
+    </div>
+  </fieldset>
+</form>
+

What's included

-- cgit v1.2.3 From f59b7ce8ea0051287488ff2119dc29a066429eaa Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Feb 2012 01:43:22 -0800 Subject: add mention of required classes to horizontal forms --- 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 22025bbb2..b345a8434 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -985,7 +985,7 @@ For example, <code>section</code> should be wrapped as inline.

Example markup

-

Given the above example form layout, here's the markup associated with the first input and control group.

+

Given the above example form layout, here's the markup associated with the first input and control group. The .control-group, .control-label, and .controls classes are all required for styling.

 <form class="form-horizontal">
   <fieldset>
-- 
cgit v1.2.3


From 8a8daca71e7c979cc2cac6392e9cf810428a0423 Mon Sep 17 00:00:00 2001
From: Aditya Panchal 
Date: Sun, 5 Feb 2012 22:04:46 -0600
Subject: Fixed a typo in base-css.html which allows the user icon to be shown
 on the example button

---
 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 60b6edfe1..1b8e3349f 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1495,7 +1495,7 @@ For example, <code>section</code> should be wrapped as inline.
- User + User
  • Edit
    • -- cgit v1.2.3 From 575b82473f8d248ca3782fa86ce1c92eea03905c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 6 Feb 2012 23:34:03 -0800 Subject: rearrange some of the docs on buttons to show examples of all possible renderings along with code snippets and note about usage; also fix the portrait tablet media query --- docs/base-css.html | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index b345a8434..a7dcbff19 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1289,17 +1289,10 @@ For example, <code>section</code> should be wrapped as inline.

    Buttons for actions

    As a convention, buttons should only be used for actions while hyperlinks are to be used for objects. For instance, "Download" should be a button while "recent activity" should be a link.

    +

    Button styles can be applied to anything with the .btn class applied. However, typically you'll want to apply these to only <a> and <button> elements.

    +

    Cross browser compatibility

    +

    IE9 doesn't crop background gradients on rounded corners, so we remove it. Related, IE9 jankifies disabled button elements, rendering text gray with a nasty text-shadow that we cannot fix.

    -
    -

    For anchors and forms

    -

    Button styles can be applied to anything with the .btn applied. However, typically you'll want to apply these to only <a> and <button> elements.

    -
    -
    -

    Note: All buttons must include the .btn class. Button styles should be applied to <button> and <a> elements for consistency.

    -
    -
- -

Multiple sizes

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

@@ -1311,8 +1304,7 @@ For example, <code>section</code> should be wrapped as inline. Primary action Action

-
-
+

Disabled state

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

@@ -1325,14 +1317,27 @@ For example, <code>section</code> should be wrapped as inline.

-

Cross browser compatibility

-

In IE9, we drop the gradient on all buttons in favor of rounded corners as IE9 doesn't crop background gradients to the corners.

-

Related, IE9 jankifies disabled button elements, rendering text gray with a nasty text-shadow—unfortunately we can't fix this.

+

One class, multiple tags

+

Use the .btn class on an <a>, <button>, or <input> element.

+
+Link + + + +
+
+<a class="btn" href="">Link</a>
+<button class="btn" type="submit">
+  Button
+</button>
+<input class="btn" type="button" 
+         value="Input">
+<input class="btn" type="submit" 
+         value="Submit">
+
+

As a best practice, try to match the element for you context to ensure matching cross-browser rendering. If you have an input, use an <input type="submit"> for your button.

- -
- -- 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 From a72ef967ba7e4870fb1d737dedf8bf8a10ae6587 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 11:08:33 -0800 Subject: re-add protocol to the shim --- docs/base-css.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 845f0460e..4678bd616 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -7,17 +7,17 @@ + + + - - - -- cgit v1.2.3 From c02df9390330b3fa6b9c7cd0b4390093c163fae9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 11:08:58 -0800 Subject: move shim after css --- docs/base-css.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 4678bd616..cbe353985 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -7,17 +7,17 @@ - - - + + + -- cgit v1.2.3 From a57dbada0f17bc3dfd4a77de436a5e590fb0d1e3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 15:18:20 -0800 Subject: change classname from .btn-dark to .btn-inverse, change use text --- docs/base-css.html | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index cbe353985..292e4a396 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1285,6 +1285,11 @@ For example, <code>section</code> should be wrapped as inline. Danger .btn-danger Indicates a dangerous or potentially negative action + + + Inverse + .btn-inverse + Alternate dark gray button, not tied to a semantic action or use -- cgit v1.2.3 From be6fdd9a62a41bf4316dbe4c139787a568ac5bb7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 20:10:48 -0800 Subject: add docs for alt form control sizing per #1700 --- docs/base-css.html | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 292e4a396..d67d1bd55 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1121,7 +1121,7 @@ For example, <code>section</code> should be wrapped as inline.
Extending form controls
- +
@@ -1150,6 +1150,15 @@ For example, <code>section</code> should be wrapped as inline.

Use the same .span* classes from the grid system for input sizes.

+
+ +
+ + + +

You may also use static classes that don't map to the grid, adapt to the responsive CSS styles, or account for varying types of controls (e.g., input vs. select).

+
+
-- cgit v1.2.3 From 61e2201c64a9a61792680c2b1d236b0a753ed182 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 16 Feb 2012 21:25:40 -0800 Subject: fix buttons focus state and swap a buttons for button buttons --- docs/base-css.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index d67d1bd55..7ab18108c 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1266,37 +1266,37 @@ For example, <code>section</code> should be wrapped as inline. - Default + .btn Standard gray button with gradient - Primary + .btn-primary Provides extra visual weight and identifies the primary action in a set of buttons - Info + .btn-info Used as an alternate to the default styles - Success + .btn-success Indicates a successful or positive action - Warning + .btn-warning Indicates caution should be taken with this action - Danger + .btn-danger Indicates a dangerous or potentially negative action - Inverse + .btn-inverse Alternate dark gray button, not tied to a semantic action or use -- cgit v1.2.3 From 268e7d67abb32ed5cfc575c71f03d635672e781c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 16 Feb 2012 21:28:16 -0800 Subject: add mini buttons per #1971 --- docs/base-css.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 7ab18108c..c04dc7daa 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1313,7 +1313,7 @@ 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.

+

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

@@ -1322,6 +1322,10 @@ For example, <code>section</code> should be wrapped as inline.

+

+ + +


Disabled state

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

-- cgit v1.2.3