2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-18 12:39:41 +03:00
Commit Graph

21773 Commits

Author SHA1 Message Date
Mark Otto 4a060881d7 Merge pull request #11 from ssorallen/jumbotron-js-inputs
Jumbotron JS + "form-control"
2013-07-30 17:41:43 -07:00
Mark Otto 0f23f514ab Merge pull request #24 from ssorallen/sticky-footer-js
Sticky footer example JS and navbar dropdown style
2013-07-30 17:37:21 -07:00
Mark Otto 46a424fc93 edit modal docs code to fix #8769 2013-07-30 15:14:38 -07:00
Mark Otto e6ac348bfc Merge pull request #8726 from andreypopp/3.0.0-wip
Fix out of order variable declaration order
2013-07-30 14:14:51 -07:00
Mark Otto 96eef43dee Merge pull request #8852 from briannelsondesign/label_baselines
Adjusts vertical alignment of labels and badges
2013-07-30 14:07:00 -07:00
fat fc8f4f0465 fixes #8216 2013-07-30 13:41:24 -07:00
fat c54b8adb85 fixes #8814 2013-07-30 13:33:56 -07:00
fat 5ee2a221ca fixes #8816 2013-07-30 13:31:57 -07:00
Chris Rebert da98c5c2c3 trivial spacing fix 2013-07-30 12:35:39 -07:00
Ross Allen ad01dd8ce8 Use correct class for header in jumbotron dropdown nav 2013-07-30 10:33:48 -07:00
Ross Allen 6a8f76f020 Enable dropdown in sticky-footer with Bootstrap JS
The sticky-footer example uses a drop down in its navbar, and dropdowns
require Bootstrap's JS to work.

Use the minified version of Bootstrap since this example is about the
CSS and not about the JS.
2013-07-30 10:10:34 -07:00
Ross Allen 934cf4f683 Use correct dropdown header class in sticky-footer
"nav-header" does not exist in Bootstrap. The class used for headers
in dropdowns is "dropdown-header".
2013-07-30 10:09:30 -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
Brian Nelson dcbf1e51c4 Compiles changes to CSS 2013-07-30 11:35:13 -04:00
Brian Nelson 220fee80bf Improves label and badge alignment so text aligns with baseline 2013-07-30 11:23:25 -04:00
Guillermo González de Agüero 3d54fe180c Fix #8658 2013-07-30 16:34:13 +02:00
Gerhard a9144b50ea .navbar-wrapper need higher z-index to be on top of the carousel 2013-07-30 16:23:34 +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
liuyl 7cfcfdfe64 make navbar-text float left 2013-07-30 09:30:21 +08: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
Andrey Popp e0395b425d reorder nav-justified classes 2013-07-30 03:27:32 +04: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
Peter Wilmott c2b7e2ca27 use the local copy of jquery 2013-07-29 21:23:19 +01: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
Ross Allen 07dd62ed7c Add jQuery + Bootstrap JS to starter template
The starter template uses the Collapse component[1], which requires
Bootstrap's JavaScript.

Fixes #15

[1] http://twitter.github.io/bootstrap/javascript/#collapse
2013-07-29 11:24:40 -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