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

646 Commits

Author SHA1 Message Date
Mark Otto f4eefd28d1 Merge branch 'master' into sr_friendly_hidden_content 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
 2014-08-27 22:38:46 -07:00
Mark Otto 1ebc7e62a8 grunt 2014-08-27 22:37:10 -07:00
Mark Otto f5890adb17 grunt 2014-08-27 22:25:24 -07:00
Mark Otto 0140198699 grunt 2014-08-23 13:46:28 -07:00
Mark Otto 32a6d9b404 Full grunt 2014-08-23 13:43:41 -07:00
Mark Otto 4fc96e8029 grunt 2014-08-23 13:35:22 -07:00
Mark Otto 6a0eb4e6bd grunt 2014-08-23 12:19:36 -07:00
Chris Rebert e7d5905f38 grunt 2014-08-17 15:44:25 -07:00
Chris Rebert 71c2c372f6 Fix #14411 by setting JSON Content-Type for Gist API request 2014-08-17 15:41:53 -07:00
Mark Otto 9096c20021 grunt 2014-08-04 14:05:12 -07:00
XhmikosR de1d8c36ad Run `grunt`. 2014-08-01 19:49:54 +03:00
Thomas Welton 9739271c04 Add drag and drop config import; closes #11004 
Closes #13790 by merging a rebased version of it.
 2014-07-31 11:45:21 -07:00
XhmikosR 97cb2803d7 Run `grunt`. 2014-07-22 08:31:36 +03:00
XhmikosR caed585033 Update Filesaver.js to v2014-07-21. 2014-07-22 08:29:06 +03:00
XhmikosR 5c569dc4d4 Update Blob.js to the latest version. 2014-07-22 08:29:06 +03:00
XhmikosR 8d435cbb3c Run `grunt`. 2014-07-22 08:25:41 +03:00
Chris Rebert b3d068f2d3 regenerate docs/assets/js/docs.min.js 2014-07-15 17:21:39 -07:00
Chris Rebert 11db482371 popover dismiss-on-next-click example: instead of <button>, use <a> w/ tabindex 
Fixes #14038.

Research supporting this choice of approach:
    https://gist.github.com/cvrebert/68659d0333a578d75372

Why not <button>?
Even with a `tabindex` attribute, they don't gain focus when clicked upon in:
    * Mac OS X Firefox 30.0
    * Mac OS X Safari 7.0.5
 2014-07-15 16:57:54 -07:00
Mark Otto 7a8d9dbdbf grunt 2014-07-12 18:06:26 -07:00
Mark Otto fe0ef38898 Fixes #14095: Add basic styling for captions, which we've for some reason been missing all this time. 2014-07-12 15:55:15 -07:00
Mark Otto 2962f845a5 grunt 2014-07-12 15:47:42 -07:00
Mark Otto 717a50ce19 grunt 2014-07-12 15:37:13 -07:00
Mark Otto bd292ca3b8 Fixes #14107: Lighten placeholder text 2014-07-12 15:13:18 -07:00
XhmikosR 94472ee74a Run `grunt`. 2014-07-10 10:03:24 +03:00
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