aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-10-28Merge branch 'master' into jonschlinkert/masterChris Rebert28-481/+540
2014-10-27swap cursor not-allow for default, and use a variable for all disabled elementsMark Otto8-10/+13
2014-10-27gruntMark Otto4-4/+4
2014-10-27Merge branch 'master' of github.com:twbs/bootstrapMark Otto5-414/+509
2014-10-27Merge pull request #14886 from twbs/customizer-clearfixChris Rebert3-382/+477
Customizer: add clearfixes to rows and simplify .bs-customizer-input to .col-xs-4
2014-10-27Merge pull request #14888 from twbs/fix-14851Chris Rebert1-31/+31
Increase timeouts in tooltip unit tests to avoid spurious Sauce failures
2014-10-27Increase timeouts in tooltip unit tests to avoid spurious Sauce failuresChris Rebert1-31/+31
Fixes #14851
2014-10-27Merge pull request #14887 from twbs/ios-8-sauceChris Rebert1-1/+1
Update Sauce iOS Safari test to iOS 8.0 [skip validator]
2014-10-27Merge branch 'master' of github.com:twbs/bootstrapMark Otto3-25/+8
2014-10-27Update Sauce iOS Safari test to iOS 8.0Chris Rebert1-1/+1
[skip validator]
2014-10-27tweak banner of autogenerated CommonJS moduleChris Rebert1-1/+1
2014-10-27.bs-customizer-input => .col-xs-4Chris Rebert3-381/+374
2014-10-27add clearfix divs to customizer input rowsChris Rebert2-1/+103
2014-10-27Tweak parser to ignore empty Less section docstrings; fixes #14878Chris Rebert2-24/+7
2014-10-27Remove `baseurl` as it doesn't serve any real purpose.XhmikosR2-2/+1
2014-10-27title changeMark Otto1-1/+1
2014-10-27rename new navbar to just navbarMark Otto1-0/+0
2014-10-27drop the old navbarMark Otto2-471/+0
2014-10-27fix up the new navbar docsMark Otto1-31/+76
2014-10-27fix rounded corners on copy buttonsMark Otto3-3/+3
2014-10-27compile the docs less as wellMark Otto1-1/+1
2014-10-27switch to max-width on containersMark Otto10-25/+29
2014-10-27add height to new navbar examples to show behaviorMark Otto2-0/+6
2014-10-27scrollspy maybe?Mark Otto1-1/+1
2014-10-27gruntMark Otto2-2/+2
2014-10-27nav list updateMark Otto1-2/+11
2014-10-27fix home navMark Otto1-2/+6
2014-10-26gruntMark Otto4-4/+4
2014-10-26Merge branch 'master' into derpMark Otto7-245/+0
Conflicts: dist/css/bootstrap-theme.css.map dist/css/bootstrap.css.map docs/assets/js/raw-files.min.js docs/dist/css/bootstrap-theme.css.map docs/dist/css/bootstrap.css.map less/progress-bars.less less/theme.less
2014-10-26gruntMark Otto5-5/+5
2014-10-26Merge pull request #14881 from bhamodi/white-space-optimizationMark Otto8-29/+0
Removed unnecessary new lines that were inconsistent with the current formatting style.
2014-10-26fix progress bar animated biznasMark Otto13-162/+169
2014-10-26no more mixin, use regular propertyMark Otto1-2/+2
2014-10-26Removed unnecessary new lines that were inconsistent with current style.Baraa8-29/+0
2014-10-26rename that variableMark Otto1-1/+1
2014-10-26nuked that variableMark Otto1-1/+0
2014-10-26fix syntaxMark Otto1-1/+1
2014-10-26Merge branch 'master' into derpMark Otto82-1574/+2271
Conflicts: Gruntfile.js 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/dropdowns.html docs/_includes/components/media.html docs/_includes/components/navs.html docs/_includes/components/progress-bars.html docs/_includes/components/responsive-embed.html docs/_includes/css/buttons.html docs/_includes/css/forms.html docs/_includes/css/less.html docs/_includes/css/overview.html docs/_includes/css/responsive-utilities.html docs/_includes/customizer-variables.html docs/_includes/getting-started/browser-device-support.html docs/_includes/getting-started/grunt.html docs/_includes/getting-started/template.html docs/_includes/header.html docs/_includes/js/alerts.html docs/_includes/js/buttons.html docs/_includes/js/carousel.html docs/_includes/js/collapse.html docs/_includes/js/dropdowns.html docs/_includes/js/modal.html docs/_includes/js/popovers.html docs/_includes/js/scrollspy.html docs/_includes/js/tabs.html docs/_includes/js/tooltips.html docs/_includes/nav/components.html docs/_includes/nav/getting-started.html docs/_layouts/default.html docs/about.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/components.html docs/components/navbar.md docs/css.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/blog/index.html docs/examples/carousel/index.html docs/examples/cover/index.html docs/examples/dashboard/index.html docs/examples/grid/index.html docs/examples/jumbotron-narrow/index.html docs/examples/jumbotron/index.html docs/examples/justified-nav/index.html docs/examples/navbar-fixed-top/index.html docs/examples/navbar-static-top/index.html docs/examples/navbar/index.html docs/examples/non-responsive/index.html docs/examples/offcanvas/index.html docs/examples/signin/index.html docs/examples/starter-template/index.html docs/examples/sticky-footer-navbar/index.html docs/examples/sticky-footer/index.html docs/examples/theme/index.html docs/examples/tooltip-viewport/index.html docs/getting-started.html docs/javascript.html docs/migration.html less/_animation.less less/_modal.less less/_navbar.less less/_variables.less less/glyphicons.less less/navs.less less/panels.less less/progress-bars.less
2014-10-26Merge branch 'master' into need-to-activate-animated-progressbarMark Otto5-4/+15
2014-10-26gruntMark Otto2-2/+2
2014-10-26Merge branch 'need-to-activate-animated-progressbar' of ↵Mark Otto2-2/+2
github.com:twbs/bootstrap into need-to-activate-animated-progressbar Conflicts: docs/_includes/components/progress-bars.html docs/assets/js/src/application.js
2014-10-26Merge pull request #14876 from twbs/fix-14875XhmikosR1-1/+1
bs-commonjs-generator.js: always use forward slashes in the require path.
2014-10-26Docs: progress bars' animation now needs to be manually toggledHeinrich Fenkart2-3/+8
Refs #14409
2014-10-26Merge pull request #14880 from danieljuhl/patch-2Julian Thilo1-0/+5
Added link to danish translation of docs
2014-10-26Added link to danish translation of docsDaniel Juhl1-0/+5
2014-10-26Replaces markdown.js with ↵jonschlinkert3-4/+6
[remarkable](https://github.com/jonschlinkert/remarkable). - remarkable has 100% support for [commonmark](http://jgm.github.io/CommonMark/spec.html) - [faster](https://github.com/jonschlinkert/remarkable/tree/master/benchmark) - easier to monkeypatch. this is a goal of ours, might be useful to you at some point given the custom tokenizing/parsing you're doing for documentation.
2014-10-26bs-commonjs-generator.js: always use forward slashes in the require path.XhmikosR1-1/+1
Since `path.resolve` is using backslashes on Windows, we ended up with different files. Just replace those with forward slashes.
2014-10-26Losslessly compress apple-touch-icon.png.XhmikosR1-0/+0
6314 -> 6140 bytes [ci skip]
2014-10-25fix clipboard button and examplesMark Otto3-4/+10
2014-10-26Docs: progress bars' animation now needs to be manually toggledHeinrich Fenkart2-3/+8
Refs #14409