Arnold Daniels f997a9ada7 Merge branch 'master' of git://github.com/twitter/bootstrap into 2.2.2-j3 ...

Conflicts:
	Makefile
	README.md
	component.json
	docs/assets/css/docs.css
	docs/assets/img/bs-docs-bootstrap-features.png
	docs/assets/img/bs-docs-responsive-illustrations.png
	docs/assets/img/bs-docs-twitter-github.png
	docs/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/base-css.html
	docs/components.html
	docs/customize.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/layout.mustache
	docs/templates/pages/customize.mustache
	docs/templates/pages/index.mustache
	js/bootstrap-typeahead.js
	package.json

2012-12-10 00:22:22 +01:00

..

tests

Nesting tables

2012-12-08 12:52:19 -08:00

accordion.less

use border-radius vars where possible

2012-10-03 09:26:52 -07:00

action-areas.less

Don't put jasny less file in subdir

2012-11-16 10:34:55 +01:00

action-links.less

Don't put jasny less file in subdir

2012-11-16 10:34:55 +01:00

alerts.less

nuke comments

2012-12-03 09:23:02 -08:00

bootstrap.less

version bump

2012-11-05 09:32:48 -08:00

breadcrumbs.less

Fixes #6136: Proper scoping of breadcrumbs divider

2012-12-07 09:43:09 -08:00

button-groups.less

Fixes #5594: Vertical button groups show use max-width, not width, and be scoped to immediate children buttons only

2012-11-28 02:21:34 -08:00

buttons.less

Fixes #6148: Icons in mini buttons properly aligned

2012-12-07 09:51:01 -08:00

carousel.less

Fix the carousel after we scoped selectors

2012-11-28 15:40:51 -08:00

close.less

standardize top level file comments

2012-06-28 21:46:45 -07:00

code.less

Fix code block white-space breaks within pre tags.

2012-12-06 11:33:00 -07:00

component-animations.less

Fix bug Collapse broken in IE

2012-08-21 14:33:15 +04:00

dropdowns.less

Fixes #5533: Remove filter gradient from disabled links on dropdowns

2012-11-28 02:22:37 -08:00

fileupload.less

Don't put jasny less file in subdir

2012-11-16 10:34:55 +01:00

forms-uneditable.less

Preparing for Boostrap-server 2.0

2012-12-06 20:21:02 +01:00

forms.less

Fixes #5853: Maintain 10px margin above help block when following input groups

2012-11-29 23:39:33 -08:00

grid.less

fixes #3694: provide override classes for .hide and .pull-right for grid columns

2012-07-29 16:51:24 -07:00

hero-unit.less

fixes #5542: move '.hero-unit p' font-styles to '.hero-unit' so they apply to all elements, including ul and ol, within the component.

2012-10-16 19:56:34 -07:00

iconic.less

Don't put jasny less file in subdir

2012-11-16 10:34:55 +01:00

jasny-bootstrap.less

Preparing for Boostrap-server 2.0

2012-12-06 20:21:02 +01:00

jasny-forms.less

Don't put jasny less file in subdir

2012-11-16 10:34:55 +01:00

jasny-forms.responsive-767px-max.less

Don't put jasny less file in subdir

2012-11-16 10:34:55 +01:00

jasny-forms.responsive-768px-979px.less

Don't put jasny less file in subdir

2012-11-16 10:34:55 +01:00

jasny-forms.responsive-1200px-min.less

Don't put jasny less file in subdir

2012-11-16 10:34:55 +01:00

jasny-navs-tabbable.less

Don't put jasny less file in subdir

2012-11-16 10:34:55 +01:00

jasny-responsive.less

Preparing for Boostrap-server 2.0

2012-12-06 20:21:02 +01:00

labels-badges.less

Fixes #5775: Collapse labels/badges

2012-11-03 13:18:23 -07:00

layouts-semifluid.less

Don't put jasny less file in subdir

2012-11-16 10:34:55 +01:00

layouts-semifluid.responsive-1200px-min.less

Don't put jasny less file in subdir

2012-11-16 10:34:55 +01:00

layouts.less

standardize top level file comments

2012-06-28 21:46:45 -07:00

media.less

overhaul the docs and css to merge into 2.1.2 since this was against master

2012-09-17 18:15:39 -07:00

mixins.less

Revert vertical gradient spec to 'to bottom' as 'top' doesn't work in IE10

2012-12-02 20:40:24 -08:00

modals.less

Add relative positioning to .modal-body - Fixes #5991

2012-12-02 09:53:05 +10:00

navbar.less

Fixes #6010: Navbar dropdown caret should match link hover color

2012-11-28 00:42:17 -08:00

navs.less

update comment

2012-11-29 23:27:09 -08:00

page-alert.less

Don't put jasny less file in subdir

2012-11-16 10:34:55 +01:00

page-alert.responsive-767px-max.less

Don't put jasny less file in subdir

2012-11-16 10:34:55 +01:00

page-alert.responsive-1200px-min.less

Don't put jasny less file in subdir

2012-11-16 10:34:55 +01:00

pager.less

fixes #5010: .pager span selector should be scoped to immediate children only

2012-09-07 11:04:51 -07:00

pagination.less

Use paginationActiveBackground var to finish fixing #4295

2012-09-25 21:12:01 +01:00

popovers.less

Remove commented out old popover CSS

2012-12-05 11:06:16 -08:00

progress-bars.less

use border-radius vars where possible

2012-10-03 09:26:52 -07:00

reset.less

Restore print styles

2012-12-08 21:05:05 -08:00

responsive-767px-max.less

Making modal work with max width 767px - fixes #4860

2012-09-27 11:46:54 +02:00

responsive-768px-979px.less

standardize top level file comments

2012-06-28 21:46:45 -07:00

responsive-1200px-min.less

standardize top level file comments

2012-06-28 21:46:45 -07:00

responsive-navbar.less

Merge branch '2.1.2-wip'

2012-10-29 22:01:58 -07:00

responsive-row-desktop.less

Preparing for Boostrap-server 2.0

2012-12-06 20:21:02 +01:00

responsive-utilities.less

Fixes #4002 responsive utilities classes

2012-07-10 08:12:16 +02:00

responsive.less

add source attribution for IE10 fix

2012-12-02 21:01:53 -08:00

rowlink.less

Don't put jasny less file in subdir

2012-11-16 10:34:55 +01:00

scaffolding.less

improve comments in image styles

2012-09-04 11:31:48 -07:00

sprites.less

fixes #5392: hover on submenu should maintain white icons for active parent a tag

2012-10-02 13:19:11 -07:00

tables.less

Fixes #5729: Nested striped tables

2012-12-08 12:57:21 -08:00

thumbnails.less

use border-radius vars where possible

2012-10-03 09:26:52 -07:00

tooltip.less

use border-radius vars where possible

2012-10-03 09:26:52 -07:00

type.less

remove margin on .inline lists

2012-11-04 12:39:27 -08:00

utilities.less

fix static navbar container issues, clean up docs presentation by unfixing the top navbar in favor of static one, start adding table of contents for longer sections of docs

2012-08-19 21:12:52 -07:00

variables.less

Fixes #5471: Remove color from .navbar and .navbar-inverse and reassign to .navbar-text to prevent unintended cascading

2012-11-04 22:50:07 -08:00

wells.less

use border-radius vars where possible

2012-10-03 09:26:52 -07:00