mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-19 16:54:24 +01:00
resolved conflict
This commit is contained in:
commit
3407ed948d
21
bootstrap-1.3.0.css
vendored
21
bootstrap-1.3.0.css
vendored
@ -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 20:34:52 PDT 2011
|
||||
* Date: Sat Sep 10 21:06:02 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).
|
||||
@ -1980,10 +1980,10 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
|
||||
opacity: 0;
|
||||
}
|
||||
.modal-backdrop, .modal-backdrop.fade.in {
|
||||
filter: alpha(opacity=50);
|
||||
-khtml-opacity: 0.5;
|
||||
-moz-opacity: 0.5;
|
||||
opacity: 0.5;
|
||||
filter: alpha(opacity=80);
|
||||
-khtml-opacity: 0.8;
|
||||
-moz-opacity: 0.8;
|
||||
opacity: 0.8;
|
||||
}
|
||||
.modal {
|
||||
position: fixed;
|
||||
@ -2011,6 +2011,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;
|
||||
|
4
bootstrap-1.3.0.min.css
vendored
4
bootstrap-1.3.0.min.css
vendored
@ -276,8 +276,10 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
|
||||
.pagination .next a{border:0;}
|
||||
.well{background-color:#f5f5f5;margin-bottom:20px;padding:19px;min-height:20px;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}
|
||||
.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=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;}
|
||||
.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;}
|
||||
|
@ -1467,7 +1467,7 @@
|
||||
<!-- Tooltips -->
|
||||
<div class="row">
|
||||
<div class="span4">
|
||||
<h2>Tool Tips</h2>
|
||||
<h2>Tooltips</h2>
|
||||
<p>Twipsies are super useful for aiding a confused user and pointing them in the right direction.</p>
|
||||
</div>
|
||||
<div class="span12">
|
||||
@ -1542,7 +1542,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>
|
||||
|
@ -171,7 +171,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">
|
||||
@ -180,7 +180,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>
|
||||
|
36
js/bootstrap-modal.js
vendored
36
js/bootstrap-modal.js
vendored
@ -59,16 +59,17 @@
|
||||
this.isShown = true
|
||||
|
||||
_.escape.call(this)
|
||||
_.backdrop.call(this)
|
||||
_.backdrop.call(this, function () {
|
||||
that.$element
|
||||
.appendTo(document.body)
|
||||
.show()
|
||||
|
||||
this.$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,19 +82,19 @@
|
||||
this.isShown = false
|
||||
|
||||
_.escape.call(this)
|
||||
_.backdrop.call(this)
|
||||
|
||||
this.$element.removeClass('in')
|
||||
|
||||
function removeElement () {
|
||||
that.$element
|
||||
.unbind(transitionEnd)
|
||||
.detach()
|
||||
.trigger('modal:hidden')
|
||||
|
||||
_.backdrop.call(that)
|
||||
}
|
||||
|
||||
$.support.transition && this.$element.hasClass('fade') ?
|
||||
this.$element.bind(transitionEnd, removeElement) :
|
||||
this.$element.one(transitionEnd, removeElement) :
|
||||
removeElement()
|
||||
|
||||
return this
|
||||
@ -107,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')
|
||||
|
||||
@ -123,7 +131,7 @@
|
||||
}
|
||||
|
||||
$.support.transition && this.$element.hasClass('fade')?
|
||||
this.$backdrop.bind(transitionEnd, removeElement) :
|
||||
this.$backdrop.one(transitionEnd, removeElement) :
|
||||
removeElement()
|
||||
}
|
||||
}
|
||||
|
@ -725,9 +725,7 @@ input[type=submit].btn {
|
||||
|
||||
.modal-backdrop {
|
||||
background-color:#000;
|
||||
&.fade {
|
||||
opacity: 0;
|
||||
}
|
||||
&.fade { opacity: 0; }
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
@ -737,7 +735,7 @@ input[type=submit].btn {
|
||||
}
|
||||
|
||||
.modal-backdrop, .modal-backdrop.fade.in {
|
||||
.opacity(50);
|
||||
.opacity(80);
|
||||
}
|
||||
|
||||
.modal {
|
||||
@ -754,9 +752,12 @@ input[type=submit].btn {
|
||||
.border-radius(6px);
|
||||
.box-shadow(0 3px 7px rgba(0,0,0,0.3));
|
||||
.background-clip(padding-box);
|
||||
.close {
|
||||
margin-top: 7px;
|
||||
.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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user