Merge branch 'misc_css_fixes'

Conflicts: bootstrap-1.0.0.css lib/patterns.less
author: Jacob Thornton <[email protected]> 2011-08-21 21:42:10 -0700
committer: Jacob Thornton <[email protected]> 2011-08-21 21:42:10 -0700
commit: b54dc13535ce50d26f3814a0246aae769ff45fc8 (patch)
tree: f55f48da03677560ff21d245c24dccfed134df0d /docs
parent: 14b77f3a2164a5348ec8d9841ddc3ace27a64e37 (diff)
parent: 985ee6455a0ee86153cb8bca29f5fbf7b5dbfcf6 (diff)
download: bootstrap-b54dc13535ce50d26f3814a0246aae769ff45fc8.tar.xz
bootstrap-b54dc13535ce50d26f3814a0246aae769ff45fc8.zip
3 files changed, 97 insertions, 108 deletions
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index ede141ce5..96c9ffb97 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -221,6 +221,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;
@@ -253,4 +256,10 @@ div.popover-well div.popover-menu-wrapper {
 img.large-bird {
   margin: 5px 0 0 310px;
   opacity: .1;
+}
+
+/* Pretty Print
+-------------------------------------------------- */
+PRE.prettyprint {
+  overflow: hidden;
 }
 \ No newline at end of file
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 ce2a96c22..cfd77581c 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -32,21 +32,23 @@
   <body onload="prettyPrint();">
 
     <div class="topbar">
-      <div class="container">
-        <h3><a href="#">Bootstrap</a></h3>
-        <ul>
-          <li class="active"><a href="#masthead">Overview</a></li>
-          <li><a href="#about">About</a></li>
-          <li><a href="#grid-system">Grid</a></li>
-          <li><a href="#layouts">Layouts</a></li>
-          <li><a href="#typography">Typography</a></li>
-          <li><a href="#tables">Tables</a></li>
-          <li><a href="#forms">Forms</a></li>
-          <li><a href="#navigation">Navigation</a></li>
-          <li><a href="#alerts">Alerts</a></li>
-          <li><a href="#popovers">Popovers</a></li>
-          <li><a href="#less">Less</a></li>
-        </ul>
+      <div class="fill">
+        <div class="container">
+          <h3><a href="#">Bootstrap</a></h3>
+          <ul>
+            <li class="active"><a href="#masthead">Overview</a></li>
+            <li><a href="#about">About</a></li>
+            <li><a href="#grid-system">Grid</a></li>
+            <li><a href="#layouts">Layouts</a></li>
+            <li><a href="#typography">Typography</a></li>
+            <li><a href="#tables">Tables</a></li>
+            <li><a href="#forms">Forms</a></li>
+            <li><a href="#navigation">Navigation</a></li>
+            <li><a href="#alerts">Alerts</a></li>
+            <li><a href="#popovers">Popovers</a></li>
+            <li><a href="#less">Less</a></li>
+          </ul>
+        </div>
       </div>
     </div>
 
@@ -359,64 +361,54 @@
   <div class="span4 columns">
     <h4>Unordered <code>&lt;ul&gt;</code></h4>
     <ul>
-      <li>Jeremy Bixby</li>
-      <li>Robert Dezure</li>
-      <li>Josh Washington</li>
-      <li>Anton Capresi</li>
-      <li>My Team Mates
+      <li>Lorem ipsum dolor sit amet</li>
+      <li>Consectetur adipiscing elit</li>
+      <li>Integer molestie lorem at massa</li>
+      <li>Facilisis in pretium nisl aliquet</li>
+      <li>Nulla volutpat aliquam velit
         <ul>
-          <li>George Castanza</li>
-          <li>Jerry Seinfeld</li>
-          <li>Cosmo Kramer</li>
-          <li>Elaine Bennis</li>
-          <li>Newman</li>
+          <li>Phasellus iaculis neque</li>
+          <li>Purus sodales ultricies</li>
+          <li>Vestibulum laoreet porttitor sem</li>
+          <li>Ac tristique libero volutpat at</li>
         </ul>
       </li>
-      <li>John Jacob</li>
-      <li>Paul Pierce</li>
-      <li>Kevin Garnett</li>
+      <li>Faucibus porta lacus fringilla vel</li>
+      <li>Aenean sit amet erat nunc</li>
+      <li>Eget porttitor lorem</li>
     </ul>
   </div>
   <div class="span4 columns">
     <h4>Unstyled <code>&lt;ul.unstyled&gt;</code></h4>
     <ul class="unstyled">
-      <li>Jeremy Bixby</li>
-      <li>Robert Dezure</li>
-      <li>Josh Washington</li>
-      <li>Anton Capresi</li>
-      <li>My Team Mates
+      <li>Lorem ipsum dolor sit amet</li>
+      <li>Consectetur adipiscing elit</li>
+      <li>Integer molestie lorem at massa</li>
+      <li>Facilisis in pretium nisl aliquet</li>
+      <li>Nulla volutpat aliquam velit
         <ul>
-          <li>George Castanza</li>
-          <li>Jerry Seinfeld</li>
-          <li>Cosmo Kramer</li>
-          <li>Elaine Bennis</li>
-          <li>Newman</li>
+          <li>Phasellus iaculis neque</li>
+          <li>Purus sodales ultricies</li>
+          <li>Vestibulum laoreet porttitor sem</li>
+          <li>Ac tristique libero volutpat at</li>
         </ul>
       </li>
-      <li>John Jacob</li>
-      <li>Paul Pierce</li>
-      <li>Kevin Garnett</li>
+      <li>Faucibus porta lacus fringilla vel</li>
+      <li>Aenean sit amet erat nunc</li>
+      <li>Eget porttitor lorem</li>
     </ul>
   </div>
   <div class="span4 columns">
     <h4>Ordered <code>&lt;ol&gt;</code></h4>
     <ol>
-      <li>Jeremy Bixby</li>
-      <li>Robert Dezure</li>
-      <li>Josh Washington</li>
-      <li>Anton Capresi</li>
-      <li>My Team Mates
-        <ol>
-          <li>George Castanza</li>
-          <li>Jerry Seinfeld</li>
-          <li>Cosmo Kramer</li>
-          <li>Elaine Bennis</li>
-          <li>Newman</li>
-        </ol>
-      </li>
-      <li>John Jacob</li>
-      <li>Paul Pierce</li>
-      <li>Kevin Garnett</li>
+      <li>Lorem ipsum dolor sit amet</li>
+      <li>Consectetur adipiscing elit</li>
+      <li>Integer molestie lorem at massa</li>
+      <li>Facilisis in pretium nisl aliquet</li>
+      <li>Nulla volutpat aliquam velit</li>
+      <li>Faucibus porta lacus fringilla vel</li>
+      <li>Aenean sit amet erat nunc</li>
+      <li>Eget porttitor lorem</li>
     </ol>
   </div>
   <div class="span4 columns">
@@ -759,8 +751,7 @@
         </div>
       </div> <!-- /clearfix -->
       <div class="actions">
-        <button type="submit" class="btn primary">Save Changes</button>
-        <button type="reset" class="btn">Cancel</button>
+        <button type="submit" class="btn primary">Save Changes</button>&nbsp;<button type="reset" class="btn">Cancel</button>
       </div>
     </fieldset>
   </form>
@@ -823,8 +814,7 @@
         </div> <!-- /clearfix -->
       </fieldset>
       <div class="actions">
-        <button type="submit" class="btn primary">Save Changes</button>
-        <button type="reset" class="btn">Cancel</button>
+        <button type="submit" class="btn primary">Save Changes</button>&nbsp;<button type="reset" class="btn">Cancel</button>
       </div>
     </form>
   </div>
@@ -840,8 +830,9 @@
     <h3>Example buttons</h3>
     <p>Button styles can be applied to anything with the <code>.btn</code> applied. Typically you’ll want to apply these to only <code>&lt;a&gt;</code>, <code>&lt;button&gt;</code>, and select <code>&lt;input&gt;</code> elements. Here’s how it looks:</p>
     <div class="well" style="padding: 14px 19px;">
-      <button type="submit" class="btn primary">Submit</button>
-      <button type="submit" class="btn">Cancel</button>
+      <form>
+        <button type="submit" class="btn primary">Submit</button>&nbsp;<button type="submit" class="btn">Cancel</button>
+      </form>
     </div>
     <h3>Alternate sizes</h3>
     <p>Fancy larger or smaller buttons? Have at it!</p>
@@ -855,6 +846,7 @@
     </div>
     <h3>Disabled state</h3>
     <p>For buttons that are not active or are disabled by the app for one reason or another, use the disabled state. That’s <code>.disabled</code> for links and <code>:disabled</code> for <code>&lt;button&gt;</code> elements.</p>
+    <p><strong>Note:</strong> If you're developing for older browsers like IE8 or below -- you're going to want to use the <code>.disabled</code> class for <code>&lt;button&gt;</code> elements as well.
     <h4>Links</h4>
     <div class="well">
       <a href="#" class="btn large primary disabled">Primary action</a>
@@ -862,8 +854,9 @@
     </div>
     <h4>Buttons</h4>
     <div class="well">
-      <button class="btn large primary" disabled>Primary action</button>
-      <button class="btn large" disabled>Action</button>
+      <form>
+        <button class="btn large primary disabled" disabled>Primary action</button>&nbsp;<button class="btn large disabled" disabled>Action</button>
+      </form>
     </div>
   </div>
 </div>
@@ -878,28 +871,30 @@
   <h2>Fixed topbar</h2>
   <div class="topbar-wrapper" style="z-index: 5;">
     <div class="topbar">
-      <div class="container fixed">
-        <h3><a href="#">Project Name</a></h3>
-        <ul>
-          <li class="active"><a href="#">Home</a></li>
-          <li><a href="#">Link</a></li>
-          <li><a href="#">Link</a></li>
-          <li><a href="#">Link</a></li>
-        </ul>
-        <form action="">
-          <input type="text" placeholder="Search" />
-        </form>
-        <ul class="nav secondary-nav">
-          <li class="menu">
-            <a href="#" class="menu">Dropdown</a>
-            <ul class="menu-dropdown">
-              <li><a href="#">Secondary link</a></li>
-              <li><a href="#">Something else here</a></li>
-              <li class="divider"></li>
-              <li><a href="#">Another link</a></li>
-            </ul>
-          </li>
-        </ul>
+      <div class="fill">
+        <div class="container fixed">
+          <h3><a href="#">Project Name</a></h3>
+          <ul>
+            <li class="active"><a href="#">Home</a></li>
+            <li><a href="#">Link</a></li>
+            <li><a href="#">Link</a></li>
+            <li><a href="#">Link</a></li>
+          </ul>
+          <form action="">
+            <input type="text" placeholder="Search" />
+          </form>
+          <ul class="nav secondary-nav">
+            <li class="menu">
+              <a href="#" class="menu">Dropdown</a>
+              <ul class="menu-dropdown">
+                <li><a href="#">Secondary link</a></li>
+                <li><a href="#">Something else here</a></li>
+                <li class="divider"></li>
+                <li><a href="#">Another link</a></li>
+              </ul>
+            </li>
+          </ul>
+        </div>
       </div>
     </div>
   </div> <!-- topbar-wrapper -->
@@ -1098,7 +1093,7 @@
       <p>Modals&mdash;dialogs or lightboxes&mdash;are great for contextual actions in situations where it’s important that the background context be maintained.</p>
     </div>
     <div class="span12 columns">
-      <div class="well" style="background-color: rgba(0,0,0,0.5); border: none; padding: 40px;">
+      <div class="well" style="background-color: #888; border: none; padding: 40px;">
         <!-- Modal -->
         <div class="modal" style="position: relative; top: auto; left: auto; margin: 0 auto; z-index: 1">
           <div class="modal-header">
@@ -1166,13 +1161,11 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
               </div>
             </div>
           </div>
-          <img class="large-bird" src="assets/img/bird.png" width="220px" height="48px">
+          <img class="large-bird" src="assets/img/bird.png" width="220px" height="145px">
         </div>
       </div>
     </div>
   </div> <!-- /row -->
-
-
 </section>
author	Jacob Thornton <[email protected]>	2011-08-21 21:42:10 -0700
committer	Jacob Thornton <[email protected]>	2011-08-21 21:42:10 -0700
commit	b54dc13535ce50d26f3814a0246aae769ff45fc8 (patch)
tree	f55f48da03677560ff21d245c24dccfed134df0d /docs
parent	14b77f3a2164a5348ec8d9841ddc3ace27a64e37 (diff)
parent	985ee6455a0ee86153cb8bca29f5fbf7b5dbfcf6 (diff)
download	bootstrap-b54dc13535ce50d26f3814a0246aae769ff45fc8.tar.xz bootstrap-b54dc13535ce50d26f3814a0246aae769ff45fc8.zip