0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Commit Graph

5779 Commits

Author SHA1 Message Date
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
Mark Otto
5381ed085c really fix the pres in scrollable tables 2013-08-14 15:26:01 -07:00
Mark Otto
4b0590b0e7 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-14 15:20:21 -07:00
Mark Otto
48bcf81646 Merge branch '3.0.0-wip' of https://github.com/jharbert/bootstrap into jharbert-3.0.0-wip
Conflicts:
	dist/css/bootstrap.min.css
2013-08-14 15:19:57 -07:00
Mark Otto
4bf9fc3d02 Merge pull request #9544 from gabrielecirulli/3.0.0-wip
Add information on how to disable zoom on mobile devices to the docs
2013-08-14 15:17:34 -07:00
Mark Otto
2002045b7f fuck aside and main elements, use divs so IE8 doesn't shit the bed 2013-08-14 14:59:08 -07:00
Gabriele Cirulli
fb71f40245 tweak note about zoom disabled on mobile 2013-08-14 23:51:26 +02:00
Mark Otto
8d3dbe78c6 fixes overflowing table due to pre 2013-08-14 14:30:00 -07:00
Mark Otto
b02e80c6fb fixes #9557: set tooltip demo to use body as container 2013-08-14 14:29:53 -07:00
Gabriele Cirulli
a3b279c556 improve the "zoom disabled" documentation 2013-08-14 23:26:34 +02:00
Mark Otto
e5e1270e57 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-14 14:24:06 -07:00
Mark Otto
49932d60b4 fixes #9556 2013-08-14 14:24:00 -07:00
Mark Otto
f7c8612f39 Merge pull request #9540 from ggam/table-variant
Added table-row-variant mixin
2013-08-14 14:21:51 -07:00
Guillermo González de Agüero
537910d484 Removed commented lines 2013-08-14 23:12:47 +02:00
Chris Rebert
a9972c5d20 Add missing close-parens in docs sentence; fixes #9512 2013-08-14 13:45:20 -07:00
Gabriele Cirulli
fb6bd757df add information on how to disable mobile zoom to the docs 2013-08-14 22:08:17 +02:00
ggam
72a2efb3db Added table-row-variant mixin 2013-08-14 21:16:45 +02:00
Luis Aleman
b0aef6cde0 Removed containers, and moved brand to after the navbar-toggle 2013-08-14 14:30:35 -04:00
Chris Rebert
3890ab3987 Merge pull request #9531 from ggam/docs-indentation
Fixed inconsistencies in JavaScript examples
2013-08-14 11:10:24 -07:00
ggam
2be8a5a245 Removed trailing semicolons from examples 2013-08-14 19:57:54 +02:00
ggam
cde39f7b78 Fixed indentation in JavaScript example 2013-08-14 19:53:37 +02:00
Luis Aleman
80ff4bf870 Add .navbar-header, and correct .nav-collapse 2013-08-14 13:31:29 -04:00
Luis Aleman
ef60b0e5fb Get rid of navbar-brand margin-right 2013-08-14 13:03:00 -04:00
Mark Otto
b9620a1d5e Merge pull request #9489 from BBosman/ol-breadcrumb
OL breadcrumbs
2013-08-14 09:44:18 -07:00
Mark Otto
518c32423e Merge pull request #9493 from brenoc/3.0.0-wip
Reference only not minified files in Bower
2013-08-14 09:40:29 -07:00
Mark Otto
4ff48c9c3c Merge pull request #9496 from BBosman/accordion-border-color
Remove old accordion remnant
2013-08-14 09:39:55 -07:00