0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-04 16:24:22 +01:00
Commit Graph

8394 Commits

Author SHA1 Message Date
Chris Rebert
7f20eff44d Merge pull request #12041 from twbs/mv-sauce-into-infra
mv sauce_browsers.yml out of the project root
2013-12-29 20:29:44 -08:00
Chris Rebert
990c2392e5 mv sauce_browsers.yml out of the project root 2013-12-29 20:25:40 -08:00
fat
d18ba50837 add note about ios dropdown compat 2013-12-29 19:40:31 -08:00
fat
1fea9656b6 Merge branch 'master' of github.com:twbs/bootstrap 2013-12-29 19:25:24 -08:00
Chris Rebert
3d3e2f2553 Merge pull request #12036 from ZDroid/grunt-fs-minify
Merge two fs variable declarations into one
2013-12-29 19:23:57 -08:00
fat
2a0b99104c Merge branch 'dropdown-aria-roles' of git://github.com/plumlee/bootstrap into plumlee-dropdown-aria-roles
Conflicts:
	js/dropdown.js
2013-12-29 19:23:15 -08:00
fat
8a62f21113 fixes #11379 - Fix carousel this.sliding not getting reset if $next.hasClass('active') 2013-12-29 19:01:32 -08:00
fat
76f0d0ff32 fixes #11373 - adds related target to dropdown events 2013-12-29 18:57:22 -08:00
fat
162d9e1776 Merge branch 'scrollspy-speedy-scroll-top' of git://github.com/ziogaschr/bootstrap into ziogaschr-scrollspy-speedy-scroll-top
Conflicts:
	dist/js/bootstrap.min.js
2013-12-29 18:04:43 -08:00
fat
9d73d9c38c Merge branch 'master' of github.com:twbs/bootstrap 2013-12-29 17:54:40 -08:00
fat
ce4a2e4352 fixes #11288 - Vertical scroll position of modal saves between openings 2013-12-29 17:53:59 -08:00
Mark Otto
70b8b330f0 no more page.base_url 2013-12-28 23:08:46 -08:00
Mark Otto
f10cf21a8f Streamline copy process by not bringing over full files into docs/dist/, only take minified ones 2013-12-28 23:05:02 -08:00
Mark Otto
a9c829bc0c Rearrange repository contents because muahahahahahaha 2013-12-28 22:47:03 -08:00
Jacob
ea40e7999d Merge pull request #11203 from jasny/patch-1
Scrollspy acting up when targets are hidden
2013-12-28 22:06:26 -08:00
fat
5bf13914e4 fixes #10658 jQuery Popover content loses bound events on second setContent call. 2013-12-28 20:59:45 -08:00
Mark Otto
6405442e66 drop the title 2013-12-28 18:47:32 -08:00
Mark Otto
068010409b Merge pull request #12035 from tomByrer/master
fixed .clearfix example, + doc link
2013-12-28 18:46:36 -08:00
Zlatan Vasović
0016b508cb Merge two fs variable declarations into one
One is enough.
2013-12-28 23:33:32 +01:00
tomByrer
120dce43e8 fixed .clearfix example, + doc link 2013-12-28 12:01:32 -07:00
Mark Otto
9e1153d049 spacing 2013-12-27 16:44:00 -08:00
Mark Otto
adab81ddcd Merge branch 'master' into docs_derp 2013-12-27 16:41:33 -08:00
Mark Otto
a2aaf80c7e grunt on last merge 2013-12-27 16:41:25 -08:00
Mark Otto
84326a3e59 big brand update 2013-12-27 14:04:44 -08:00
Mark Otto
140d24c8fb Merge pull request #12028 from moshevds/deprecated-screen-md
Small fix: I noticed the use of a deprecated variable.
2013-12-27 12:40:02 -08:00
Môshe van der Sterre
dd9c5fdb08 Small fix: I noticed the use of a deprecated variable. This seems to be the only occurrence. 2013-12-27 21:27:51 +01:00
Mark Otto
87288da72c more nav changes 2013-12-26 22:03:37 -08:00
Mark Otto
a73767e518 the final frontier 2013-12-26 21:49:40 -08:00
Mark Otto
5b02dbd97a Merge branch 'master' into docs_derp
Conflicts:
	_config.yml
2013-12-26 21:40:15 -08:00
fat
201088cb5f update accordion-group to panel 2013-12-26 20:33:44 -08:00
fat
c595db19ff fixes #10911 - add loading event for use with remote option :| 2013-12-26 20:26:27 -08:00
fat
499cca2115 Merge branch 'master' of github.com:twbs/bootstrap 2013-12-26 19:40:41 -08:00
fat
d21369c1ed fixes #10890 2013-12-26 19:40:18 -08:00
Mark Otto
d43eb0a513 less fun to address #12008 2013-12-26 19:37:19 -08:00
Mark Otto
ca7498faa0 Merge branch 'master' of github.com:twbs/bootstrap 2013-12-26 19:08:34 -08:00
Mark Otto
567dc12e86 Fixes #12012: Use correct banner in docs js 2013-12-26 19:08:19 -08:00
fat
cd0ad94aae rebuild 2013-12-26 18:30:16 -08:00
fat
3c73904e17 update tool/pop destroy placement 2013-12-26 18:27:43 -08:00
Jacob
6baf266cda Merge pull request #10761 from jochenberger/dont-create-tooltip-for-destroy
don't create new Tooltip/Popover objects just to destroy them immediately
2013-12-26 18:25:29 -08:00
fat
39091b0748 nope 2013-12-26 18:18:53 -08:00
Jacob
bf3c525d05 Merge pull request #11496 from satazor/patch-1
Clear timeout on destroy.
2013-12-26 18:18:09 -08:00
fat
34fb5767cb fixes #10798 2013-12-26 17:53:31 -08:00
Jacob
37bfd8fa60 Merge pull request #10801 from Travesty3/master
Add 'collapse' class back after expanding
2013-12-26 17:50:41 -08:00
Jacob
bea46fca70 Merge pull request #10834 from Prinzhorn/master
Only preventDefault on click on [data-toggle="modal"] when the element is a link
2013-12-26 17:46:59 -08:00
Chris Rebert
0bcc5a2814 add Python indentation style to editorconfig; refs #12023 2013-12-26 13:44:27 -08:00
Chris Rebert
be6ad3fda0 Merge pull request #12009 from ZDroid/no-utf8-py
Replace UTF-8 characters in s3_cache.py with ASCII characters
2013-12-26 13:28:22 -08:00
Chris Rebert
e0268c32cb Merge pull request #12022 from ZDroid/update-deps
Update dependencies
2013-12-26 13:16:13 -08:00
Zlatan Vasović
2426a2aeef Update dependencies
Updates grunt-html-validation and grunt-jekyll dependencies.
2013-12-26 21:55:55 +01:00
Mark Otto
d8e4c1578d Merge pull request #12010 from ZDroid/wrong-indent
Fix wrong indent in .jscs.json
2013-12-26 12:54:23 -08:00
Chris Rebert
e4b036d278 Merge pull request #12021 from XhmikosR/master
Add docs-assets/css/docs.css to csslint too.
2013-12-26 12:32:34 -08:00