aboutsummaryrefslogtreecommitdiff
path: root/docs/assets
AgeCommit message (Collapse)AuthorFilesLines
2014-01-16remove flaky pos bottom test which is effect by unit scroll posfat1-2/+2
2014-01-15Merge branch 'master' of github.com:twbs/bootstrapMark Otto2-2/+2
Conflicts: docs/assets/css/pack.min.css
2014-01-15fix ad placementMark Otto2-2/+4
2014-01-16Fix customizer's toggle buttons' marginJulian Thilo2-2/+2
2014-01-15Fix page headersMark Otto2-11/+4
2014-01-15Merge branch 'master' into docs_derpMark Otto3-25/+9
Conflicts: docs/components.html docs/css.html
2014-01-14revert unnecessary customizations of Blob.js & FileSaver.jsChris Rebert3-25/+9
Per https://github.com/eligrey/Blob.js/pull/20 & https://github.com/eligrey/FileSaver.js/pull/63 The library author has deemed the existing /*! @source URL */ comments to be sufficient attribution, and these already survive minification. Refs ea591748edee4f8fe722274b71787ccf2b052c4a
2014-01-14Merge branch 'master' into docs_derpMark Otto2-0/+5
Conflicts: docs/_includes/old-bs-docs.html
2014-01-14add copyright notice to raw-files.jsChris Rebert1-0/+5
2014-01-14Rename uglify.js to uglify.min.js for consistencyZlatan Vasović1-0/+0
2014-01-13header masthead changesMark Otto2-3/+6
2014-01-13make page headers like mastheadMark Otto2-26/+18
2014-01-13Merge branch 'master' into docs_derpMark Otto11-25/+80
Conflicts: docs/assets/css/pack.min.css docs/assets/js/customize.min.js docs/assets/js/docs.min.js
2014-01-13sort out attribution banners of docs assets; fixes #11976Chris Rebert7-16/+77
2014-01-13avoid redundant banner in minified docs CSSChris Rebert2-8/+1
2014-01-13add a title/description to customizer.js's attribution commentChris Rebert1-0/+1
2014-01-12Merge branch 'master' into docs_derpMark Otto9-274/+426
Conflicts: docs/assets/js/docs.min.js
2014-01-12Formatting and docs changesMark Otto2-4/+3
2014-01-11Improve spacing and alignment of sections and their headingsMark Otto2-5/+4
2014-01-11brand guidelines cleanupMark Otto2-18/+23
2014-01-11homepage improvementsMark Otto3-20/+21
2014-01-11Merge branch 'master' into docs_derpMark Otto3-2/+22
Conflicts: docs/getting-started.html
2014-01-09Merge branch 'master' into docs_derpMark Otto6-43/+62
Conflicts: docs/assets/css/docs.css
2014-01-09more derpMark Otto2-21/+39
2014-01-05Merge branch 'master' into docs_derpMark Otto1-1/+1
2014-01-02updates to homepageMark Otto3-0/+0
2014-01-01Merge branch 'master' into docs_derpMark Otto3-3/+8
Conflicts: docs/_includes/footer.html docs/assets/css/docs.css
2013-12-31fix homepage imagesMark Otto3-0/+0
2013-12-31Merge branch 'master' into docs_derpMark Otto14-0/+4296
Conflicts: _config.yml docs/_includes/footer.html docs/_includes/nav-main.html docs/_includes/old-bs-docs.html docs/_layouts/default.html docs/_layouts/home.html docs/getting-started.html docs/index.html
2013-07-18flatten docs dir back into rootMark Otto15-8168/+0
2013-07-18vertically center adMark Otto1-1/+1
2013-07-18Merge branch 'bs3_old_docs_callout' into bs3_rc1Mark Otto1-30/+26
2013-07-18Merge branch 'bs3_add_ads' into bs3_rc1Mark Otto1-3/+56
2013-07-18for some reason iOS is shitting the bed on the .navbar-toggle unless it gets ↵Mark Otto1-0/+2
fixed dimensions
2013-07-18Quick pass at new touch and faviconsMark Otto6-0/+0
2013-07-18Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wipMark Otto3-6/+8
2013-07-18Fixes #8374: ensure navbar is always at least 50pxMark Otto1-0/+1
2013-07-18Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wipfat1-44/+33
Conflicts: docs/assets/js/bootstrap.min.js
2013-07-18cleaner way of preventing double click events + clean up tests for jshintfat2-2/+2
2013-07-18Fixes #8397: better navbar padding with grid gutter stuffMark Otto1-1/+1
2013-07-18get button js working with actual form elements p coollfat3-13/+16
2013-07-18run make on mixin changes from #8380Mark Otto1-24/+3
2013-07-18change charactersMark Otto1-2/+2
2013-07-18Merge branch '3.0.0-wip' of https://github.com/mauricew/bootstrap into ↵Mark Otto1-2/+14
mauricew-3.0.0-wip
2013-07-18Fixes #8452: adds `.active` to table classesMark Otto1-0/+6
2013-07-17make on collapse changesMark Otto2-8/+9
2013-07-17Bump tooltips to use `@font-size-small` (11px to 12px)Mark Otto1-1/+1
2013-07-17Drop `.nav-header` for `.dropdown-header`Mark Otto1-16/+8
* Since we no longer have `.nav-list`, I've nuked the `.nav-header` * However, dropdowns can still have section headings, so I've kept that around with the addition of `.dropdown-header` * Restyled it a smidge as well
2013-07-17Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wipMark Otto2-5/+7
Conflicts: docs/assets/js/bootstrap.min.js
2013-07-17fixes #8491: add vars for table paddingMark Otto1-1/+1