]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
10 years agoFix name of Tooltip.replaceArrow() parameter 15681/head
Chris Rebert [Tue, 27 Jan 2015 19:15:55 +0000 (11:15 -0800)] 
Fix name of Tooltip.replaceArrow() parameter

isHorizontal => isVertical

10 years agoMerge pull request #15678 from coliff/patch-1
Chris Rebert [Tue, 27 Jan 2015 16:33:26 +0000 (08:33 -0800)] 
Merge pull request #15678 from coliff/patch-1

Update non-responsive.css

10 years agoUpdate non-responsive.css 15678/head
Christian [Tue, 27 Jan 2015 11:51:55 +0000 (20:51 +0900)] 
Update non-responsive.css

Fix typo on Utilize

10 years agoGruntfile.js: Remove now unneeded validator relaxError option.
XhmikosR [Mon, 26 Jan 2015 16:02:58 +0000 (18:02 +0200)] 
Gruntfile.js: Remove now unneeded validator relaxError option.

10 years agoFix validation errors.
XhmikosR [Mon, 26 Jan 2015 15:56:25 +0000 (17:56 +0200)] 
Fix validation errors.

Surprisingly those weren't reported by the validator; only in the grunt-contrib-htmlmin branch they were reported, so after digging into it, I saw they were indeed errors...

10 years agoMerge pull request #15660 from twbs/bump-dev-deps
Chris Rebert [Sat, 24 Jan 2015 00:14:11 +0000 (16:14 -0800)] 
Merge pull request #15660 from twbs/bump-dev-deps

update devDependencies

10 years agoupdate shrinkwrap 15660/head
Chris Rebert [Sat, 24 Jan 2015 00:03:23 +0000 (16:03 -0800)] 
update shrinkwrap

10 years agoupdate devDependencies
Chris Rebert [Fri, 23 Jan 2015 23:59:37 +0000 (15:59 -0800)] 
update devDependencies

upgrade grunt-contrib-jshint to ~0.11.0
upgrade load-grunt-tasks to ~3.0.0

10 years agoMerge pull request #15651 from sebnow/bower-woff2
Chris Rebert [Fri, 23 Jan 2015 16:06:55 +0000 (08:06 -0800)] 
Merge pull request #15651 from sebnow/bower-woff2

Add woff2 font file to bower main files

10 years agoAdd woff2 font file to bower main files 15651/head
Sebastian Nowicki [Fri, 23 Jan 2015 13:18:52 +0000 (14:18 +0100)] 
Add woff2 font file to bower main files

If Bootstrap is installed through bower, the woff2 font file may not be
copied over as it's not in the "main" files. The LESS files still
reference the font file which results in errors.

