0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-05 17:24:20 +01:00
Commit Graph

8142 Commits

Author SHA1 Message Date
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
Julian Thilo
1e938f1781 Merge pull request #12019 from XhmikosR/badge
Change david-dm theme to make README badges uniform
2013-12-26 10:58:23 -08:00
Chris Rebert
1e6ae57575 Merge pull request #12020 from XhmikosR/package
Update dependencies.
2013-12-26 10:52:38 -08:00
XhmikosR
b590b268ad Update dependencies. 2013-12-26 19:54:04 +02:00
XhmikosR
5cb8510a81 README.md: switch to the shields.io dependency badges theme. 2013-12-26 19:52:39 +02:00
XhmikosR
5eab9cbe82 Add docs-assets/css/docs.css to csslint too. 2013-12-26 19:49:33 +02:00
fat
fc7049b18f fixes #10675 2013-12-25 20:33:05 -08:00
fat
3161acd710 build js 2013-12-25 20:04:49 -08:00
fat
c25fa0661a Merge branch 'tooltip-events-fix' of git://github.com/lukaszfiszer/bootstrap into lukaszfiszer-tooltip-events-fix
Conflicts:
	js/tooltip.js
2013-12-25 20:03:28 -08:00
Zlatan Vasović
1e05029d1a Fix wrong indent in .jscs.json 2013-12-25 20:22:52 +01:00
Zlatan Vasović
d381771f6a Replace UTF-8 characters in s3_cache.py with ASCII characters 2013-12-25 20:19:59 +01:00
fat
dffd4ffad2 Merge branch 'master' of github.com:twbs/bootstrap 2013-12-24 17:00:55 -08:00
fat
394e0fa611 fixes #11788 - focusin focusout instead of focus/blur 2013-12-24 17:00:34 -08:00
Jacob
0fab6e7ea7 Merge pull request #11722 from DocX/patch-1
Use document scroll height instead of offset height
2013-12-24 16:43:24 -08:00
fat
d9266aee96 add docs for affix events 2013-12-24 16:37:53 -08:00
fat
c77740bd3a fixes #11720 - Add events trigger to affix 2013-12-24 16:29:51 -08:00
fat
073f8c049d Merge branch 'master' of github.com:twbs/bootstrap 2013-12-24 13:43:47 -08:00
fat
f689a26a1c note for #10486 add note about data-toggle dropdown dependency 2013-12-24 13:43:09 -08:00
Jacob
139b395dfb Merge pull request #10359 from ixti/patch-1
Pass $element to offset top/bottom calc funcs
2013-12-24 13:21:19 -08:00
fat
a93a753c7d fixes #10134 – dont use jquery offset directly because it uses sub pixel rendering 2013-12-24 13:07:42 -08:00
fat
fe7fffe034 Merge branch 'slide-event-reset' of git://github.com/Rowno/bootstrap into Rowno-slide-event-reset
Conflicts:
	js/tests/unit/carousel.js
2013-12-24 12:50:55 -08:00
fat
0a75e4c09b fixes #10283 2013-12-24 12:40:24 -08:00
fat
558b6a478d Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	dist/js/bootstrap.min.js
	docs-assets/js/raw-files.js
2013-12-24 12:35:24 -08:00
fat
50bd4edb8c fixes #10236
if affixed top add scrollTop to it position.top
calculate and cache pinnedoffset independent of scrolling for initial load
2013-12-24 12:32:06 -08:00
Mark Otto
1da3a8c6b1 Merge pull request #12001 from soundarapandian/fix_typo_contributing
Use correct directory name for bootstrap contribution
2013-12-24 12:24:07 -08:00
Mark Otto
04ec4354ed don't roll back that comment 2013-12-24 12:18:53 -08:00
Mark Otto
5c2dfbf33b Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	docs-assets/js/raw-files.js
2013-12-24 12:17:48 -08:00
Mark Otto
679c786237 roll back version numbers to avoid broken links in docs and readme (fixes #12000) 2013-12-24 12:16:17 -08:00
Gleb Mazovetskiy
25390716ea Reflect sass readme change in css.html 2013-12-24 17:20:52 +01:00
soundarapandian
8b564f9e32 Use correct directory name for bootstrap contribution 2013-12-24 16:05:19 +05:30
Jacob
237b85a7c1 Merge pull request #11933 from twbs/fat-10105
change where modal loads content -– fixes #10105, #9318, #9459
2013-12-23 23:31:11 -08:00
fat
fe839e6e78 change where modal loads content -– fixes #10105, #9318, #9459 2013-12-23 23:30:06 -08:00
Mark Otto
52a964d19b Merge pull request #11999 from XhmikosR/respond.js
Update Respond.js
2013-12-23 23:26:05 -08:00
XhmikosR
3d65fc2b65 Update Respond.js to v1.4.2. 2013-12-24 09:22:53 +02:00
fat
1fc08c1973 fixes #10568 - kill hoverstate info once command has been executed 2013-12-23 22:57:39 -08:00
fat
a87b150bc7 fixes #10205 Scrollspy Doesn't Support Chinese ID Targets http://mathiasbynens.be/notes/html5-id-class 2013-12-23 22:08:43 -08:00
Mark Otto
71e9db4183 add callout about justified button group borders to address #11964 2013-12-23 20:28:21 -08:00
Mark Otto
340e2f5534 Merge pull request #11970 from supergibbs/Better_10492_fix
Fixes #10492 better
2013-12-23 18:53:30 -08:00
Supergibbs
f3ce6a9696 Fixes #10492 better:
- Made more generic. Applies to "> .table" and "> .table-responsive > .table" to support td/tr background colors too and not just .table-striped
- Supports tfoot
2013-12-23 16:07:55 -08:00
Mark Otto
0bd5bca695 Fixes #11975: Change from png to .ico for favicon 2013-12-23 15:16:25 -08:00
Mark Otto
37bc0c230d Merge branch 'master' of github.com:twbs/bootstrap 2013-12-23 13:26:01 -08:00
Mark Otto
4376ce8466 Upgrade to CSScomb 1.2.1 and reset some ordering to ensure no rogue spaces 2013-12-23 13:25:51 -08:00
Mark Otto
00850e247c Merge pull request #11989 from ZDroid/banner
Improve banner
2013-12-23 12:42:41 -08:00
Zlatan Vasović
608926e808 Improve banner 2013-12-23 18:02:42 +01:00
Mark Otto
f32796559a Merge pull request #11978 from XhmikosR/clean-up-_gh-pages
Jekyll: exclude more files/folders.
2013-12-22 23:15:35 -08:00
Mark Otto
96b5ae8b6a grunt 2013-12-22 22:32:35 -08:00
Mark Otto
6fda30e1c4 Merge branch 'master' of github.com:twbs/bootstrap 2013-12-22 22:31:28 -08:00
Mark Otto
9fc0e20381 Fixes #10492 and some of #11970: round the proper corner on table cells in panels 2013-12-22 22:31:13 -08:00
Mark Otto
45a8a9508e Merge pull request #11974 from XhmikosR/meta
Normalize meta
2013-12-22 22:20:23 -08:00
Mark Otto
90ba7fa836 Merge pull request #11972 from XhmikosR/comma
Get rid of JSHint's `laxcomma` option now that the comma is used on the ...
2013-12-22 22:08:33 -08:00