]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
11 years agofix #13185 - keyboard support for carousel 13787/head
fat [Wed, 11 Jun 2014 03:24:19 +0000 (20:24 -0700)] 
fix #13185 - keyboard support for carousel

11 years agoMerge pull request #13785 from twbs/fat-13609
Mark Otto [Wed, 11 Jun 2014 02:21:03 +0000 (19:21 -0700)] 
Merge pull request #13785 from twbs/fat-13609

fixes 13609 - Modal is shifting left just before the hiding animation

11 years agohidden and auto 13785/head
Mark Otto [Wed, 11 Jun 2014 02:20:56 +0000 (19:20 -0700)] 
hidden and auto

11 years agofixes 13609 - Modal is shifting left just before the hiding animation
fat [Wed, 11 Jun 2014 02:06:24 +0000 (19:06 -0700)] 
fixes 13609 - Modal is shifting left just before the hiding animation

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Wed, 11 Jun 2014 01:12:29 +0000 (18:12 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agogrunt
Mark Otto [Wed, 11 Jun 2014 01:11:26 +0000 (18:11 -0700)] 
grunt

11 years agobutton-groups.html: fix grammar: "in on" => "on"
Chris Rebert [Wed, 11 Jun 2014 01:09:30 +0000 (18:09 -0700)] 
button-groups.html: fix grammar: "in on" => "on"

11 years agoMerge pull request #13772 from twbs/fat-amd
Jacob [Wed, 11 Jun 2014 00:24:15 +0000 (17:24 -0700)] 
Merge pull request #13772 from twbs/fat-amd

AMD/CommonJS/Globals #12909

11 years agoMD/CommonJS/Globals #12909 13772/head
Katie Zhu [Tue, 10 Jun 2014 05:18:05 +0000 (22:18 -0700)] 
MD/CommonJS/Globals #12909

11 years agoMerge pull request #13780 from twbs/fx-30
Chris Rebert [Tue, 10 Jun 2014 18:52:20 +0000 (11:52 -0700)] 
Merge pull request #13780 from twbs/fx-30

<input> buttons line-height Firefox bugfix has been shipped!

11 years ago<input> buttons line-height Firefox bugfix has been shipped! 13780/head
Chris Rebert [Tue, 10 Jun 2014 18:41:32 +0000 (11:41 -0700)] 
<input> buttons line-height Firefox bugfix has been shipped!

Remove Wall of Browser Bugs entry.
Update mention of the bug in the CSS docs.
[skip sauce]

11 years agoMerge pull request #13777 from BBosman/fix-gutter
Chris Rebert [Tue, 10 Jun 2014 17:02:11 +0000 (10:02 -0700)] 
Merge pull request #13777 from BBosman/fix-gutter

Fix gutter variable

11 years agoFix gutter variable 13777/head
Bas Bosman [Tue, 10 Jun 2014 14:46:04 +0000 (16:46 +0200)] 
Fix gutter variable

11 years agogrunt for table change
Mark Otto [Tue, 10 Jun 2014 07:26:20 +0000 (00:26 -0700)] 
grunt for table change

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Tue, 10 Jun 2014 07:25:52 +0000 (00:25 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoFixes #13616: Add custom gutter support to containers
Mark Otto [Tue, 10 Jun 2014 07:24:23 +0000 (00:24 -0700)] 
Fixes #13616: Add custom gutter support to containers

11 years agoMerge pull request #13670 from nadangergeo/master
Mark Otto [Tue, 10 Jun 2014 07:14:33 +0000 (00:14 -0700)] 
Merge pull request #13670 from nadangergeo/master

Table-responsive: changed overflow-x to auto to hide scrollbar when it's not overflown, fixes #13669.

11 years agoMerge pull request #12690 from twbs/docs_zeroclipboard
Mark Otto [Tue, 10 Jun 2014 06:36:41 +0000 (23:36 -0700)] 
Merge pull request #12690 from twbs/docs_zeroclipboard

Add ZeroClipboard to docs

11 years agotwerk copy 12690/head
Mark Otto [Tue, 10 Jun 2014 06:29:44 +0000 (23:29 -0700)] 
twerk copy

11 years agoMerge pull request #13771 from twbs/jekyll-2.x
Mark Otto [Tue, 10 Jun 2014 06:14:00 +0000 (23:14 -0700)] 
Merge pull request #13771 from twbs/jekyll-2.x

Update docs for Jekyll 2.x.

11 years agoRun `grunt dist`.
XhmikosR [Sat, 22 Mar 2014 06:33:53 +0000 (08:33 +0200)] 
Run `grunt dist`.

11 years agoUpdate ZeroClipboard to v1.3.5.
XhmikosR [Thu, 20 Mar 2014 05:26:37 +0000 (07:26 +0200)] 
Update ZeroClipboard to v1.3.5.

Also use the official filenames.

11 years agoRemove unused variables and make tests pass.
XhmikosR [Mon, 17 Mar 2014 05:42:05 +0000 (07:42 +0200)] 
Remove unused variables and make tests pass.

11 years agoRefactor and restyle.
Mark Otto [Tue, 11 Feb 2014 08:04:53 +0000 (00:04 -0800)] 
Refactor and restyle.

11 years agoIntegrate ZeroClipboard to easily copy code snippets
soundarapandian [Wed, 8 Jan 2014 12:02:35 +0000 (17:32 +0530)] 
Integrate ZeroClipboard to easily copy code snippets

11 years agogrunt
Mark Otto [Tue, 10 Jun 2014 05:25:24 +0000 (22:25 -0700)] 
grunt

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Tue, 10 Jun 2014 05:25:00 +0000 (22:25 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoFixes #13587: Switch to Kramdown for Markdown compiler in Jekyll
Mark Otto [Tue, 10 Jun 2014 05:24:51 +0000 (22:24 -0700)] 
Fixes #13587: Switch to Kramdown for Markdown compiler in Jekyll

11 years agoUpdate docs for Jekyll 2.x. 13771/head
XhmikosR [Tue, 10 Jun 2014 05:14:09 +0000 (08:14 +0300)] 
Update docs for Jekyll 2.x.

11 years agoMerge pull request #13770 from twbs/fat-carousel
Jacob [Tue, 10 Jun 2014 05:09:38 +0000 (22:09 -0700)] 
Merge pull request #13770 from twbs/fat-carousel

change how carousel indicators activate - fixes #12592

11 years agochange how carousel indicators activate #12592 13770/head
Katie Zhu [Tue, 10 Jun 2014 04:54:31 +0000 (21:54 -0700)] 
change how carousel indicators activate #12592

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Tue, 10 Jun 2014 04:56:45 +0000 (21:56 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agofixes #13769
Mark Otto [Tue, 10 Jun 2014 04:45:55 +0000 (21:45 -0700)] 
fixes #13769

11 years agoMerge pull request #13768 from twbs/font_files_docs
Mark Otto [Tue, 10 Jun 2014 04:35:05 +0000 (21:35 -0700)] 
Merge pull request #13768 from twbs/font_files_docs

Simpler and updated docs copy for icon font file paths

11 years agorelative 13768/head
Mark Otto [Tue, 10 Jun 2014 04:26:57 +0000 (21:26 -0700)] 
relative

11 years agotypo
Mark Otto [Tue, 10 Jun 2014 04:08:24 +0000 (21:08 -0700)] 
typo

11 years agosimpler and updated docs copy for icon font file paths
Mark Otto [Tue, 10 Jun 2014 04:00:27 +0000 (21:00 -0700)] 
simpler and updated docs copy for icon font file paths

11 years agobump grunt-contrib-connect to ~0.8.0
Chris Rebert [Tue, 10 Jun 2014 00:32:10 +0000 (17:32 -0700)] 
bump grunt-contrib-connect to ~0.8.0

11 years agoupdate shrinkwrap
Chris Rebert [Tue, 10 Jun 2014 00:26:49 +0000 (17:26 -0700)] 
update shrinkwrap

11 years agoREADME: move badges to separate line
Chris Rebert [Tue, 10 Jun 2014 00:05:01 +0000 (17:05 -0700)] 
README: move badges to separate line

much badge, so wow

11 years agoMerge pull request #13766 from twbs/npm-badge
Chris Rebert [Tue, 10 Jun 2014 00:02:39 +0000 (17:02 -0700)] 
Merge pull request #13766 from twbs/npm-badge

Add npm version badge to README

11 years agoAdd npm version badge to README 13766/head
Chris Rebert [Tue, 10 Jun 2014 00:00:39 +0000 (17:00 -0700)] 
Add npm version badge to README

Follow-up to #12857

[skip sauce] [skip validator]

11 years agoFix favicon.ico after d763b0fe5b5d83025b94212638b1bd5500c43c71.
XhmikosR [Mon, 9 Jun 2014 08:13:24 +0000 (11:13 +0300)] 
Fix favicon.ico after d763b0fe5b5d83025b94212638b1bd5500c43c71.

11 years agoRun `grunt`.
XhmikosR [Wed, 28 May 2014 17:50:11 +0000 (20:50 +0300)] 
Run `grunt`.

[ci skip]

11 years agoUpdate filesaver.js to v2014-05-27.
XhmikosR [Wed, 28 May 2014 17:48:51 +0000 (20:48 +0300)] 
Update filesaver.js to v2014-05-27.

[ci skip]

11 years agoUpdate Blob.js to v2014-05-31.
XhmikosR [Wed, 28 May 2014 05:08:32 +0000 (08:08 +0300)] 
Update Blob.js to v2014-05-31.

[ci skip]

11 years agochange up the padding on bs-docs-header container to alleviate #13682
Mark Otto [Mon, 9 Jun 2014 06:09:06 +0000 (23:09 -0700)] 
change up the padding on bs-docs-header container to alleviate #13682

11 years agoAddresses part of #13643: Correct webkit-linear-gradient syntax in horizontal gradients
Mark Otto [Mon, 9 Jun 2014 06:02:16 +0000 (23:02 -0700)] 
Addresses part of #13643: Correct webkit-linear-gradient syntax in horizontal gradients

11 years agoremove max-width: 100%; from table and place it on .table
Mark Otto [Sun, 8 Jun 2014 23:54:05 +0000 (16:54 -0700)] 
remove max-width: 100%; from table and place it on .table

11 years agoMerge pull request #13707 from bcullman/bcullman-remove-table-max-width
Mark Otto [Sun, 8 Jun 2014 23:53:14 +0000 (16:53 -0700)] 
Merge pull request #13707 from bcullman/bcullman-remove-table-max-width

removing unnecessary max-width on tables

11 years agoMerge pull request #13738 from thomaswelton/issue-13737-fix-ie11-rem-sizing
Mark Otto [Sun, 8 Jun 2014 23:38:17 +0000 (16:38 -0700)] 
Merge pull request #13738 from thomaswelton/issue-13737-fix-ie11-rem-sizing

Use px for font-size fixes #13737

11 years agoMerge pull request #13189 from twbs/apple-touch-icon
Mark Otto [Sun, 8 Jun 2014 23:18:09 +0000 (16:18 -0700)] 
Merge pull request #13189 from twbs/apple-touch-icon

New apple touch icon and favicon

11 years agoMerge pull request #13755 from twbs/fat-visual-test
Jacob [Sun, 8 Jun 2014 23:05:08 +0000 (16:05 -0700)] 
Merge pull request #13755 from twbs/fat-visual-test

Adds isolated visual tests for javascript plugins (decoupled from docs)....

11 years agoLosslessly compress apple-touch-icon-precomposed.png. 13189/head
XhmikosR [Sun, 8 Jun 2014 22:11:11 +0000 (01:11 +0300)] 
Losslessly compress apple-touch-icon-precomposed.png.

11 years agonew icons
Mark Otto [Sun, 8 Jun 2014 17:42:16 +0000 (20:42 +0300)] 
new icons

11 years agoMove apple-touch-icon-precomposed.png and favicon.ico in docs root.
XhmikosR [Tue, 25 Mar 2014 07:30:04 +0000 (09:30 +0200)] 
Move apple-touch-icon-precomposed.png and favicon.ico in docs root.

This way, it works in all browsers.

11 years agoUse a 152x152 apple touch icon.
XhmikosR [Tue, 25 Mar 2014 07:22:20 +0000 (09:22 +0200)] 
Use a 152x152 apple touch icon.

11 years agoRe-create favicon.ico from the new SVG image.
XhmikosR [Tue, 25 Mar 2014 07:22:03 +0000 (09:22 +0200)] 
Re-create favicon.ico from the new SVG image.

11 years agofixes #13375
Mark Otto [Sun, 8 Jun 2014 21:08:06 +0000 (14:08 -0700)] 
fixes #13375

11 years agoMerge branch 'master' into pr/13736
Mark Otto [Sun, 8 Jun 2014 20:57:44 +0000 (13:57 -0700)] 
Merge branch 'master' into pr/13736

Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css

11 years agogrunt
Mark Otto [Sun, 8 Jun 2014 20:55:40 +0000 (13:55 -0700)] 
grunt

11 years agoMerge pull request #13735 from skhilko/master
Mark Otto [Sun, 8 Jun 2014 20:53:53 +0000 (13:53 -0700)] 
Merge pull request #13735 from skhilko/master

Fix bug where a panel recieve extra top border when placed within a collapsible panel

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sun, 8 Jun 2014 20:28:56 +0000 (13:28 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agofix nested containers (addresses some of #13682)
Mark Otto [Sun, 8 Jun 2014 20:28:45 +0000 (13:28 -0700)] 
fix nested containers (addresses some of #13682)

11 years agoMerge pull request #13542 from twbs/icon_paths
Mark Otto [Sun, 8 Jun 2014 18:23:20 +0000 (11:23 -0700)] 
Merge pull request #13542 from twbs/icon_paths

Fixes #13478, reverts #10941

11 years agogrunt 13542/head
Mark Otto [Sun, 8 Jun 2014 18:19:35 +0000 (11:19 -0700)] 
grunt

11 years agogrunt
Mark Otto [Sun, 8 Jun 2014 18:18:59 +0000 (11:18 -0700)] 
grunt

11 years agoMerge pull request #13649 from ItsJonQ/repaint-fixes-2
Mark Otto [Sun, 8 Jun 2014 18:14:57 +0000 (11:14 -0700)] 
Merge pull request #13649 from ItsJonQ/repaint-fixes-2

Repaint Fixes When Scrolling

11 years agoMerge pull request #13745 from twbs/fix-13281
Mark Otto [Sun, 8 Jun 2014 18:05:39 +0000 (11:05 -0700)] 
Merge pull request #13745 from twbs/fix-13281

set not-allowed cursor on disabled radio+checkbox labels

11 years agofixes #13210: clean up tooltip example
Mark Otto [Sun, 8 Jun 2014 17:50:54 +0000 (10:50 -0700)] 
fixes #13210: clean up tooltip example

11 years agoMerge pull request #13744 from twbs/fix-13650
Mark Otto [Sun, 8 Jun 2014 17:25:50 +0000 (10:25 -0700)] 
Merge pull request #13744 from twbs/fix-13650

replace SemVer summary with a link to its website

11 years agoAdds isolated visual tests for javascript plugins (decoupled from docs). This makes it 13755/head
fat [Sun, 8 Jun 2014 02:11:44 +0000 (19:11 -0700)] 
Adds isolated visual tests for javascript plugins (decoupled from docs). This makes it
faster and easier to test/develop js functionality not represented in unit tests, and gives us
a playground for interactions, etc.

It also makes it so developing javascript is now decoupled form jekyll, which should make everything
faster and less painful.

This commit also reverts my filter commit https://github.com/twbs/bootstrap/commit/9900771aa7f1b3ddcee49aec84082104776ace70
which broke scrollspy for dropdowns.

11 years agoMerge branch 'mikegreiling-scrollspy-update'
Chris Rebert [Sun, 8 Jun 2014 01:27:32 +0000 (18:27 -0700)] 
Merge branch 'mikegreiling-scrollspy-update'

11 years agorefactor scrollspy refresh method
Mike Greiling [Thu, 29 May 2014 07:51:49 +0000 (02:51 -0500)] 
refactor scrollspy refresh method

Closes #13702 by merging a rebased version of it.

11 years agoremoving this.$element as it is a superfluous copy of this.$scrollElement
Mike Greiling [Thu, 29 May 2014 07:36:53 +0000 (02:36 -0500)] 
removing this.$element as it is a superfluous copy of this.$scrollElement

11 years agono need to check for href attribute on the scrollable element
Mike Greiling [Thu, 29 May 2014 07:30:18 +0000 (02:30 -0500)] 
no need to check for href attribute on the scrollable element

11 years agothere is no need for this.offsets and this.targets to be jQuery objects
Mike Greiling [Thu, 29 May 2014 07:24:41 +0000 (02:24 -0500)] 
there is no need for this.offsets and this.targets to be jQuery objects

11 years agoMerge pull request #13752 from twbs/fix-13268 2ca6581798cf516d6ab2029bf63d1ed5f1070703
Chris Rebert [Sun, 8 Jun 2014 01:03:49 +0000 (18:03 -0700)] 
Merge pull request #13752 from twbs/fix-13268

Proposed fix for #13268

11 years agodon't show tooltips/popovers whose element isn't in the DOM; fixes #13268 13752/head
Chris Rebert [Fri, 6 Jun 2014 22:34:56 +0000 (15:34 -0700)] 
don't show tooltips/popovers whose element isn't in the DOM; fixes #13268

11 years agoput the tooltips into the DOM in the tooltip unit tests
Chris Rebert [Fri, 6 Jun 2014 22:30:44 +0000 (15:30 -0700)] 
put the tooltips into the DOM in the tooltip unit tests

11 years agoadd failing test for #13268
Chris Rebert [Fri, 6 Jun 2014 21:49:59 +0000 (14:49 -0700)] 
add failing test for #13268

11 years agoMerge pull request #13388 from twbs/xhmikosr-js-style
XhmikosR [Sat, 7 Jun 2014 06:13:05 +0000 (09:13 +0300)] 
Merge pull request #13388 from twbs/xhmikosr-js-style

Improve JS style

11 years agoadd docs for #13745 13745/head
Chris Rebert [Sat, 7 Jun 2014 00:28:02 +0000 (17:28 -0700)] 
add docs for #13745

Good catch @juthilo
[skip sauce]

11 years agoset not-allowed cursor on disabled radio+checkbox labels; fixes #13281
Chris Rebert [Thu, 5 Jun 2014 20:31:39 +0000 (13:31 -0700)] 
set not-allowed cursor on disabled radio+checkbox labels; fixes #13281

[skip validator] [skip sauce]

11 years agoMerge pull request #13627 from twbs/maybe-fix-12364
Chris Rebert [Fri, 6 Jun 2014 22:59:17 +0000 (15:59 -0700)] 
Merge pull request #13627 from twbs/maybe-fix-12364

Hopefully fixes trigger focus restoration on modal close

11 years agoRun `grunt`. 13388/head
XhmikosR [Thu, 22 May 2014 06:38:57 +0000 (09:38 +0300)] 
Run `grunt`.

11 years agoMinor style tweaks.
XhmikosR [Thu, 29 May 2014 04:35:22 +0000 (07:35 +0300)] 
Minor style tweaks.

11 years agocarousel.js: remove unneeded variable assignment.
XhmikosR [Thu, 22 May 2014 06:48:17 +0000 (09:48 +0300)] 
carousel.js: remove unneeded variable assignment.

`slideIndex` is assigned to the same value a few lines above.

11 years agoComply to the new style.
XhmikosR [Mon, 17 Mar 2014 07:12:55 +0000 (09:12 +0200)] 
Comply to the new style.

11 years agoTweak JSHint and JSCS checks.
XhmikosR [Mon, 17 Mar 2014 07:07:21 +0000 (09:07 +0200)] 
Tweak JSHint and JSCS checks.

Be more consistent across the whole codebase.

Also, make use of JSHint's 2.5.1 `extends` and `qunit` options. This way we set our basis options in js/.jshintrc and override the rest.

11 years agoMerge pull request #10632 from stuartpb/patch-1
Chris Rebert [Thu, 5 Jun 2014 20:58:22 +0000 (13:58 -0700)] 
Merge pull request #10632 from stuartpb/patch-1

Customizer: Alert on successful save to Gist

11 years agoreplace SemVer summary with a link to its website; fixes #13650 13744/head
Chris Rebert [Thu, 5 Jun 2014 18:56:23 +0000 (11:56 -0700)] 
replace SemVer summary with a link to its website; fixes #13650

[skip validator] [skip sauce]

11 years agoMerge pull request #13740 from jasny/patch-composer-replace
Chris Rebert [Thu, 5 Jun 2014 16:02:36 +0000 (09:02 -0700)] 
Merge pull request #13740 from jasny/patch-composer-replace

Added rename directive for composer

11 years agoAdded directive for composer 13740/head
Arnold Daniels [Thu, 5 Jun 2014 11:24:56 +0000 (13:24 +0200)] 
Added  directive for composer

11 years agoUse px for font-size fixes #13737 13738/head
Thomas Welton [Thu, 5 Jun 2014 11:07:40 +0000 (12:07 +0100)] 
Use px for font-size fixes #13737

11 years agoResolves Issue #13689 13736/head
Ben Zumhagen [Wed, 4 Jun 2014 02:48:36 +0000 (22:48 -0400)] 
Resolves Issue #13689

Doing this the right way this time. Hiding .panel-footer top border when
preceeded by a .list-group. This should resolve the "double border"
issue.

11 years agoFix bug where a panel recieve extra top border 13735/head
Siarhei Khilko [Wed, 4 Jun 2014 22:20:36 +0000 (15:20 -0700)] 
Fix bug where a panel recieve extra top border

https://github.com/twbs/bootstrap/issues/13734

A panel placed inside of a collapsible panel recieve extra top border.

This commit reduces the effect of a selector to apply a border only to
the collapsible panel body itself, not to any panel placed within it.

11 years agoMerge pull request #13732 from twbs/bump-sauce
Chris Rebert [Wed, 4 Jun 2014 20:40:23 +0000 (13:40 -0700)] 
Merge pull request #13732 from twbs/bump-sauce

Bump grunt-saucelabs to ~8.0.2

11 years agoupdate shrinkwrap 13732/head
Chris Rebert [Wed, 4 Jun 2014 19:40:51 +0000 (12:40 -0700)] 
update shrinkwrap

[skip validator]

11 years agobump grunt-saucelabs to ~8.0.2
Chris Rebert [Wed, 4 Jun 2014 19:38:26 +0000 (12:38 -0700)] 
bump grunt-saucelabs to ~8.0.2