root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip

This commit is contained in:
Jacob Thornton 2012-04-16 15:09:26 -07:00
parent 498b7d984a 5fa0fcc888
commit 457859feba
14 changed files with 1854 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -16,6 +16,11 @@ docs:
cp img/* docs/assets/img/
cp js/*.js docs/assets/js/
cp js/tests/vendor/jquery.js docs/assets/js/
cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js > docs/assets/js/bootstrap.js
uglifyjs -nc docs/assets/js/bootstrap.js > docs/assets/js/bootstrap.min.tmp.js
echo "/**\n* Bootstrap.js by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > docs/assets/js/copyright.js
cat docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js > docs/assets/js/bootstrap.min.js
rm docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js
#
# BUILD SIMPLE BOOTSTRAP DIRECTORY

2
docs/assets/css/bootstrap.css vendored
View File

@ -969,6 +969,8 @@ select:focus:required:invalid:focus {
-moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
cursor: not-allowed;
overflow: hidden;
white-space: nowrap;
}
:-moz-placeholder {
color: #999999;

4
docs/assets/js/bootstrap-alert.js vendored
View File

@ -27,7 +27,7 @@
* ====================== */
var dismiss = '[data-dismiss="alert"]'
, Alert = function ( el ) {
, Alert = function (el) {
$(el).on('click', dismiss, this.close)
}
@ -68,7 +68,7 @@
/* ALERT PLUGIN DEFINITION
* ======================= */
$.fn.alert = function ( option ) {
$.fn.alert = function (option) {
return this.each(function () {
var $this = $(this)
, data = $this.data('alert')

1
docs/assets/js/bootstrap-collapse.js vendored
View File

@ -60,6 +60,7 @@
if (actives && actives.length) {
hasData = actives.data('collapse')
if (hasData && hasData.transitioning) return
actives.collapse('hide')
hasData || actives.data('collapse', null)
}

1813
docs/assets/js/bootstrap.js vendored Normal file
View File

File diff suppressed because it is too large Load Diff

6
docs/assets/js/bootstrap.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
docs/javascript.html
View File

@ -206,7 +206,7 @@
<h2>Static example</h2>
<p>Below is a statically rendered modal.</p>
<div class="well modal-example" style="background-color: #888; border: none;">
<div class="modal" style="position: relative; top: auto; left: auto; margin: 0 auto; z-index: 1">
<div class="modal" style="position: relative; top: auto; left: auto; margin: 0 auto; z-index: 1; max-width: 100%;">
<div class="modal-header">
<button class="close" data-dismiss="modal">&times;</button>
<h3>Modal header</h3>

2
docs/templates/pages/javascript.mustache vendored
View File

@ -129,7 +129,7 @@
<h2>{{_i}}Static example{{/i}}</h2>
<p>{{_i}}Below is a statically rendered modal.{{/i}}</p>
<div class="well modal-example" style="background-color: #888; border: none;">
<div class="modal" style="position: relative; top: auto; left: auto; margin: 0 auto; z-index: 1">
<div class="modal" style="position: relative; top: auto; left: auto; margin: 0 auto; z-index: 1; max-width: 100%;">
<div class="modal-header">
<button class="close" data-dismiss="modal">&times;</button>
<h3>{{_i}}Modal header{{/i}}</h3>

4
js/bootstrap-alert.js vendored
View File

@ -27,7 +27,7 @@
* ====================== */
var dismiss = '[data-dismiss="alert"]'
, Alert = function ( el ) {
, Alert = function (el) {
$(el).on('click', dismiss, this.close)
}
@ -68,7 +68,7 @@
/* ALERT PLUGIN DEFINITION
* ======================= */
$.fn.alert = function ( option ) {
$.fn.alert = function (option) {
return this.each(function () {
var $this = $(this)
, data = $this.data('alert')

1
js/bootstrap-collapse.js vendored
View File

@ -60,6 +60,7 @@
if (actives && actives.length) {
hasData = actives.data('collapse')
if (hasData && hasData.transitioning) return
actives.collapse('hide')
hasData || actives.data('collapse', null)
}

3
less/forms.less
View File

@ -331,6 +331,9 @@ select:focus:required:invalid {
border-color: #eee;
.box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
cursor: not-allowed;
// prevent text from wrapping, but still cut it off like an input does
overflow: hidden;
white-space: nowrap;
}
// Placeholder text gets special styles; can't be bundled together though for some reason

2
less/mixins.less
View File

@ -545,7 +545,7 @@
.offsetX (0) {}
.offset (@columns) {
margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2);
margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns + 1));
}
.span (@columns) {

16
less/tests/css-tests.html
View File

@ -374,6 +374,19 @@
</ul>
</li>
</ul>
<h4>Dropdown on a button</h4>
<div style="position: relative;">
<button class="btn" type="button" data-toggle="dropdown">Dropdown <span class="caret"></span></button>
<ul class="dropdown-menu">
<li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li>
<li><a href="#">Something else here</a></li>
<li class="divider"></li>
<li><a href="#">Separated link</a></li>
</ul>
</div>
<br>
@ -445,6 +458,7 @@
</div>
<!-- Tabs
================================================== -->
@ -491,6 +505,8 @@
<!-- Footer
================================================== -->
<footer class="footer">

2
less/variables.less
View File

@ -197,8 +197,6 @@
@gridColumns: 12;
@gridColumnWidth: 60px;
@gridGutterWidth: 20px;
@gridRowWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
// Fluid grid
// -------------------------