Commit Graph

2107 Commits

Author SHA1 Message Date
Mark Otto
e72b524d41 Fixes #8374: ensure navbar is always at least 50px 2013-07-18 01:25:08 -07:00
Mark Otto
181b276774 Fixes #8397: better navbar padding with grid gutter stuff 2013-07-18 01:04:54 -07:00
Mark Otto
f757cf4cf3 run make on mixin changes from #8380 2013-07-18 00:50:57 -07:00
Mark Otto
8dc7807dcd change characters 2013-07-18 00:48:02 -07:00
Mark Otto
1363ffa473 Merge branch '3.0.0-wip' of https://github.com/mauricew/bootstrap into mauricew-3.0.0-wip 2013-07-18 00:43:48 -07:00
Mark Otto
79a10feb7a Fixes #8452: adds .active to table classes 2013-07-18 00:10:22 -07:00
Mark Otto
87adbf7aa4 make on collapse changes 2013-07-17 23:56:38 -07:00
Mark Otto
bc79f8a399 Bump tooltips to use @font-size-small (11px to 12px) 2013-07-17 23:55:58 -07:00
Mark Otto
e57758cbb4 Drop .nav-header for .dropdown-header
* Since we no longer have `.nav-list`, I've nuked the `.nav-header`
* However, dropdowns can still have section headings, so I've kept that
around with the addition of `.dropdown-header`
* Restyled it a smidge as well
2013-07-17 23:54:09 -07:00
Mark Otto
4d73aa60f9 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	docs/assets/js/bootstrap.min.js
2013-07-17 23:34:31 -07:00
Mark Otto
d3a139622e fixes #8491: add vars for table padding 2013-07-17 23:34:04 -07:00
Mark Otto
ba0c6cd57c make on prev js changes 2013-07-17 23:33:34 -07:00
fat
8cf04911db fixes #7776 2013-07-17 23:25:26 -07:00
Mark Otto
9efba239b6 Merge pull request #8511 from twitter/bs3_remove_examples
BS3: Move examples to @twbs/bootstrap-examples
2013-07-17 22:17:30 -07:00
fat
18d23b892c rebuild js + fixes #7583 2013-07-17 21:35:28 -07:00
fat
2cccc0889f make sure triggering element is visible before focusing #7521 2013-07-17 21:30:38 -07:00
fat
102df4ff33 Merge branch '3.0.0-wip' of git://github.com/muan/bootstrap into muan-3.0.0-wip
Conflicts:
	docs/assets/js/bootstrap.min.js
2013-07-17 21:14:02 -07:00
fat
eb3333a612 fix #7000 2013-07-17 21:08:50 -07:00
Mark Otto
f0d0718322 Merge branch '3.0.0-wip' into bs3_remove_examples
Conflicts:
	docs/_includes/nav-getting-started.html
	docs/examples/navbar-fixed-top.html
	docs/examples/navbar-static-top.html
	docs/examples/navbar.html
	docs/getting-started.html
2013-07-17 20:44:27 -07:00
fat
392bf0c9c9 fixes #6691 2013-07-17 20:29:41 -07:00
fat
5396c40877 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-17 19:33:49 -07:00
Mark Otto
542e03ae3a Merge branch '3.0.0-docs-calloutfam' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-docs-calloutfam
Conflicts:
	docs/components.html
	docs/css.html
	docs/customize.html
2013-07-17 19:33:30 -07:00
fat
f97dd5af49 rebuild doe 2013-07-17 19:33:21 -07:00
Mark Otto
5967ef64a3 remove margin from left side of navs since it's no longer being set 2013-07-16 11:49:04 -07:00
Mark Otto
522004e67a remove webkit-overflow-scrolling from modal for now /cc #8495 2013-07-16 11:26:48 -07:00
liuyl
0d5c3c2ecf simplify type.less 2013-07-09 09:22:36 +08:00
Mark Otto
1045226544 Merge pull request #8415 from cvrebert/code.less-cleanup
code.less: cleanup styles that get immediately overriden later in the file
2013-07-08 06:57:37 -07:00
Mark Otto
e0d1b83e25 Merge pull request #8412 from cvrebert/pagination-nesting
use nesting more in pagination.less
2013-07-08 06:55:50 -07:00
Mark Otto
46378c7ba3 Merge pull request #8411 from cvrebert/navbar-LESS-nesting
more nesting in navbar.less
2013-07-08 06:55:16 -07:00
Chris Rebert
e40aee9c9e code.less: cleanup styles that get immediately overriden later in the file 2013-07-07 20:03:52 -07:00
Chris Rebert
6bda16f6be use nesting more in pagination.less 2013-07-07 19:30:51 -07:00
Chris Rebert
d9cd5e4e0c more nesting in navbar.less 2013-07-07 19:22:18 -07:00
Chris Rebert
6e03639af2 more nesting in buttons.less 2013-07-07 19:16:38 -07:00
Maurice Wahba
8a84da6341 Carousel no longer dependent on glyphicons
Used laquo/raquo for control buttons
Updated docs
2013-07-06 22:26:40 +04:00
Mark Otto
95655e7275 Remove more Glyphicons 2013-07-05 14:27:54 -05:00
Mark Otto
fffb37ecea Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-05 14:24:40 -05:00
Mark Otto
3279181f42 Merge pull request #8378 from liuyl/aftertosibling
optimize breadcrumb
2013-07-05 12:23:14 -07:00
Mark Otto
30c138c4bf Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-05 14:22:46 -05:00
Mark Otto
61823dbff1 Move hr to scaffolding.less (out of type.less) and simplify styles 2013-07-05 14:21:05 -05:00
Mark Otto
88a266b800 Add tfoot back (addresses more than #8387) 2013-07-05 14:15:00 -05:00
Mark Otto
14056409c3 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-05 14:13:24 -05:00
Mark Otto
817972724a Remove further mentions of Glyphicons 2013-07-05 14:11:12 -05:00
liuyl
e6529e9588 delete typeahead style 2013-07-05 15:09:16 +08:00
liuyl
5b69d34053 use sibling selector instead of pseudo selector 2013-07-03 20:37:36 +08:00
Chris Rebert
da072fff21 refactor tables.less to use nesting more 2013-07-02 11:42:37 -07:00
Mark Otto
749dc35328 comma for the guardian angel /cc @cvrebert 2013-07-01 20:18:44 -07:00
Mark Otto
a049dcb7f6 Merge branch '3.0.0-responsive-tables' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-responsive-tables
Conflicts:
	less/mixins.less
2013-07-01 20:06:16 -07:00
Mark Otto
5b2d933524 Fixes #8350: unfuck Chrome number input element cursor /cc @cvrebert @eintnohick 2013-07-01 19:49:29 -07:00
Mark Otto
08b3515fd7 fixes #8345: use inline-block on .img-responsive 2013-07-01 19:42:43 -07:00
Mark Otto
9da90adb4c fixes #8068: add .help-block to form field state mixin 2013-07-01 18:21:19 -07:00