root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
8,984 Commits 111 Branches 92 Tags 666 MiB
Commit Graph

8984 Commits

Author SHA1 Message Date
Chris Rebert d08f7dd807 Merge pull request #13330 from Kronuz/patch-1 
Wait for the expected target during a collapse
 2014-04-15 21:38:45 -07:00
Chris Rebert 1254c322fa Merge pull request #13353 from twbs/fix-13340 
Document @icon-font-path & @icon-font-name more
 2014-04-15 20:05:46 -07:00
Chris Rebert aec366c591 fix #13340 by documenting @icon-font-path & @icon-font-name more 2014-04-15 20:03:44 -07:00
Chris Rebert 2127eb563f rm not particularly useful @zindex var comments 2014-04-15 11:01:51 -07:00
Germán M. Bravo 82b066f0a9 Wait for the expected target during a collapse 
Actually wait for the collapsed item to complete. If complete is called
with other target, instead of simply returning and do nothing, wait again
until the proper target triggers the event (otherwise this leaves collapse
in a broken state).
 2014-04-12 14:44:35 -05:00
Chris Rebert ee7498a693 grunt dist 2014-04-09 12:07:27 -07:00
XhmikosR ee2df11e93 Merge pull request #13091 from twbs/unused-js 
Remove unused javascript
 2014-04-09 10:07:35 +03:00
XhmikosR 2f0f8ec6d1 Run `grunt dist`. 2014-04-09 10:02:34 +03:00
XhmikosR 45b476bdbf JS: remove unused variables. 2014-04-09 10:01:48 +03:00
Mark Otto de86b36b50 grunt dist 2014-04-08 23:59:17 -07:00
Collin Donahue-Oponski d7a3771abd When opening the dropdown, focus() the dropdown-toggle BEFORE triggering 'shown.bs.dropdown' 
Closes #11281 by merging it (after rebasing & resolving conflicts)
 2014-04-08 22:36:21 -07:00
Mark Otto 558e112de4 Merge pull request #13203 from twbs/equal-height-experiment 
Add flexbox-based equal-height grid columns as an experimental example
 2014-04-08 21:13:43 -07:00
Mark Otto 5d78200a66 the space between spaces 2014-04-08 21:07:05 -07:00
Mark Otto 3424195e64 add screenshot 2014-04-08 21:04:02 -07:00
Mark Otto 11a835f566 Merge branch 'master' into equal-height-experiment 2014-04-08 20:51:56 -07:00
XhmikosR 9863344e9a README.md: switch to SVG badges. 2014-04-08 18:05:15 +03:00
Mark Otto f159ce8b9e Fixes #13208: Drop <b> for <span> in code snippets and examples 2014-04-07 22:59:37 -07:00
Mark Otto bfb99413ee grunt dist 2014-04-06 20:49:22 -07:00
Mark Otto 1554b7cdd7 Merge pull request #13242 from killthekitten/fix-carousel-controls 
Fix carousel-control margin asymmetry
 2014-04-06 20:37:34 -07:00
Mark Otto 818a50e2ea Merge pull request #13284 from chasingtheflow/master 
Fixed typo in Responsive Tables CSS docs
 2014-04-06 20:16:56 -07:00
Julian Thilo 58e6af3988 #12790: Add link to unofficial Italian translation 2014-04-06 02:21:44 +02:00
Billy Matthews fce0254b2a Fixed typo in Responsive Tables CSS docs 2014-04-05 18:33:57 -04:00
Chris Rebert d56026d489 fix grammar in "Underlined text" example 2014-04-04 10:25:22 -07:00
Julian Thilo fa9e541f5e Re-implement Universal Analytics 
X-Refs:
b2a67ffe55
c97e6d5cad
 2014-04-04 10:28:45 +02:00
