From aaf9f752c476877fa99a2f54576e3785b397dec6 Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Sat, 20 Aug 2011 23:25:22 -0700
Subject: docs spacing, spare divs in a few places, updating css spacing

---
 docs/assets/css/docs.css | 32 +++-----------------------------
 1 file changed, 3 insertions(+), 29 deletions(-)

(limited to 'docs/assets')

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index ede141ce5..243130e01 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -146,34 +146,6 @@ div.quickstart form textarea {
 .show-grid:hover .column, .show-grid:hover .columns {
   background: rgba(0, 0, 0, 0.25);
 }
-/* Hashgrid.js grid (press G & H to view)
--------------------------------------------------- */
-#grid {
-  width: 980px;
-  position: absolute;
-  top: 0;
-  left: 50%;
-  margin-left: -490px;
-}
-#grid div.vert {
-  background-color: rgba(0, 206, 209, 0.075);
-  width: 39px;
-  border: solid darkturquoise;
-  border-width: 0 1px;
-  margin-right: 19px;
-}
-#grid div.vert.first-line {
-  margin-left: 19px;
-}
-#grid div.horiz {
-  height: 19px;
-  border-bottom: 1px solid rgba(255, 0, 0, 0.1);
-  margin: 0;
-  padding: 0;
-}
-#grid div.horiz:nth-child(5n) {
-  border-color: rgba(255, 0, 0, 0.25);
-}
 /* Render mini layout previews
 -------------------------------------------------- */
 div.mini-layout {
@@ -199,7 +171,9 @@ div.mini-layout div.mini-layout-body {
   width: 450px;
   height: 340px;
 }
-div.mini-layout.fluid div.mini-layout-sidebar, div.mini-layout.fluid div.mini-layout-header, div.mini-layout.fluid div.mini-layout-body {
+div.mini-layout.fluid div.mini-layout-sidebar,
+div.mini-layout.fluid div.mini-layout-header,
+div.mini-layout.fluid div.mini-layout-body {
   float: left;
 }
 div.mini-layout.fluid div.mini-layout-sidebar {
-- 
cgit v1.2.3


From 254e70550e2e10372736939702ee77072884bde2 Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
Date: Sun, 21 Aug 2011 17:06:37 -0700
Subject: remove 60px top margin on body and tweak a few other things

---
 docs/assets/css/docs.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/assets')

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 243130e01..2d17370c2 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -44,7 +44,7 @@ section {
   font-weight: bold;
 }
 #masthead {
-  margin-top: -20px;
+  margin-top: 40px;
 }
 #masthead h1,
 #masthead p {
-- 
cgit v1.2.3


From a98d2cccb8076b106e08e7ca76e59af013ab2851 Mon Sep 17 00:00:00 2001
From: Mark Otto <mark.otto@twitter.com>
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 ++++-----------------
 2 files changed, 7 insertions(+), 17 deletions(-)

(limited to 'docs/assets')

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;
   });
 
-- 
cgit v1.2.3