4874 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
fat	13cad5061d	maybe fix this old ass issue #5973	2013-07-17 19:28:43 -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	e7be60fd4d	Update readme to point previous releases to GitHub project releases (fixes #8508)	2013-07-17 17:21:11 -07:00
Mark Otto	8a79590d05	Remove changelog in favor of GitHub releases	2013-07-17 17:20:47 -07:00
Mark Otto	cb9cc972ed	Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip	2013-07-16 13:36:02 -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	7dbcce30c1	Merge pull request #8498 from cvrebert/patch-1 ... Add missing backtick in comment	2013-07-16 11:27:33 -07:00
Mark Otto	522004e67a	remove webkit-overflow-scrolling from modal for now /cc #8495	2013-07-16 11:26:48 -07:00
Chris Rebert	76063ea739	Add missing backtick in comment	2013-07-16 10:49:59 -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
Mark Otto	fb75ffca55	Merge pull request #8478 from juthilo/3.0.0-customizer ... Update customizer	2013-07-14 16:56:56 -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
Mark Otto	89555cb61c	Merge pull request #8453 from cvrebert/retina-rename ... rename .retina-image => .img-retina	2013-07-11 14:17:11 -07:00
Mark Otto	cb117c62eb	Merge pull request #8454 from bassjobsen/patch-2 ... Update forms.less	2013-07-11 14:16:58 -07:00
Mark Otto	9efab70c93	Merge pull request #8455 from cvrebert/control-group-dead ... rm .control-group from docs since it's no longer in the LESS	2013-07-11 14:16:29 -07: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
Bass Jobsen	3a17578a94	Update forms.less ... All variables should be set in variables.less?	2013-07-11 21:24:06 +02:00
Chris Rebert	a41fd16da2	rename .retina-image => .img-retina	2013-07-11 12:07:35 -07:00
Mark Otto	606d6e81d4	Merge pull request #8426 from liuyl/simplify-type ... simplify type.less	2013-07-09 12:43:15 -07:00
Mark Otto	b2fa51521f	Merge pull request #8430 from juthilo/3.0.0-docs-fixes ... Dustin the docs again	2013-07-09 12:41:07 -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	f69afc1b23	Merge pull request #8414 from cvrebert/dropdowns-LESS-nesting ... use LESS nesting more in dropdowns.less	2013-07-08 06:56:57 -07:00
Mark Otto	b2b09f679a	Merge pull request #8413 from cvrebert/misc-less-refactoring ... refactor {badges,jumbotron,media,popover,print}.less (mostly nesting)	2013-07-08 06:56:35 -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
Mark Otto	b13417525c	Merge pull request #8410 from cvrebert/buttons-nesting ... more nesting in buttons.less	2013-07-08 06:54:39 -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	7e154740f3	use LESS nesting more in dropdowns.less	2013-07-07 19:54:07 -07:00
Chris Rebert	dcf1b60f2b	refactor {badges,jumbotron,media,popover,print}.less (mostly nesting)	2013-07-07 19:46:20 -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	084291aac7	Merge pull request #8408 from cvrebert/progress-bar-variant-mixin ... extract .progress-bar-variant mix-in	2013-07-07 18:27:43 -07:00
Mark Otto	906d04a4aa	Merge pull request #8407 from cvrebert/label-variant-mixin ... extract .label-variant mix-in	2013-07-07 18:26:54 -07:00
Mark Otto	65141338df	Merge pull request #8406 from cvrebert/navs-nesting ... more nesting in navs.less	2013-07-07 18:26:26 -07:00
Mark Otto	03becfb9e3	Merge pull request #8405 from cvrebert/button-groups-nesting ... more nesting in button-groups.less	2013-07-07 18:25:48 -07:00
Mark Otto	400e9b2a88	Merge pull request #8404 from cvrebert/alert-variant ... extract .alert-variant mix-in	2013-07-07 18:25:17 -07:00
Chris Rebert	d2fb35d546	extract .progress-bar-variant mix-in	2013-07-07 15:44:18 -07:00
Chris Rebert	a7dd1088d2	extract .label-variant mix-in	2013-07-07 15:38:43 -07:00
Chris Rebert	15bd6eadf3	more nesting in navs.less	2013-07-07 15:31:18 -07:00
Chris Rebert	f12d6401f2	more nesting in button-groups.less	2013-07-07 15:27:06 -07:00
Chris Rebert	e757ddd60f	extract .alert-variant mix-in	2013-07-07 15:21:40 -07:00