Chris Rebert 5ef634dab9 replace $.bind() with $.on() in unit tests; per #13272 2014-04-03 18:13:16 -07:00
Chris Rebert f6d1a733f5 Merge pull request #13272 from hnrch02/banish-bind 
Replace $.fn.bind with $.fn.on in alert docs
 2014-04-03 18:03:09 -07:00
Heinrich Fenkart b94306d29b Replace $.fn.bind with $.fn.on in alert docs 2014-04-04 02:46:19 +02:00
Chris Rebert 8ca182876d customizer: squelch error when can't save Gist 2014-04-03 17:02:10 -07:00
Chris Rebert 0b6f1906cd better way of tracking what caches need to be uploaded; fixes #13270 2014-04-03 14:57:56 -07:00
Chris Rebert 4c049e3600 Merge pull request #13260 from twbs/doc-12651 
document that label.active on preselected inputs in btn-groups is manual
 2014-04-03 14:45:31 -07:00
Chris Rebert 9056fe0ec0 Merge pull request #13269 from twbs/fix-13136 
move some caching info+logic out of .travis.yml
 2014-04-03 14:07:49 -07:00
Chris Rebert 718a6c5da7 move some caching info+logic out of .travis.yml; fixes #13136 2014-04-03 13:44:42 -07:00
Chris Rebert e7d9ca7f79 Merge pull request #13222 from twbs/fix-13126 
doc how to change the collapsed mobile navbar breakpoint
 2014-04-03 13:32:34 -07:00
Chris Rebert 1c19284a38 doc how to change the collapsed mobile navbar breakpoint; fixes #13126 2014-04-03 13:31:55 -07:00
Chris Rebert 1759569dbe Travis: introduce $GEMDIR env var 2014-04-03 12:23:42 -07:00
Chris Rebert 2878d6ef83 grammar 2014-04-03 11:53:35 -07:00
Chris Rebert 9c7e86be99 add timing logic+output to s3_cache.py 2014-04-03 11:34:15 -07:00
XhmikosR 4c2626fecb Run `grunt`. 2014-04-03 10:53:44 +03:00
XhmikosR 2b30b48894 Fix the new JSHint warnings. 2014-04-03 10:53:13 +03:00
XhmikosR 76e717b233 Update dependencies. 2014-04-03 10:52:32 +03:00
Mark Otto a444863268 Merge pull request #13217 from thedavidscherer/fix-13216 
fixes #13216
 2014-04-02 23:48:55 -07:00
Chris Rebert 2d1d5754f7 document that you have to add .active yourself on prechecked btn-ized checkboxes+radios; fixes #12651 2014-04-02 20:00:52 -07:00
Chris Rebert 640923eb36 help avoid misuse of Carousel's .active when copy-pasting from examples; fix #13252 2014-04-01 13:04:43 -07:00
Chris Rebert f9e98a1422 re-deprecate @screen-xs-min per #12913 
By definition, XS screens have no minimum size, only a maximum size.
(Symmetrically, LG screens have no maximum size, hence why there's no @screen-lg-max.)
 2014-04-01 12:49:52 -07:00
XhmikosR 8c95ff748f Run `grunt`. 2014-04-01 08:26:47 +03:00
XhmikosR 367da423c4 Update "grunt-contrib-concat" dependency. 2014-04-01 08:26:39 +03:00
Mark Otto 47a3c6d60b Merge pull request #13241 from twbs/address-13240 
explicitly doc that icon classes should only be used on empty elements
 2014-03-31 21:12:38 -07:00
Chris Rebert 11ffc7346b explicitly doc that icon classes should only be used on empty elements; closes #13240 2014-03-31 20:23:14 -07:00
Mark Otto 680be24cd9 Merge pull request #13249 from twbs/slid-is-not-a-typo 
Add comments in carousel.js to clarify that "slid" is not a typo
 2014-03-31 20:08:07 -07:00
Chris Rebert 26f6807a3d Add comments in carousel.js to clarify that "slid" is not a typo 
Addresses #13248.
 2014-03-31 18:09:24 -07:00