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 |
|
Mark Otto
|
6f7c3e2d5b
|
Merge pull request #9499 from ggam/docs-print
Added hidden-print class to docs sidebar
|
2013-08-14 09:38:23 -07:00 |
|
Mark Otto
|
99a5f16db6
|
Merge pull request #9502 from Luis-TP/navbar-padding
Remove .navbar-collapse padding when not in mobile context
|
2013-08-14 09:37:50 -07:00 |
|
Luis Aleman
|
1b3896fabf
|
Remove .navbar-collapse padding when not in mobile context
|
2013-08-14 11:39:38 -04:00 |
|
ggam
|
72785644bd
|
Added hidden-print class to docs sidebar
|
2013-08-14 17:09:13 +02:00 |
|
ggam
|
80d1b6b117
|
Made panel-variant apply styles only to first child
|
2013-08-14 16:40:26 +02:00 |
|
Bas Bosman
|
09464b5d41
|
Remove old accordion remnant
|
2013-08-14 16:33:35 +02:00 |
|
Breno Calazans
|
48c1add83b
|
Reference only not minified files in Bower
Fixes #8985
|
2013-08-14 11:10:48 -03:00 |
|
Bas Bosman
|
c4568e4c3b
|
Ordered breadcrumbs
|
2013-08-14 15:16:30 +02:00 |
|
Luca Wehrstedt
|
1e1b5c737b
|
fixes #9406: proper border for justified btn-groups inside tables
|
2013-08-14 12:37:48 +02:00 |
|
Chris Rebert
|
1fd51b0fa3
|
Merge pull request #9463 from PMPP/css-ex-fix
CSS Grid old classes in use
|
2013-08-14 02:14:59 -07:00 |
|
Pedro Pereira
|
1800edc07c
|
CSS Grid old classes in use
|
2013-08-14 17:02:57 +08:00 |
|
Chris Rebert
|
aa2c152d85
|
rm action attr from highlighted example code too
fixup to e61c71e077
|
2013-08-14 00:09:42 -07:00 |
|
Chris Rebert
|
13d2616631
|
tweak punctuation in sentence of docs
|
2013-08-13 21:32:49 -07:00 |
|
Mark Otto
|
9d82a8ba1f
|
Merge pull request #9451 from Luis-TP/3.0.0-wip
Fix .navbar-right > .dropdown-menu alignment
|
2013-08-13 20:47:58 -07:00 |
|
Luis Aleman
|
c79fa6ad04
|
Apply mixin to correct class
|
2013-08-13 22:53:23 -04:00 |
|
Jason Harbert
|
09e1f69d3e
|
fixes issue after navbar is collapsed, dropdown-menus on uncollapsed menu are no longer visible
|
2013-08-13 19:40:12 -07:00 |
|
Luis Aleman
|
e29c2d0c24
|
Fix .navbar-right > .dropdown-menu alignment
|
2013-08-13 22:30:02 -04:00 |
|
Chris Rebert
|
66122fa153
|
Merge pull request #9443 from mattleff/patch-1
Tiny typo in class prefix
|
2013-08-13 17:04:34 -07:00 |
|
Matthew Leffler
|
a380e80cd7
|
Typo
|
2013-08-13 17:56:12 -06:00 |
|
Mark Otto
|
d1e18e55ac
|
remove accordion from customizer; shorten min height for affix
|
2013-08-13 16:00:05 -07:00 |
|
Mark Otto
|
5b4fe08f42
|
fixes #9439: use overflow: auto on navbar collapse
|
2013-08-13 15:22:05 -07:00 |
|