Commit Graph

5287 Commits

Author SHA1 Message Date
Chris Rebert
da98c5c2c3 trivial spacing fix 2013-07-30 12:35:39 -07:00
Mark Otto
d9266f95c4 Merge pull request #8846 from ggam/patch-5
Fix grid sizes documentation
2013-07-30 09:40:01 -07:00
Guillermo González de Agüero
3d54fe180c Fix #8658 2013-07-30 16:34:13 +02:00
Chris Rebert
5ef1fe160e Merge pull request #8821 from twbs/twbs-license-faq-tweak
tweak part of license FAQ to reflect Twitter->twbs change
2013-07-29 22:11:37 -07:00
Chris Rebert
652f056556 tweak part of license FAQ to reflect Twitter->twbs change 2013-07-29 22:10:53 -07:00
Mark Otto
8b5e41d900 Refactor .input-* sizing a bit by not chaining to .form-control (fixes #8672) 2013-07-29 17:30:36 -07:00
Mark Otto
09edfcf8c2 fixes #8670: move list group bg color to individual items for mo betta rendering 2013-07-29 17:23:08 -07:00
Mark Otto
87c98478d2 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-07-29 17:21:31 -07:00
Mark Otto
ddafa9a0bb Attempts to fix #8645: add code comments to grid example to clarify behavior 2013-07-29 17:21:22 -07:00
Chris Rebert
7ae32074a0 Remove hack/workaround for jshint/grunt bug that's now fixed
See https://github.com/gruntjs/grunt-contrib-jshint/issues/86
2013-07-29 17:17:52 -07:00
Mark Otto
fa854a58bd Merge pull request #8818 from twbs/firefox-input-btn-docs-note
make it clearer than <input> buttons are slightly broken on Firefox
2013-07-29 17:16:02 -07:00
Mark Otto
5716355cda Restore mini button (fixes #8644) 2013-07-29 17:08:04 -07:00
Mark Otto
2dcfa00e56 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-07-29 17:03:40 -07:00
Mark Otto
09fff764ed fixes #8687: correct docs typo on radio inputs 2013-07-29 17:03:00 -07:00
Chris Rebert
dfd10efd80 make it clearer than <input> buttons are slightly broken on Firefox 2013-07-29 16:57:30 -07:00
Mark Otto
d9c9afa6d1 add focus to button group active button behavior 2013-07-29 14:53:55 -07:00
Chris Rebert
1e0c0b8f94 Add .fade to div.modal in "Live demo" modal example code; fixes #8723 2013-07-29 13:26:00 -07:00
Mark Otto
d08d9a63c3 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-07-29 12:29:22 -07:00
Mark Otto
7b42b8b0fe fixes #8797: only expand submenu docs links at >768px 2013-07-29 12:28:54 -07:00
Mark Otto
a954f04a02 Merge pull request #8800 from brenocalazans/3.0.0-wip
Update bower.json
2013-07-29 12:25:57 -07:00
Breno Calazans
47a56f5451 Update bower.json 2013-07-29 16:11:28 -03:00
Chris Rebert
db051288c5 Merge pull request #8791 from acmetech/3.0.0-wip
Update the code example for <select> multiple
2013-07-29 11:34:13 -07:00
Jacob
9c2ae98a4e Merge pull request #8774 from liuyl/transition
fix transition end
2013-07-29 11:23:29 -07:00
Chris Rebert
33a61baf38 fix the download link to 3.0.0-wip 2013-07-29 11:20:41 -07:00
Tom Pietschker
13406c240a update code example for <select> multiple 2013-07-29 14:15:17 -04:00
Mark Otto
2acb0f40c0 Merge pull request #8718 from ggam/patch-4
Deleted unnecessary ID from modals example
2013-07-29 10:00:35 -07:00
Mark Otto
0bf5443ad7 Merge pull request #8717 from ggam/patch-3
Deleted "show-grid" class from examples
2013-07-29 10:00:10 -07:00
Mark Otto
08cd3072fc Merge pull request #8747 from liuyl/buttons
disable user-select for buttons
2013-07-29 09:58:54 -07:00
Mark Otto
6c44246dc9 fix broken focus state on download button (fixes #8782) 2013-07-29 09:42:50 -07:00
liuyl
270316f140 fix transition end 2013-07-29 20:23:01 +08:00
Chris Rebert
b1a1210f07 fix #8694: apply tooltip demo ordering change from #8730 to popovers too 2013-07-29 03:35:45 -07:00
Chris Rebert
be0974802d update composer.json to reflect org change 2013-07-29 00:21:18 -07:00
Chris Rebert
3a50ce3596 fix #8745: fix html5shiv & respond.js script links in docs 2013-07-28 23:13:43 -07:00
liuyl
e77d134481 buttons 2013-07-29 14:09:41 +08:00
Mark Otto
f3cff49d6d Merge pull request #8738 from twbs/clarify-width-vs-height-size-classes
form input docs: clarify height-related vs. width-related classes
2013-07-28 22:29:05 -07:00
Chris Rebert
061535019c avoid ambiguous term "relative sizing"; clarify width vs. height control classes 2013-07-28 22:24:49 -07:00
Jacob Thornton
8eb42d9b20 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-28 22:23:56 -07:00
Jacob Thornton
edaeb33816 fixed #8715 2013-07-28 22:23:20 -07:00
Mark Otto
eb56f7e4f4 Merge pull request #8737 from twbs/docs-html5-style-select-multiple
CSS docs page: Use simpler HTML5 style for `multiple` <select> attribute
2013-07-28 22:22:10 -07:00
Mark Otto
e74a25a3b8 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-07-28 22:21:27 -07:00
Mark Otto
774f173a18 expand grid system options table to include column widths, gutter widths, large desktop media query, and container widths (fixes #8733) 2013-07-28 22:21:16 -07:00
Chris Rebert
70bd9b936f CSS docs page: Use simpler HTML5 style for multiple boolean attribute of <select> 2013-07-28 22:17:08 -07:00
Jacob Thornton
a31c5cea42 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-28 22:16:17 -07:00
Jacob Thornton
e5a7af36d5 fixes #8703 2013-07-28 22:14:43 -07:00
Chris Rebert
c9c2418a47 Merge pull request #8736 from twbs/css-docs-code
CSS docs page: apply <code> in a few places
2013-07-28 22:14:24 -07:00
Chris Rebert
7bcee1acd2 apply <code> in a few places 2013-07-28 22:09:01 -07:00
Chris Rebert
4ebb29e5bd Merge pull request #8735 from twbs/docs-edits
minor CSS docs edits
2013-07-28 22:07:46 -07:00
Chris Rebert
d0a2a62cd7 expand out IE for consistency w/ the rest of the page 2013-07-28 22:04:38 -07:00
Chris Rebert
e9b1422e86 add commas in a couple places 2013-07-28 22:04:21 -07:00
Mark Otto
bcc6fe5b2b Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-07-28 22:00:55 -07:00