root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 10 Packages Projects Releases Wiki Activity
9,676 Commits 104 Branches 92 Tags 676 MiB
Commit Graph

622 Commits

Author SHA1 Message Date
XhmikosR e598247bcc Update uglify-js to v2.4.15. 2014-07-10 10:02:41 +03:00
XhmikosR 643effe382 Run `grunt`. 2014-07-09 10:24:39 +03:00
XhmikosR d88a837fea Update uglify-js to v2.4.14. 2014-07-09 10:22:43 +03:00
Chris Rebert 5d1abf8b38 Merge pull request #14036 from twbs/fix-13575 
Jekyll: Use non-minified assets when not running from GitHub Pages
 2014-07-07 19:36:32 -07:00
Mark Otto 9be2bbb5ef Fixes #14053: Don't show radio/checkbox in justified button groups 2014-07-06 16:48:41 -07:00
Mark Otto b44d4ef724 grunt 2014-07-06 15:35:24 -07:00
Mark Otto e2029e122c Fixes #13997: Move min-height for radio/checkbox to their inner label 2014-07-06 15:09:20 -07:00
Mark Otto 354d423668 grunt 2014-07-06 15:08:37 -07:00
Mark Otto 043b40636c grunt 2014-07-05 20:17:57 -07:00
Mark Otto d55462fae8 grunt 2014-07-05 20:10:44 -07:00
Mark Otto 3c99de9764 grunt 2014-07-05 19:57:15 -07:00
Chris Rebert 1dc54dc160 use non-minified Bootstrap JS when on non-gh-pages 2014-07-03 13:40:47 -07:00
Chris Rebert 92fd25a2a2 use non-minified docs JS on non-gh-pages 2014-07-03 13:18:44 -07:00
Mark Otto 23dd323da1 grunt 2014-07-03 00:57:37 -07:00
Mark Otto 3537481c97 Fixes #12738 again: use max-device-width instead of max-width for .navbar-collapse height in landscape devices 2014-07-03 00:55:32 -07:00
Mark Otto 4f8697cbbb grunt 2014-07-02 23:44:56 -07:00
XhmikosR 225351431e Update dependencies. 2014-06-30 18:35:50 +03:00
Mark Otto 018114fc09 Merge pull request #13954 from hnrch02/persist-preview-theme 
Save "Preview theme" state; resolves #13940
 2014-06-28 21:43:04 -07:00
XhmikosR fec94e1695 Update "grunt-autoprefixer". 2014-06-27 07:38:46 +03:00
Heinrich Fenkart 92ca842830 Save "Preview theme" state; resolves #13940 2014-06-27 02:08:58 +02:00
Chris Rebert b9527acc45 JSCS hotfix 
[skip sauce] [skip validator]
 2014-06-26 13:01:21 -07:00
Chris Rebert fde088751a regenerate docs.min.js 
[skip sauce]
 2014-06-26 12:21:45 -07:00
Chris Rebert 0bc2edd191 add docs JS to activate popover demos; fixes #13937 2014-06-26 12:21:33 -07:00
Chris Rebert c0b3f18c0c rm apparent dead code from docs JS 
.bs-docs-navbar class doesn't seem to be used anywhere at all
 2014-06-26 10:53:58 -07:00
Chris Rebert 43ecc8726b add comment explaining which demos this JS is for 2014-06-26 10:52:12 -07:00
Mark Otto ff6b279b3c bump to v3.2.0 2014-06-26 09:13:24 -07:00
Mark Otto 719ebd8239 grunt 2014-06-26 02:49:21 -07:00
Mark Otto 4dcdc08d89 grunt 2014-06-25 23:03:40 -07:00
Mark Otto 4045740c54 Merge branch 'master' of github.com:twbs/bootstrap 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-06-25 16:57:22 -07:00
XhmikosR 4abb095783 Run `grunt`. 
Revert a991cd572c.
 2014-06-25 02:07:17 +03:00
Chris Rebert a991cd572c grunt dist; closes #13914 2014-06-24 15:06:47 -07:00
XhmikosR 15c63fa137 Run `grunt`. 2014-06-24 19:01:40 +03:00
Chris Rebert c2c19a4d2d Revert UMD (#13772 & friends) for now, due to #13812. 
Will hopefully revert this reversion and land a fully-working version of UMD in v3.3.0.

Revert "some changes from #13801 - add strict mode back and =="
This reverts commit 2b302f69ee.

Revert "Fix regression of #10038 introduced by #13772"
This reverts commit e9d6756a1a.

Revert "MD/CommonJS/Globals #12909"
This reverts commit 1c6fa9010d.

Revert "address #13811"
This reverts commit f347d7d955.

Conflicts:
    js/carousel.js
    js/collapse.js
    js/dropdown.js
    js/modal.js
    js/tab.js
    js/tooltip.js
 2014-06-23 11:11:59 -07:00
Mark Otto 8bd4163ad4 fixes #13881: restore existing striped progress bar behavior with theme styles 2014-06-19 18:14:56 -07:00
Mark Otto 1482947405 grunt 2014-06-19 15:25:50 -07:00
Mark Otto a4fa8d07c8 grunt dist 2014-06-19 15:24:24 -07:00
Heinrich Fenkart 587451ad9a Update a few source files to comply to new JSCS rules 2014-06-19 21:08:05 +02:00
XhmikosR abe7afd87a Run `grunt`. 2014-06-19 12:58:34 +03:00
XhmikosR 0418c7678d Update JSZip to v2.3.0. 2014-06-19 12:03:10 +03:00
Mark Otto 162a27f67a grunt 2014-06-18 23:50:16 -07:00
Mark Otto 99f176e7ec rewrite striped and active to deprecate the parent selectors, change the docs 2014-06-18 22:35:05 -07:00
Mark Otto d222c21f84 grunt 2014-06-18 22:24:56 -07:00
Mark Otto 74982cf101 grunt 2014-06-18 22:23:31 -07:00
Mark Otto 11cf54f9df grunt 2014-06-18 18:22:11 -07:00
XhmikosR 6d45f733e5 Run `grunt`. 2014-06-18 13:16:32 +03:00
Chris Rebert f347d7d955 address #13811 2014-06-17 18:53:52 -07:00
Mark Otto 82bd8b6dfd twerk copy 2014-06-09 23:29:44 -07:00
XhmikosR 1b8935ee95 Run `grunt dist`. 2014-06-10 08:30:17 +03:00
XhmikosR 89c0e4d2ab Update ZeroClipboard to v1.3.5. 
Also use the official filenames.
 2014-06-10 08:30:17 +03:00
XhmikosR 5057e7c7b8 Remove unused variables and make tests pass. 2014-06-10 08:30:17 +03:00