From 2ac7c29c8319eb088102f9fe752fb87f520ae681 Mon Sep 17 00:00:00 2001
From: Arnold Daniels <arnold@adaniels.nl>
Date: Tue, 17 Jul 2012 15:03:06 +0200
Subject: [PATCH] Added modal fix to bootstrap and docs

---
 docs/templates/pages/index.mustache | 2 +-
 less/jasny/bootstrap.less           | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache
index d131b76a..ff3321ea 100644
--- a/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@ -38,7 +38,6 @@
   </div>
 </div>
 
-<<<<<<< HEAD
 <div class="container">
   <div class="changes">
     <h1>{{_i}}What's different?{{/i}}</h1>
@@ -89,6 +88,7 @@
         <ul>
           <li>Action area for header <code>.header-actions</code></li>
           <li>Action area for tables <code>.table-actions</code></li>
+          <li>Fixed margin for modal forms</li>
         </ul>
       </div>
     </div><!--/row-->
diff --git a/less/jasny/bootstrap.less b/less/jasny/bootstrap.less
index e2d1ee43..49159254 100644
--- a/less/jasny/bootstrap.less
+++ b/less/jasny/bootstrap.less
@@ -28,3 +28,6 @@
 
 // Components: Nav
 @import "navs-tabbable.less";
+
+// Components: Popovers
+@import "modals.less";