]>
git.ipfire.org Git - thirdparty/bootstrap.git/log
Mark Otto [Tue, 30 Jul 2013 21:07:00 +0000 (14:07 -0700)]
Merge pull request #8852 from briannelsondesign/label_baselines
Adjusts vertical alignment of labels and badges
fat [Tue, 30 Jul 2013 20:41:24 +0000 (13:41 -0700)]
fixes #8216
fat [Tue, 30 Jul 2013 20:33:56 +0000 (13:33 -0700)]
fixes #8814
fat [Tue, 30 Jul 2013 20:31:57 +0000 (13:31 -0700)]
fixes #8816
Chris Rebert [Tue, 30 Jul 2013 19:35:39 +0000 (12:35 -0700)]
trivial spacing fix
Ross Allen [Tue, 30 Jul 2013 17:33:48 +0000 (10:33 -0700)]
Use correct class for header in jumbotron dropdown nav
Ross Allen [Tue, 30 Jul 2013 17:10:34 +0000 (10:10 -0700)]
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.
Ross Allen [Tue, 30 Jul 2013 17:09:30 +0000 (10:09 -0700)]
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".
Mark Otto [Tue, 30 Jul 2013 16:40:01 +0000 (09:40 -0700)]
Merge pull request #8846 from ggam/patch-5
Fix grid sizes documentation
Brian Nelson [Tue, 30 Jul 2013 15:35:13 +0000 (11:35 -0400)]
Compiles changes to CSS
Brian Nelson [Tue, 30 Jul 2013 15:23:25 +0000 (11:23 -0400)]
Improves label and badge alignment so text aligns with baseline
Guillermo González de Agüero [Tue, 30 Jul 2013 14:34:13 +0000 (16:34 +0200)]
Fix #8658
Gerhard [Tue, 30 Jul 2013 14:23:34 +0000 (16:23 +0200)]
.navbar-wrapper need higher z-index to be on top of the carousel
Chris Rebert [Tue, 30 Jul 2013 05:11:37 +0000 (22:11 -0700)]
Merge pull request #8821 from twbs/twbs-license-faq-tweak
tweak part of license FAQ to reflect Twitter->twbs change
Chris Rebert [Tue, 30 Jul 2013 01:48:50 +0000 (18:48 -0700)]
tweak part of license FAQ to reflect Twitter->twbs change
liuyl [Tue, 30 Jul 2013 01:30:21 +0000 (09:30 +0800)]
make navbar-text float left
Mark Otto [Tue, 30 Jul 2013 00:30:36 +0000 (17:30 -0700)]
Refactor .input-* sizing a bit by not chaining to .form-control (fixes #8672)
Mark Otto [Tue, 30 Jul 2013 00:23:08 +0000 (17:23 -0700)]
fixes #8670: move list group bg color to individual items for mo betta rendering
Mark Otto [Tue, 30 Jul 2013 00:21:31 +0000 (17:21 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Tue, 30 Jul 2013 00:21:22 +0000 (17:21 -0700)]
Attempts to fix #8645: add code comments to grid example to clarify behavior
Chris Rebert [Tue, 30 Jul 2013 00:17:52 +0000 (17:17 -0700)]
Remove hack/workaround for jshint/grunt bug that's now fixed
See https://github.com/gruntjs/grunt-contrib-jshint/issues/86
Mark Otto [Tue, 30 Jul 2013 00:16:02 +0000 (17:16 -0700)]
Merge pull request #8818 from twbs/firefox-input-btn-docs-note
make it clearer than <input> buttons are slightly broken on Firefox
Mark Otto [Tue, 30 Jul 2013 00:08:04 +0000 (17:08 -0700)]
Restore mini button (fixes #8644)
Mark Otto [Tue, 30 Jul 2013 00:03:40 +0000 (17:03 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Tue, 30 Jul 2013 00:03:00 +0000 (17:03 -0700)]
fixes #8687: correct docs typo on radio inputs
Chris Rebert [Mon, 29 Jul 2013 23:57:30 +0000 (16:57 -0700)]
make it clearer than <input> buttons are slightly broken on Firefox
Andrey Popp [Mon, 29 Jul 2013 23:27:32 +0000 (03:27 +0400)]
reorder nav-justified classes
Mark Otto [Mon, 29 Jul 2013 21:53:55 +0000 (14:53 -0700)]
add focus to button group active button behavior
Chris Rebert [Mon, 29 Jul 2013 20:26:00 +0000 (13:26 -0700)]
Add .fade to div.modal in "Live demo" modal example code; fixes #8723
Peter Wilmott [Mon, 29 Jul 2013 20:23:19 +0000 (21:23 +0100)]
use the local copy of jquery
Mark Otto [Mon, 29 Jul 2013 19:29:22 +0000 (12:29 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Mon, 29 Jul 2013 19:28:54 +0000 (12:28 -0700)]
fixes #8797: only expand submenu docs links at >768px
Mark Otto [Mon, 29 Jul 2013 19:25:57 +0000 (12:25 -0700)]
Merge pull request #8800 from brenocalazans/3.0.0-wip
Update bower.json
Breno Calazans [Mon, 29 Jul 2013 19:11:28 +0000 (16:11 -0300)]
Update bower.json
Chris Rebert [Mon, 29 Jul 2013 18:34:13 +0000 (11:34 -0700)]
Merge pull request #8791 from acmetech/3.0.0-wip
Update the code example for <select> multiple
Ross Allen [Mon, 29 Jul 2013 18:24:40 +0000 (11:24 -0700)]
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
Jacob [Mon, 29 Jul 2013 18:23:29 +0000 (11:23 -0700)]
Merge pull request #8774 from liuyl/transition
fix transition end
Chris Rebert [Mon, 29 Jul 2013 18:20:41 +0000 (11:20 -0700)]
fix the download link to 3.0.0-wip
Tom Pietschker [Mon, 29 Jul 2013 18:15:17 +0000 (14:15 -0400)]
update code example for <select> multiple
Mark Otto [Mon, 29 Jul 2013 17:00:35 +0000 (10:00 -0700)]
Merge pull request #8718 from ggam/patch-4
Deleted unnecessary ID from modals example
Mark Otto [Mon, 29 Jul 2013 17:00:10 +0000 (10:00 -0700)]
Merge pull request #8717 from ggam/patch-3
Deleted "show-grid" class from examples
Mark Otto [Mon, 29 Jul 2013 16:58:54 +0000 (09:58 -0700)]
Merge pull request #8747 from liuyl/buttons
disable user-select for buttons
Mark Otto [Mon, 29 Jul 2013 16:42:50 +0000 (09:42 -0700)]
fix broken focus state on download button (fixes #8782)
liuyl [Mon, 29 Jul 2013 12:23:01 +0000 (20:23 +0800)]
fix transition end
Chris Rebert [Mon, 29 Jul 2013 10:35:45 +0000 (03:35 -0700)]
fix #8694: apply tooltip demo ordering change from #8730 to popovers too
Chris Rebert [Mon, 29 Jul 2013 07:21:18 +0000 (00:21 -0700)]
update composer.json to reflect org change
Chris Rebert [Mon, 29 Jul 2013 06:13:43 +0000 (23:13 -0700)]
fix #8745: fix html5shiv & respond.js script links in docs
liuyl [Mon, 29 Jul 2013 06:09:41 +0000 (14:09 +0800)]
buttons
Mark Otto [Mon, 29 Jul 2013 05:29:05 +0000 (22:29 -0700)]
Merge pull request #8738 from twbs/clarify-width-vs-height-size-classes
form input docs: clarify height-related vs. width-related classes
Chris Rebert [Sun, 28 Jul 2013 08:44:23 +0000 (01:44 -0700)]
avoid ambiguous term "relative sizing"; clarify width vs. height control classes
Jacob Thornton [Mon, 29 Jul 2013 05:23:56 +0000 (22:23 -0700)]
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Jacob Thornton [Mon, 29 Jul 2013 05:23:20 +0000 (22:23 -0700)]
fixed #8715
Mark Otto [Mon, 29 Jul 2013 05:22:10 +0000 (22:22 -0700)]
Merge pull request #8737 from twbs/docs-html5-style-select-multiple
CSS docs page: Use simpler HTML5 style for `multiple` <select> attribute
Mark Otto [Mon, 29 Jul 2013 05:21:27 +0000 (22:21 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Mon, 29 Jul 2013 05:21:16 +0000 (22:21 -0700)]
expand grid system options table to include column widths, gutter widths, large desktop media query, and container widths (fixes #8733)
Chris Rebert [Sun, 28 Jul 2013 08:42:55 +0000 (01:42 -0700)]
CSS docs page: Use simpler HTML5 style for `multiple` boolean attribute of <select>
Jacob Thornton [Mon, 29 Jul 2013 05:16:17 +0000 (22:16 -0700)]
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Jacob Thornton [Mon, 29 Jul 2013 05:14:43 +0000 (22:14 -0700)]
fixes #8703
Chris Rebert [Mon, 29 Jul 2013 05:14:24 +0000 (22:14 -0700)]
Merge pull request #8736 from twbs/css-docs-code
CSS docs page: apply <code> in a few places
Chris Rebert [Sun, 28 Jul 2013 08:38:48 +0000 (01:38 -0700)]
apply <code> in a few places
Chris Rebert [Mon, 29 Jul 2013 05:07:46 +0000 (22:07 -0700)]
Merge pull request #8735 from twbs/docs-edits
minor CSS docs edits
Chris Rebert [Sun, 28 Jul 2013 08:41:39 +0000 (01:41 -0700)]
expand out IE for consistency w/ the rest of the page
Chris Rebert [Sun, 28 Jul 2013 08:39:15 +0000 (01:39 -0700)]
add commas in a couple places
Mark Otto [Mon, 29 Jul 2013 05:00:55 +0000 (22:00 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Mon, 29 Jul 2013 05:00:49 +0000 (22:00 -0700)]
add responsive images section to docs (fixes #8734)
Mark Otto [Mon, 29 Jul 2013 04:50:06 +0000 (21:50 -0700)]
Merge pull request #8730 from eluttner/3.0.0-wip
Javascript - tooltips directions - easier visualization
Chris Rebert [Mon, 29 Jul 2013 03:53:59 +0000 (20:53 -0700)]
docs.css: Remove border-color that's missing a value
/cc @mdo to fix this properly later
/cc @rcotrina94 from
e1bb94c38370fd2542415557c660d0804d4f42b1
Nicholas Westlake [Mon, 29 Jul 2013 02:25:16 +0000 (21:25 -0500)]
Format multiple badges in list-group-item
eduardo luttner [Mon, 29 Jul 2013 01:46:16 +0000 (22:46 -0300)]
Javascript - tooltips directions - easier visualization
Changed the order of the visualization. It is not the css order, however it is easier to see the tooltips
Andrey Popp [Sun, 28 Jul 2013 23:03:46 +0000 (03:03 +0400)]
get rid of out of order variable declaration
Guillermo González de Agüero [Sun, 28 Jul 2013 17:46:15 +0000 (19:46 +0200)]
Deleted unnecessary ID from modals example
Guillermo González de Agüero [Sun, 28 Jul 2013 17:40:50 +0000 (19:40 +0200)]
Deleted "show-grid" class from examples
Mark Otto [Sun, 28 Jul 2013 16:42:56 +0000 (09:42 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Sun, 28 Jul 2013 16:38:12 +0000 (09:38 -0700)]
Merge pull request #8712 from claydiffrient/3.0.0-wip
Fix wording in 'hidden on...' to be in line with 3.0 wording.
Mark Otto [Sun, 28 Jul 2013 16:37:10 +0000 (09:37 -0700)]
fixes #8714: correct stacked pills nav
Haukur Páll Hallvarðsson [Sun, 28 Jul 2013 15:37:53 +0000 (15:37 +0000)]
Fix relative links to examples and links to docs
Clay Diffrient [Sun, 28 Jul 2013 14:57:10 +0000 (08:57 -0600)]
Fix wording in 'hidden on...' to be in line with 3.0 wording.
syed [Sun, 28 Jul 2013 12:32:08 +0000 (17:32 +0500)]
move things around
Moved alerts, badges, button groups, buttons, carousel, close to
variables.less and customize.html
Chris Rebert [Sun, 28 Jul 2013 10:48:40 +0000 (03:48 -0700)]
fix #8701: IE 10+ supports <fieldset disabled>
*golf clap*
Chris Rebert [Sun, 28 Jul 2013 09:05:38 +0000 (02:05 -0700)]
Safari handles <fieldset disabled> just fine; fixes #8698
This makes me wonder whether recent IE might actually support this too.
If not, your move IE Team.
Mark Otto [Sun, 28 Jul 2013 07:08:55 +0000 (00:08 -0700)]
derp, no s on that url
Mark Otto [Sun, 28 Jul 2013 07:03:24 +0000 (00:03 -0700)]
point to different download urls
Mark Otto [Sun, 28 Jul 2013 06:53:09 +0000 (23:53 -0700)]
temporarily undo @fat's scrollspy enhancement since it fucks firefox and ie
Mark Otto [Sun, 28 Jul 2013 06:45:11 +0000 (23:45 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Chris Rebert [Sun, 28 Jul 2013 06:12:00 +0000 (23:12 -0700)]
Merge pull request #8696 from twbs/jshintrc
get jshint close to passing by updating .jshintrc settings
liuyl [Sun, 28 Jul 2013 06:05:47 +0000 (14:05 +0800)]
make pull-right !important
Chris Rebert [Sun, 28 Jul 2013 04:56:44 +0000 (21:56 -0700)]
get jshint close to passing by updating .jshintrc settings
I don't agree with these personally, but they jive with BS/@fat's JS code style.
The remaining jshint complaints are things that really actually should get fixed.
Chris Rebert [Sun, 28 Jul 2013 04:43:27 +0000 (21:43 -0700)]
Merge pull request #8695 from twbs/fix-grunt-jshint
Fix grunt jshint
Chris Rebert [Sun, 28 Jul 2013 04:33:41 +0000 (21:33 -0700)]
tweak Gruntfile.js so it passes jshint
Chris Rebert [Sun, 28 Jul 2013 04:33:11 +0000 (21:33 -0700)]
workaround possible bug in grunt-contrib-jshint
Chris Rebert [Sun, 28 Jul 2013 04:33:41 +0000 (21:33 -0700)]
tweak Gruntfile.js so it passes jshint
Chris Rebert [Sun, 28 Jul 2013 04:33:11 +0000 (21:33 -0700)]
workaround possible bug in grunt-contrib-jshint
Ross Allen [Sun, 28 Jul 2013 03:40:24 +0000 (20:40 -0700)]
Add Bootstrap JS to make collapsible nav work
This example uses the collapsible nav for smaller screen sizes, and it
requires Bootstrap JS to get that functionality.
Ross Allen [Sun, 28 Jul 2013 03:39:24 +0000 (20:39 -0700)]
Add new 'form-control' class to style header inputs
Ross Allen [Sun, 28 Jul 2013 03:19:20 +0000 (20:19 -0700)]
Replace 'input-block-level' with 'form-control'
'input-block-level' was replaced with 'form-control' in v3. To get
block-level inputs, the 'form-control' class is now needed.
Ross Allen [Sun, 28 Jul 2013 03:17:53 +0000 (20:17 -0700)]
Update carousel example JS path
'bootstrap.min.js' lives in '../bootstrap/js' now. Switch to the
minified version for a smaller download since this example is focused
on CSS changes, not JavaScript ones.
Ross Allen [Sun, 28 Jul 2013 03:14:49 +0000 (20:14 -0700)]
Match .carousel-inner specificity to beat styles
'.carousel ing' was replaced with '.carousel-inner > .item > img' in
3.0 and now loses the specificity war. To make carousel images 500px
tall, match specificity to make carousel.css win.
Mark Otto [Sun, 28 Jul 2013 02:50:33 +0000 (19:50 -0700)]
Remove back to top link from docs
Mark Otto [Sun, 28 Jul 2013 02:38:05 +0000 (19:38 -0700)]
fixes #8665: have modals use auto margin on sides and widen it instead of positioning and negative margin
Mark Otto [Sun, 28 Jul 2013 01:56:52 +0000 (18:56 -0700)]
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip