0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Commit Graph

1936 Commits

Author SHA1 Message Date
Mark Otto
3f87bf46e4 fixes #9855: account for modal overflow on body hiding scrollbar 2013-08-19 13:16:32 -07:00
Mark Otto
3d5ccc6c6f Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-19 10:43:45 -07:00
Mark Otto
723b9b89d7 Merge pull request #9864 from boomsb/3.0.0-wip
Update tables.less
2013-08-19 10:43:26 -07:00
Mark Otto
16976cc494 Fixes secondary issue in #9798 2013-08-19 09:36:56 -07:00
Mark Otto
7bc845abfa Add default navbar z-index to fix #9844
iOS doesn't pick up the z-indexing properly on the dropdowns unless you
specify one for the parent navbar.
2013-08-19 09:31:16 -07:00
boomsb
bfe2dc4109 Update tables.less
Fixed Table cell sizing with multiple classes by using *= instead of ^=
2013-08-19 11:30:38 -05:00
Mark Otto
d195d5989f Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-19 08:58:59 -07:00
Mark Otto
f497b5e1f5 move dropdown change from navbar to dropdowns to fix customizer compiling 2013-08-19 08:54:40 -07:00
Mark Otto
a9297c7ad2 save and recompile for that last commit 2013-08-19 08:51:25 -07:00
Mark Otto
7e82ceb533 fix #9832 somewhat: more vars for jumbotron 2013-08-19 08:46:49 -07:00
saiwang
fabbb9e4ba .table style is duplicate in List groups in panels and Tables in panels 2013-08-19 22:08:06 +08:00
Mark Otto
285393fb77 Re-enable glyphicons in carousel controls and then remove redundant CSS from example 2013-08-19 00:58:29 -07:00
Mark Otto
d8128fca94 Change up label padding to equalize top and bottom 2013-08-19 00:36:39 -07:00
Mark Otto
14c4484ec4 Nuke margin for last child navbar text 2013-08-19 00:34:31 -07:00
Mark Otto
3260288df8 Merge branch '3.0.0-wip' of https://github.com/eratzlaff/bootstrap into eratzlaff-3.0.0-wip 2013-08-19 00:15:47 -07:00
Mark Otto
e293873484 smaller h1 and h2 2013-08-18 21:49:05 -07:00
Elvis Ratzlaff
988c03d462 Variable name fix 2013-08-19 00:46:09 -04:00
Mark Otto
e989acfc79 Add responsive tables with help of .table-responsive wrapper 2013-08-18 21:43:05 -07:00
Elvis Ratzlaff
5b3e6eb563 make visible/hidden classes mixable 2013-08-19 00:23:53 -04:00
Mark Otto
a9378a9267 Merge branch '3.0.0-wip' into bs3_homepage
Conflicts:
	customize.html
	dist/css/bootstrap.min.css
2013-08-18 20:15:45 -07:00
Mark Otto
a1db2d7a5e Merge branch '3.0.0-wip' into bs3_panel_base_class
Conflicts:
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.min.css
2013-08-18 20:11:04 -07:00
Mark Otto
e6ff75bcea Update var in theme 2013-08-18 19:57:25 -07:00
Mark Otto
108d10a920 Refactor alerts to have a base class, but no default class, thus requiring a modifier class at all times 2013-08-18 19:50:53 -07:00
Mark Otto
bab51d27ac Refactor panels to have a base class for improved flexibility when customizing (and no overriding to start, too) 2013-08-18 19:40:57 -07:00
Mark Otto
d5cd040f57 improve dependencies for image thumbnails and thumbnail component 2013-08-18 19:24:10 -07:00
Mark Otto
cf09e6a6b5 better alignment of glyphicons vertically 2013-08-18 19:05:48 -07:00
Mark Otto
9dcae610e9 Merge branch '3.0.0-wip' into bs3_homepage
Conflicts:
	customize.html
	examples/justified-nav/justified-nav.css
2013-08-18 19:02:42 -07:00
Mark Otto
5bd2d7ed7e fixes #9815: proper alignment of navbar nav if first child 2013-08-18 18:49:07 -07:00
Mark Otto
c240460f0b Merge branch '3.0.0-wip' into glyphicons-LESS-fixes
Conflicts:
	dist/css/bootstrap.min.css
2013-08-18 15:47:29 -07:00
Mark Otto
7b4e2a9a4a Merge branch '3.0.0-navbar-default' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-navbar-default
Conflicts:
	dist/css/bootstrap.min.css
2013-08-18 15:43:27 -07:00
Mark Otto
fe767a18d3 fixes #9798: update spacing on checkboxes and radios for horizontal 2013-08-18 15:41:24 -07:00
Mark Otto
5746979aad Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-18 15:30:02 -07:00
Chris Rebert
9fa0a5d127 tweak some of the Glyphicon class names to match Bootstrap conventions 2013-08-18 15:19:13 -07:00
Mark Otto
43271f1ab6 Merge pull request #9804 from twbs/redundant-ampersands
rm redundant ampersands from button-groups LESS
2013-08-18 15:15:53 -07:00
Chris Rebert
7b0d93f79e regenerate Glyphicons LESS from their website; fixes some wrong codepoint numbers 2013-08-18 15:15:33 -07:00
Mark Otto
9b61b7a722 fixes #9803: label and input alignment in horizontal forms 2013-08-18 15:10:28 -07:00
Chris Rebert
fa3959a1e1 rm redundant ampersands from button-groups LESS 2013-08-18 15:05:42 -07:00
Julian Thilo
546b2cc614 Fix some forgotten things for navbar-default
New variable names were missing here and there.
2013-08-18 23:30:40 +02:00
Zlatan Vasović
743fc9ac7e Nesting for link styles 2013-08-18 23:28:55 +02:00
Julian Thilo
abca00870f Add a .navbar-default class for default colors
* Extract color styles from .navbar { } and put them into
.navbar-default { }
* Change variable names
* Change the docs accordingly (i.e., add the .navbar-default class to
all default navbars)
* Change customizer accordingly
2013-08-18 23:05:56 +02:00
Mark Otto
9b66e6b0f4 fixes #9790: nullify right padding in container-ed navbars when last element in collapse is a right aligned navbar nav 2013-08-18 11:17:28 -07:00
Mark Otto
26067d3d7d fixes #9768: unbold buttons 2013-08-18 11:11:31 -07:00
Mark Otto
ef4590dfb4 fixes #9786: enable tables in panels 2013-08-18 11:08:20 -07:00
Mark Otto
3c1d951d29 fixes #9787: remove derp file 2013-08-18 11:00:04 -07:00
Mark Otto
d7eee9bd6e Merge pull request #9767 from twbs/bs3_restore_glyphicons
BS3: Restore Glyphicons
2013-08-18 10:35:26 -07:00
Mark Otto
f8b65b41ab Merge branch '3.0.0-wip' into bs3_restore_glyphicons
Conflicts:
	dist/css/bootstrap.min.css
2013-08-18 10:28:32 -07:00
Mike Pagé
2488f2ae68 Update mixins.less 2013-08-18 19:23:42 +02:00
Mark Otto
73a1a4133c combine and simplify caret border widths 2013-08-18 10:08:18 -07:00
Mark Otto
a9e741bffc Merge branch 'fixcaret' of https://github.com/liuyl/bootstrap into liuyl-fixcaret 2013-08-18 10:07:34 -07:00
Mark Otto
4246f6a01f fixes #9769: use navbar border radius var in theme 2013-08-18 09:58:21 -07:00