]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
9 years agoUpdate grunt-jscs.
XhmikosR [Thu, 3 Mar 2016 08:35:55 +0000 (10:35 +0200)] 
Update grunt-jscs.

[skip sauce]

9 years agoRevert "Travis CI: Specify node.js 5.6 since 5.7.0 has regressions."
XhmikosR [Thu, 3 Mar 2016 07:38:32 +0000 (09:38 +0200)] 
Revert "Travis CI: Specify node.js 5.6 since 5.7.0 has regressions."

This reverts commit d0059ac2ed5335e1d68b161639f7c8f619378cc7.

Node.js 5.7.1 is out with the issue fixed.

[skip sauce]

9 years agoUpdate tether CDN.
XhmikosR [Tue, 1 Mar 2016 17:28:18 +0000 (19:28 +0200)] 
Update tether CDN.

[ci skip]

9 years agoMerge pull request #19341 from twbs/examples-page-header
Chris Rebert [Sun, 28 Feb 2016 02:53:30 +0000 (18:53 -0800)] 
Merge pull request #19341 from twbs/examples-page-header

Example pages: Remove usages of defunct .page-header class

9 years agoExample pages: Remove usages of defunct .page-header class 19341/head
Chris Rebert [Sun, 28 Feb 2016 02:16:22 +0000 (18:16 -0800)] 
Example pages: Remove usages of defunct .page-header class

/fyi @mdo

Note: The selector in dashboard.css that used .page-header was superfluous
    because the margin that it zeroed was already zero even without that declaration.

[skip sauce]

9 years agoMerge pull request #19340 from twbs/js-tests-page-header
Chris Rebert [Sun, 28 Feb 2016 02:09:33 +0000 (18:09 -0800)] 
Merge pull request #19340 from twbs/js-tests-page-header

JS visual tests: Remove usages of defunct .page-header class

9 years agoJS visual tests: Remove usages of defunct .page-header class 19340/head
Chris Rebert [Sun, 28 Feb 2016 02:01:11 +0000 (18:01 -0800)] 
JS visual tests: Remove usages of defunct .page-header class

[skip sauce]

9 years agoRun grunt.
XhmikosR [Sun, 28 Feb 2016 01:49:02 +0000 (03:49 +0200)] 
Run grunt.

[ci skip]

9 years agoupdate theme parameters to fix #19333
Ivan Malopinsky [Sat, 27 Feb 2016 22:24:00 +0000 (17:24 -0500)] 
update theme parameters to fix #19333

9 years agoUpdate holder.js to v2.9.3.
XhmikosR [Sun, 28 Feb 2016 01:28:44 +0000 (03:28 +0200)] 
Update holder.js to v2.9.3.

[ci skip]

9 years agoMerge pull request #19331 from twbs/v4-dev-fix-travis
XhmikosR [Sun, 28 Feb 2016 01:48:09 +0000 (03:48 +0200)] 
Merge pull request #19331 from twbs/v4-dev-fix-travis

Travis: use node.js 5.6

9 years agoTravis CI: Specify node.js 5.6 since 5.7.0 has regressions. 19331/head
XhmikosR [Sat, 27 Feb 2016 11:34:57 +0000 (13:34 +0200)] 
Travis CI: Specify node.js 5.6 since 5.7.0 has regressions.

This should be reverted when the next 5.x version is out.

[skip sauce]

9 years agoUpdate npm-shrinkwrap.json.
XhmikosR [Sun, 28 Feb 2016 01:36:52 +0000 (03:36 +0200)] 
Update npm-shrinkwrap.json.

[skip sauce]

9 years agoMerge pull request #19337 from ameya-pandilwar/fix-19332
Chris Rebert [Sun, 28 Feb 2016 00:38:40 +0000 (16:38 -0800)] 
Merge pull request #19337 from ameya-pandilwar/fix-19332

Removed unused markdown-it dependency

9 years agoRemoved unused markdown-it dependency 19337/head
Ameya Pandilwar [Sat, 27 Feb 2016 23:17:51 +0000 (18:17 -0500)] 
Removed unused markdown-it dependency

9 years agoMerge pull request #19333 from twbs/v4-dev-update-docs-assets
Chris Rebert [Sat, 27 Feb 2016 22:58:09 +0000 (14:58 -0800)] 
Merge pull request #19333 from twbs/v4-dev-update-docs-assets

Update docs assets

9 years agoRun `grunt`. 19333/head
XhmikosR [Sat, 27 Feb 2016 11:55:49 +0000 (13:55 +0200)] 
Run `grunt`.

