aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-01-08docs-assets: concatenate and minify all javascript files.XhmikosR4-7/+15
2014-01-08Merge pull request #12151 from wangsai/no-prebootMark Otto1-2/+2
no preboot
2014-01-08no prebootwangsai1-2/+2
2014-01-07extract glyphicons.yml generator out of Gruntfile into separate moduleChris Rebert2-23/+29
2014-01-07extract raw-files.js generator out of Gruntfile into separate moduleChris Rebert2-18/+24
2014-01-07Merge pull request #12149 from twbs/bump-grunt-contrib-lessChris Rebert1-1/+1
bump grunt-contrib-less to v0.9.0
2014-01-07bump grunt-contrib-less to v0.9.0Chris Rebert1-1/+1
2014-01-07enable CSSLint in test suite; fixes #12094Chris Rebert1-1/+1
2014-01-07adjust filename to indicate that customize JS is minifiedChris Rebert3-2/+2
2014-01-07grunt dist build-customizerChris Rebert2-3/+3
2014-01-07have customizer output Bootstrap Theme too; fixes #12003Chris Rebert1-1/+3
2014-01-07make customizer compilation code more genericChris Rebert1-34/+42
2014-01-07fix #12143Chris Rebert3-3/+3
2014-01-07Merge pull request #12147 from ZDroid/doubleChris Rebert1-1/+1
Drop redundant 'the'
2014-01-07Drop redundant 'the'Zlatan Vasović1-1/+1
2014-01-07Fix #12073: Consistent order of variationsJulian Thilo19-246/+258
This changes the order of component variations throughout the repo (code and docs) to be more consistent. The order now used everywhere is the one most frequently found in the repo before: Default, Primary, Success, Info, Warning, Danger
2014-01-07Merge pull request #12057 from ZDroid/nlChris Rebert12-12/+24
'use strict' on new line
2014-01-07Merge pull request #12135 from leoj3n/patch-2Chris Rebert1-2/+2
Improve wording in CONTRIBUTING.md
2014-01-07Improve wording in CONTRIBUTING.mdJoel Kuzmarski1-2/+2
Parts of the "Pull requests" section are strangely worded. This commit fixes that.
2014-01-06Merge pull request #12133 from leoj3n/patch-1Chris Rebert1-1/+1
Fix bad anchor link in CONTRIBUTING.md
2014-01-07Fix bad anchor link in CONTRIBUTING.mdJoel Kuzmarski1-1/+1
Hey look, I'm contributing to CONTRIBUTING.md! This anchor must have been overlooked while updating the docs in a previous commit. Expected behavior: scroll the document to a linked section. Experienced behavior: nada. This proposed file change renames the anchor text from `coding conventions` to `coding guidelines` and changes the anchor link from `#code-conventions` to `#code-guidelines`.
2014-01-07Merge branch 'master' of https://github.com/twbs/bootstrapJulian Thilo1-1/+1
2014-01-07duh, missed one more fileJulian Thilo1-2/+2
X-Ref: https://github.com/twbs/bootstrap/commit/7fcfe61f4da41356b2ae974ad20536db0d74e83f
2014-01-07missed a fileJulian Thilo1-1/+1
X-Ref: https://github.com/twbs/bootstrap/commit/7fcfe61f4da41356b2ae974ad20536db0d74e83f
2014-01-07Update copyright notices in all placesJulian Thilo34-54/+54
- Implements new format "Copyright 2011-xxxx Twitter, Inc.", which resonates well with our History page and more accurately reflects the copyright status of the repo - grunt dist to update all the files
2014-01-06justify textMark Otto1-0/+2
2014-01-06Merge pull request #12125 from juniorconte/input-block-levelMark Otto1-1/+10
notes from .input-block-level
2014-01-06notes from .input-block-leveljuniorconte1-1/+10
2014-01-05New YearChris Rebert1-1/+1
2014-01-05Merge pull request #12116 from twbs/pacify-csslintChris Rebert2-0/+4
make CSSLint happier
2014-01-05linkMark Otto1-1/+1
2014-01-05Move homepage examples to data fileMark Otto2-17/+23
2014-01-05Merge branch 'master' into docs_derpMark Otto1-2/+4
Conflicts: docs/_layouts/default.html docs/_layouts/home.html
2014-01-05Merge pull request #12107 from twbs/same-footer-linksMark Otto2-0/+12
harmonize footer links on homepage & docs pages
2014-01-05Merge branch 'master' into docs_derpMark Otto5-5/+6
Conflicts: docs/components.html
2014-01-05Merge pull request #12118 from wangsai/fix-out-containerChris Rebert1-1/+1
fix the paragraph outside of '.bs-docs-section'
2014-01-06fix the paragraph outside of '.bs-docs-section'wangsai1-1/+1
2014-01-05make CSSLint happier; refs #12094Chris Rebert2-0/+4
2014-01-05grammarghhhhhhhhhhhhMark Otto1-1/+1
2014-01-05copyMark Otto1-1/+1
2014-01-05add /docs/assets JS to JSCS Grunt task configChris Rebert1-0/+3
2014-01-05Merge pull request #12115 from Quy/masterMark Otto1-1/+0
Delete reference to a non-existent class
2014-01-05Delete reference to a non-existent classQuy Ton1-1/+0
2014-01-05Merge pull request #12082 from kevinsawicki/use-dollar-instead-of-jqueryChris Rebert1-1/+1
Use $ instead of jQuery
2014-01-05Merge branch 'master' into docs_derpMark Otto1-2/+4
2014-01-05Merge branch 'master' into docs_derpMark Otto11-284/+304
2014-01-05Merge pull request #12110 from twbs/one-control-per-input-groupMark Otto1-2/+4
document single .form-control per .input-group limitation
2014-01-05document single .form-control per .input-group limitation; fixes #12109Chris Rebert1-2/+4
2014-01-05harmonize footer links on homepage & docs pagesChris Rebert2-0/+12
2014-01-05Use mix of medium and small grid clases on dashboard exampleMark Otto1-2/+2