aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-03-09Merge branch 'master' into mixin-table-of-contentsmrmrs10-52/+57
* master: Fix bad grunt merge and then G R U N T Reorder the Gruntfile a bit Fixes #12892: Link to one of the SO articles on Bootstrap modals and YouTube Remove unneeded quotes. Rename generateRawFilesJs to generateRawFiles Remove redundant parens Conflicts: docs/assets/js/raw-files.min.js test-infra/npm-shrinkwrap.canonical.json
2014-03-09Adjusts some section titles to be more explicit.mrmrs7-9/+9
FIXES #12992
2014-03-10Merge pull request #12977 from ZDroid/varXhmikosR1-2/+2
Rename generateRawFilesJs to generateRawFiles
2014-03-09Merge branch 'master' of github.com:twbs/bootstrapMark Otto1-1/+1
2014-03-09Fix bad grunt merge and then G R U N TMark Otto3-3/+3
2014-03-10Merge pull request #12975 from ZDroid/parensXhmikosR1-1/+1
Remove redundant parens
2014-03-09Changes compiled assets after changing mixins.lessmrmrs6-6/+6
2014-03-09Adds basic table of contents for mixins.less. You know for the kids.mrmrs1-0/+69
2014-03-09Merge branch 'master' of github.com:twbs/bootstrapMark Otto6-19/+20
Conflicts: Gruntfile.js
2014-03-09Reorder the Gruntfile a bitMark Otto1-27/+27
2014-03-10Merge pull request #12986 from twbs/unneeded-quotesXhmikosR6-20/+21
Remove unneeded quotes.
2014-03-09Fixes #12892: Link to one of the SO articles on Bootstrap modals and YouTubeMark Otto1-1/+5
2014-03-09Moves IE8 justified button border mention to docs section, not the browser ↵Mark Otto2-6/+5
bugs page /cc @cvrebert
2014-03-09Fixes #12487: Document required use of position relative for scrollspyMark Otto1-1/+9
2014-03-09Document shitty situation of multiple .navbar-right classes in #12951Mark Otto1-0/+5
2014-03-09Merge branch 'master' of github.com:twbs/bootstrapMark Otto1-1/+1
2014-03-09Document #12476 bug in the wall of bugsMark Otto1-0/+6
2014-03-09Merge pull request #12989 from twbs/bower_ignoreMark Otto1-1/+1
Don't ignore every dot file in Bower
2014-03-09gruntMark Otto1-1/+1
2014-03-09Merge pull request #12679 from twbs/sr-only-focusableMark Otto14-13/+49
add .sr-only-focusable
2014-03-09Merge branch 'master' into sr-only-focusableMark Otto2-17/+24
2014-03-09Don't ignore every dot file in BowerMark Otto1-1/+1
2014-03-09Remove unneeded quotes.XhmikosR6-20/+21
2014-03-08gruntMark Otto1-1/+1
2014-03-08document position relative firefox bug; cleanup some stuff in the browser ↵Mark Otto1-16/+23
bugs page
2014-03-08Merge branch 'master' into sr-only-focusableMark Otto153-5730/+12544
Conflicts: dist/css/bootstrap.css
2014-03-08Merge pull request #12983 from twbs/fat-9836Mark Otto7-9/+13
fixes #9836
2014-03-08gruntMark Otto2-2/+2
2014-03-08fixes #9836fat6-8/+12
2014-03-08Merge pull request #12982 from twbs/fat-9342Mark Otto7-7/+7
fix #9342
2014-03-08gruntMark Otto2-2/+2
2014-03-08fix #9342fat6-6/+6
2014-03-08grunt distMark Otto1-1/+1
2014-03-08Fix commentMark Otto4-4/+4
2014-03-08gruntMark Otto6-6/+6
2014-03-08Merge pull request #12976 from ZDroid/commentMark Otto1-2/+1
Update .hide-text() comment
2014-03-08Fixes #12966: Ensure icon font vars are loaded into CustomizerMark Otto5-4/+28
2014-03-08gruntMark Otto12-14/+14
2014-03-08Merge pull request #12980 from ZDroid/config-yml-quotesMark Otto1-3/+3
Remove redundant _config.yml quotes
2014-03-08Remove redundant _config.yml quotesZlatan Vasović1-3/+3
2014-03-08Rename generateRawFilesJs to generateRawFilesZlatan Vasović1-2/+2
2014-03-08Update .hide-text() commentZlatan Vasović1-2/+1
2014-03-08Remove redundant parensZlatan Vasović1-1/+1
2014-03-07Merge pull request #12972 from twbs/cleaner-shrinkwrapChris Rebert2-2/+15
Exclude `resolved` from npm shrinkwrap to avoid irrelevant changes
2014-03-07S H R I N K W R A PChris Rebert1-1/+1
2014-03-07fix #12959Chris Rebert1-1/+14
2014-03-07Merge pull request #12962 from BBosman/transitions-countMark Otto1-1/+5
Add transition-timing-function mixin to docs
2014-03-07Merge pull request #12969 from ZDroid/badge-mixinMark Otto2-19/+19
Improve badges mixinability
2014-03-07Merge pull request #12970 from ZDroid/package.json-paMark Otto1-2/+2
Remove ./ from package.json paths
2014-03-07Merge pull request #12971 from ZDroid/config-ymlMark Otto1-2/+2
Remove ./ from _config.yml paths