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
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
Mark Otto b0225c073a add responsive images section to docs (fixes #8734) 2013-07-28 22:00:49 -07:00
Mark Otto af90282858 Merge pull request #8730 from eluttner/3.0.0-wip
Javascript - tooltips directions - easier visualization
2013-07-28 21:50:06 -07:00
Chris Rebert 59ad7a9cf4 docs.css: Remove border-color that's missing a value
/cc @mdo to fix this properly later
/cc @rcotrina94 from e1bb94c383
2013-07-28 20:53:59 -07:00
Nicholas Westlake 8858ef4dae Format multiple badges in list-group-item 2013-07-28 21:25:16 -05:00
eduardo luttner 6652e2684d 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
2013-07-28 22:46:16 -03:00
Andrey Popp 0d7940d950 get rid of out of order variable declaration 2013-07-29 03:04:12 +04:00
Guillermo González de Agüero 7dba45bae7 Deleted unnecessary ID from modals example 2013-07-28 19:46:15 +02:00
Guillermo González de Agüero c649a04286 Deleted "show-grid" class from examples 2013-07-28 19:40:50 +02:00
Mark Otto e1180daca0 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-07-28 09:42:56 -07:00
Mark Otto 67e89ea2bf Merge pull request #8712 from claydiffrient/3.0.0-wip
Fix wording in 'hidden on...' to be in line with 3.0 wording.
2013-07-28 09:38:12 -07:00
Mark Otto 111dc1492f fixes #8714: correct stacked pills nav 2013-07-28 09:37:10 -07:00
Haukur Páll Hallvarðsson 582787342e Fix relative links to examples and links to docs 2013-07-28 15:37:53 +00:00
Clay Diffrient 98a24cbd25 Fix wording in 'hidden on...' to be in line with 3.0 wording. 2013-07-28 08:57:10 -06:00
syed 1aedb7862c move things around
Moved alerts, badges, button groups, buttons, carousel, close to
variables.less and customize.html
2013-07-28 17:32:08 +05:00
Chris Rebert c947ab1c9a fix #8701: IE 10+ supports <fieldset disabled>
*golf clap*
2013-07-28 03:48:40 -07:00
Chris Rebert 89746174b7 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.
2013-07-28 02:05:38 -07:00
Mark Otto b9ff423443 derp, no s on that url 2013-07-28 00:08:55 -07:00
Mark Otto c6aedfb877 point to different download urls 2013-07-28 00:03:24 -07:00
Mark Otto 4f793752c5 temporarily undo @fat's scrollspy enhancement since it fucks firefox and ie 2013-07-27 23:53:09 -07:00
Mark Otto 939c9590e5 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-07-27 23:45:11 -07:00
Chris Rebert 908f4c342b Merge pull request #8696 from twbs/jshintrc
get jshint close to passing by updating .jshintrc settings
2013-07-27 23:12:00 -07:00
liuyl efac0bf8d6 make pull-right !important 2013-07-28 14:05:47 +08:00
Chris Rebert 9c672c6b20 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.
2013-07-27 21:56:44 -07:00
Chris Rebert c25bf6ba46 Merge pull request #8695 from twbs/fix-grunt-jshint
Fix grunt jshint
2013-07-27 21:43:27 -07:00
Chris Rebert 03b2866b9e tweak Gruntfile.js so it passes jshint 2013-07-27 21:39:11 -07:00
Chris Rebert ba62cfeffe workaround possible bug in grunt-contrib-jshint 2013-07-27 21:38:59 -07:00
Chris Rebert 880f43221d tweak Gruntfile.js so it passes jshint 2013-07-27 21:33:41 -07:00
Chris Rebert 8a430b3698 workaround possible bug in grunt-contrib-jshint 2013-07-27 21:33:11 -07:00
Ross Allen d149f651f2 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.
2013-07-27 20:40:24 -07:00
Ross Allen cee5f6fbdf Add new 'form-control' class to style header inputs 2013-07-27 20:39:24 -07:00
Ross Allen 1a1bc33406 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.
2013-07-27 20:24:28 -07:00
Ross Allen ce1fdc5ded 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.
2013-07-27 20:17:53 -07:00