[ci skip]

9 years agoUpdate tether to v1.2.0.
XhmikosR [Sat, 27 Feb 2016 11:54:33 +0000 (13:54 +0200)] 
Update tether to v1.2.0.

[skip sauce]
[skip validator]

9 years agoUpdate jekyll-search to v1.1.1.
XhmikosR [Sat, 27 Feb 2016 11:53:19 +0000 (13:53 +0200)] 
Update jekyll-search to v1.1.1.

[ci skip]

9 years agoUpdate clipboard.js to v1.5.9.
XhmikosR [Sat, 27 Feb 2016 11:52:19 +0000 (13:52 +0200)] 
Update clipboard.js to v1.5.9.

[ci skip]

9 years agoUpdate anchor-js to v3.1.0.
XhmikosR [Sat, 27 Feb 2016 11:51:14 +0000 (13:51 +0200)] 
Update anchor-js to v3.1.0.

[ci skip]

9 years agoMerge pull request #19328 from satsukitv/v4-dev
XhmikosR [Sat, 27 Feb 2016 11:46:57 +0000 (13:46 +0200)] 
Merge pull request #19328 from satsukitv/v4-dev

Include all grunt required files in npm package

9 years agoBump scss_lint to v0.47.0.
XhmikosR [Sat, 27 Feb 2016 11:26:27 +0000 (13:26 +0200)] 
Bump scss_lint to v0.47.0.

[skip sauce]

9 years agoInclude all grunt requires files in npm package 19328/head
Charlie Wagner [Sat, 27 Feb 2016 02:36:00 +0000 (21:36 -0500)] 
Include all grunt requires files in npm package

9 years agoMerge pull request #19321 from twbs/bugs.chromium.org
Chris Rebert [Fri, 26 Feb 2016 01:06:09 +0000 (17:06 -0800)] 
Merge pull request #19321 from twbs/bugs.chromium.org

Wall of Browser Bugs: Update Chromium bug tracker URLs

9 years agoWall of Browser Bugs: Update Chromium bug tracker URLs 19321/head
Chris Rebert [Fri, 26 Feb 2016 00:52:57 +0000 (16:52 -0800)] 
Wall of Browser Bugs: Update Chromium bug tracker URLs

RIP code.google.com
[skip sauce]

9 years agoMerge pull request #19277 from patrickhlauke/v4-dev-forms-fixes#2
Patrick H. Lauke [Thu, 25 Feb 2016 11:28:16 +0000 (11:28 +0000)] 
Merge pull request #19277 from patrickhlauke/v4-dev-forms-fixes#2

Forms fixes: fieldset/legend, new .form-control-legend, accessibility advice

9 years agoMerge pull request #19312 from prose100/docs
Chris Rebert [Thu, 25 Feb 2016 09:20:38 +0000 (01:20 -0800)] 
Merge pull request #19312 from prose100/docs

docs/components/alerts.md: Correct grammar
[ci skip]

9 years agoCorrect grammar 19312/head
Paul Rose [Thu, 25 Feb 2016 05:04:38 +0000 (23:04 -0600)] 
Correct grammar

9 years agoMerge pull request #19294 from twbs/ios-9.2
Chris Rebert [Tue, 23 Feb 2016 21:59:02 +0000 (13:59 -0800)] 
Merge pull request #19294 from twbs/ios-9.2

Use iOS 9.2 in Sauce tests

9 years agoMerge pull request #19293 from twbs/el-capitan
Chris Rebert [Tue, 23 Feb 2016 21:29:31 +0000 (13:29 -0800)] 
Merge pull request #19293 from twbs/el-capitan

Use OS X El Capitan for Sauce tests

9 years agoUse iOS 9.2 in Sauce tests 19294/head
Chris Rebert [Tue, 23 Feb 2016 20:49:17 +0000 (12:49 -0800)] 
Use iOS 9.2 in Sauce tests

[skip validator]

9 years agoUse OS X El Capitan for Sauce tests 19293/head
Chris Rebert [Tue, 23 Feb 2016 20:46:27 +0000 (12:46 -0800)] 
Use OS X El Capitan for Sauce tests

[skip validator]

9 years agoMerge pull request #19291 from twbs/win10
Chris Rebert [Tue, 23 Feb 2016 20:43:49 +0000 (12:43 -0800)] 
Merge pull request #19291 from twbs/win10

Use Windows 10 for Win Chrome+Firefox tests on Sauce Labs

