Skip to content

Commit

Permalink
Merge branch 'misc_css_fixes'
Browse files Browse the repository at this point in the history 
Conflicts:
	bootstrap-1.0.0.css
	lib/patterns.less
  • Loading branch information
@fat
fat committed Aug 22, 2011
2 parents 14b77f3 + 985ee64 commit b54dc13
Show file tree
Hide file tree
Showing 10 changed files with 624 additions and 521 deletions.
477 changes: 279 additions & 198 deletions bootstrap-1.0.0.css
View file

Large diffs are not rendered by default.

217 changes: 109 additions & 108 deletions bootstrap-1.0.0.min.css
View file

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions docs/assets/css/docs.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
21 changes: 4 additions & 17 deletions docs/assets/js/application.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
});

Expand Down
175 changes: 84 additions & 91 deletions docs/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -359,64 +361,54 @@ <h2>Lists</h2>
<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">
Expand Down Expand Up @@ -759,8 +751,7 @@ <h2>Default styles</h2>
</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>
Expand Down Expand Up @@ -823,8 +814,7 @@ <h2>Stacked forms</h2>
</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>
Expand All @@ -840,8 +830,9 @@ <h2>Buttons</h2>
<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>
Expand All @@ -855,15 +846,17 @@ <h3>Alternate sizes</h3>
</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">
<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>
Expand All @@ -878,28 +871,30 @@ <h1>Navigation</h1>
<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 -->
Expand Down Expand Up @@ -1098,7 +1093,7 @@ <h2>Modals</h2>
<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">
Expand Down Expand Up @@ -1166,13 +1161,11 @@ <h3 class="title">Popover Title</h3>
</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>


Expand Down
Loading

0 comments on commit b54dc13

Please sign in to comment.