2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-21 13:24:08 +03:00

Commit Graph

  • 87c98478d2 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip Mark Otto 2013-07-29 17:21:31 -07:00
  • ddafa9a0bb Attempts to fix #8645: add code comments to grid example to clarify behavior Mark Otto 2013-07-29 17:21:22 -07:00
  • 7ae32074a0 Remove hack/workaround for jshint/grunt bug that's now fixed Chris Rebert 2013-07-29 17:17:52 -07:00
  • fa854a58bd Merge pull request #8818 from twbs/firefox-input-btn-docs-note Mark Otto 2013-07-29 17:16:02 -07:00
  • 5716355cda Restore mini button (fixes #8644) Mark Otto 2013-07-29 17:08:04 -07:00
  • 2dcfa00e56 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip Mark Otto 2013-07-29 17:03:40 -07:00
  • 09fff764ed fixes #8687: correct docs typo on radio inputs Mark Otto 2013-07-29 17:03:00 -07:00
  • dfd10efd80 make it clearer than <input> buttons are slightly broken on Firefox Chris Rebert 2013-07-29 16:57:30 -07:00
  • e0395b425d reorder nav-justified classes Andrey Popp 2013-07-30 03:27:32 +04:00
  • d9c9afa6d1 add focus to button group active button behavior Mark Otto 2013-07-29 14:53:55 -07:00
  • 1e0c0b8f94 Add .fade to div.modal in "Live demo" modal example code; fixes #8723 Chris Rebert 2013-07-29 13:26:00 -07:00
  • c2b7e2ca27 use the local copy of jquery Peter Wilmott 2013-07-29 21:23:19 +01:00
  • d08d9a63c3 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip Mark Otto 2013-07-29 12:29:22 -07:00
  • 7b42b8b0fe fixes #8797: only expand submenu docs links at >768px Mark Otto 2013-07-29 12:28:54 -07:00
  • a954f04a02 Merge pull request #8800 from brenocalazans/3.0.0-wip Mark Otto 2013-07-29 12:25:57 -07:00
  • 47a56f5451 Update bower.json Breno Calazans 2013-07-29 16:11:28 -03:00
  • db051288c5 Merge pull request #8791 from acmetech/3.0.0-wip Chris Rebert 2013-07-29 11:34:13 -07:00
  • 07dd62ed7c Add jQuery + Bootstrap JS to starter template Ross Allen 2013-07-29 11:24:40 -07:00
  • 9c2ae98a4e Merge pull request #8774 from liuyl/transition Jacob 2013-07-29 11:23:29 -07:00
  • 33a61baf38 fix the download link to 3.0.0-wip Chris Rebert 2013-07-29 11:20:41 -07:00
  • 13406c240a update code example for <select> multiple Tom Pietschker 2013-07-29 14:15:17 -04:00
  • 2acb0f40c0 Merge pull request #8718 from ggam/patch-4 Mark Otto 2013-07-29 10:00:35 -07:00
  • 0bf5443ad7 Merge pull request #8717 from ggam/patch-3 Mark Otto 2013-07-29 10:00:10 -07:00
  • 08cd3072fc Merge pull request #8747 from liuyl/buttons Mark Otto 2013-07-29 09:58:54 -07:00
  • 6c44246dc9 fix broken focus state on download button (fixes #8782) Mark Otto 2013-07-29 09:42:50 -07:00
  • 270316f140 fix transition end liuyl 2013-07-29 20:23:01 +08:00
  • b1a1210f07 fix #8694: apply tooltip demo ordering change from #8730 to popovers too Chris Rebert 2013-07-29 03:35:45 -07:00
  • be0974802d update composer.json to reflect org change Chris Rebert 2013-07-29 00:21:18 -07:00
  • 3a50ce3596 fix #8745: fix html5shiv & respond.js script links in docs Chris Rebert 2013-07-28 23:13:43 -07:00
  • e77d134481 buttons liuyl 2013-07-29 14:09:41 +08:00
  • f3cff49d6d Merge pull request #8738 from twbs/clarify-width-vs-height-size-classes Mark Otto 2013-07-28 22:29:05 -07:00
  • 061535019c avoid ambiguous term "relative sizing"; clarify width vs. height control classes Chris Rebert 2013-07-28 01:44:23 -07:00
  • 8eb42d9b20 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip Jacob Thornton 2013-07-28 22:23:56 -07:00
  • edaeb33816 fixed #8715 Jacob Thornton 2013-07-28 22:23:20 -07:00
  • eb56f7e4f4 Merge pull request #8737 from twbs/docs-html5-style-select-multiple Mark Otto 2013-07-28 22:22:10 -07:00
  • e74a25a3b8 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip Mark Otto 2013-07-28 22:21:27 -07:00
  • 774f173a18 expand grid system options table to include column widths, gutter widths, large desktop media query, and container widths (fixes #8733) Mark Otto 2013-07-28 22:21:16 -07:00
  • 70bd9b936f CSS docs page: Use simpler HTML5 style for multiple boolean attribute of <select> Chris Rebert 2013-07-28 01:42:55 -07:00
  • a31c5cea42 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip Jacob Thornton 2013-07-28 22:16:17 -07:00
  • e5a7af36d5 fixes #8703 Jacob Thornton 2013-07-28 22:14:43 -07:00
  • c9c2418a47 Merge pull request #8736 from twbs/css-docs-code Chris Rebert 2013-07-28 22:14:24 -07:00
  • 7bcee1acd2 apply <code> in a few places Chris Rebert 2013-07-28 01:38:48 -07:00
  • 4ebb29e5bd Merge pull request #8735 from twbs/docs-edits Chris Rebert 2013-07-28 22:07:46 -07:00
  • d0a2a62cd7 expand out IE for consistency w/ the rest of the page Chris Rebert 2013-07-28 01:41:39 -07:00
  • e9b1422e86 add commas in a couple places Chris Rebert 2013-07-28 01:39:15 -07:00
  • bcc6fe5b2b Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip Mark Otto 2013-07-28 22:00:55 -07:00
  • b0225c073a add responsive images section to docs (fixes #8734) Mark Otto 2013-07-28 22:00:49 -07:00
  • af90282858 Merge pull request #8730 from eluttner/3.0.0-wip Mark Otto 2013-07-28 21:50:06 -07:00
  • 59ad7a9cf4 docs.css: Remove border-color that's missing a value Chris Rebert 2013-07-28 20:53:59 -07:00
  • 8858ef4dae Format multiple badges in list-group-item Nicholas Westlake 2013-07-28 21:25:16 -05:00
  • 6652e2684d Javascript - tooltips directions - easier visualization eduardo luttner 2013-07-28 22:46:16 -03:00
  • 0d7940d950 get rid of out of order variable declaration Andrey Popp 2013-07-29 03:03:46 +04:00
  • 7dba45bae7 Deleted unnecessary ID from modals example Guillermo González de Agüero 2013-07-28 19:46:15 +02:00
  • c649a04286 Deleted "show-grid" class from examples Guillermo González de Agüero 2013-07-28 19:40:50 +02:00
  • e1180daca0 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip Mark Otto 2013-07-28 09:42:56 -07:00
  • 67e89ea2bf Merge pull request #8712 from claydiffrient/3.0.0-wip Mark Otto 2013-07-28 09:38:12 -07:00
  • 111dc1492f fixes #8714: correct stacked pills nav Mark Otto 2013-07-28 09:37:10 -07:00
  • 582787342e Fix relative links to examples and links to docs Haukur Páll Hallvarðsson 2013-07-28 15:37:53 +00:00
  • 98a24cbd25 Fix wording in 'hidden on...' to be in line with 3.0 wording. Clay Diffrient 2013-07-28 08:57:10 -06:00
  • 1aedb7862c move things around syed 2013-07-28 17:32:08 +05:00
  • c947ab1c9a fix #8701: IE 10+ supports <fieldset disabled> Chris Rebert 2013-07-28 03:48:40 -07:00
  • 89746174b7 Safari handles <fieldset disabled> just fine; fixes #8698 Chris Rebert 2013-07-28 02:05:38 -07:00
  • 2e9ca57781 Merge branch '3.0.0-wip' into gh-pages Mark Otto 2013-07-28 00:09:05 -07:00
  • b9ff423443 derp, no s on that url Mark Otto 2013-07-28 00:08:55 -07:00
  • f319ec1f2a add new zip Mark Otto 2013-07-28 00:04:09 -07:00
  • 92bd778f45 Merge branch '3.0.0-wip' into gh-pages Mark Otto 2013-07-28 00:03:33 -07:00
  • c6aedfb877 point to different download urls Mark Otto 2013-07-28 00:03:24 -07:00
  • 841711f2f6 Merge branch '3.0.0-wip' into gh-pages Mark Otto 2013-07-27 23:53:23 -07:00
  • 4f793752c5 temporarily undo @fat's scrollspy enhancement since it fucks firefox and ie Mark Otto 2013-07-27 23:53:09 -07:00
  • 939c9590e5 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip Mark Otto 2013-07-27 23:45:11 -07:00
  • 3d06ee3fa8 restore 2.3.2 zip Mark Otto 2013-07-27 23:40:39 -07:00
  • 908f4c342b Merge pull request #8696 from twbs/jshintrc Chris Rebert 2013-07-27 23:12:00 -07:00
  • efac0bf8d6 make pull-right !important liuyl 2013-07-28 14:05:47 +08:00
  • 9c672c6b20 get jshint close to passing by updating .jshintrc settings Chris Rebert 2013-07-27 21:56:44 -07:00
  • c25bf6ba46 Merge pull request #8695 from twbs/fix-grunt-jshint Chris Rebert 2013-07-27 21:43:27 -07:00
  • 03b2866b9e tweak Gruntfile.js so it passes jshint Chris Rebert 2013-07-27 21:33:41 -07:00
  • ba62cfeffe workaround possible bug in grunt-contrib-jshint Chris Rebert 2013-07-27 21:33:11 -07:00
  • 880f43221d tweak Gruntfile.js so it passes jshint Chris Rebert 2013-07-27 21:33:41 -07:00
  • 8a430b3698 workaround possible bug in grunt-contrib-jshint Chris Rebert 2013-07-27 21:33:11 -07:00
  • d149f651f2 Add Bootstrap JS to make collapsible nav work Ross Allen 2013-07-27 20:40:24 -07:00
  • cee5f6fbdf Add new 'form-control' class to style header inputs Ross Allen 2013-07-27 20:39:24 -07:00
  • 1a1bc33406 Replace 'input-block-level' with 'form-control' Ross Allen 2013-07-27 20:19:20 -07:00
  • ce1fdc5ded Update carousel example JS path Ross Allen 2013-07-27 20:17:53 -07:00
  • c834b4027c Match .carousel-inner specificity to beat styles Ross Allen 2013-07-27 20:14:49 -07:00
  • 7b6f85c179 Remove back to top link from docs Mark Otto 2013-07-27 19:50:33 -07:00
  • ce57378705 fixes #8665: have modals use auto margin on sides and widen it instead of positioning and negative margin Mark Otto 2013-07-27 19:38:05 -07:00
  • 5aad25b34b Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip Mark Otto 2013-07-27 18:56:52 -07:00
  • b281ad6409 Input groups overhaul Mark Otto 2013-07-27 18:56:31 -07:00
  • 2f39259d9b Merge pull request #8685 from jouve/3.0.0-wip Chris Rebert 2013-07-27 18:13:54 -07:00
  • b4f5687c05 fix README.md Cyril Jouve 2013-07-28 02:52:39 +02:00
  • e953c23019 fixes #8659: remove lingering .nav-header Mark Otto 2013-07-27 16:51:04 -07:00
  • 8cb1b766f8 fixes #8642: use .pull-right to keep dropdowns aligned in example Mark Otto 2013-07-27 16:41:02 -07:00
  • 14f688c7fc fixes #8675: align horizontal form label and input Mark Otto 2013-07-27 16:37:45 -07:00
  • 51515e6791 Merge pull request #8676 from sprice/update-editorconfig Mark Otto 2013-07-27 14:56:29 -07:00
  • d8b477f273 Use local copy of jquery instead of hotlinking Shawn Price 2013-07-27 14:30:38 -07:00
  • dfa71726a9 Fix path to bootstrap javascript Shawn Price 2013-07-27 14:28:13 -07:00
  • d14c72f334 Remove Makefile section from .editorconfig Shawn Price 2013-07-27 14:04:46 -07:00
  • 57bc65f7f8 Merge pull request #8650 from loic/3.0.0-wip Mark Otto 2013-07-27 11:26:28 -07:00
  • 1fb1c40aba Merge pull request #8657 from Micronax/3.0.0-wip Mark Otto 2013-07-27 11:25:17 -07:00
  • 1ca5c2bdb9 Merge pull request #8663 from mekishizufu/fix-typo Mark Otto 2013-07-27 11:24:32 -07:00