Commit Graph

3323 Commits

Author SHA1 Message Date
fat
eb3333a612 fix #7000 2013-07-17 21:08:50 -07:00
fat
0f64c21049 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-17 20:30:09 -07:00
fat
392bf0c9c9 fixes #6691 2013-07-17 20:29:41 -07:00
Mark Otto
bfebf0e490 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-17 20:18:03 -07:00
Mark Otto
7cc34ea547 fix broken docs callouts 2013-07-17 20:17:56 -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
06d47b0082 Fixes #8360: Add mention of IE compatibility mode to docs 2013-07-17 19:26:37 -07:00
Mark Otto
f4b9938d8c Move license FAQs to the docs, add link to side nav 2013-07-17 19:20:08 -07:00
Mark Otto
aa49c919c6 Fixes #8356: Move browser compatibility from wiki into real docs 2013-07-17 19:08:08 -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
Mark Otto
ced641b107 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-15 12:00:10 -07:00
Mark Otto
6aec8f36fc fix broken scrollspy example 2013-07-15 12:00:01 -07:00
Julian Thilo
aab4c95cd2 Update customizer
Add all the new things to customizer:
* `@headings-font-family`
* `@container-*`
* darker `@btn-default-bg`
2013-07-14 12:50:14 +02:00
Chris Rebert
5d9f51d496 rm .control-group from docs since it's no longer in the LESS 2013-07-11 12:57:44 -07:00
Mark Otto
606d6e81d4 Merge pull request #8426 from liuyl/simplify-type
simplify type.less
2013-07-09 12:43:15 -07:00
Julian Thilo
88d76e386f Dustin the docs again
* Fix alllll the links!
* Change all `*.js` in JS plugin docs (no mo `bootstrap-`)
* Fully remove `tr.info`
* Bring nav includes up to date
2013-07-09 15:32:28 +02: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
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
Mark Otto
c9df1db502 fixes #7367: slightly larger carousel indicators 2013-07-01 18:16:59 -07:00
Mark Otto
7ad9fbef8b Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-01 17:32:14 -07:00
Mark Otto
a27ecfccf3 Make more components mixin-friendly 2013-07-01 17:32:07 -07:00
Julian Thilo
fea69df80c Fix responsive utilities for table elements
This change prevents situations where specificity causes some rules to
be overridden by the ones intended for mobile.
* Added mixin `responsive-invisibility()`
* Swapped out `display: none !important;` for new mixin
2013-07-01 21:13:57 +02:00
Mark Otto
534eac5242 Merge pull request #8340 from JohnONolan/Fix-Broken-Docs-Links
Docs: Fix broken links to navbar component in examples pages
2013-06-29 17:29:19 -07:00
Mark Otto
eeaa70ab4a Merge pull request #8341 from Quy/3.0.0-wip
Remove references to fonts
2013-06-29 17:29:01 -07:00
Francis Brunelle
6a20810ca4 reset left padding for .media-list, .pagination and .pager 2013-06-29 16:06:14 -04:00