aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
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
2014-01-05Merge pull request #12105 from twbs/navbar-containersMark Otto3-264/+284
add .container(-fluid) to remaining navbar examples
2014-01-05add .container(-fluid) to remaining navbar examples for consistency/accuracyChris Rebert3-264/+284
follow-up to 93a4d6cc5ecdc1cbc09c4b8af2e587f4480b36cf
2014-01-05Merge pull request #12104 from ghoullier/masterChris Rebert2-2/+2
Replace getElementsByTag with querySelector in IE10 Mobile viewport JS snippet
2014-01-05Replace getElementsByTag by querySelector for IE10 Mobile plateform.Gregory HOULLIER2-2/+2
2014-01-05Merge pull request #12099 from Quy/masterChris Rebert1-2/+2
Fix typos
2014-01-05Fix typosQuy Ton1-2/+2
2014-01-05Merge pull request #12098 from ZDroid/reorgChris Rebert1-1/+1
Group repo vars together in Jekyll config
2014-01-05Merge pull request #12097 from ZDroid/deprecatedChris Rebert1-1/+1
Replace @screen-sm with @screen-sm-min
2014-01-05Reorganize varsZlatan Vasović1-1/+1
2014-01-05Replace @screen-sm with @screen-sm-minZlatan Vasović1-1/+1
2014-01-04Merge pull request #12095 from Quy/masterChris Rebert1-1/+1
Fix typo
2014-01-04Fix typoQuy Ton1-1/+1
2014-01-04Merge pull request #12092 from Quy/masterMark Otto4-10/+10
Use relative URLs and fix anchor links
2014-01-04Merge pull request #12090 from nschonni/patch-2Chris Rebert1-1/+1
Quote Node 0.10 so correct version is printed
2014-01-04Fix anchor linksQuy Ton4-7/+7