Permalink
Browse files

merge in master, resolve conflicts

  • Loading branch information...
1 parent 5cc933c commit a98d2cccb8076b106e08e7ca76e59af013ab2851 @mdo mdo committed Aug 22, 2011
Showing with 615 additions and 477 deletions.
  1. +252 −191 bootstrap-1.0.0.css
  2. +105 −105 bootstrap-1.0.0.min.css
  3. +3 −0 docs/assets/css/docs.css
  4. +4 −17 docs/assets/js/application.js
  5. +126 −61 docs/index.html
  6. +14 −14 lib/forms.less
  7. +68 −48 lib/patterns.less
  8. +4 −6 lib/preboot.less
  9. +9 −1 lib/scaffolding.less
  10. +30 −34 lib/tables.less
View

Large diffs are not rendered by default.

Oops, something went wrong.
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -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;
@@ -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;
});
View
@@ -34,21 +34,23 @@
<!-- Topbar
================================================== -->
<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>
@@ -377,70 +379,59 @@
</div>
</div> <!-- /row -->
- <!-- Types of Lists -->
<h2>Lists</h2>
<div class="row">
<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">
@@ -794,10 +785,33 @@
<br />
+<<<<<<< .merge_file_CXRuoN
<div class="row">
<div class="span4 columns">
<h2>Stacked forms</h2>
<p>Add <code>.form-stacked</code> 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.</p>
+=======
+<div class="row">
+ <div class="span4 columns">
+ <h2>Buttons</h2>
+ <p>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.</p>
+ <p>All buttons default to a light gray style, but a blue <code>.primary</code> class is available. Plus, rolling your own styles is easy peasy.</p>
+ </div>
+ <div class="span12 columns">
+ <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;">
+ <form>
+ <button type="submit" class="btn primary">Submit</button>
+ <button type="submit" class="btn">Cancel</button>
+ </form>
+ </div>
+ <h3>Alternate sizes</h3>
+ <p>Fancy larger or smaller buttons? Have at it!</p>
+ <div class="well">
+ <a href="#" class="btn large primary">Primary action</a>
+ <a href="#" class="btn large">Action</a>
+>>>>>>> .merge_file_hNGrGI
</div>
<div class="span12 columns">
<form action="" class="form-stacked">
@@ -860,6 +874,7 @@
</div>
</form>
</div>
+<<<<<<< .merge_file_CXRuoN
</div> <!-- /row -->
<div class="row">
@@ -897,6 +912,22 @@
<button class="btn large primary" disabled>Primary action</button>
<button class="btn large" disabled>Action</button>
</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>
+ <a href="#" class="btn large disabled">Action</a>
+ </div>
+ <h4>Buttons</h4>
+ <div class="well">
+ <form>
+ <button class="btn large primary disabled" disabled>Primary action</button>
+ <button class="btn large disabled" disabled>Action</button>
+ </form>
+>>>>>>> .merge_file_hNGrGI
</div>
</div> <!-- /row -->
</section>
@@ -912,6 +943,7 @@
<h2>Fixed topbar</h2>
<div class="topbar-wrapper" style="z-index: 5;">
<div class="topbar">
+<<<<<<< .merge_file_CXRuoN
<div class="container">
<h3><a href="#">Project Name</a></h3>
<ul>
@@ -934,6 +966,32 @@
</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>
+>>>>>>> .merge_file_hNGrGI
</div>
</div>
</div> <!-- topbar-wrapper -->
@@ -1139,7 +1197,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">
@@ -1209,12 +1267,19 @@ <h3 class="title">Popover Title</h3>
</div>
</div>
</div>
- <img class="large-bird" src="assets/img/bird.png" width="220px" height="48px">
+<<<<<<< HEAD
+ <img class="large-bird" src="assets/img/bird.png" width="220px" height="145px">
+=======
+ <img class="large-bird" src="assets/img/bird.png" width="220px" height="151px">
+>>>>>>> 842ad01fce710c50dc9c0174ab790f91e66c46b1
</div>
</div>
</div>
</div> <!-- /row -->
+<<<<<<< .merge_file_CXRuoN
+=======
+>>>>>>> .merge_file_hNGrGI
</section>
@@ -1392,4 +1457,4 @@ <h3 class="title">Popover Title</h3>
</div>
</body>
-</html>
+</html>
Oops, something went wrong.

0 comments on commit a98d2cc

Please sign in to comment.