Merge master

This commit is contained in:
Ben Word
2012-12-11 16:19:08 -06:00
50 changed files with 1290 additions and 408 deletions

View File

@@ -23,11 +23,11 @@
// Base modal
.modal {
position: fixed;
top: 50%;
top: 10%;
left: 50%;
z-index: @zindexModal;
width: 560px;
margin: -250px 0 0 -280px;
margin-left: -280px;
background-color: @white;
border: 1px solid #999;
border: 1px solid rgba(0,0,0,.3);
@@ -42,7 +42,7 @@
.transition(e('opacity .3s linear, top .3s ease-out'));
top: -25%;
}
&.fade.in { top: 50%; }
&.fade.in { top: 10%; }
}
.modal-header {
padding: 9px 15px;
@@ -58,6 +58,7 @@
// Body (where all modal content resides)
.modal-body {
position: relative;
overflow-y: auto;
max-height: 400px;
padding: 15px;