aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2013-08-03Greater standardization of sizing terminologyChris Rebert16-121/+121
2013-08-03Merge pull request #9052 from liuyl/inputgroupsMark Otto3-2/+6
2013-08-04add line-heightliuyl3-2/+6
2013-08-03Merge pull request #9036 from eratzlaff/3.0.0-wipMark Otto2-3/+3
2013-08-03Merge pull request #9050 from jonschlinkert/3.0.0-wipMark Otto1-114/+131
2013-08-03This pull request organizes the Gruntfile, makes better use of Grunt conventi...Jon Schlinkert1-114/+131
2013-08-03Merge pull request #9045 from naneau/3.0.0-wipMark Otto1-1/+1
2013-08-03using @line-height-computed in .navbar-nav linkMaurice Fonk1-1/+1
2013-08-03Update .navbar-toggle to match other navbar elJames Holland1-5/+5
2013-08-03JS docs: put `transitionEnd` within <code>Chris Rebert1-1/+1
2013-08-03JavaScript docs: fix caps of "JS"Chris Rebert1-1/+1
2013-08-03JS docs: fix caps of "CSS" acronymChris Rebert1-1/+1
2013-08-03Merge remote-tracking branch 'upstream/3.0.0-wip' into 3.0.0-wipElvis Ratzlaff1-4/+4
2013-08-03Merge pull request #9037 from ChrisRiddell/horizontal-form-fixChris Rebert1-4/+4
2013-08-03fix Horizontal form docsChrisRiddell1-4/+4
2013-08-03Change value for padding on pagination to variablesElvis Ratzlaff1-1/+1
2013-08-03Change line-height value with variable for btn-large and btn-smallElvis Ratzlaff1-2/+2
2013-08-02Merge branch 'btngroup' of https://github.com/liuyl/bootstrap into liuyl-btng...Mark Otto3-1/+3
2013-08-02Merge pull request #8939 from frabrunelle/3.0.0-wipMark Otto2-6/+18
2013-08-02Merge branch 'navtext' of https://github.com/liuyl/bootstrap into liuyl-navtextMark Otto3-1/+5
2013-08-02Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wipMark Otto1-0/+16
2013-08-02Merge pull request #8934 from twbs/generalize-horiz-form-exampleMark Otto1-0/+16
2013-08-02move form layouts from input groups back to forms (messed this up in b281ad64...Mark Otto4-98/+101
2013-08-02Remove requirement of `.list-group-flush` when list groups are in panelsMark Otto4-38/+38
2013-08-02Merge pull request #36 from ggam/patch-1Mark Otto1-0/+5
2013-08-02fix typo in commentChris Rebert1-1/+1
2013-08-02fixes #8957fat3-3/+7
2013-08-02Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wipfat26-278/+442
2013-08-02fixes #8955fat1-1/+1
2013-08-02Tighten up buttons and form controlsMark Otto5-19/+28
2013-08-02Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wipMark Otto1-14/+14
2013-08-02fixes #9015: bold links not semibold in alertsMark Otto3-3/+3
2013-08-02Merge pull request #9018 from adamwoodbeck/3.0.0-wipMark Otto1-14/+14
2013-08-02Merge branch '3.0.0-wip-fixed-grid-push-pull-offset' of https://github.com/jt...Mark Otto4-82/+219
2013-08-02Added ".col-sm-*" to the grid example per the description above theAdam Woodbeck1-14/+14
2013-08-02Merge pull request #9017 from jonschlinkert/3.0.0-wipMark Otto4-27/+27
2013-08-02Resolves https://github.com/twbs/bootstrap/issues/9014. updates mixins to con...Jon Schlinkert4-27/+27
2013-08-02run grunt dist for #8967Mark Otto2-2/+8
2013-08-02Merge pull request #8967 from bassjobsen/patch-2Mark Otto1-1/+3
2013-08-02Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wipMark Otto1-0/+6
2013-08-02Merge pull request #8979 from ggam/patch-6Mark Otto1-0/+6
2013-08-02Fixes #8996: shift placement of justified CSS for nav componentMark Otto3-62/+61
2013-08-02whitespace in js file?Mark Otto1-1/+1
2013-08-02Fix #9008: consolidate `.alert-block` styles into `.alert`Mark Otto5-51/+21
2013-08-02Merge pull request #9011 from Rycul/patch-1Mark Otto1-1/+1
2013-08-02Merge pull request #8980 from ggam/patch-7Mark Otto1-5/+5
2013-08-02Added short instruction for obtaining respond.jsBryan Keiren1-1/+1
2013-08-02Included required JavaScript in navbar-static-topGuillermo González de Agüero1-0/+5
2013-08-01fix typo in CSS docs; fixes #8992Chris Rebert1-1/+1
2013-08-01Removed data-toggle class when it wasn't been appliedGuillermo González de Agüero1-5/+5