10 years agoMerge branch 'master' of github.com:twbs/bootstrap 15637/head
Mark Otto [Thu, 22 Jan 2015 05:06:28 +0000 (21:06 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

10 years agokeep the base64
Mark Otto [Thu, 22 Jan 2015 05:06:11 +0000 (21:06 -0800)] 
keep the base64

10 years agoMerge branch 'master' into move-inline-css
Mark Otto [Thu, 22 Jan 2015 04:16:08 +0000 (20:16 -0800)] 
Merge branch 'master' into move-inline-css

Conflicts:
docs/assets/css/docs.min.css

10 years agoMerge pull request #15299 from SpectrumPixel/patch-2
Mark Otto [Thu, 22 Jan 2015 03:58:03 +0000 (19:58 -0800)] 
Merge pull request #15299 from SpectrumPixel/patch-2

Remove "Separated link" in example where it's not

10 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Thu, 22 Jan 2015 03:20:59 +0000 (19:20 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

10 years agoMerge branch 'docs-anchors'
Mark Otto [Thu, 22 Jan 2015 03:20:21 +0000 (19:20 -0800)] 
Merge branch 'docs-anchors'

10 years agostyle changes
Mark Otto [Thu, 22 Jan 2015 03:20:16 +0000 (19:20 -0800)] 
style changes

10 years agoautomatic grunt dist
Bootstrap's Grunt bot [Thu, 22 Jan 2015 03:01:38 +0000 (03:01 +0000)] 
automatic grunt dist

10 years agoMerge pull request #15628 from kkirsche/patch-1
Mark Otto [Thu, 22 Jan 2015 02:50:33 +0000 (18:50 -0800)] 
Merge pull request #15628 from kkirsche/patch-1

[Fix Issue #15561] Fix badges not being resized inside .btn-group-xs if .btn-xs is not applied

10 years agoFix having multiple selectors on a single line. 15628/head
Kevin Kirsche [Wed, 21 Jan 2015 21:38:58 +0000 (16:38 -0500)] 
Fix having multiple selectors on a single line.

10 years agoautomatic grunt dist
Bootstrap's Grunt bot [Wed, 21 Jan 2015 21:20:51 +0000 (21:20 +0000)] 
automatic grunt dist

10 years agoMerge pull request #15620 from twbs/iso-4217
Chris Rebert [Wed, 21 Jan 2015 21:16:57 +0000 (13:16 -0800)] 
Merge pull request #15620 from twbs/iso-4217

Add .glyphicon-* aliases for other ISO 4217-ish currency codes

10 years agoFix issue twbs/bootstrap#15561
Kevin Kirsche [Wed, 21 Jan 2015 17:01:25 +0000 (12:01 -0500)] 
Fix issue twbs/bootstrap#15561

Fix issue twbs/bootstrap#15561 regarding badges not shrinking to fit inside of .btn-group-xs

10 years agoMerge pull request #15621 from twbs/fix-12832
Chris Rebert [Wed, 21 Jan 2015 08:02:09 +0000 (00:02 -0800)] 
Merge pull request #15621 from twbs/fix-12832

Document sticky :hover on mobile browsers

10 years agoCarousel example: move the Base64 images outside of the HTML. 15255/head
XhmikosR [Sun, 30 Nov 2014 11:09:30 +0000 (13:09 +0200)] 
Carousel example: move the Base64 images outside of the HTML.

Use a simple blank.gif and change the background color instead of duplicating stuff.

10 years agoMove inline CSS to docs.css.
XhmikosR [Thu, 20 Nov 2014 08:09:47 +0000 (10:09 +0200)] 
Move inline CSS to docs.css.

10 years agoAdd AnchorJS for docs anchors. 15491/head
XhmikosR [Tue, 28 Oct 2014 21:50:22 +0000 (23:50 +0200)] 
Add AnchorJS for docs anchors.

10 years agoMerge pull request #15503 from twbs/qunit
Chris Rebert [Wed, 21 Jan 2015 04:23:34 +0000 (20:23 -0800)] 
Merge pull request #15503 from twbs/qunit

Update QUnit to v1.17.0.

10 years agotweak 'close reopened modal' unit test to work under new QUnit API 15503/head
Chris Rebert [Wed, 21 Jan 2015 04:18:33 +0000 (20:18 -0800)] 
tweak 'close reopened modal' unit test to work under new QUnit API

10 years agofix bug in tab show/shown relatedTarget unit test
Chris Rebert [Wed, 21 Jan 2015 04:16:42 +0000 (20:16 -0800)] 
fix bug in tab show/shown relatedTarget unit test

10 years agoupdate JS unit tests to future-proof QUnit 1.16.0 API
Chris Rebert [Wed, 21 Jan 2015 03:40:50 +0000 (19:40 -0800)] 
update JS unit tests to future-proof QUnit 1.16.0 API

[skip validator]

10 years agoDocument sticky :hover on mobile browsers; fixes #12832 15621/head
Chris Rebert [Wed, 21 Jan 2015 03:22:20 +0000 (19:22 -0800)] 
Document sticky :hover on mobile browsers; fixes #12832

10 years agoAdd .glyphicon-* aliases for other ISO 4217-ish currency codes 15620/head
Chris Rebert [Wed, 21 Jan 2015 00:24:34 +0000 (16:24 -0800)] 
Add .glyphicon-* aliases for other ISO 4217-ish currency codes

Fixes #15617.

10 years agoMerge pull request #15619 from twbs/markdown
Chris Rebert [Tue, 20 Jan 2015 21:25:24 +0000 (13:25 -0800)] 
Merge pull request #15619 from twbs/markdown

Change markdown library

10 years agoupdate shrinkwrap 15619/head
Chris Rebert [Tue, 20 Jan 2015 21:05:38 +0000 (13:05 -0800)] 
update shrinkwrap

10 years agoremarkable -> markdown-it
Chris Rebert [Tue, 20 Jan 2015 21:04:35 +0000 (13:04 -0800)] 
remarkable -> markdown-it

10 years agoMerge pull request #15618 from twbs/update-sauce
Chris Rebert [Tue, 20 Jan 2015 21:04:17 +0000 (13:04 -0800)] 
Merge pull request #15618 from twbs/update-sauce

update grunt-saucelabs to ~8.5.0

10 years agoupdate shrinkwrap 15618/head
Chris Rebert [Tue, 20 Jan 2015 20:49:46 +0000 (12:49 -0800)] 
update shrinkwrap

10 years agoupdate grunt-saucelabs to ~8.5.0
Chris Rebert [Tue, 20 Jan 2015 20:49:08 +0000 (12:49 -0800)] 
update grunt-saucelabs to ~8.5.0

10 years agoautomatic grunt dist
Bootstrap's Grunt bot [Mon, 19 Jan 2015 23:20:54 +0000 (23:20 +0000)] 
automatic grunt dist

10 years agoMerge pull request #15606 from tagliala/trim-whitespaces
Mark Otto [Mon, 19 Jan 2015 23:13:16 +0000 (15:13 -0800)] 
Merge pull request #15606 from tagliala/trim-whitespaces

Trim whitespaces

10 years agoTrim whitespaces 15606/head
Geremia Taglialatela [Mon, 19 Jan 2015 20:26:01 +0000 (21:26 +0100)] 
Trim whitespaces

10 years agoUpdate QUnit to v1.17.0.
XhmikosR [Mon, 19 Jan 2015 17:05:24 +0000 (19:05 +0200)] 
Update QUnit to v1.17.0.

10 years agoMerge pull request #15605 from twbs/deps
XhmikosR [Mon, 19 Jan 2015 17:54:43 +0000 (19:54 +0200)] 
Merge pull request #15605 from twbs/deps

Update devDependencies.

10 years agoUpdate devDependencies. 15605/head
XhmikosR [Mon, 19 Jan 2015 17:13:43 +0000 (19:13 +0200)] 
Update devDependencies.

10 years agocustomizer typo
Mark Otto [Mon, 19 Jan 2015 17:19:09 +0000 (09:19 -0800)] 
customizer typo

10 years agoMerge pull request #15604 from twbs/ship_v3.3.2 v3.3.2
Mark Otto [Mon, 19 Jan 2015 17:03:09 +0000 (09:03 -0800)] 
Merge pull request #15604 from twbs/ship_v3.3.2

Ship v3.3.2

10 years agogrunt 15604/head
Mark Otto [Mon, 19 Jan 2015 16:33:33 +0000 (08:33 -0800)] 
grunt

10 years agobump versions
Mark Otto [Mon, 19 Jan 2015 16:32:13 +0000 (08:32 -0800)] 
bump versions

10 years agogrunt
Mark Otto [Mon, 19 Jan 2015 16:27:15 +0000 (08:27 -0800)] 
grunt

10 years agofixes #15497: increase decimals on line-height-large from 1.33 to 1.3333333 to fix...
Mark Otto [Sun, 18 Jan 2015 23:03:14 +0000 (15:03 -0800)] 
fixes #15497: increase decimals on line-height-large from 1.33 to 1.3333333 to fix button sizing in Win 8.1 Chrome

10 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sun, 18 Jan 2015 21:39:50 +0000 (13:39 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

10 years agoFixes #15142: Add position: relative; to .dropup for proper placement of menus
Mark Otto [Sun, 18 Jan 2015 21:39:40 +0000 (13:39 -0800)] 
Fixes #15142: Add position: relative; to .dropup for proper placement of menus

10 years agorm dummy href from dismiss-on-next-click popover example; fixes #15277
Chris Rebert [Sun, 18 Jan 2015 20:51:47 +0000 (12:51 -0800)] 
rm dummy href from dismiss-on-next-click popover example; fixes #15277

10 years agoMerge branch 'master' into pr/15278
Mark Otto [Sun, 18 Jan 2015 20:24:29 +0000 (12:24 -0800)] 
Merge branch 'master' into pr/15278

Conflicts:
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.css.map
docs/dist/css/bootstrap.min.css

10 years agogrunt
Mark Otto [Sun, 18 Jan 2015 20:22:43 +0000 (12:22 -0800)] 
grunt

10 years agoMerge pull request #15594 from twbs/fix_15493
Mark Otto [Sun, 18 Jan 2015 05:51:03 +0000 (21:51 -0800)] 
Merge pull request #15594 from twbs/fix_15493

Fixes #15493: inherit color on small/.small in .panel-title

10 years agofixes #15493: inherit color on small/.small in .panel-title 15594/head
Mark Otto [Sun, 18 Jan 2015 05:35:55 +0000 (21:35 -0800)] 
fixes #15493: inherit color on small/.small in .panel-title

10 years agoautomatic grunt dist
Bootstrap's Grunt bot [Sun, 18 Jan 2015 05:11:01 +0000 (05:11 +0000)] 
automatic grunt dist

10 years agoMerge pull request #15551 from lee101/master
Mark Otto [Sun, 18 Jan 2015 05:07:13 +0000 (21:07 -0800)] 
Merge pull request #15551 from lee101/master

Fix table-striped to work with bootstraps tooltips on rows

10 years ago#15576 errata: #15298 also reproduces on Linux
Chris Rebert [Fri, 16 Jan 2015 23:16:52 +0000 (15:16 -0800)] 
#15576 errata: #15298 also reproduces on Linux

See https://github.com/twbs/bootstrap/issues/15298#issuecomment-69216754

10 years agoautomatic grunt dist
Bootstrap's Grunt bot [Fri, 16 Jan 2015 21:41:05 +0000 (21:41 +0000)] 
automatic grunt dist

10 years agoMerge pull request #15589 from KevinJannis/patch-3
Mark Otto [Fri, 16 Jan 2015 21:31:52 +0000 (13:31 -0800)] 
Merge pull request #15589 from KevinJannis/patch-3

Added blank line between selectors in badges

10 years agoAdded blank line between selectors in badges 15589/head
Kevin Jannis [Fri, 16 Jan 2015 20:44:27 +0000 (21:44 +0100)] 
Added blank line between selectors in badges

10 years agoautomatic grunt dist
Bootstrap's Grunt bot [Fri, 16 Jan 2015 19:11:06 +0000 (19:11 +0000)] 
automatic grunt dist

10 years ago.form-control: add note about <select> & border-radius
Chris Rebert [Fri, 16 Jan 2015 19:02:51 +0000 (11:02 -0800)] 
.form-control: add note about <select> & border-radius

Refs #15340

10 years agoautomatic grunt dist
Bootstrap's Grunt bot [Fri, 16 Jan 2015 16:41:05 +0000 (16:41 +0000)] 
automatic grunt dist

10 years agoMerge pull request #15583 from twbs/deps
XhmikosR [Fri, 16 Jan 2015 16:38:52 +0000 (18:38 +0200)] 
Merge pull request #15583 from twbs/deps

Update devDependencies.

10 years agoMerge pull request #15581 from twbs/inline-form-with-visible-labels
Chris Rebert [Fri, 16 Jan 2015 16:20:41 +0000 (08:20 -0800)] 
Merge pull request #15581 from twbs/inline-form-with-visible-labels

Add example of using .form-inline with visible <label>s

10 years agoFix bogus JSCS warning. 15583/head
XhmikosR [Fri, 16 Jan 2015 15:45:58 +0000 (17:45 +0200)] 
Fix bogus JSCS warning.

10 years agoUpdate JSCS config for the new version.
XhmikosR [Fri, 16 Jan 2015 15:43:39 +0000 (17:43 +0200)] 
Update JSCS config for the new version.

10 years agoUpdate devDependencies.
XhmikosR [Fri, 16 Jan 2015 08:10:02 +0000 (10:10 +0200)] 
Update devDependencies.

10 years agoMerge pull request #15585 from dancourse/patch-1
Mark Otto [Fri, 16 Jan 2015 11:03:28 +0000 (03:03 -0800)] 
Merge pull request #15585 from dancourse/patch-1

12 items of *fewer* as it's a countable item

10 years agoautomatic grunt dist
Bootstrap's Grunt bot [Fri, 16 Jan 2015 10:51:20 +0000 (10:51 +0000)] 
automatic grunt dist

10 years agoMerge pull request #15584 from KevinJannis/patch-2
Mark Otto [Fri, 16 Jan 2015 10:41:11 +0000 (02:41 -0800)] 
Merge pull request #15584 from KevinJannis/patch-2

Added blank lines between selectors for alerts

10 years ago12 items of *fewer* as it's a countable item 15585/head
Dan Course [Fri, 16 Jan 2015 10:36:46 +0000 (10:36 +0000)] 
12 items of *fewer* as it's a countable item

http://www.oxforddictionaries.com/words/less-or-fewer

10 years agoAdded blank lines between selectors for alerts 15584/head
Kevin Jannis [Fri, 16 Jan 2015 09:06:35 +0000 (10:06 +0100)] 
Added blank lines between selectors for alerts

10 years agocustom widths not always required for inline form fields
Chris Rebert [Fri, 16 Jan 2015 01:52:02 +0000 (17:52 -0800)] 
custom widths not always required for inline form fields

[skip sauce]

10 years agoAdd example of using .form-inline with visible <label>s 15581/head
Chris Rebert [Fri, 16 Jan 2015 01:44:38 +0000 (17:44 -0800)] 
Add example of using .form-inline with visible <label>s

Refs #15410
[skip sauce]

10 years agoMerge pull request #15580 from twbs/tooltip-async-docs
Chris Rebert [Fri, 16 Jan 2015 01:22:14 +0000 (17:22 -0800)] 
Merge pull request #15580 from twbs/tooltip-async-docs

Document that tooltip+popover show+hide methods are async

10 years agoDocument that tooltip+popover show+hide methods are async; fixes #15500 15580/head
Chris Rebert [Fri, 16 Jan 2015 01:15:41 +0000 (17:15 -0800)] 
Document that tooltip+popover show+hide methods are async; fixes #15500

[skip sauce]

10 years agoFixes #15536, #15559: Add .form-group sizing support to .form-control-static
Mark Otto [Fri, 16 Jan 2015 00:03:13 +0000 (16:03 -0800)] 
Fixes #15536, #15559: Add .form-group sizing support to .form-control-static

10 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Thu, 15 Jan 2015 23:51:12 +0000 (15:51 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

10 years agogrunt
Mark Otto [Thu, 15 Jan 2015 23:51:02 +0000 (15:51 -0800)] 
grunt

10 years agoMerge pull request #15498 from twbs/fix-15332
Chris Rebert [Thu, 15 Jan 2015 23:49:46 +0000 (15:49 -0800)] 
Merge pull request #15498 from twbs/fix-15332

Add examples of using feedback icons with .input-group

10 years agoautomatic grunt dist
Bootstrap's Grunt bot [Thu, 15 Jan 2015 23:41:25 +0000 (23:41 +0000)] 
automatic grunt dist

10 years agoMerge pull request #15567 from twbs/fix-15565
Mark Otto [Thu, 15 Jan 2015 23:36:19 +0000 (15:36 -0800)] 
Merge pull request #15567 from twbs/fix-15565

Use @link-hover-decoration for .btn-link too; fixes #15565

10 years agoMerge pull request #15482 from liias/patch-1
Mark Otto [Thu, 15 Jan 2015 23:34:34 +0000 (15:34 -0800)] 
Merge pull request #15482 from liias/patch-1

Add .disabled class styling for .btn-styles in theme

10 years agoautomatic grunt dist
Bootstrap's Grunt bot [Thu, 15 Jan 2015 23:31:25 +0000 (23:31 +0000)] 
automatic grunt dist

10 years agoMerge pull request #15577 from KevinJannis/patch-1
Mark Otto [Thu, 15 Jan 2015 23:28:38 +0000 (15:28 -0800)] 
Merge pull request #15577 from KevinJannis/patch-1

Added blank line between selectors in jumbotron

10 years agoMerge pull request #15578 from twbs/licensing-contributing
Chris Rebert [Thu, 15 Jan 2015 23:01:40 +0000 (15:01 -0800)] 
Merge pull request #15578 from twbs/licensing-contributing

Clarify in CONTRIBUTING docs that CC-BY 3.0 License applies to Bootstrap's docs

10 years agoMerge pull request #15576 from twbs/chrome-bug-449180
Chris Rebert [Thu, 15 Jan 2015 22:07:37 +0000 (14:07 -0800)] 
Merge pull request #15576 from twbs/chrome-bug-449180

Add Wall of Browser Bugs entry for #15298

10 years agoClarify in CONTRIBUTING docs that CC-BY 3.0 License applies to Bootstrap's docs 15578/head
Chris Rebert [Thu, 15 Jan 2015 19:23:09 +0000 (11:23 -0800)] 
Clarify in CONTRIBUTING docs that CC-BY 3.0 License applies to Bootstrap's docs

[ci skip]

10 years agoAdded blank line between selectors in jumbotron 15577/head
Kevin Jannis [Thu, 15 Jan 2015 19:17:02 +0000 (20:17 +0100)] 
Added blank line between selectors in jumbotron

10 years agoAdd Wall of Browser Bugs entry for #15298 15576/head
Chris Rebert [Thu, 15 Jan 2015 19:10:02 +0000 (11:10 -0800)] 
Add Wall of Browser Bugs entry for #15298

[skip sauce]

10 years agoDocs: add missing "http://"
Chris Rebert [Thu, 15 Jan 2015 18:46:58 +0000 (10:46 -0800)] 
Docs: add missing "http://"

10 years agoMerge pull request #15560 from twbs/fix-15555
Chris Rebert [Thu, 15 Jan 2015 05:07:26 +0000 (21:07 -0800)] 
Merge pull request #15560 from twbs/fix-15555

Document that .form-inline & .form-horizontal work fine on non-<form>s too

10 years agoMerge pull request #15569 from twbs/fix-15127
Chris Rebert [Thu, 15 Jan 2015 02:52:17 +0000 (18:52 -0800)] 
Merge pull request #15569 from twbs/fix-15127

Document usage of npm package

10 years agodocument usage of npm package; fixes #15127 15569/head
Chris Rebert [Thu, 15 Jan 2015 02:43:04 +0000 (18:43 -0800)] 
document usage of npm package; fixes #15127

[skip sauce]

10 years agoUse @link-hover-decoration for .btn-link too; fixes #15565 15567/head
Chris Rebert [Wed, 14 Jan 2015 22:42:22 +0000 (14:42 -0800)] 
Use @link-hover-decoration for .btn-link too; fixes #15565

[skip sauce]
[skip validator]