]>
git.ipfire.org Git - thirdparty/bootstrap.git/log
Mark Otto [Mon, 10 Nov 2014 06:02:53 +0000 (22:02 -0800)] 
Merge branch 'master' into derp
Conflicts:
Gruntfile.js
_config.yml
dist/css/bootstrap-theme.css
dist/css/bootstrap-theme.css.map
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/_includes/components/button-groups.html
docs/_includes/components/jumbotron.html
docs/_includes/components/media.html
docs/_includes/components/navs.html
docs/_includes/customizer-variables.html
docs/_includes/footer.html
docs/_includes/getting-started/browser-device-support.html
docs/_includes/js/carousel.html
docs/_includes/js/dropdowns.html
docs/_includes/js/modal.html
docs/_includes/js/popovers.html
docs/_includes/js/tooltips.html
docs/_includes/nav/getting-started.html
docs/_includes/nav/javascript.html
docs/_layouts/default.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/customize.min.js
docs/assets/js/docs.min.js
docs/assets/js/raw-files.min.js
docs/browser-bugs.html
docs/dist/css/bootstrap-theme.css
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap-theme.min.css
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/examples/justified-nav/index.html
less/_forms.less
less/_tooltip.less
less/navs.less
less/theme.less
Mark Otto [Mon, 10 Nov 2014 02:04:00 +0000 (18:04 -0800)]
grunt
Mark Otto [Sun, 9 Nov 2014 23:05:40 +0000 (15:05 -0800)] 
Merge pull request #15052 from twbs/badge-in-non-anchor-list-group-item
Badges: fix active styles when in non-anchor `.list-group-item`
Mark Otto [Sun, 9 Nov 2014 23:04:32 +0000 (15:04 -0800)]
comment and formatting
Mark Otto [Sun, 9 Nov 2014 23:03:33 +0000 (15:03 -0800)]
Fixes #14234 again
- Rather than override and hack for IE8-10 and then IE11, scope to just Safari.
- Drops the IE hacks for a media query Webkit hack
Heinrich Fenkart [Sat, 8 Nov 2014 10:00:37 +0000 (11:00 +0100)] 
Badges: fix active styles when in non-anchor `.list-group-item`
Mark Otto [Sat, 8 Nov 2014 08:13:19 +0000 (00:13 -0800)]
Fixes #14965: Reset top border-radii on dropdown menus in fixed bottom navbars
Mark Otto [Sat, 8 Nov 2014 08:10:53 +0000 (00:10 -0800)]
grunt
Mark Otto [Sat, 8 Nov 2014 08:07:39 +0000 (00:07 -0800)]
Merge pull request #15018 from twbs/fix-theme-active-items
Theme: Correctly override active dropdown items in collapsed navbars
Mark Otto [Sat, 8 Nov 2014 07:01:20 +0000 (23:01 -0800)]
Fixes #14979: Override .jumbotron padding within .container-fluid to match .container
Mark Otto [Sat, 8 Nov 2014 06:17:39 +0000 (22:17 -0800)]
Fixes #15046: Add full font overrides for popovers and tooltips
Chris Rebert [Wed, 5 Nov 2014 22:59:24 +0000 (14:59 -0800)] 
Merge pull request #14986 from twbs/safari-broken-printing-doc
Add #14868 to the compatibility docs
Heinrich Fenkart [Wed, 5 Nov 2014 19:11:46 +0000 (20:11 +0100)]
grunt
Heinrich Fenkart [Wed, 5 Nov 2014 19:09:17 +0000 (20:09 +0100)]
Merge pull request #15031 from twbs/customizer-remove-file-type-check
Customizer: Remove file type check from config import
Heinrich Fenkart [Wed, 5 Nov 2014 18:10:48 +0000 (19:10 +0100)]
Customizer: Remove file type check from config import
Fixes #14978.
Heinrich Fenkart [Wed, 5 Nov 2014 17:52:09 +0000 (18:52 +0100)]
Merge pull request #15030 from twbs/config-bridge-jekyll-plugin
Use a Jekyll plugin instead of the `copy:configBridge` grunt task
Heinrich Fenkart [Tue, 4 Nov 2014 22:46:44 +0000 (23:46 +0100)]
Theme: Correctly override active dropdown items in collapsed navbars
Heinrich Fenkart [Wed, 5 Nov 2014 17:35:13 +0000 (18:35 +0100)]
Use a Jekyll plugin instead of the `copy:configBridge` grunt task
Heinrich Fenkart [Wed, 5 Nov 2014 00:56:18 +0000 (01:56 +0100)]
grunt
Heinrich Fenkart [Wed, 5 Nov 2014 00:54:13 +0000 (01:54 +0100)]
Merge pull request #14921 from bassjobsen/patch-3
Update grid-framework.less
Chris Rebert [Wed, 5 Nov 2014 00:50:36 +0000 (16:50 -0800)]
Merge pull request #14993 from twbs/fix-14991
Have Carousel ignore keyboard events from <input>s or <textarea>s
Heinrich Fenkart [Wed, 5 Nov 2014 00:45:16 +0000 (01:45 +0100)]
grunt
Heinrich Fenkart [Wed, 5 Nov 2014 00:39:46 +0000 (01:39 +0100)]
Merge pull request #14933 from twbs/center-modal-at-all-times
Center modal at all times
Heinrich Fenkart [Thu, 30 Oct 2014 10:25:28 +0000 (11:25 +0100)]
Center modal dialog at all times
Chris Rebert [Tue, 4 Nov 2014 02:35:35 +0000 (18:35 -0800)] 
Have Carousel ignore keyboard events from <input>s or <textarea>s; fixes #14991
Heinrich Fenkart [Wed, 5 Nov 2014 00:18:11 +0000 (01:18 +0100)]
Update head of all visual tests to use our basic template
Heinrich Fenkart [Tue, 4 Nov 2014 23:36:52 +0000 (00:36 +0100)]
grunt
Julian Thilo [Tue, 4 Nov 2014 23:33:04 +0000 (00:33 +0100)] 
Merge pull request #15019 from twbs/whoomp_there_it_was
Deprecate diagonal tooltip classes
Heinrich Fenkart [Tue, 4 Nov 2014 23:15:52 +0000 (00:15 +0100)]
Merge pull request #14927 from twbs/fix-modal-backdrop-above-scrollbar
Fix modal backdrop overlaying the modal's scrollbar
Julian Thilo [Tue, 4 Nov 2014 23:09:56 +0000 (00:09 +0100)]
Deprecate diagonal tooltip classes
Julian Thilo [Tue, 4 Nov 2014 22:21:59 +0000 (23:21 +0100)]
Merge pull request #14938 from twbs/oh_arrow_where_art_thou
Fix #14936: Use correct left/right and margin on tooltip arrows
Heinrich Fenkart [Thu, 30 Oct 2014 03:46:14 +0000 (04:46 +0100)]
Fix modal backdrop overlaying the modal's scrollbar
Fixes #14916.
Jayanth Koushik [Tue, 4 Nov 2014 16:50:34 +0000 (22:20 +0530)] 
Add initialization examples to tooltip and popover "Opt-in functionality" callouts
Fixes #14950.
Closes #15015 by merging it.
Heinrich Fenkart [Tue, 4 Nov 2014 18:40:39 +0000 (19:40 +0100)]
HTTPS for Apple Safari Radar in bugify filter
Heinrich Fenkart [Tue, 4 Nov 2014 18:38:04 +0000 (19:38 +0100)]
Merge pull request #14987 from twbs/overengineer-wall-of-browser-bugs
Use Jekyll data for Wall of Browser Bugs
Heinrich Fenkart [Tue, 4 Nov 2014 18:35:34 +0000 (19:35 +0100)]
Merge pull request #14980 from twbs/customizer-autoprefixer
Use autoprefixer for Customizer builds
Heinrich Fenkart [Mon, 3 Nov 2014 13:32:38 +0000 (14:32 +0100)]
Use autoprefixer for Customizer builds
Heinrich Fenkart [Tue, 4 Nov 2014 18:30:13 +0000 (19:30 +0100)]
Merge pull request #14982 from twbs/grunt-customizer-share-common
Remove duplicate code from Customizer/Gruntfile by sharing it
Heinrich Fenkart [Mon, 3 Nov 2014 15:19:40 +0000 (16:19 +0100)]
Remove duplicate code from Customizer/Gruntfile by sharing it
Chris Rebert [Tue, 4 Nov 2014 07:37:38 +0000 (23:37 -0800)]
Merge pull request #14989 from twbs/modal-relatedTarget-data-example
Add event.relatedTarget + `data-*` example to Modal docs
Heinrich Fenkart [Mon, 3 Nov 2014 19:17:03 +0000 (20:17 +0100)]
Use Jekyll data for Wall of Browser Bugs
Chris Rebert [Mon, 3 Nov 2014 21:37:27 +0000 (13:37 -0800)]
Add event.relatedTarget + `data-*` example to Modal docs
Fixes #14245
Chris Rebert [Mon, 3 Nov 2014 18:56:30 +0000 (10:56 -0800)]
Add #14868 to the compatibility docs
Heinrich Fenkart [Mon, 3 Nov 2014 17:21:15 +0000 (18:21 +0100)]
Merge pull request #14985 from twbs/14972-wall
Add Wall of Browser Bugs entry for #14972
Heinrich Fenkart [Mon, 3 Nov 2014 17:17:35 +0000 (18:17 +0100)]
Add Wall of Browser Bugs entry for #14972
Chris Rebert [Sun, 2 Nov 2014 00:49:22 +0000 (17:49 -0700)]
Merge pull request #14967 from aaron-coding/patch-1
Fix typo
Aaron Cordovez [Sun, 2 Nov 2014 00:46:33 +0000 (17:46 -0700)] 
Fix typo
Corrected spelling of the word "elements"
XhmikosR [Sat, 1 Nov 2014 15:01:14 +0000 (17:01 +0200)] 
Merge pull request #14966 from krautcomputing/whitespace_fix
fix whitespace in js dropdown docs
Manuel Meurer [Sat, 1 Nov 2014 10:51:11 +0000 (11:51 +0100)] 
fix whitespace in js dropdown docs
XhmikosR [Sat, 1 Nov 2014 08:02:16 +0000 (10:02 +0200)]
Merge pull request #14746 from twbs/gems-bump
Update Jekyll to v2.4.0 and rouge to v1.7.2.
XhmikosR [Sat, 1 Nov 2014 06:55:03 +0000 (08:55 +0200)]
Merge pull request #14917 from twbs/examples-footer
Examples: Make use of the `footer` tag instead of a class.
Chris Rebert [Sat, 1 Nov 2014 06:51:43 +0000 (23:51 -0700)]
Merge pull request #14959 from twbs/contrib-pitfalls
Cover common contributor mistakes in CONTRIBUTING.md
Chris Rebert [Sat, 1 Nov 2014 00:33:20 +0000 (17:33 -0700)]
Cover common contributor mistakes in CONTRIBUTING.md
Based on https://github.com/twbs/rorschach/tree/master/docs
Chris Rebert [Sat, 1 Nov 2014 00:11:37 +0000 (17:11 -0700)]
Merge pull request #14958 from twbs/chrome-css-animation-mem-leak
Add Wall of Browser Bugs entry for #14409
Chris Rebert [Sat, 1 Nov 2014 00:08:01 +0000 (17:08 -0700)]
Add Wall of Browser Bugs entry for #14409
Closes #14409.
[skip sauce]
Chris Rebert [Fri, 31 Oct 2014 23:15:32 +0000 (16:15 -0700)]
Merge pull request #14949 from twbs/bots-in-contributing
Explain issue/PR bots in CONTRIBUTING.md
Heinrich Fenkart [Fri, 31 Oct 2014 10:09:01 +0000 (11:09 +0100)]
grunt
Heinrich Fenkart [Fri, 31 Oct 2014 10:04:26 +0000 (11:04 +0100)]
Merge pull request #14954 from twbs/customizer-use-change-event
Customizer: listen to the right event for manual file selection in import
Heinrich Fenkart [Fri, 31 Oct 2014 09:58:03 +0000 (10:58 +0100)]
Customizer: listen to the right event for manual file selection in import
Heinrich Fenkart [Fri, 31 Oct 2014 09:31:56 +0000 (10:31 +0100)]
grunt
Chris Rebert [Fri, 31 Oct 2014 00:37:54 +0000 (17:37 -0700)]
Revert "Use jsDelivr CDN until BootstrapCDN gets updated"
This reverts commit
ea23969150e7329dd4e996b844db0282c4d2319d.
BootstrapCDN has now uploaded Bootstrap v3.3.0
Chris Rebert [Fri, 31 Oct 2014 00:37:06 +0000 (17:37 -0700)]
Merge pull request #14945 from twbs/media-pulls-docs
Replace deprecated uses of .pull-left & .pull-right in .media docs
Chris Rebert [Fri, 31 Oct 2014 00:05:17 +0000 (17:05 -0700)]
Explain issue/PR bots in CONTRIBUTING.md
[skip sauce]
[skip validator]
Chris Rebert [Thu, 30 Oct 2014 18:31:28 +0000 (11:31 -0700)]
Replace deprecated uses of .pull-left & .pull-right in .media docs
Refs https://github.com/twbs/bootlint/pull/153
[skip sauce]
hillai [Thu, 30 Oct 2014 16:13:39 +0000 (18:13 +0200)] 
Replace v3.2.1 reference with v3.3.0 since there wasn't a v3.2.1
Closes #14941
Julian Thilo [Thu, 30 Oct 2014 15:33:14 +0000 (16:33 +0100)]
Fix #14936: Use correct left/right and margin on tooltip arrows
Chris Rebert [Thu, 30 Oct 2014 08:47:48 +0000 (01:47 -0700)]
fix typo in comment
Heinrich Fenkart [Thu, 30 Oct 2014 08:46:49 +0000 (09:46 +0100)]
Merge pull request #14931 from twbs/fix-ios-unit-test-failures
Fix the iOS 8 unit test failures
Heinrich Fenkart [Thu, 30 Oct 2014 04:19:48 +0000 (05:19 +0100)]
Fix the iOS 8 unit test failures
Resolves #14919.
Heinrich Fenkart [Thu, 30 Oct 2014 07:07:55 +0000 (08:07 +0100)]
Merge pull request #14930 from twbs/use-jsdelivr-cdn-urls
Use jsDelivr CDN until BootstrapCDN gets updated
Heinrich Fenkart [Thu, 30 Oct 2014 06:20:41 +0000 (07:20 +0100)]
Use jsDelivr CDN until BootstrapCDN gets updated
XhmikosR [Wed, 29 Oct 2014 20:07:13 +0000 (22:07 +0200)] 
Examples: Make use of the `footer` tag instead of a `div`.
Heinrich Fenkart [Thu, 30 Oct 2014 03:45:04 +0000 (04:45 +0100)]
grunt
Heinrich Fenkart [Thu, 30 Oct 2014 03:42:18 +0000 (04:42 +0100)]
Merge pull request #14925 from twbs/button-focus-use-regexp
Use RegExp for button plugin's focus shim
Heinrich Fenkart [Thu, 30 Oct 2014 02:46:49 +0000 (03:46 +0100)]
Use RegExp for button plugin's focus shim
Fixes #14923.
Chris Rebert [Thu, 30 Oct 2014 01:03:15 +0000 (18:03 -0700)]
Merge pull request #14922 from twbs/ios-cursor-scroll
Add Wall of Browser Bugs entry for #14708
Chris Rebert [Thu, 30 Oct 2014 01:00:52 +0000 (18:00 -0700)]
Add Wall of Browser Bugs entry for #14708
Closes #14708
Bass Jobsen [Thu, 30 Oct 2014 00:20:35 +0000 (01:20 +0100)] 
Update grid-framework.less
The `when (@index = 1)` guards are not needed cause the mixins already only match on arity.
Chris Rebert [Wed, 29 Oct 2014 23:12:19 +0000 (16:12 -0700)]
Merge pull request #14920 from twbs/safari-print-font-size
Add Wall of Browser Bugs entry for #14868
Chris Rebert [Wed, 29 Oct 2014 23:11:12 +0000 (16:11 -0700)]
Add Wall of Browser Bugs entry for #14868
Closes #14868
Mark Otto [Wed, 29 Oct 2014 18:56:48 +0000 (11:56 -0700)]
Merge branch 'master' into v3.3.0
Conflicts:
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
Mark Otto [Wed, 29 Oct 2014 18:13:25 +0000 (11:13 -0700)]
grunt
XhmikosR [Wed, 29 Oct 2014 17:31:20 +0000 (19:31 +0200)]
Update shrinkwrap.
Mark Otto [Wed, 29 Oct 2014 17:27:18 +0000 (10:27 -0700)]
fixes #14913: badges in list group shouldn't have text shadow
Mark Otto [Wed, 29 Oct 2014 17:02:51 +0000 (10:02 -0700)]
new homepage images
Mark Otto [Wed, 29 Oct 2014 16:54:43 +0000 (09:54 -0700)]
grunt
Mark Otto [Wed, 29 Oct 2014 16:45:09 +0000 (09:45 -0700)]
Merge branch 'master' into v3.3.0
Mark Otto [Wed, 29 Oct 2014 16:42:00 +0000 (09:42 -0700)]
fixes #14911: bump dependencies to fix customizer text from being cut shor
Mark Otto [Wed, 29 Oct 2014 15:58:51 +0000 (08:58 -0700)]
grunt
Mark Otto [Wed, 29 Oct 2014 15:56:20 +0000 (08:56 -0700)]
version bump
Mark Otto [Wed, 29 Oct 2014 15:51:05 +0000 (08:51 -0700)]
grunt
Chris Rebert [Wed, 29 Oct 2014 06:22:46 +0000 (23:22 -0700)]
Merge pull request #14907 from twbs/justified-nav-wall
Add WebKit bug for #9774 to Wall of Browser Bugs
Chris Rebert [Wed, 29 Oct 2014 06:20:02 +0000 (23:20 -0700)]
Add WebKit bug for #9774 to Wall of Browser Bugs
[skip sauce]
Mark Otto [Wed, 29 Oct 2014 06:08:42 +0000 (23:08 -0700)]
grunt
Mark Otto [Wed, 29 Oct 2014 06:04:49 +0000 (23:04 -0700)]
Merge pull request #14891 from twbs/cursor_var
Add variable for default cursor
Mark Otto [Wed, 29 Oct 2014 06:04:25 +0000 (23:04 -0700)]
indentation and comment
Mark Otto [Wed, 29 Oct 2014 06:02:48 +0000 (23:02 -0700)]
Merge pull request #14904 from twbs/customize-min-files
Customizer: include the minified files only on GitHub pages.
Mark Otto [Wed, 29 Oct 2014 05:57:56 +0000 (22:57 -0700)]
change back to not allowed cursor
Mark Otto [Wed, 29 Oct 2014 05:57:26 +0000 (22:57 -0700)]
Merge branch 'master' into cursor_var
Mark Otto [Wed, 29 Oct 2014 05:57:16 +0000 (22:57 -0700)]
Reverts #14848, the overflow scrolling in the docs sidebar /cc @hnrch02
projects / thirdparty / bootstrap.git / log
