Commit 80abe211 authored by Mark Otto's avatar Mark Otto

resolve conflict in patterns from modals

parents 68f421ea e3380844
# NOTE: you must have the less npm package installed globally to build!
# To install run: npm install less -g
build:
@lessc ./lib/bootstrap.less > ./bootstrap-1.0.0.css
@lessc ./lib/bootstrap.less > ./bootstrap-1.0.0.min.css --compress
.PHONY: build
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -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 -->
......
......@@ -491,6 +491,23 @@ div.modal {
height: 500px;
margin: -310px 0 0 -250px;
background-color: @white;
.border-radius(6px);
border: 1px solid rgba(0,0,0,.3);
.border-radius(6px);
.box-shadow(0 2px 6px rgba(0, 0, 0, 0.35))
.modal-header {
border-bottom:1px solid #eee;
padding: 5px 20px;
h2 {
font-size: 20px;
font-weight: 200;
}
a.close {
position: absolute;
right: 10px;
top: 10px;
color: #999;
line-height:10px;
font-size: 18px;
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment