From a98d2cccb8076b106e08e7ca76e59af013ab2851 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 21 Aug 2011 20:47:24 -0700 Subject: merge in master, resolve conflicts --- docs/assets/css/docs.css | 3 + docs/assets/js/application.js | 21 +---- docs/index.html | 187 ++++++++++++++++++++++++++++-------------- 3 files changed, 133 insertions(+), 78 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 2d17370c2..4fbfac9d3 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -195,6 +195,9 @@ div.topbar-wrapper { div.topbar-wrapper div.topbar { position: absolute; margin: 0 -20px; +} + +div.topbar-wrapper div.topbar .fill { padding-left: 20px; padding-right: 20px; -webkit-border-radius: 4px; diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 0de6ca96f..3319e607d 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -42,25 +42,12 @@ $(document).ready(function(){ // Dropdown example for topbar nav // =============================== - $("body").bind("click", function(e) { - $("ul.menu-dropdown").hide(); - $('a.menu').parent("li").removeClass("open").children("ul.menu-dropdown").hide(); + $("body").bind("click", function (e) { + $('a.menu').parent("li").removeClass("open"); }); - $("a.menu").click(function(e) { - var $target = $(this); - var $parent = $target.parent("li"); - var $siblings = $target.siblings("ul.menu-dropdown"); - var $parentSiblings = $parent.siblings("li"); - if ($parent.hasClass("open")) { - $parent.removeClass("open"); - $siblings.hide(); - } else { - $parent.addClass("open"); - $siblings.show(); - } - $parentSiblings.children("ul.menu-dropdown").hide(); - $parentSiblings.removeClass("open"); + $("a.menu").click(function (e) { + var $li = $(this).parent("li").toggleClass('open'); return false; }); diff --git a/docs/index.html b/docs/index.html index 940478c2d..311edc093 100644 --- a/docs/index.html +++ b/docs/index.html @@ -34,21 +34,23 @@
-
-

Bootstrap

- +
+
+

Bootstrap

+ +
@@ -377,70 +379,59 @@
-

Lists

Unordered <ul>

    -
  • Jeremy Bixby
    • -
  • Robert Dezure
    • -
  • Josh Washington
    • -
  • Anton Capresi
    • -
  • My Team Mates +
  • Lorem ipsum dolor sit amet
    • +
  • Consectetur adipiscing elit
    • +
  • Integer molestie lorem at massa
    • +
  • Facilisis in pretium nisl aliquet
    • +
  • Nulla volutpat aliquam velit
      -
    • George Castanza
      • -
    • Jerry Seinfeld
      • -
    • Cosmo Kramer
      • -
    • Elaine Bennis
      • -
    • Newman
      • +
    • Phasellus iaculis neque
      • +
    • Purus sodales ultricies
      • +
    • Vestibulum laoreet porttitor sem
      • +
    • Ac tristique libero volutpat at
    • -
  • John Jacob
    • -
  • Paul Pierce
    • -
  • Kevin Garnett
    • +
  • Faucibus porta lacus fringilla vel
    • +
  • Aenean sit amet erat nunc
    • +
  • Eget porttitor lorem

Unstyled <ul.unstyled>

    -
  • Jeremy Bixby
    • -
  • Robert Dezure
    • -
  • Josh Washington
    • -
  • Anton Capresi
    • -
  • My Team Mates +
  • Lorem ipsum dolor sit amet
    • +
  • Consectetur adipiscing elit
    • +
  • Integer molestie lorem at massa
    • +
  • Facilisis in pretium nisl aliquet
    • +
  • Nulla volutpat aliquam velit
      -
    • George Castanza
      • -
    • Jerry Seinfeld
      • -
    • Cosmo Kramer
      • -
    • Elaine Bennis
      • -
    • Newman
      • +
    • Phasellus iaculis neque
      • +
    • Purus sodales ultricies
      • +
    • Vestibulum laoreet porttitor sem
      • +
    • Ac tristique libero volutpat at
    • -
  • John Jacob
    • -
  • Paul Pierce
    • -
  • Kevin Garnett
    • +
  • Faucibus porta lacus fringilla vel
    • +
  • Aenean sit amet erat nunc
    • +
  • Eget porttitor lorem

Ordered <ol>

    -
  1. Jeremy Bixby
    2. -
  2. Robert Dezure
    3. -
  3. Josh Washington
    4. -
  4. Anton Capresi
    5. -
  5. My Team Mates -
      -
    1. George Castanza
      2. -
    2. Jerry Seinfeld
      3. -
    3. Cosmo Kramer
      4. -
    4. Elaine Bennis
      5. -
    5. Newman
      6. -
    -
    6. -
  6. John Jacob
    7. -
  7. Paul Pierce
    8. -
  8. Kevin Garnett
    9. +
  9. Lorem ipsum dolor sit amet
    10. +
  10. Consectetur adipiscing elit
    11. +
  11. Integer molestie lorem at massa
    12. +
  12. Facilisis in pretium nisl aliquet
    13. +
  13. Nulla volutpat aliquam velit
    14. +
  14. Faucibus porta lacus fringilla vel
    15. +
  15. Aenean sit amet erat nunc
    16. +
  16. Eget porttitor lorem
@@ -794,10 +785,33 @@
+<<<<<<< .merge_file_CXRuoN

Stacked forms

Add .form-stacked to your form’s HTML and you’ll have labels on top of their fields instead of to their left. This works great if your forms are short or you have two columns of inputs for heavier forms.

+======= +
+
+

Buttons

+

As a convention, buttons are used for actions while links are used for objects. For instance, "Download" could be a button and "recent activity" could be a link.

+

All buttons default to a light gray style, but a blue .primary class is available. Plus, rolling your own styles is easy peasy.

+
+
+

Example buttons

+

Button styles can be applied to anything with the .btn applied. Typically you’ll want to apply these to only <a>, <button>, and select <input> elements. Here’s how it looks:

+
+
+ + +
+
+

Alternate sizes

+

Fancy larger or smaller buttons? Have at it!

+
+ Primary action + Action +>>>>>>> .merge_file_hNGrGI
@@ -860,6 +874,7 @@
+<<<<<<< .merge_file_CXRuoN
@@ -897,6 +912,22 @@
+======= +

Disabled state

+

For buttons that are not active or are disabled by the app for one reason or another, use the disabled state. That’s .disabled for links and :disabled for <button> elements.

+

Note: If you're developing for older browsers like IE8 or below -- you're going to want to use the .disabled class for <button> elements as well. +

Links

+
+ Primary action + Action +
+

Buttons

+
+
+ + +
+>>>>>>> .merge_file_hNGrGI
@@ -912,6 +943,7 @@

Fixed topbar

+<<<<<<< .merge_file_CXRuoN

Project Name

    @@ -934,6 +966,32 @@
+======= +
+
+

Project Name

+ +
+ +
+ +
+>>>>>>> .merge_file_hNGrGI
@@ -1139,7 +1197,7 @@

Modals—dialogs or lightboxes—are great for contextual actions in situations where it’s important that the background context be maintained.

-
+
@@ -1209,12 +1267,19 @@ Lorem ipsum dolar sit amet illo error ipsum verita
- +<<<<<<< HEAD + +======= + +>>>>>>> 842ad01fce710c50dc9c0174ab790f91e66c46b1
+<<<<<<< .merge_file_CXRuoN +======= +>>>>>>> .merge_file_hNGrGI @@ -1392,4 +1457,4 @@ Lorem ipsum dolar sit amet illo error ipsum verita
- \ No newline at end of file + -- cgit v1.2.3