add the dhg flavor back

6 files changed, 43 insertions, 16 deletions

diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css
index 6ebbc17e4a..64e4bc7039 100644
--- a/bootstrap-1.3.0.css
+++ b/bootstrap-1.3.0.css
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Sat Sep 10 18:24:47 PDT 2011
+ * Date: Sat Sep 10 19:00:49 PDT 2011
  */
 /* Reset.less
  * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here	that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -2008,6 +2008,17 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
 .modal .close {
   margin-top: 7px;
 }
+.modal.fade {
+  -webkit-transition: opacity .3s linear, top .3s ease-out;
+  -moz-transition: opacity .3s linear, top .3s ease-out;
+  -ms-transition: opacity .3s linear, top .3s ease-out;
+  -o-transition: opacity .3s linear, top .3s ease-out;
+  transition: opacity .3s linear, top .3s ease-out;
+  top: -25%;
+}
+.modal.fade.in {
+  top: 50%;
+}
 .modal-header {
   border-bottom: 1px solid #eee;
   padding: 5px 15px;
diff --git a/bootstrap-1.3.0.min.css b/bootstrap-1.3.0.min.css
index 94d8d06211..7ae5a08dbb 100644
--- a/bootstrap-1.3.0.min.css
+++ b/bootstrap-1.3.0.min.css
@@ -276,6 +276,8 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
 .modal-backdrop{background-color:#000;position:fixed;top:0;left:0;right:0;bottom:0;z-index:1000;}.modal-backdrop.fade{opacity:0;}
 .modal-backdrop,.modal-backdrop.fade.in{filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;}
 .modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-250px 0 0 -250px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal .close{margin-top:7px;}
+.modal.fade{-webkit-transition:opacity .3s linear, top .3s ease-out;-moz-transition:opacity .3s linear, top .3s ease-out;-ms-transition:opacity .3s linear, top .3s ease-out;-o-transition:opacity .3s linear, top .3s ease-out;transition:opacity .3s linear, top .3s ease-out;top:-25%;}
+.modal.fade.in{top:50%;}
 .modal-header{border-bottom:1px solid #eee;padding:5px 15px;}
 .modal-body{padding:15px;}
 .modal-footer{background-color:#f5f5f5;padding:14px 15px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;margin-bottom:0;text-align:right;}.modal-footer:before,.modal-footer:after{display:table;content:"";zoom:1;*display:inline;}
diff --git a/docs/index.html b/docs/index.html
index 3afdebd846..64f95c6daf 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1519,7 +1519,7 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
        <p>Integrating javascript with the Bootstrap library is super easy. Below we go over the basics and provide you with some awesome plugins to get you started!</p>
      </div>
      <div class="span12">
-       <h2>Getting started</h2>
+       <h2>Getting started</h2>       
        <p>We've set out to make your interactive work with Bootstrap even more simple, offering several lightweight plugins for things like modals, tooltips, and other dynamic components. These plugins have been coded up to work with either <a href="http://jquery.com/" target="_blank">jQuery</a> or <a href="http://ender.no.de" target="_blank">Ender</a>, but we encourage you to extend and modify them to fit your development needs!</p>
        <h2>Do I need javascript?</h2>
        <p>The short answer is <strong>no</strong>... of course not! However, for those who need it, we've provided the plugins below to help you understand how to integrate bootstrap with javascript and to give you a quick lightweight option for dropping something in and getting the basic functionality right away! For more information on these plugins and to see demos of them in action, please refer to our <a href="./javascript.html">plugin documentation page</a>.</p>
@@ -1541,7 +1541,7 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
            </tr>
            <tr>
              <td><a href="./javascript.html#dropdowns">bootstrap-dropdown.js</a></td>
-             <td>This plugin is for adding dropdowns to the bootstrap topbar or tabbed navigations.</td>
+             <td>This plugin is for adding dropdown interaction to the bootstrap topbar or tabbed navigations.</td>
            </tr>
            <tr>
              <td><a href="./javascript.html#tabs">bootstrap-tabs.js</a></td>
diff --git a/docs/javascript.html b/docs/javascript.html
index 47cd34414b..bc3372fabd 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -156,7 +156,7 @@ $('#modal-content')
       </div>
       <div class="row">
         <div class="span4 columns">
-          <p>This plugin is for adding dropdowns to the bootstrap nav.</p>
+          <p>This plugin is for adding dropdown interaction to the bootstrap topbar or tabbed navigations.</p>
           <a href="../js/bootstrap-dropdown.js" target="_blank" class="btn primary">Download</a>
         </div>
         <div class="span12 columns">
@@ -165,7 +165,7 @@ $('#modal-content')
           <h3>Method</h3>
           <h4>$().dropdown</h4>
           <p>
-          Activates menus for given topbar navigation.
+          Activates menus for given topbar or tabbed navigation.
           </p>
           <h3>Demo</h3>
           <script>
diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js
index 4843d2b727..a7ab252ebc 100644
--- a/js/bootstrap-modal.js
+++ b/js/bootstrap-modal.js
@@ -59,16 +59,17 @@
       this.isShown = true
 
       _.escape.call(this)
-      _.backdrop.call(this)
-
-      this.$element
-        .appendTo(document.body)
-        .show()
+      _.backdrop.call(this, function () {
+        that.$element
+          .appendTo(document.body)
+          .show()
 
-      setTimeout(function () {
-        that.$element.addClass('in').trigger('modal:shown')
-        that.$backdrop && that.$backdrop.addClass('in')
-      }, 1)
+        setTimeout(function () {
+          that.$element
+            .addClass('in')
+            .trigger('modal:shown')
+        }, 1)
+      })
 
       return this
     }
@@ -81,7 +82,6 @@
       this.isShown = false
 
       _.escape.call(this)
-      _.backdrop.call(this)
 
       this.$element.removeClass('in')
 
@@ -89,6 +89,8 @@
         that.$element
           .detach()
           .trigger('modal:hidden')
+
+        _.backdrop.call(that)
       }
 
       $.support.transition && this.$element.hasClass('fade') ?
@@ -106,13 +108,20 @@
 
   var _ = {
 
-    backdrop: function () {
+    backdrop: function ( callback ) {
       var that = this
         , animate = this.$element.hasClass('fade') ? 'fade' : ''
       if ( this.isShown && this.settings.backdrop ) {
         this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
           .click($.proxy(this.hide, this))
           .appendTo(document.body)
+
+        setTimeout(function () {
+          that.$backdrop && that.$backdrop.addClass('in')
+          $.support.transition && that.$backdrop.hasClass('fade') ?
+            that.$backdrop.one(transitionEnd, callback) :
+            callback()
+        })
       } else if ( !this.isShown && this.$backdrop ) {
         this.$backdrop.removeClass('in')
 
diff --git a/lib/patterns.less b/lib/patterns.less
index de9096b997..9d2a387f6b 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -753,6 +753,11 @@ input[type=submit].btn {
   .box-shadow(0 3px 7px rgba(0,0,0,0.3));
   .background-clip(padding-box);
   .close { margin-top: 7px; }
+  &.fade {
+    .transition(e('opacity .3s linear, top .3s ease-out'));
+    top: -25%;
+  }
+  &.fade.in { top: 50%; }
 }
 .modal-header {
   border-bottom: 1px solid #eee;