resolve conflict in patterns from modals

1 files changed, 27 insertions, 1 deletions

diff --git a/docs/index.html b/docs/index.html
index d9634f81b..c8444a89c 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -5,7 +5,7 @@
     <title>Twitter Bootstrap</title>
 
     <!-- Le styles -->
-    <link href="../bootstrap.css" rel="stylesheet" type="text/css">
+    <link href="../bootstrap-1.0.0.css" rel="stylesheet" type="text/css">
     <link href="assets/css/docs.css" rel="stylesheet" type="text/css">
 
     <!-- Le javascript -->
@@ -35,6 +35,7 @@
           <li><a href="#forms">Forms</a></li>
           <li><a href="#navigation">Navigation</a></li>
           <li><a href="#alerts">Alerts</a></li>
+          <li><a href="#modals">Modals</a></li>
         </ul>
       </div>
     </div>
@@ -1177,6 +1178,31 @@
 </section>
 
 
+<section id="modals">
+  <div class="page-header">
+    <h1>Modals <small>Rules and conditions for displaying content in popovers.</small></h1>
+  </div>
+  <div class="row">
+    <div class="span4 columns">
+      <h2>Tweet Modal</h2>
+      <p>This is text about a modal that i am making. mark will say change this text. we will change it. It will be changed O_O</p>
+    </div>
+    <div class="span12 columns">
+      <div class="modal-backdrop" style="position:relative; min-height:200px; padding:40px; border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px; z-index: 1">
+        <div class="modal" style="position:relative; top: auto; left: auto; margin: 0 auto; width:565px; height: 265px; z-index: 1">
+          <div class="modal-header">
+            <h2>Add new Tweet</h2>
+            <a href="#" class="close">&times;</a>
+          </div>
+          <div class="modal-body">
+          </div>
+          <div class="modal-footer">
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</section>
 
 
     </div> <!-- /container -->