6374 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Mark Otto	b5ac1b065e	Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip	2013-08-18 11:08:29 -07:00
Mark Otto	ef4590dfb4	fixes #9786: enable tables in panels	2013-08-18 11:08:20 -07:00
Chris Rebert	0cbffb3bcb	Delete glphyicons.less ... File is empty and has misspelled name. Fixes #9787	2013-08-18 11:00:27 -07:00
Mark Otto	3c1d951d29	fixes #9787: remove derp file	2013-08-18 11:00:04 -07:00
Chris Rebert	40a1bcea7d	Merge pull request #9789 from thgh/patch-2 ... Fix well class names in migration section of getting-started.html	2013-08-18 10:57:23 -07:00
Chris Rebert	25d9b2ad49	Merge pull request #9788 from brunoamaral/3.0.0-wip ... fixes two type-o's in glyphicons	2013-08-18 10:55:22 -07:00
thgh	5e2569f15b	Fix well class names in migration section of getting-started.html	2013-08-18 19:54:28 +02:00
Bruno Amaral	0989babe5d	fixes two type-os in glyphicons	2013-08-18 18:47:40 +01:00
Mark Otto	a918b34eeb	Merge branch '3.0.0-wip' into gh-pages	2013-08-18 10:35:49 -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
Mark Otto	92d8989553	Merge pull request #9785 from mikepage/patch-1 ... Update mixins.less to fix error .button-variant is undefined in Grunt	2013-08-18 10:27:53 -07:00
Mark Otto	6496ffb7d4	reformat all the things	2013-08-18 10:26:50 -07:00
Mike Pagé	2488f2ae68	Update mixins.less	2013-08-18 19:23:42 +02:00
Mark Otto	a5ac0b7498	Merge branch '3.0.0-wip' of https://github.com/iatek/bootstrap into iatek-3.0.0-wip	2013-08-18 10:12:33 -07: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	0c9bf6bcce	remove padding from justified nav masthead and footer	2013-08-18 10:02:32 -07:00
Mark Otto	8ae9736ead	Merge branch 'remove-body-content' of https://github.com/lipis/bootstrap into lipis-remove-body-content	2013-08-18 10:00:30 -07:00
Mark Otto	78701778d0	Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip	2013-08-18 10:00:20 -07:00
Mark Otto	4246f6a01f	fixes #9769: use navbar border radius var in theme	2013-08-18 09:58:21 -07:00
Chris Rebert	db5aee54df	Merge pull request #9782 from minddust/3.0.0-wip ... Update progressbar docs	2013-08-18 09:01:41 -07:00
Stephan Groß	142ada4219	Update progressbar ... there is no gradient in 3.x	2013-08-18 17:17:07 +02:00
liuyl	ce410dc36e	fixed caret	2013-08-18 20:13:48 +08:00
iatek	863b03cf38	updates to migration	2013-08-18 07:20:56 -04:00
iatek	d1519400f2	updates to migration	2013-08-18 07:19:53 -04:00
Panayiotis Lipiridis	e6e8499ab8	Got rid of body-content from examples	2013-08-18 12:25:23 +02:00
Mark Otto	6b24297c5b	update urls	2013-08-18 02:11:57 -07:00
Mark Otto	fd97c2fce4	bad copypasta	2013-08-18 02:04:39 -07:00
Mark Otto	c7e5fa15e0	Merge branch '3.0.0-wip' into bs3_restore_glyphicons	2013-08-18 02:04:10 -07:00
Mark Otto	72a3819f6c	remove carousel icons include	2013-08-18 01:55:47 -07:00
Mark Otto	e13ca6d384	Upgrade to latest glyphicons	2013-08-18 01:46:26 -07:00
Mark Otto	b09fcc019c	remove old glyphicons mention	2013-08-18 01:32:33 -07:00
Mark Otto	f2e35bf702	docs layout and alignment refinement	2013-08-18 01:23:45 -07:00
Mark Otto	1e0453f825	Restore glyphicons	2013-08-18 00:36:51 -07:00
fat	b790bbbafc	Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip	2013-08-18 00:29:15 -07:00
fat	57f5872467	bunch of updates to customizer	2013-08-18 00:28:52 -07:00
Mark Otto	09d80fab99	Merge pull request #9761 from wangsai/fix-eamples-respondjs ... add IE's Conditional comments for respondjs and html5shiv	2013-08-17 23:55:05 -07:00
Mark Otto	578a14e14a	Rearrange the docs CSS	2013-08-17 23:53:27 -07:00
saiwang	0c094efe28	add IE's Conditional comments for respondjs and html5shiv	2013-08-18 14:28:52 +08:00
Mark Otto	d13c4e5e5b	Update URLs in config to what I think they need to be; add theme CDN url	2013-08-17 23:07:15 -07:00
Mark Otto	c729f16282	it's levi-OH-sa, not levi-oh-SAR	2013-08-17 22:51:00 -07:00
Mark Otto	40cbfb69d2	undo old change to navbar brand from this branch	2013-08-17 22:44:59 -07:00
Mark Otto	6b74b871df	clean up padding and alignment and stuff	2013-08-17 22:43:15 -07:00
Mark Otto	18766db634	Merge branch '3.0.0-wip' into bs3_homepage ... Conflicts: dist/css/bootstrap.min.css	2013-08-17 22:39:07 -07:00
Mark Otto	b03a2df0b0	Merge branch '3.0.0-wip' into gh-pages	2013-08-17 22:11:40 -07:00
Mark Otto	04a73ebe42	Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip	2013-08-17 22:11:27 -07:00
Mark Otto	3e02b0f5d0	Update docs text a bit	2013-08-17 22:11:21 -07:00
fat	95732b429f	add dependency support to customizer	2013-08-17 21:50:01 -07:00
Mark Otto	f891f91bac	Reorder bootstrap.less to match docs oder	2013-08-17 21:18:00 -07:00