aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-12-14Merge branch 'master' into pr/11302Mark Otto121-4397/+5584
Conflicts: dist/css/bootstrap.css dist/css/bootstrap.min.css
2013-12-14Document new modal sizesMark Otto2-3/+65
2013-12-14Merge branch 'master' into pr/11162Mark Otto129-4610/+5883
Conflicts: less/modals.less
2013-12-14Merge branch 'master' into pr/11107Mark Otto131-4045/+6023
Conflicts: docs-assets/js/raw-files.js
2013-12-14Merge pull request #11286 from BBosman/well-borderMark Otto3-1/+4
Add well-border variable
2013-12-14Fixes #10921: Add support for input groups within button toolbarsMark Otto3-13/+15
* Floats any `.input-group` within a toolbar * Simplifies the CSS to remove sibling selectors and instead use a negative amrgin on the parent with only `margin-left` See it in action: http://jsbin.com/aGEcUqAT/1/.
2013-12-14mention lack of support for split button dropdowns in vertical button groupsMark Otto1-1/+1
2013-12-14Merge branch 'master' into pr/10951Mark Otto141-4949/+7218
Conflicts: dist/css/bootstrap.min.css less/modals.less
2013-12-14Fixes #10505: Document more of LESS vars and mixinsMark Otto3-0/+497
2013-12-14Merge branch 'master' of github.com:twbs/bootstrapMark Otto1-1/+1
2013-12-14Fixes #10370: Improved and deprecated dropdown menu alignment optionsMark Otto5-16/+46
* Removes an old pair of selectors that didn’t properly target the right-aligned navbar alignment of dropdown menus. * Deprecates the `.pull-right` alignment in favor of a more specific and unique class name. * Adds `.dropdown-menu-right` as the new alignment class. This is then mixin-ed into the `.navbar-right.navbar-nav` dropdown menus for auto-alignment. * To override that auto-alignment, use `.dropdown-menu-left` as needed.
2013-12-14Merge pull request #11878 from ZDroid/patch-1Chris Rebert1-1/+1
Add `try` and `catch` to keywords
2013-12-14Add `try` and `catch` to keywordsZlatan Vasović1-1/+1
2013-12-14Fixes #11867: Add `@panel-body-padding` variableMark Otto2-2/+4
2013-12-14Merge branch 'master' into pr/11868Mark Otto7-5/+113
Conflicts: dist/css/bootstrap.min.css
2013-12-13Fixes #10495: Float Glyphicon and set margins in .navbar-brand to ensure ↵Mark Otto3-1/+13
there is no added height because wtf even is CSS
2013-12-13Merge pull request #11869 from twbs/cache-node_modulesChris Rebert3-3/+99
use S3-based node_modules caching
2013-12-13time all the thingsChris Rebert1-5/+5
2013-12-13use S3-based node_modules cachingChris Rebert3-1/+97
2013-12-13Merge pull request #11874 from ZDroid/hotfixChris Rebert1-1/+1
';' isn't needed
2013-12-13';' isn't neededZlatan Vasović1-1/+1
2013-12-13add dist files.Tobias Lindig2-4/+3
2013-12-13use @zindex-modal for .modal and @zindex-modal-background for .modal-backdrop.Tobias Lindig1-3/+2
removed z-index for .modal-dialog, it was not necessary because the parent element (.modal) already has a z-index.
2013-12-12-ms-transform is for IE9 only, IE10+ don't require itMark Otto1-6/+6
2013-12-12Merge pull request #11819 from janpanschab/ms-transform-originMark Otto1-0/+1
Transform-origin mixin for IE
2013-12-12Merge pull request #11863 from twbs/update-osxChris Rebert1-4/+4
Sauce tests: update to later browsers supported by OS X 10.9
2013-12-12Sauce tests: update to later browsers supported by OS X 10.9Chris Rebert1-4/+4
2013-12-12quotesMark Otto1-1/+1
2013-12-12text updateMark Otto1-1/+1
2013-12-12move icons to partialMark Otto3-804/+807
2013-12-12just column width, not maxMark Otto1-1/+1
2013-12-12more docs homepage cleanupMark Otto2-38/+79
2013-12-12Issue #11852 : create a new variable for the list group active item link text.mrasscha2-2/+2
2013-12-12homepage imagesMark Otto1-4/+4
2013-12-12typoMark Otto1-1/+1
2013-12-12Merge pull request #11859 from dzwillia/add_dropdown_caret_colorChris Rebert1-0/+3
Add @dropdown-caret-color variable back to variables.less
2013-12-12Added @dropdown-caret-color variable back to variables.less (deprecated)dzwillia1-0/+3
2013-12-11Merge branch 'master' into docs_derpMark Otto103-4246/+4617
Conflicts: docs-assets/css/docs.css docs-assets/js/application.js
2013-12-11more homepage and sidenav overhaulMark Otto9-129/+219
2013-12-11Add new template, CoverMark Otto2-0/+334
2013-12-11Merge branch 'master' of github.com:twbs/bootstrapMark Otto5-8/+10
2013-12-11Fixes #11837: grid containers are fixed width now, no longer max-widthMark Otto1-1/+1
2013-12-11Merge pull request #11841 from ZDroid/breadcrumbsMark Otto2-5/+7
Use variables for breadcrumb padding
2013-12-11Merge pull request #11839 from XhmikosR/readmeMark Otto1-1/+1
Clarify Windows workarounds.
2013-12-11Use variables for breadcrumb paddingZlatan Vasović2-5/+7
2013-12-11Improve pager customizationZlatan Vasović2-5/+13
2013-12-11Merge pull request #11838 from XhmikosR/customizerChris Rebert2-2/+2
customizer.js: Remove a workaround for older less.js.
2013-12-11customizer.js: remove a workaround for older less.js.XhmikosR2-2/+2
2013-12-11Clarify Windows workarounds.XhmikosR1-1/+1
2013-12-10Combine updates to Windows Jekyll stuffMark Otto1-2/+1