mirror of
https://github.com/twbs/bootstrap.git
synced 2024-12-01 13:24:25 +01:00
version bump to 3.0
This commit is contained in:
parent
0947105656
commit
98b0d475ae
2
Makefile
2
Makefile
@ -25,7 +25,7 @@ build:
|
|||||||
@echo "Compiling documentation... ${CHECK} Done"
|
@echo "Compiling documentation... ${CHECK} Done"
|
||||||
@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 js/bootstrap-affix.js > docs/assets/js/bootstrap.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 js/bootstrap-affix.js > docs/assets/js/bootstrap.js
|
||||||
@uglifyjs docs/assets/js/bootstrap.js -nc > docs/assets/js/bootstrap.min.tmp.js
|
@uglifyjs docs/assets/js/bootstrap.js -nc > docs/assets/js/bootstrap.min.tmp.js
|
||||||
@echo "/**\n* Bootstrap.js v2.2.2 by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > docs/assets/js/copyright.js
|
@echo "/**\n* Bootstrap.js v3.0.0 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
|
@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
|
@rm docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js
|
||||||
@echo "Compiling and minifying javascript... ${CHECK} Done"
|
@echo "Compiling and minifying javascript... ${CHECK} Done"
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
[Twitter Bootstrap v2.2.2](http://twitter.github.com/bootstrap) [![Build Status](https://secure.travis-ci.org/twitter/bootstrap.png)](http://travis-ci.org/twitter/bootstrap)
|
[Twitter Bootstrap v3.0.0](http://twitter.github.com/bootstrap) [![Build Status](https://secure.travis-ci.org/twitter/bootstrap.png)](http://travis-ci.org/twitter/bootstrap)
|
||||||
=================
|
=================
|
||||||
|
|
||||||
Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat).
|
Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat).
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "bootstrap",
|
"name": "bootstrap",
|
||||||
"version": "2.2.2",
|
"version": "3.0.0",
|
||||||
"main": ["./docs/assets/js/bootstrap.js", "./docs/assets/css/bootstrap.css"],
|
"main": ["./docs/assets/js/bootstrap.js", "./docs/assets/css/bootstrap.css"],
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"jquery": "~1.8.0"
|
"jquery": "~1.8.0"
|
||||||
|
2
docs/assets/css/bootstrap-responsive.css
vendored
2
docs/assets/css/bootstrap-responsive.css
vendored
@ -1,5 +1,5 @@
|
|||||||
/*!
|
/*!
|
||||||
* Bootstrap Responsive v2.2.2
|
* Bootstrap Responsive v3.0.0
|
||||||
*
|
*
|
||||||
* Copyright 2012 Twitter, Inc
|
* Copyright 2012 Twitter, Inc
|
||||||
* Licensed under the Apache License v2.0
|
* Licensed under the Apache License v2.0
|
||||||
|
2
docs/assets/css/bootstrap.css
vendored
2
docs/assets/css/bootstrap.css
vendored
@ -1,5 +1,5 @@
|
|||||||
/*!
|
/*!
|
||||||
* Bootstrap v2.2.2
|
* Bootstrap v3.0.0
|
||||||
*
|
*
|
||||||
* Copyright 2012 Twitter, Inc
|
* Copyright 2012 Twitter, Inc
|
||||||
* Licensed under the Apache License v2.0
|
* Licensed under the Apache License v2.0
|
||||||
|
2
docs/assets/js/bootstrap-affix.js
vendored
2
docs/assets/js/bootstrap-affix.js
vendored
@ -1,5 +1,5 @@
|
|||||||
/* ==========================================================
|
/* ==========================================================
|
||||||
* bootstrap-affix.js v2.2.2
|
* bootstrap-affix.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#affix
|
* http://twitter.github.com/bootstrap/javascript.html#affix
|
||||||
* ==========================================================
|
* ==========================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
|
2
docs/assets/js/bootstrap-alert.js
vendored
2
docs/assets/js/bootstrap-alert.js
vendored
@ -1,5 +1,5 @@
|
|||||||
/* ==========================================================
|
/* ==========================================================
|
||||||
* bootstrap-alert.js v2.2.2
|
* bootstrap-alert.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#alerts
|
* http://twitter.github.com/bootstrap/javascript.html#alerts
|
||||||
* ==========================================================
|
* ==========================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
|
2
docs/assets/js/bootstrap-button.js
vendored
2
docs/assets/js/bootstrap-button.js
vendored
@ -1,5 +1,5 @@
|
|||||||
/* ============================================================
|
/* ============================================================
|
||||||
* bootstrap-button.js v2.2.2
|
* bootstrap-button.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#buttons
|
* http://twitter.github.com/bootstrap/javascript.html#buttons
|
||||||
* ============================================================
|
* ============================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
|
2
docs/assets/js/bootstrap-carousel.js
vendored
2
docs/assets/js/bootstrap-carousel.js
vendored
@ -1,5 +1,5 @@
|
|||||||
/* ==========================================================
|
/* ==========================================================
|
||||||
* bootstrap-carousel.js v2.2.2
|
* bootstrap-carousel.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#carousel
|
* http://twitter.github.com/bootstrap/javascript.html#carousel
|
||||||
* ==========================================================
|
* ==========================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
|
2
docs/assets/js/bootstrap-collapse.js
vendored
2
docs/assets/js/bootstrap-collapse.js
vendored
@ -1,5 +1,5 @@
|
|||||||
/* =============================================================
|
/* =============================================================
|
||||||
* bootstrap-collapse.js v2.2.2
|
* bootstrap-collapse.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#collapse
|
* http://twitter.github.com/bootstrap/javascript.html#collapse
|
||||||
* =============================================================
|
* =============================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
|
2
docs/assets/js/bootstrap-dropdown.js
vendored
2
docs/assets/js/bootstrap-dropdown.js
vendored
@ -1,5 +1,5 @@
|
|||||||
/* ============================================================
|
/* ============================================================
|
||||||
* bootstrap-dropdown.js v2.2.2
|
* bootstrap-dropdown.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
|
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
|
||||||
* ============================================================
|
* ============================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
|
2
docs/assets/js/bootstrap-modal.js
vendored
2
docs/assets/js/bootstrap-modal.js
vendored
@ -1,5 +1,5 @@
|
|||||||
/* =========================================================
|
/* =========================================================
|
||||||
* bootstrap-modal.js v2.2.2
|
* bootstrap-modal.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#modals
|
* http://twitter.github.com/bootstrap/javascript.html#modals
|
||||||
* =========================================================
|
* =========================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
|
2
docs/assets/js/bootstrap-popover.js
vendored
2
docs/assets/js/bootstrap-popover.js
vendored
@ -1,5 +1,5 @@
|
|||||||
/* ===========================================================
|
/* ===========================================================
|
||||||
* bootstrap-popover.js v2.2.2
|
* bootstrap-popover.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#popovers
|
* http://twitter.github.com/bootstrap/javascript.html#popovers
|
||||||
* ===========================================================
|
* ===========================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
|
2
docs/assets/js/bootstrap-scrollspy.js
vendored
2
docs/assets/js/bootstrap-scrollspy.js
vendored
@ -1,5 +1,5 @@
|
|||||||
/* =============================================================
|
/* =============================================================
|
||||||
* bootstrap-scrollspy.js v2.2.2
|
* bootstrap-scrollspy.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
|
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
|
||||||
* =============================================================
|
* =============================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
|
2
docs/assets/js/bootstrap-tab.js
vendored
2
docs/assets/js/bootstrap-tab.js
vendored
@ -1,5 +1,5 @@
|
|||||||
/* ========================================================
|
/* ========================================================
|
||||||
* bootstrap-tab.js v2.2.2
|
* bootstrap-tab.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#tabs
|
* http://twitter.github.com/bootstrap/javascript.html#tabs
|
||||||
* ========================================================
|
* ========================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
|
3
docs/assets/js/bootstrap-tooltip.js
vendored
3
docs/assets/js/bootstrap-tooltip.js
vendored
@ -1,5 +1,6 @@
|
|||||||
|
|
||||||
/* ===========================================================
|
/* ===========================================================
|
||||||
* bootstrap-tooltip.js v2.2.2
|
* bootstrap-tooltip.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#tooltips
|
* http://twitter.github.com/bootstrap/javascript.html#tooltips
|
||||||
* Inspired by the original jQuery.tipsy by Jason Frame
|
* Inspired by the original jQuery.tipsy by Jason Frame
|
||||||
* ===========================================================
|
* ===========================================================
|
||||||
|
2
docs/assets/js/bootstrap-transition.js
vendored
2
docs/assets/js/bootstrap-transition.js
vendored
@ -1,5 +1,5 @@
|
|||||||
/* ===================================================
|
/* ===================================================
|
||||||
* bootstrap-transition.js v2.2.2
|
* bootstrap-transition.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#transitions
|
* http://twitter.github.com/bootstrap/javascript.html#transitions
|
||||||
* ===================================================
|
* ===================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
|
2
docs/assets/js/bootstrap-typeahead.js
vendored
2
docs/assets/js/bootstrap-typeahead.js
vendored
@ -1,5 +1,5 @@
|
|||||||
/* =============================================================
|
/* =============================================================
|
||||||
* bootstrap-typeahead.js v2.2.2
|
* bootstrap-typeahead.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#typeahead
|
* http://twitter.github.com/bootstrap/javascript.html#typeahead
|
||||||
* =============================================================
|
* =============================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
|
26
docs/assets/js/bootstrap.js
vendored
26
docs/assets/js/bootstrap.js
vendored
@ -1,5 +1,5 @@
|
|||||||
/* ===================================================
|
/* ===================================================
|
||||||
* bootstrap-transition.js v2.2.2
|
* bootstrap-transition.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#transitions
|
* http://twitter.github.com/bootstrap/javascript.html#transitions
|
||||||
* ===================================================
|
* ===================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
@ -58,7 +58,7 @@
|
|||||||
})
|
})
|
||||||
|
|
||||||
}(window.jQuery);/* ==========================================================
|
}(window.jQuery);/* ==========================================================
|
||||||
* bootstrap-alert.js v2.2.2
|
* bootstrap-alert.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#alerts
|
* http://twitter.github.com/bootstrap/javascript.html#alerts
|
||||||
* ==========================================================
|
* ==========================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
@ -145,7 +145,7 @@
|
|||||||
$(document).on('click.alert.data-api', dismiss, Alert.prototype.close)
|
$(document).on('click.alert.data-api', dismiss, Alert.prototype.close)
|
||||||
|
|
||||||
}(window.jQuery);/* ============================================================
|
}(window.jQuery);/* ============================================================
|
||||||
* bootstrap-button.js v2.2.2
|
* bootstrap-button.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#buttons
|
* http://twitter.github.com/bootstrap/javascript.html#buttons
|
||||||
* ============================================================
|
* ============================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
@ -238,7 +238,7 @@
|
|||||||
})
|
})
|
||||||
|
|
||||||
}(window.jQuery);/* ==========================================================
|
}(window.jQuery);/* ==========================================================
|
||||||
* bootstrap-carousel.js v2.2.2
|
* bootstrap-carousel.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#carousel
|
* http://twitter.github.com/bootstrap/javascript.html#carousel
|
||||||
* ==========================================================
|
* ==========================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
@ -413,7 +413,7 @@
|
|||||||
})
|
})
|
||||||
|
|
||||||
}(window.jQuery);/* =============================================================
|
}(window.jQuery);/* =============================================================
|
||||||
* bootstrap-collapse.js v2.2.2
|
* bootstrap-collapse.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#collapse
|
* http://twitter.github.com/bootstrap/javascript.html#collapse
|
||||||
* =============================================================
|
* =============================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
@ -568,7 +568,7 @@
|
|||||||
})
|
})
|
||||||
|
|
||||||
}(window.jQuery);/* ============================================================
|
}(window.jQuery);/* ============================================================
|
||||||
* bootstrap-dropdown.js v2.2.2
|
* bootstrap-dropdown.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
|
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
|
||||||
* ============================================================
|
* ============================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
@ -715,7 +715,7 @@
|
|||||||
.on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
|
.on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
|
||||||
|
|
||||||
}(window.jQuery);/* =========================================================
|
}(window.jQuery);/* =========================================================
|
||||||
* bootstrap-modal.js v2.2.2
|
* bootstrap-modal.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#modals
|
* http://twitter.github.com/bootstrap/javascript.html#modals
|
||||||
* =========================================================
|
* =========================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
@ -949,7 +949,7 @@
|
|||||||
|
|
||||||
}(window.jQuery);
|
}(window.jQuery);
|
||||||
/* ===========================================================
|
/* ===========================================================
|
||||||
* bootstrap-tooltip.js v2.2.2
|
* bootstrap-tooltip.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#tooltips
|
* http://twitter.github.com/bootstrap/javascript.html#tooltips
|
||||||
* Inspired by the original jQuery.tipsy by Jason Frame
|
* Inspired by the original jQuery.tipsy by Jason Frame
|
||||||
* ===========================================================
|
* ===========================================================
|
||||||
@ -1224,7 +1224,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
}(window.jQuery);/* ===========================================================
|
}(window.jQuery);/* ===========================================================
|
||||||
* bootstrap-popover.js v2.2.2
|
* bootstrap-popover.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#popovers
|
* http://twitter.github.com/bootstrap/javascript.html#popovers
|
||||||
* ===========================================================
|
* ===========================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
@ -1326,7 +1326,7 @@
|
|||||||
})
|
})
|
||||||
|
|
||||||
}(window.jQuery);/* =============================================================
|
}(window.jQuery);/* =============================================================
|
||||||
* bootstrap-scrollspy.js v2.2.2
|
* bootstrap-scrollspy.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
|
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
|
||||||
* =============================================================
|
* =============================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
@ -1476,7 +1476,7 @@
|
|||||||
})
|
})
|
||||||
|
|
||||||
}(window.jQuery);/* ========================================================
|
}(window.jQuery);/* ========================================================
|
||||||
* bootstrap-tab.js v2.2.2
|
* bootstrap-tab.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#tabs
|
* http://twitter.github.com/bootstrap/javascript.html#tabs
|
||||||
* ========================================================
|
* ========================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
@ -1608,7 +1608,7 @@
|
|||||||
})
|
})
|
||||||
|
|
||||||
}(window.jQuery);/* =============================================================
|
}(window.jQuery);/* =============================================================
|
||||||
* bootstrap-typeahead.js v2.2.2
|
* bootstrap-typeahead.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#typeahead
|
* http://twitter.github.com/bootstrap/javascript.html#typeahead
|
||||||
* =============================================================
|
* =============================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
@ -1918,7 +1918,7 @@
|
|||||||
|
|
||||||
}(window.jQuery);
|
}(window.jQuery);
|
||||||
/* ==========================================================
|
/* ==========================================================
|
||||||
* bootstrap-affix.js v2.2.2
|
* bootstrap-affix.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#affix
|
* http://twitter.github.com/bootstrap/javascript.html#affix
|
||||||
* ==========================================================
|
* ==========================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
|
4
docs/assets/js/bootstrap.min.js
vendored
4
docs/assets/js/bootstrap.min.js
vendored
@ -1,10 +1,10 @@
|
|||||||
/**
|
/**
|
||||||
* Bootstrap.js v2.2.2 by @fat & @mdo
|
* Bootstrap.js v3.0.0 by @fat & @mdo
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0.txt
|
* http://www.apache.org/licenses/LICENSE-2.0.txt
|
||||||
*/
|
*/
|
||||||
/* ===================================================
|
/* ===================================================
|
||||||
* bootstrap-transition.js v2.2.2
|
* bootstrap-transition.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#transitions
|
* http://twitter.github.com/bootstrap/javascript.html#transitions
|
||||||
* ===================================================
|
* ===================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
|
@ -81,7 +81,7 @@
|
|||||||
<a href="./extend.html" >Extend</a>
|
<a href="./extend.html" >Extend</a>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
Version 2.2.2
|
Version 3.0.0
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
4
docs/templates/pages/index.mustache
vendored
4
docs/templates/pages/index.mustache
vendored
@ -3,7 +3,7 @@
|
|||||||
<h1>{{_i}}Bootstrap{{/i}}</h1>
|
<h1>{{_i}}Bootstrap{{/i}}</h1>
|
||||||
<p>{{_i}}Sleek, intuitive, and powerful front-end framework for faster and easier web development.{{/i}}</p>
|
<p>{{_i}}Sleek, intuitive, and powerful front-end framework for faster and easier web development.{{/i}}</p>
|
||||||
<p>
|
<p>
|
||||||
<a href="assets/bootstrap.zip" class="btn btn-primary btn-large" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 2.2.2']);"{{/production}}>{{_i}}Download Bootstrap{{/i}}</a>
|
<a href="assets/bootstrap.zip" class="btn btn-primary btn-large" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 3.0.0']);"{{/production}}>{{_i}}Download Bootstrap{{/i}}</a>
|
||||||
</p>
|
</p>
|
||||||
<ul class="masthead-links">
|
<ul class="masthead-links">
|
||||||
<li>
|
<li>
|
||||||
@ -16,7 +16,7 @@
|
|||||||
<a href="./extend.html" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Extend']);"{{/production}}>{{_i}}Extend{{/i}}</a>
|
<a href="./extend.html" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Extend']);"{{/production}}>{{_i}}Extend{{/i}}</a>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
{{_i}}Version 2.2.2{{/i}}
|
{{_i}}Version 3.0.0{{/i}}
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
2
js/bootstrap-affix.js
vendored
2
js/bootstrap-affix.js
vendored
@ -1,5 +1,5 @@
|
|||||||
/* ==========================================================
|
/* ==========================================================
|
||||||
* bootstrap-affix.js v2.2.2
|
* bootstrap-affix.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#affix
|
* http://twitter.github.com/bootstrap/javascript.html#affix
|
||||||
* ==========================================================
|
* ==========================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
|
2
js/bootstrap-alert.js
vendored
2
js/bootstrap-alert.js
vendored
@ -1,5 +1,5 @@
|
|||||||
/* ==========================================================
|
/* ==========================================================
|
||||||
* bootstrap-alert.js v2.2.2
|
* bootstrap-alert.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#alerts
|
* http://twitter.github.com/bootstrap/javascript.html#alerts
|
||||||
* ==========================================================
|
* ==========================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
|
2
js/bootstrap-button.js
vendored
2
js/bootstrap-button.js
vendored
@ -1,5 +1,5 @@
|
|||||||
/* ============================================================
|
/* ============================================================
|
||||||
* bootstrap-button.js v2.2.2
|
* bootstrap-button.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#buttons
|
* http://twitter.github.com/bootstrap/javascript.html#buttons
|
||||||
* ============================================================
|
* ============================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
|
2
js/bootstrap-carousel.js
vendored
2
js/bootstrap-carousel.js
vendored
@ -1,5 +1,5 @@
|
|||||||
/* ==========================================================
|
/* ==========================================================
|
||||||
* bootstrap-carousel.js v2.2.2
|
* bootstrap-carousel.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#carousel
|
* http://twitter.github.com/bootstrap/javascript.html#carousel
|
||||||
* ==========================================================
|
* ==========================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
|
2
js/bootstrap-collapse.js
vendored
2
js/bootstrap-collapse.js
vendored
@ -1,5 +1,5 @@
|
|||||||
/* =============================================================
|
/* =============================================================
|
||||||
* bootstrap-collapse.js v2.2.2
|
* bootstrap-collapse.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#collapse
|
* http://twitter.github.com/bootstrap/javascript.html#collapse
|
||||||
* =============================================================
|
* =============================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
|
2
js/bootstrap-dropdown.js
vendored
2
js/bootstrap-dropdown.js
vendored
@ -1,5 +1,5 @@
|
|||||||
/* ============================================================
|
/* ============================================================
|
||||||
* bootstrap-dropdown.js v2.2.2
|
* bootstrap-dropdown.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
|
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
|
||||||
* ============================================================
|
* ============================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
|
2
js/bootstrap-modal.js
vendored
2
js/bootstrap-modal.js
vendored
@ -1,5 +1,5 @@
|
|||||||
/* =========================================================
|
/* =========================================================
|
||||||
* bootstrap-modal.js v2.2.2
|
* bootstrap-modal.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#modals
|
* http://twitter.github.com/bootstrap/javascript.html#modals
|
||||||
* =========================================================
|
* =========================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
|
2
js/bootstrap-popover.js
vendored
2
js/bootstrap-popover.js
vendored
@ -1,5 +1,5 @@
|
|||||||
/* ===========================================================
|
/* ===========================================================
|
||||||
* bootstrap-popover.js v2.2.2
|
* bootstrap-popover.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#popovers
|
* http://twitter.github.com/bootstrap/javascript.html#popovers
|
||||||
* ===========================================================
|
* ===========================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
|
2
js/bootstrap-scrollspy.js
vendored
2
js/bootstrap-scrollspy.js
vendored
@ -1,5 +1,5 @@
|
|||||||
/* =============================================================
|
/* =============================================================
|
||||||
* bootstrap-scrollspy.js v2.2.2
|
* bootstrap-scrollspy.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
|
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
|
||||||
* =============================================================
|
* =============================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
|
2
js/bootstrap-tab.js
vendored
2
js/bootstrap-tab.js
vendored
@ -1,5 +1,5 @@
|
|||||||
/* ========================================================
|
/* ========================================================
|
||||||
* bootstrap-tab.js v2.2.2
|
* bootstrap-tab.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#tabs
|
* http://twitter.github.com/bootstrap/javascript.html#tabs
|
||||||
* ========================================================
|
* ========================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
|
2
js/bootstrap-tooltip.js
vendored
2
js/bootstrap-tooltip.js
vendored
@ -1,5 +1,5 @@
|
|||||||
/* ===========================================================
|
/* ===========================================================
|
||||||
* bootstrap-tooltip.js v2.2.2
|
* bootstrap-tooltip.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#tooltips
|
* http://twitter.github.com/bootstrap/javascript.html#tooltips
|
||||||
* Inspired by the original jQuery.tipsy by Jason Frame
|
* Inspired by the original jQuery.tipsy by Jason Frame
|
||||||
* ===========================================================
|
* ===========================================================
|
||||||
|
2
js/bootstrap-transition.js
vendored
2
js/bootstrap-transition.js
vendored
@ -1,5 +1,5 @@
|
|||||||
/* ===================================================
|
/* ===================================================
|
||||||
* bootstrap-transition.js v2.2.2
|
* bootstrap-transition.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#transitions
|
* http://twitter.github.com/bootstrap/javascript.html#transitions
|
||||||
* ===================================================
|
* ===================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
|
2
js/bootstrap-typeahead.js
vendored
2
js/bootstrap-typeahead.js
vendored
@ -1,5 +1,5 @@
|
|||||||
/* =============================================================
|
/* =============================================================
|
||||||
* bootstrap-typeahead.js v2.2.2
|
* bootstrap-typeahead.js v3.0.0
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#typeahead
|
* http://twitter.github.com/bootstrap/javascript.html#typeahead
|
||||||
* =============================================================
|
* =============================================================
|
||||||
* Copyright 2012 Twitter, Inc.
|
* Copyright 2012 Twitter, Inc.
|
||||||
|
2
less/bootstrap.less
vendored
2
less/bootstrap.less
vendored
@ -1,5 +1,5 @@
|
|||||||
/*!
|
/*!
|
||||||
* Bootstrap v2.2.2
|
* Bootstrap v3.0.0
|
||||||
*
|
*
|
||||||
* Copyright 2012 Twitter, Inc
|
* Copyright 2012 Twitter, Inc
|
||||||
* Licensed under the Apache License v2.0
|
* Licensed under the Apache License v2.0
|
||||||
|
@ -1,48 +0,0 @@
|
|||||||
/*!
|
|
||||||
* Bootstrap Responsive v2.2.2
|
|
||||||
*
|
|
||||||
* Copyright 2012 Twitter, Inc
|
|
||||||
* Licensed under the Apache License v2.0
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Designed and built with all the love in the world @twitter by @mdo and @fat.
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
// Responsive.less
|
|
||||||
// For phone and tablet devices
|
|
||||||
// -------------------------------------------------------------
|
|
||||||
|
|
||||||
|
|
||||||
// REPEAT VARIABLES & MIXINS
|
|
||||||
// -------------------------
|
|
||||||
// Required since we compile the responsive stuff separately
|
|
||||||
|
|
||||||
@import "variables.less"; // Modify this for custom colors, font-sizes, etc
|
|
||||||
@import "mixins.less";
|
|
||||||
|
|
||||||
|
|
||||||
// RESPONSIVE CLASSES
|
|
||||||
// ------------------
|
|
||||||
|
|
||||||
@import "responsive-utilities.less";
|
|
||||||
|
|
||||||
|
|
||||||
// MEDIA QUERIES
|
|
||||||
// ------------------
|
|
||||||
|
|
||||||
// Large desktops
|
|
||||||
@import "responsive-1200px-min.less";
|
|
||||||
|
|
||||||
// Tablets to regular desktops
|
|
||||||
@import "responsive-768px-979px.less";
|
|
||||||
|
|
||||||
// Phones to portrait tablets and narrow desktops
|
|
||||||
@import "responsive-767px-max.less";
|
|
||||||
|
|
||||||
|
|
||||||
// RESPONSIVE NAVBAR
|
|
||||||
// ------------------
|
|
||||||
|
|
||||||
// From 979px and below, show a button to toggle navbar contents
|
|
||||||
@import "responsive-navbar.less";
|
|
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "bootstrap"
|
"name": "bootstrap"
|
||||||
, "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development."
|
, "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development."
|
||||||
, "version": "2.2.2"
|
, "version": "3.0.0"
|
||||||
, "keywords": ["bootstrap", "css"]
|
, "keywords": ["bootstrap", "css"]
|
||||||
, "homepage": "http://twitter.github.com/bootstrap/"
|
, "homepage": "http://twitter.github.com/bootstrap/"
|
||||||
, "author": "Twitter Inc."
|
, "author": "Twitter Inc."
|
||||||
|
Loading…
Reference in New Issue
Block a user