9 years agoUse Windows 10 for Win Chrome+Firefox tests on Sauce Labs 19291/head
Chris Rebert [Tue, 23 Feb 2016 20:16:25 +0000 (12:16 -0800)] 
Use Windows 10 for Win Chrome+Firefox tests on Sauce Labs

[skip validator]

9 years agoBump grunt-contrib-concat.
XhmikosR [Tue, 23 Feb 2016 07:47:17 +0000 (09:47 +0200)] 
Bump grunt-contrib-concat.

[skip sauce]

9 years agoUpdate Jekyll to v3.1.2.
XhmikosR [Tue, 23 Feb 2016 07:08:22 +0000 (09:08 +0200)] 
Update Jekyll to v3.1.2.

[skip sauce]

9 years agoUpdate scss_lint to v0.46.0.
XhmikosR [Tue, 23 Feb 2016 07:07:52 +0000 (09:07 +0200)] 
Update scss_lint to v0.46.0.

[skip sauce]

9 years agoAppropriate use of fieldset/div, legend, callout for hidden/no label alternatives 19277/head
Patrick H. Lauke [Fri, 19 Feb 2016 14:57:26 +0000 (14:57 +0000)] 
Appropriate use of fieldset/div, legend, callout for hidden/no label alternatives

9 years agoAdd form-control-legend
Patrick H. Lauke [Fri, 19 Feb 2016 15:35:00 +0000 (15:35 +0000)] 
Add form-control-legend

9 years agoRun grunt.
XhmikosR [Fri, 19 Feb 2016 11:10:46 +0000 (13:10 +0200)] 
Run grunt.

[ci skip]

9 years agoUpdate devDependencies.
XhmikosR [Fri, 19 Feb 2016 11:09:42 +0000 (13:09 +0200)] 
Update devDependencies.

9 years agoBump scss_lint to v0.45.0.
XhmikosR [Fri, 19 Feb 2016 10:55:14 +0000 (12:55 +0200)] 
Bump scss_lint to v0.45.0.

[skip sauce]

9 years agoMerge pull request #19029 from twbs/v4-dev-xmr-grunt-html
XhmikosR [Fri, 19 Feb 2016 10:07:14 +0000 (12:07 +0200)] 
Merge pull request #19029 from twbs/v4-dev-xmr-grunt-html

Update grunt-html

9 years agoTravis CI: switch to the Trusty image. 19029/head
XhmikosR [Fri, 19 Feb 2016 09:27:33 +0000 (11:27 +0200)] 
Travis CI: switch to the Trusty image.

9 years agoFix validation errors.
XhmikosR [Tue, 26 Jan 2016 12:58:19 +0000 (14:58 +0200)] 
Fix validation errors.

[skip sauce]

9 years agoUpdate grunt-html to v6.0.0.
XhmikosR [Tue, 26 Jan 2016 12:55:26 +0000 (14:55 +0200)] 
Update grunt-html to v6.0.0.

Also remove the workaround for the old validator version.

[skip sauce]

9 years agoDocs: Add example of .dropdown-menu-right
Jeremy Kratz [Mon, 11 Jan 2016 00:02:33 +0000 (18:02 -0600)] 
Docs: Add example of .dropdown-menu-right

Fixes #18493
Closes #18836
[skip sauce]

9 years agoMerge pull request #18987 from xcatliu/v4-dev-fix-search-json-prefix
Chris Rebert [Fri, 19 Feb 2016 02:36:14 +0000 (18:36 -0800)] 
Merge pull request #18987 from xcatliu/v4-dev-fix-search-json-prefix

Add prefix to footer.html search.json
[skip sauce]

9 years agoDocument .pos-f-t utility class; fixes #18494
Russell Beye [Fri, 8 Jan 2016 04:34:13 +0000 (22:34 -0600)] 
Document .pos-f-t utility class; fixes #18494

Add documentation to components/utilities to publicly expose the
.pos-f-t utility class to users.

Closes #18799
[skip sauce]

9 years agoDocument the possibility of extending the $spacers map
Tobias [Sun, 27 Dec 2015 18:20:39 +0000 (19:20 +0100)] 
Document the possibility of extending the $spacers map

It's very handy to add another spacer size (e.g. `4`) which can easily be done by extending the map.
Example:
```
$spacers: (
  0: (
    x:   0,
    y:   0
  ),
  1: (
    x:   $spacer-x,
    y:   $spacer-y
  ),
  2: (
    x:   ($spacer-x * 1.5),
    y:   ($spacer-y * 1.5)
  ),
  3: (
    x:   ($spacer-x * 3),
    y:   ($spacer-y * 3)
  ),
  4: (
    x:   ($spacer-x * 5),
    y:   ($spacer-y * 5)
  )
);
```

