aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-12-24Merge branch 'master' of github.com:twbs/bootstrapfat1-2/+2
2013-12-24note for #10486 add note about data-toggle dropdown dependencyfat1-1/+1
2013-12-24Merge pull request #10359 from ixti/patch-1Jacob1-2/+2
Pass $element to offset top/bottom calc funcs
2013-12-24fixes #10134 – dont use jquery offset directly because it uses sub pixel ↵fat4-8/+26
rendering
2013-12-24Merge branch 'slide-event-reset' of git://github.com/Rowno/bootstrap into ↵fat5-19/+40
Rowno-slide-event-reset Conflicts: js/tests/unit/carousel.js
2013-12-24fixes #10283fat1-0/+2
2013-12-24Merge branch 'master' of github.com:twbs/bootstrapfat49-73/+75
Conflicts: dist/js/bootstrap.min.js docs-assets/js/raw-files.js
2013-12-24fixes #10236fat4-10/+32
if affixed top add scrollTop to it position.top calculate and cache pinnedoffset independent of scrolling for initial load
2013-12-24Merge pull request #12001 from soundarapandian/fix_typo_contributingMark Otto1-1/+1
Use correct directory name for bootstrap contribution
2013-12-24don't roll back that commentMark Otto3-3/+3
2013-12-24Merge branch 'master' of github.com:twbs/bootstrapMark Otto27-30/+36
Conflicts: docs-assets/js/raw-files.js
2013-12-24roll back version numbers to avoid broken links in docs and readme (fixes ↵Mark Otto27-46/+46
#12000)
2013-12-24Reflect sass readme change in css.htmlGleb Mazovetskiy1-3/+5
2013-12-24Use correct directory name for bootstrap contributionsoundarapandian1-1/+1
2013-12-23Merge pull request #11933 from twbs/fat-10105Jacob4-4/+4
change where modal loads content -– fixes #10105, #9318, #9459
2013-12-23change where modal loads content -– fixes #10105, #9318, #9459fat4-4/+4
2013-12-23Merge pull request #11999 from XhmikosR/respond.jsMark Otto20-20/+20
Update Respond.js
2013-12-24Update Respond.js to v1.4.2.XhmikosR20-20/+20
2013-12-23fixes #10568 - kill hoverstate info once command has been executedfat4-2/+6
2013-12-23fixes #10205 Scrollspy Doesn't Support Chinese ID Targets ↵fat4-5/+5
http://mathiasbynens.be/notes/html5-id-class
2013-12-23add callout about justified button group borders to address #11964Mark Otto1-0/+5
2013-12-23Merge pull request #11970 from supergibbs/Better_10492_fixMark Otto4-27/+36
Fixes #10492 better
2013-12-23Fixes #10492 better:Supergibbs4-27/+36
- 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-23Fixes #11975: Change from png to .ico for faviconMark Otto21-19/+19
2013-12-23Merge branch 'master' of github.com:twbs/bootstrapMark Otto5-8/+4
2013-12-23Upgrade to CSScomb 1.2.1 and reset some ordering to ensure no rogue spacesMark Otto4-51/+61
2013-12-23Merge pull request #11989 from ZDroid/bannerMark Otto5-8/+4
Improve banner
2013-12-23Improve bannerZlatan Vasović5-8/+4
2013-12-22Merge pull request #11978 from XhmikosR/clean-up-_gh-pagesMark Otto1-1/+16
Jekyll: exclude more files/folders.
2013-12-22gruntMark Otto1-1/+1
2013-12-22Merge branch 'master' of github.com:twbs/bootstrapMark Otto6-23/+32
2013-12-22Fixes #10492 and some of #11970: round the proper corner on table cells in ↵Mark Otto4-4/+4
panels
2013-12-22Merge pull request #11974 from XhmikosR/metaMark Otto3-17/+27
Normalize meta
2013-12-22Merge pull request #11972 from XhmikosR/commaMark Otto3-6/+5
Get rid of JSHint's `laxcomma` option now that the comma is used on the ...
2013-12-22fixes #11961: dropdown alignment docs improvementsMark Otto1-2/+6
2013-12-22Merge pull request #11963 from twbs/sass_docsMark Otto7-14/+265
Add docs for Sass port
2013-12-22spaceMark Otto1-1/+0
2013-12-22add what's includedMark Otto1-1/+37
2013-12-22Merge branch 'master' into sass_docsMark Otto5-18/+16
2013-12-22Revert to CSScomb 1.1.0 because 1.2.0 and 1.2.1 fuck up our compiled CSSMark Otto1-1/+1
2013-12-22Remove timestamp on generated GlyhpiconsMark Otto2-6/+4
2013-12-22Merge branch 'master' of github.com:twbs/bootstrapMark Otto2-9/+9
2013-12-22gruntMark Otto2-3/+3
2013-12-22Merge pull request #11979 from ZDroid/fix-old-linksMark Otto1-2/+2
Fix old links
2013-12-22Merge pull request #11982 from ZDroid/update-depsChris Rebert1-7/+7
Update dependencies
2013-12-22Update dependenciesZlatan Vasović1-7/+7
2013-12-22Fix old linksZlatan Vasović1-2/+2
Replace recess with less.
2013-12-22Jekyll: exclude more files/folders.XhmikosR1-1/+16
We still can't exclude `./fonts/" and "./js/" due to https://github.com/jekyll/jekyll/issues/906
2013-12-22Get rid of JSHint's `laxcomma` option now that the comma is used on the ↵XhmikosR3-6/+5
right side.
2013-12-22bower.json: sort by name.XhmikosR1-6/+6