Mark Otto 8551f42ae2 Merge branch 'master' into pr/12412 ...

Conflicts:
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	test-infra/npm-shrinkwrap.canonical.json

2014-02-11 09:50:40 -08:00

..

.csscomb.json

Upgrade to Normalize v3-rc1 in prep for v3 final

2014-01-27 12:08:55 -08:00

.csslintrc

make CSSLint happier; refs #12094

2014-01-05 21:29:26 -08:00

alerts.less

@headingsColor → @headings-color

2013-09-21 14:19:11 +02:00

badges.less

Fixes #12210: badges in xs buttons

2014-01-14 21:44:38 -08:00

bootstrap.less

revert an earlier change to move the component-animations.less file because it fubared modal backdrop .fade usage

2013-12-15 14:14:09 -08:00

breadcrumbs.less

restore inline block on breadcrumbs and ensure proper code formatting for readibility

2013-12-18 14:27:21 -08:00

button-groups.less

use Less' extend feature in btn-group-lg etc.

2014-02-06 10:59:04 -08:00

buttons.less

brace position

2014-02-08 16:56:59 -08:00

carousel.less

Merge pull request #12552 from stoudenmire/carousel-icon-classname-fix

2014-02-08 16:03:25 -08:00

close.less

Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0.0-wip

2013-08-05 16:03:10 -07:00

code.less

Fixes #11193: Add kbd element styles to indicate user input via keyboard

2013-12-07 12:18:13 -08:00

component-animations.less

change how collapse works - collapse, collapsing, and in

2013-07-26 20:34:39 -07:00

dropdowns.less

docs & comments: v3.1 => v3.1.0

2014-01-26 17:48:15 -08:00

forms.less

Nuke shit I added in 4d7b2ddba92e47f923d22d9d7b23cb7b0a3e0bc2 that shouldn't come until v4

2014-02-07 15:44:50 -08:00

glyphicons.less

Add new varaible @icon-font-svg-id and set it to be the correct SVG font ID, used new variable in glyphicons.less

2014-01-09 10:16:27 +00:00

grid.less

refactored and renamed grid mixins

2014-01-28 10:48:45 +01:00

input-groups.less

Fix handling of btn-group placed inside input-group-btn (used for mixing dropdowns with normal buttons)

2013-12-16 22:56:28 +01:00

jumbotron.less

Fixes #11588: Scope font-size to only p elements in a .jumbotron and remove the supersized line-height from the base class

2013-12-14 21:50:47 -08:00

labels.less

Add quick fix to labels and badges in buttons

2013-10-23 22:14:34 +02:00

list-group.less

Fix #12073: Consistent order of variations

2014-01-07 22:24:45 +01:00

media.less

refactor {badges,jumbotron,media,popover,print}.less (mostly nesting)

2013-07-07 19:46:20 -07:00

mixins.less

Merge branch 'master' into pr/12412

2014-02-11 09:50:40 -08:00

modals.less

Fixes #12470: Scope large modal styles to minimum viewport width

2014-02-04 02:01:31 -08:00

navbar.less

Fix issue causing .navbar-brand element height to be shorter than .navbar height

2014-01-30 14:59:54 -07:00

navs.less

copyediting

2013-12-15 18:13:50 -08:00

normalize.less

v3 instead of rc1

2014-01-28 10:07:33 -08:00

pager.less

Merge pull request #11840 from ZDroid/pagination-boom

2013-12-15 13:46:11 -08:00

pagination.less

add new variables for "pagination" to improve support of customizing

2013-12-20 17:06:53 +01:00

panels.less

Fixes #12625: Only remove first list group item's top and last list group item's bottom borders when the list group is first or last

2014-02-08 17:29:10 -08:00

popovers.less

use @popover-arrow-width for offset the popover to account for the popover arrow

2014-02-10 10:57:11 +01:00

print.less

Follow-up to #12250: remove remaining page margins for print

2014-01-22 21:51:23 -06:00

progress-bars.less

Remove unusual keyframes prefixes

2013-11-13 22:32:46 +01:00

responsive-utilities.less

Fix #12025 and minify styles

2014-01-19 12:52:31 +01:00

scaffolding.less

Fixes #12424: Account for Normalize change on figure element so that we don't potentially screw folks over

2014-01-29 21:23:23 -08:00

tables.less

Fix #12073: Consistent order of variations

2014-01-07 22:24:45 +01:00

theme.less

Fix #12073: Consistent order of variations

2014-01-07 22:24:45 +01:00

thumbnails.less

use :extend in thumbnail Less

2014-02-06 15:42:54 -08:00

tooltip.less

Fixes #11555: Add @tooltip-opacity variable

2013-12-14 21:43:08 -08:00

type.less

Merge pull request #12433 from tagliala/list-inline-first-element-fix

2014-02-08 16:59:59 -08:00

utilities.less

move .hidden to utilities; fixes #10997

2013-10-13 19:59:42 -07:00

variables.less

Fixes #12674

2014-02-10 20:49:17 -08:00

wells.less

Add well-border variable

2013-10-30 14:10:16 +01:00