Commit Graph

4065 Commits

Author SHA1 Message Date
Mark Otto
9443eb6e21 restore comma between selectors 2013-02-05 19:40:32 -08:00
Mark Otto
15c7e73abd Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into patrickhlauke-2.3.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
	less/navbar.less
2013-02-05 19:39:49 -08:00
fat-kun
31b9240dd0 Merge pull request #6737 from openwide-java/fix-tooltip-positioning-for-ie8
Fix tooltip positioning for IE8 broken in 2.3.0
2013-02-05 19:22:34 -08:00
Mark Otto
e4a74607b0 simplify media docs 2013-02-05 01:12:39 -08:00
Mark Otto
b65293dec0 reorganize progress bars docs 2013-02-05 01:11:41 -08:00
Mark Otto
3949623eee simpler alerts docs 2013-02-05 01:07:43 -08:00
Mark Otto
238566b445 mo betta thumbnails docs 2013-02-05 01:01:23 -08:00
Mark Otto
2576e6d1d6 reorder counters docs 2013-02-05 00:59:22 -08:00
Mark Otto
cf78f4b010 pagination docs cleanup 2013-02-05 00:54:48 -08:00
Mark Otto
1f673b77bb simpler breadcrumbs docs 2013-02-05 00:51:19 -08:00
Mark Otto
74c8a5611d Increase margins and line-height on h3; overhaul button dropdown docs 2013-02-05 00:49:54 -08:00
Mark Otto
c09b994eea Add justified button groups for link buttons; reorganize dropdowns and button groups docs sections 2013-02-05 00:30:03 -08:00
Mark Otto
5c1cc722e7 Forgot to remove base-css.mustache 2013-02-05 00:22:20 -08:00
Mark Otto
cb0fed6693 Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2013-02-04 11:25:46 -08:00
Mark Otto
2c92b5f6a4 Remove base-css.html after recent merges 2013-02-04 11:12:32 -08:00
Mark Otto
0a3e3a50fe Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
	less/type.less
2013-02-04 11:12:09 -08:00
Mark Otto
1f6a988190 Fixes #6794: incorrect docs mention of th element 2013-02-04 11:11:25 -08:00
Mark Otto
db8a78fae6 Fixes #6794: incorrect docs mention of th element 2013-02-04 11:11:04 -08:00
Joseph Price
4b86a91e53 fix typo 2013-02-04 09:10:48 -05:00
Mark Otto
7ec817ea46 Merge pull request #6638 from GeoffYoung/2.3.0-wip
Update package.json to current Recess version
2013-02-02 19:53:22 -08:00
Mark Otto
9480eb89cb Revamp button mixins and pseudo states
* Remove .darken-button-states and .buttonBackground mixins (latter wasn't being used anyway)
* Create new .btn-pseudo-states mixin for setting button background and border colors for default and pseudo states
2013-02-02 19:16:15 -08:00
Mark Otto
2f7087eae9 Merge branch '3.0.0-wip' of https://github.com/vickash/bootstrap into vickash-3.0.0-wip 2013-02-02 19:08:59 -08:00
Mark Otto
d6048031ed Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2013-02-02 18:58:08 -08:00
Mark Otto
b1f1d7871f Add changelog file to repo instead of relying on the wiki 2013-02-02 18:57:24 -08:00
Mark Otto
5638b2559a Verion number in JS makefile 2013-02-02 18:50:13 -08:00
Mark Otto
3d74c670d3 Rearrange forms content 2013-02-02 18:30:52 -08:00
Mark Otto
6993fadf7e Simplify input and input group sizing
* Remove .input-mini because who really needs inputs that small
* Remove unnecessary border-radius resets from large and small input groups
2013-02-02 17:31:26 -08:00
Mark Otto
04aae2f56c Merge branch '3.0.0-wip' of https://github.com/gilbarbara/bootstrap into gilbarbara-3.0.0-wip 2013-02-02 17:01:29 -08:00
Joseph Price
1fe4ed8823 reordered access of options in tooltip and popover to allow overriding data attrs from js 2013-02-02 18:58:56 -05:00
Mark Otto
c64aa26d06 Add @btn-color variable and use in buttons and carets; fixes dropup caret as well 2013-02-02 13:03:18 -08:00
Mark Otto
dbe8aed76e Merge pull request #6763 from rjregenold/2.3.0-wip
fixes jankiness with anchor tags in carousel.
2013-02-02 12:35:39 -08:00
Luke Page
6b9bb547bf Move to new selector interpolation, supported from 1.3.1 2013-02-02 07:58:27 +00:00
Mark Otto
94e256c016 Refactor navbar dividers
* Instead of .divider-vertical, use .divider
* Makes use of .nav-divider mixin
* Dividers are horizontal to start, matching the default state of navbar nav links
* Dividers become vertical above 768px via media queries
2013-02-01 22:56:09 -08:00
Mark Otto
dad9889aeb Fixes #6657: Upgrade Normalize to 2.1.0 2013-02-01 21:49:54 -08:00
Mark Otto
0bfbf1446d Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2013-02-01 21:44:35 -08:00
Mark Otto
8f0bc9e79b Merge branch 'dospuntocero-master' into 2.3.0-wip 2013-02-01 21:41:13 -08:00
Mark Otto
d2ea2cdedd add horizontal-three-color gradient test 2013-02-01 21:41:02 -08:00
Mark Otto
d53af49afe Refactor colors and progress bars
* Buttons and progress bars now make use of more semantic global @brand- colors
* Progress bars have been rewritten to reduce the number of possible selectors
* Instead of .progress .bar, it's .progress-bar for individual bars of color, ultimately making for less CSS
2013-02-01 16:21:38 -08:00
Mark Otto
f328ebbc73 Merge pull request #6776 from ndabas/fix-inline-lists-ie7
Fix inline lists for IE7
2013-02-01 13:04:17 -08:00
Nikhil Dabas
b7b2e4f8a1 Fixing inline lists for IE7 2013-02-02 02:04:30 +05:30
Mark Otto
2553d74b54 Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	docs/examples/hero.html
	docs/examples/sticky-footer-navbar.html
2013-02-01 10:34:25 -08:00
Mark Otto
7d655c3549 Use button element instead of a for responsive navbar buttons 2013-02-01 10:33:36 -08:00
Mark Otto
725cf7f6ec start to refactor justified nav example 2013-02-01 10:32:08 -08:00
Mark Otto
7528b6e10a button element instead of href-less a tag for navbar button 2013-02-01 10:30:48 -08:00
Gil Barbara
24f0505bde Update input-group-addon for input sizes 2013-02-01 01:39:26 -02:00
Mark Otto
755f1776da Refactor jumbotron-narrow.html example
* Make it mobile-first
* Add a handful of comments to explain CSS
* Instead of an <hr> between custom header and jumbotron, use border for a tighter mobile layout
2013-01-31 18:34:12 -08:00
Mark Otto
19b5ebcf24 Rename marketing-narrow to jumbotron-narrow for mo betta naming schemes 2013-01-31 18:25:44 -08:00
Mark Otto
dfdf343825 Refactor jumbotron example:
* Add hella CSS comments
* Reduce padding on body to height of navbar, then set top margin on jumbotron at +768px
* Wrap marketing copy and footer in an extra div so we can set some padding for ideal responsive views
2013-01-31 18:22:47 -08:00
Mark Otto
52aa67fa1c only round jumbotron corners at 768px+ 2013-01-31 18:11:45 -08:00
Mark Otto
b02a0fe768 Button up navbar form which was adding 2px padding to .navbar 2013-01-31 18:09:49 -08:00