Closes #18706
[skip sauce]

9 years agoDocs: Remove <meta name="keywords"> from <head>
Chris Rebert [Fri, 19 Feb 2016 02:08:43 +0000 (18:08 -0800)] 
Docs: Remove <meta name="keywords"> from <head>

Ports #18872 to v4
[skip sauce]

9 years agoModal docs: Added JS event handler for relatedTarget demo
James Mosier [Tue, 15 Sep 2015 16:36:36 +0000 (12:36 -0400)] 
Modal docs: Added JS event handler for relatedTarget demo

Fixes #17584
Closes #17607 by merging it

9 years agoMerge pull request #19241 from twbs/carousel-indicators-width
Chris Rebert [Thu, 18 Feb 2016 05:13:17 +0000 (21:13 -0800)] 
Merge pull request #19241 from twbs/carousel-indicators-width

Extract $carousel-indicators-width variable

9 years agoExtract $carousel-indicators-width variable 19241/head
Chris Rebert [Wed, 17 Feb 2016 05:28:20 +0000 (21:28 -0800)] 
Extract $carousel-indicators-width variable

[skip sauce]
[skip validator]

9 years agoMerge pull request #19238 from twbs/dropdown-padding-y
Chris Rebert [Thu, 18 Feb 2016 05:08:19 +0000 (21:08 -0800)] 
Merge pull request #19238 from twbs/dropdown-padding-y

Extract $dropdown-padding-y variable

9 years agoExtract $dropdown-padding-y variable 19238/head
Chris Rebert [Wed, 17 Feb 2016 05:07:24 +0000 (21:07 -0800)] 
Extract $dropdown-padding-y variable

[skip sauce]
[skip validator]

9 years agoMerge pull request #19243 from twbs/list-group-item-heading-margin-bottom
Chris Rebert [Thu, 18 Feb 2016 05:04:35 +0000 (21:04 -0800)] 
Merge pull request #19243 from twbs/list-group-item-heading-margin-bottom

Extract $list-group-item-heading-margin-bottom variable

9 years agoExtract $list-group-item-heading-margin-bottom variable 19243/head
Chris Rebert [Wed, 17 Feb 2016 06:27:29 +0000 (22:27 -0800)] 
Extract $list-group-item-heading-margin-bottom variable

[skip sauce]
[skip validator]

9 years agoMerge pull request #19242 from twbs/carousel-caption-width
Mark Otto [Wed, 17 Feb 2016 16:55:16 +0000 (08:55 -0800)] 
Merge pull request #19242 from twbs/carousel-caption-width

Extract $carousel-caption-width variable

9 years agoMerge pull request #19239 from twbs/dropdown-margin-top
Mark Otto [Wed, 17 Feb 2016 16:54:47 +0000 (08:54 -0800)] 
Merge pull request #19239 from twbs/dropdown-margin-top

Extract $dropdown-margin-top variable

9 years agoMerge pull request #19237 from twbs/carousel-indicator-size
Mark Otto [Wed, 17 Feb 2016 16:54:25 +0000 (08:54 -0800)] 
Merge pull request #19237 from twbs/carousel-indicator-size

Extract $carousel-indicator{-active}-size variables

9 years agoMerge pull request #19255 from patrickhlauke/color-accessibility-callout-include
Patrick H. Lauke [Wed, 17 Feb 2016 16:48:51 +0000 (16:48 +0000)] 
Merge pull request #19255 from patrickhlauke/color-accessibility-callout-include

Docs: add/unify advice on contextual colors and accessibility

9 years agoMerge pull request #19259 from patrickhlauke/keyboard-navigation-focus-patch1
Patrick H. Lauke [Wed, 17 Feb 2016 15:34:52 +0000 (15:34 +0000)] 
Merge pull request #19259 from patrickhlauke/keyboard-navigation-focus-patch1

Replace jQuery with vanilla JS

9 years agoReplace jQuery with vanilla JS 19259/head
Patrick H. Lauke [Wed, 17 Feb 2016 15:21:02 +0000 (15:21 +0000)] 
Replace jQuery with vanilla JS

9 years agoMerge pull request #19257 from twbs/fix-19147
Chris Rebert [Wed, 17 Feb 2016 11:25:04 +0000 (03:25 -0800)] 
Merge pull request #19257 from twbs/fix-19147

