From 1fc4491cd6f18809468dfc73ce5e55ac87352d1d Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 11:22:33 -0700 Subject: simplify drop down logic - fix color of search hover for ie --- docs/assets/js/application.js | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) (limited to 'docs') 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; }); -- cgit v1.2.3 From b18e76f99072fe94f771ad30e492f2d8aca463cb Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 12:19:01 -0700 Subject: introduce .fill class to top-nav for overflow bug --- docs/assets/css/docs.css | 3 +++ docs/index.html | 2 ++ 2 files changed, 5 insertions(+) (limited to 'docs') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index ede141ce5..2f2f096ca 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -223,6 +223,9 @@ div.topbar-wrapper div.topbar { margin: 0 -20px; padding-left: 20px; padding-right: 20px; +} + +div.topbar-wrapper div.topbar .fill { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; diff --git a/docs/index.html b/docs/index.html index 7244191c9..7738b4a6e 100644 --- a/docs/index.html +++ b/docs/index.html @@ -32,6 +32,7 @@
+

Bootstrap

    @@ -879,6 +880,7 @@

    Fixed topbar

    +

    Project Name

      -- cgit v1.2.3 From 22dbf9d8e4fc5568d9d49b40d1c1020fbab064c9 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 13:36:06 -0700 Subject: fix up the modals for ie8 --- docs/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/index.html b/docs/index.html index 7738b4a6e..135483a83 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1101,7 +1101,7 @@

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

    -
    +
    @@ -1169,7 +1169,7 @@ Lorem ipsum dolar sit amet illo error ipsum verita
    - +
    -- cgit v1.2.3 From 2aeed35f24ad1ba3fa07c4d76fa3664dda91508a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 21 Aug 2011 17:30:45 -0700 Subject: pull filter gradients out completely because IE can't render them correctly in half of all instances and they are performance problems with them; tweak alert message styles, particularly close button; --- docs/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/index.html b/docs/index.html index 7244191c9..18be5f158 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1167,7 +1167,7 @@ Lorem ipsum dolar sit amet illo error ipsum verita
- + -- cgit v1.2.3 From e1e4ceee3f72d0892bf84aa7a1c7f1bdb719032e Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 18:07:47 -0700 Subject: fix disabled button for ie 8 and below --- docs/index.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/index.html b/docs/index.html index 135483a83..a9351d861 100644 --- a/docs/index.html +++ b/docs/index.html @@ -857,6 +857,7 @@

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 @@ -864,8 +865,8 @@

Buttons

- - + +
-- cgit v1.2.3 From 48c3c6f1b67b1f2a2f2ea499cef65bdfd27dc21d Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 18:14:53 -0700 Subject: make topbar .fill wrap --- docs/assets/css/docs.css | 4 +-- docs/index.html | 80 +++++++++++++++++++++++++----------------------- 2 files changed, 43 insertions(+), 41 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 2f2f096ca..bae49064a 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -221,11 +221,11 @@ div.topbar-wrapper { div.topbar-wrapper div.topbar { position: absolute; margin: 0 -20px; - padding-left: 20px; - padding-right: 20px; } div.topbar-wrapper div.topbar .fill { + padding-left: 20px; + padding-right: 20px; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; diff --git a/docs/index.html b/docs/index.html index a9351d861..b9fffce97 100644 --- a/docs/index.html +++ b/docs/index.html @@ -32,22 +32,23 @@
-
-
-

Bootstrap

- +
+
+

Bootstrap

+ +
@@ -881,29 +882,30 @@

Fixed topbar

-
-
-

Project Name

- -
- -
- +
+
+

Project Name

+ +
+ +
+ +
-- cgit v1.2.3 From f17b2633adb016ef58423c083d2a377368fc51c7 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 19:56:43 -0700 Subject: fix btn borders ie7/ie8 --- docs/index.html | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'docs') diff --git a/docs/index.html b/docs/index.html index b9fffce97..686115684 100644 --- a/docs/index.html +++ b/docs/index.html @@ -843,8 +843,10 @@

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!

@@ -866,8 +868,10 @@

Buttons

- - +
+ + +
-- cgit v1.2.3 From 80e0e9c41309f0ac525aa6f67bccb91916637351 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 21 Aug 2011 20:03:12 -0700 Subject: updated list html, tweaks to patterns --- docs/index.html | 76 ++++++++++++++++++++++++--------------------------------- 1 file changed, 32 insertions(+), 44 deletions(-) (limited to 'docs') diff --git a/docs/index.html b/docs/index.html index 18be5f158..efcf19746 100644 --- a/docs/index.html +++ b/docs/index.html @@ -359,64 +359,54 @@

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
@@ -1172,8 +1162,6 @@ Lorem ipsum dolar sit amet illo error ipsum verita
- - -- cgit v1.2.3