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 +++
 1 file changed, 3 insertions(+)

(limited to 'docs/assets/css')

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