Add $gutter parameter to make-col mixin

9 years agoAdd $gutter parameter to make-col mixin; fixes #19147 19257/head
Chris Rebert [Wed, 17 Feb 2016 11:19:07 +0000 (03:19 -0800)] 
Add $gutter parameter to make-col mixin; fixes #19147

[skip sauce]
[skip validator]

9 years agoMerge pull request #19256 from patrickhlauke/label-tag-nav-fixup1
Patrick H. Lauke [Wed, 17 Feb 2016 11:08:43 +0000 (11:08 +0000)] 
Merge pull request #19256 from patrickhlauke/label-tag-nav-fixup1

Replace "label" with "tag" in navigation

9 years agoReplace "label" with "tag" in navigation 19256/head
Patrick H. Lauke [Wed, 17 Feb 2016 11:06:32 +0000 (11:06 +0000)] 
Replace "label" with "tag" in navigation

9 years ago- Conveying color meaning to AT as markdown include 19255/head
Patrick H. Lauke [Wed, 17 Feb 2016 10:22:48 +0000 (10:22 +0000)] 
- Conveying color meaning to AT as markdown include
- Add/replace callout for color and AT with include

9 years agoMerge pull request #19251 from twbs/navbar-brand-padding-y
Chris Rebert [Wed, 17 Feb 2016 07:15:34 +0000 (23:15 -0800)] 
Merge pull request #19251 from twbs/navbar-brand-padding-y

Extract $navbar-brand-padding-y variable

9 years agoExtract $navbar-brand-padding-y variable 19251/head
Chris Rebert [Wed, 17 Feb 2016 07:11:25 +0000 (23:11 -0800)] 
Extract $navbar-brand-padding-y variable

[skip sauce]
[skip validator]

9 years agoMerge pull request #19250 from twbs/list-group-item-padding
Chris Rebert [Wed, 17 Feb 2016 07:08:41 +0000 (23:08 -0800)] 
Merge pull request #19250 from twbs/list-group-item-padding

Add $list-group-item-padding-{x,y} variables

9 years agoMerge pull request #19249 from twbs/card-columns-sm-up-column-gap
Chris Rebert [Wed, 17 Feb 2016 07:08:24 +0000 (23:08 -0800)] 
Merge pull request #19249 from twbs/card-columns-sm-up-column-gap

Add $card-columns-sm-up-column-gap variable

9 years agoAdd $card-columns-sm-up-column-gap variable 19249/head
Chris Rebert [Wed, 17 Feb 2016 07:00:58 +0000 (23:00 -0800)] 
Add $card-columns-sm-up-column-gap variable

[skip sauce]
[skip validator]

9 years agoAdd $list-group-item-padding-{x,y} variables 19250/head
Chris Rebert [Wed, 17 Feb 2016 06:57:10 +0000 (22:57 -0800)] 
Add $list-group-item-padding-{x,y} variables

[skip sauce]
[skip validator]

9 years ago_tags.scss: Updated comments to reflect name change
Ameya Pandilwar [Wed, 17 Feb 2016 06:32:32 +0000 (01:32 -0500)] 
_tags.scss: Updated comments to reflect name change

Erratum from #19157
Closes #19245

9 years agoMerge pull request #19247 from twbs/code-padding-vars
Chris Rebert [Wed, 17 Feb 2016 06:49:16 +0000 (22:49 -0800)] 
Merge pull request #19247 from twbs/code-padding-vars

Extract $code-padding-{x,y} variables

9 years agoExtract $code-padding-{x,y} variables 19247/head
Chris Rebert [Wed, 17 Feb 2016 06:45:26 +0000 (22:45 -0800)] 
Extract $code-padding-{x,y} variables

[skip sauce]
[skip validator]

9 years agoMerge pull request #19246 from twbs/code-font-size
Chris Rebert [Wed, 17 Feb 2016 06:41:55 +0000 (22:41 -0800)] 
Merge pull request #19246 from twbs/code-font-size

Extract $code-font-size variable

9 years agoMerge pull request #19244 from twbs/figure-caption-font-size
Chris Rebert [Wed, 17 Feb 2016 06:37:38 +0000 (22:37 -0800)] 
Merge pull request #19244 from twbs/figure-caption-font-size

Add $figure-caption-font-size variable

9 years agoExtract $code-font-size variable 19246/head
Chris Rebert [Wed, 17 Feb 2016 06:37:00 +0000 (22:37 -0800)] 
Extract $code-font-size variable

[skip sauce]
[skip validator]

