Commit Graph

6090 Commits

Author SHA1 Message Date
Mark Otto 69a7c16705 fix spacing between examples and highlights again (my bad yo) 2013-08-15 13:00:06 -07:00
Chris Rebert a3cbdfab06 docs.css: rm duplicate semicolon 2013-08-15 12:55:43 -07:00
Mark Otto 834cbce9b7 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-15 12:35:46 -07:00
Mark Otto 33edb95b98 drop legend from docs example per #9626 2013-08-15 12:35:22 -07:00
Chris Rebert bc89c06b6c Merge pull request #9625 from twbs/fix-9513-more
more fixes for #9513
2013-08-15 12:27:42 -07:00
Chris Rebert 5f311790b9 more fixes for #9513 2013-08-15 12:26:37 -07:00
Chris Rebert 5a4401ac91 copyediting tweaks to "Disabling responsiveness" docs 2013-08-15 12:01:53 -07:00
Mark Otto 4b350f8b79 delete comments 2013-08-15 11:56:07 -07:00
Mark Otto 2690a3dc31 Add to #9578 and fix #9614: use cursor not-allowed on radios and checkboxes 2013-08-15 11:52:22 -07:00
Mark Otto 5a0ba42a7b fix up inverse navbar form styles 2013-08-15 11:47:56 -07:00
Mark Otto 49e95f2bcf add clearfix mention to another grid example and clear up examples 2013-08-15 11:47:45 -07:00
Mark Otto 3a7ddae39e fixes #9600 2013-08-15 11:37:35 -07:00
Mark Otto 06e6da0918 fixes #9596: proper dropup caret colors 2013-08-15 11:36:08 -07:00
Mark Otto 209d3af301 Fixes #9617: consistent variation order, add .label-primary 2013-08-15 11:31:26 -07:00
Mark Otto a5cb6c7a15 fixes #9613: update docs css to prevent misaligned buttons example 2013-08-15 11:13:57 -07:00
Mark Otto da6a7827d2 fixes #9616 2013-08-15 11:09:13 -07:00
Mark Otto 4002ac7e65 update to include nav link and mo betta docs on that last commit 2013-08-15 10:54:32 -07:00
Mark Otto e550e113a0 fixes #9586: add documentaton on how to disable the responsiveness of BS3 2013-08-15 10:50:58 -07:00
Mark Otto f681c9712d Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-15 10:30:47 -07:00
Mark Otto 51f2c907e7 fixes #9607: restore bottom border on hover of nav tabs for proper display 2013-08-15 10:30:37 -07:00
Mark Otto 18be4e880c Merge pull request #9591 from BBosman/9523
Doc fixes related to #9523
2013-08-15 10:01:14 -07:00
Mark Otto b9052a74bb Merge pull request #9598 from coliff/patch-5
Change input type for the email input examples
2013-08-15 09:59:19 -07:00
Christian 6b612ae3fe Update css.html
I know the form code are only examples, but it'd be good to encourage usage of the proper input type for the email inputs by changing the type from "text" to "email".
2013-08-15 21:57:24 +09:00
Bas Bosman 1619122603 Doc fixes related to #9523 2013-08-15 11:40:39 +02:00
Mark Otto fee3f1e733 fixes #9582: restore img-responsive as a class and move it's mixin to mixins.less 2013-08-15 00:46:18 -07:00
Mark Otto 1b6a5bbca2 fixes #9507: remove padding on navbar-collapse as any padding on an animated object screws it up; instead use some padding on the navbar nav 2013-08-15 00:08:21 -07:00
Mark Otto 7f4e05fcce Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-14 23:53:21 -07:00
Mark Otto f058a6a3ea fixes #9522 2013-08-14 23:52:57 -07:00
Chris Rebert c84d34b5f1 fix inaccurate comment in media query docs 2013-08-14 23:31:21 -07:00
Mark Otto 6e26f846cd fix #9454: add grid docs about responsive column clearing 2013-08-14 23:11:38 -07:00
Mark Otto 622fe05ff4 fixes #9445: make img responsive mixin use display block, but provide option to pass custom value to it 2013-08-14 23:06:37 -07:00
Mark Otto 0456e5e4b3 fixes #9508: use navbar align mixin for buttons to get correct top/bottom spacing 2013-08-14 23:02:58 -07:00
Mark Otto c5ca743cb7 Merge branch 'navbar-brand-margin' of https://github.com/Luis-TP/bootstrap into Luis-TP-navbar-brand-margin
Conflicts:
	dist/css/bootstrap.min.css
2013-08-14 22:59:02 -07:00
Mark Otto 70b0fb445e fixes #9523: more accurate grid table breakpoint numbers 2013-08-14 22:57:59 -07:00
Mark Otto 083b7c0981 fixes #9563: add callout about browser zooming to browser support section 2013-08-14 22:52:07 -07:00
Mark Otto 039966a0fc add call out to fix #9569 2013-08-14 22:48:04 -07:00
Mark Otto dff88d66e2 reaffix the docs sidenav at all times--screw this height business; fix space between code snippet and example 2013-08-14 22:45:26 -07:00
Mark Otto 9de788134f refactor navbar file to better nest css and restore navbar-color to navbar text (fixes #9500) 2013-08-14 21:32:23 -07:00
Mark Otto 2e8a146b61 remove gradients from dropdown menu items on hover/active (fixes #9473) 2013-08-14 21:24:48 -07:00
Chris Rebert 3a67054536 fix copypasta-o to fully fix #9295 2013-08-14 19:07:14 -07:00
Mark Otto a58bf08360 Merge pull request #9578 from twbs/cursor-not-allowed-disabled-btn-checkbox-radio
fixes #9511; set cursor:not-allowed for disabled buttons,checkboxes,radios
2013-08-14 18:32:15 -07:00
Chris Rebert e684758b55 fixes #9511; set cursor:not-allowed for disabled buttons,checkboxes,radios 2013-08-14 18:20:28 -07:00
Mark Otto a9d6b7ee0b Merge branch '3.0.0-wip' into reset-FF-Android-default-background-image
Conflicts:
	dist/css/bootstrap.min.css
2013-08-14 16:24:39 -07:00
Chris Rebert 4d527ec316 fixes #8702 until Normalize.css starts handling this 2013-08-14 16:08:24 -07:00
Mark Otto 8e8fe8de93 fixes #9509: add margin around buttons so they don't shit the bed when wrapping 2013-08-14 15:39:21 -07:00
Mark Otto db684a1a61 remove unused docs css 2013-08-14 15:37:21 -07:00
Mark Otto 0086761660 Merge branch '3.0.0-wip' of https://github.com/lerks/bootstrap into lerks-3.0.0-wip
Conflicts:
	dist/css/bootstrap.min.css
2013-08-14 15:33:38 -07:00
Mark Otto c8c9274728 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-14 15:33:06 -07:00
Mark Otto 60a281507a Merge pull request #9498 from ggam/panel-variant-fix
Made panel-variant apply styles only to first child
2013-08-14 15:32:21 -07:00
Mark Otto 057a87ed65 Merge pull request #9521 from Luis-TP/fix-javascript-docs
Javascript Docs: Add .navbar-header, and correct .nav-collapse
2013-08-14 15:27:41 -07:00