9 years agoAdd $figure-caption-font-size variable 19244/head
Chris Rebert [Wed, 17 Feb 2016 06:31:40 +0000 (22:31 -0800)] 
Add $figure-caption-font-size variable

[skip sauce]
[skip validator]

9 years agoExtract $carousel-caption{-sm-up}-width variables 19242/head
Chris Rebert [Wed, 17 Feb 2016 05:32:39 +0000 (21:32 -0800)] 
Extract $carousel-caption{-sm-up}-width variables

[skip sauce]
[skip validator]

9 years agoMerge pull request #19240 from twbs/dropdown-item-padding-x
Chris Rebert [Wed, 17 Feb 2016 05:21:58 +0000 (21:21 -0800)] 
Merge pull request #19240 from twbs/dropdown-item-padding-x

Extract $dropdown-item-padding-x variable

9 years agoExtract $dropdown-item-padding-x variable 19240/head
Chris Rebert [Wed, 17 Feb 2016 05:16:55 +0000 (21:16 -0800)] 
Extract $dropdown-item-padding-x variable

[skip sauce]
[skip validator]

9 years agoExtract $dropdown-margin-top variable 19239/head
Chris Rebert [Wed, 17 Feb 2016 05:13:15 +0000 (21:13 -0800)] 
Extract $dropdown-margin-top variable

[skip sauce]
[skip validator]

9 years agoExtract $carousel-indicator{-active}-size variables 19237/head
Chris Rebert [Wed, 17 Feb 2016 05:00:10 +0000 (21:00 -0800)] 
Extract $carousel-indicator{-active}-size variables

[skip sauce]
[skip validator]

9 years agoMerge pull request #19235 from twbs/carousel-control-sm-up-width
Chris Rebert [Wed, 17 Feb 2016 04:53:53 +0000 (20:53 -0800)] 
Merge pull request #19235 from twbs/carousel-control-sm-up-width

Extract $carousel-control-sm-up-width variable

9 years agoExtract $carousel-control-sm-up-size variable 19235/head
Chris Rebert [Wed, 17 Feb 2016 04:40:54 +0000 (20:40 -0800)] 
Extract $carousel-control-sm-up-size variable

[skip sauce]
[skip validator]

9 years agogrunt
Mark Otto [Wed, 17 Feb 2016 04:34:35 +0000 (20:34 -0800)] 
grunt

9 years agoFixes #19142 (follow-up to #18771): Restore cursor: pointer to custom radio/checkbox...
Mark Otto [Wed, 17 Feb 2016 04:34:31 +0000 (20:34 -0800)] 
Fixes #19142 (follow-up to #18771): Restore cursor: pointer to custom radio/checkbox components

9 years agoupdate migration docs
Mark Otto [Wed, 17 Feb 2016 04:30:20 +0000 (20:30 -0800)] 
update migration docs

9 years agogrunt
Mark Otto [Wed, 17 Feb 2016 04:28:56 +0000 (20:28 -0800)] 
grunt

9 years agoMerge branch 'fix-19094' of https://github.com/ameya-pandilwar/bootstrap into ameya...
Mark Otto [Wed, 17 Feb 2016 04:28:51 +0000 (20:28 -0800)] 
Merge branch 'fix-19094' of https://github.com/ameya-pandilwar/bootstrap into ameya-pandilwar-fix-19094

9 years agoMerge pull request #19116 from twbs/docs-17264
Mark Otto [Wed, 17 Feb 2016 04:26:41 +0000 (20:26 -0800)] 
Merge pull request #19116 from twbs/docs-17264

Docs: Add captions above progress bars

9 years agoMerge branch 'v4-dev' into mark-padding
Mark Otto [Wed, 17 Feb 2016 04:25:40 +0000 (20:25 -0800)] 
Merge branch 'v4-dev' into mark-padding

9 years agogrunt
Mark Otto [Wed, 17 Feb 2016 04:24:39 +0000 (20:24 -0800)] 
grunt

9 years agoMerge pull request #19210 from twbs/small-font-size
Mark Otto [Wed, 17 Feb 2016 04:23:54 +0000 (20:23 -0800)] 
Merge pull request #19210 from twbs/small-font-size

Add $small-font-size variable

9 years agoMerge pull request #19211 from twbs/mark-bg-var
Mark Otto [Wed, 17 Feb 2016 04:23:41 +0000 (20:23 -0800)] 
Merge pull request #19211 from twbs/mark-bg-var

Add $mark-bg so <mark>'s background-color can be customized independently of $state-warning-bg