aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-08-03using @line-height-computed in .navbar-nav linkMaurice Fonk1-1/+1
When a user changed the @line-height-base/@line-height-computed var, the nav-bar items would not scale appropriately.
2013-08-03Update .navbar-toggle to match other navbar elJames Holland1-5/+5
In place of commit #9040, fix #8844 And sizing .navbar-toggle more like .btn elem + change `position:absolute` to `position:relative` + remove `right: 10px` in favor of `float:right` + change to `height: 34px` + remove `top:` in favor of `.navbar-vertical-align` basis new height + change `padding:` to match `.btn` el
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
Fix Horizontal form docs
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 ↵Mark Otto3-1/+3
liuyl-btngroup Conflicts: dist/css/bootstrap.min.css
2013-08-02Merge pull request #8939 from frabrunelle/3.0.0-wipMark Otto2-6/+18
add nav to media object and thumbnails
2013-08-02Merge branch 'navtext' of https://github.com/liuyl/bootstrap into liuyl-navtextMark Otto3-1/+5
Conflicts: dist/css/bootstrap.min.css
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
use separate `form-group`s in horiz form example for greater generality
2013-08-02move form layouts from input groups back to forms (messed this up in ↵Mark Otto4-98/+101
b281ad64096d919145159ffbc4e1a5b284708d9b)
2013-08-02Remove requirement of `.list-group-flush` when list groups are in panelsMark Otto4-38/+38
Fixes #8900
2013-08-02Merge pull request #36 from ggam/patch-1Mark Otto1-0/+5
Included required JavaScript in navbar-static-top
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
* Smaller padding on buttons and large buttons * Same with inputs and large inputs * Remove about 10px from height of large inputs/buttons and 4px from regular ones Fixes #8707 and #8700. (Also relevant: #8711)
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
Added ".col-sm-*" to the grid example per the description above the
2013-08-02Merge branch '3.0.0-wip-fixed-grid-push-pull-offset' of ↵Mark Otto4-82/+219
https://github.com/jtickle/fp-bootstrap into jtickle-3.0.0-wip-fixed-grid-push-pull-offset Conflicts: dist/css/bootstrap.min.css
2013-08-02Added ".col-sm-*" to the grid example per the description above theAdam Woodbeck1-14/+14
example.
2013-08-02Merge pull request #9017 from jonschlinkert/3.0.0-wipMark Otto4-27/+27
updates mixins to consistently use semicolons as argument separator.
2013-08-02Resolves https://github.com/twbs/bootstrap/issues/9014. updates mixins to ↵Jon Schlinkert4-27/+27
consistently use semicolons as argument separator. Rebuild to confirm, no diff in compiled CSS.
2013-08-02run grunt dist for #8967Mark Otto2-2/+8
2013-08-02Merge pull request #8967 from bassjobsen/patch-2Mark Otto1-1/+3
Update input-groups.less
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
Add dropdown class
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
Added short instruction for obtaining respond.js in example HTML code (see description).
2013-08-02Merge pull request #8980 from ggam/patch-7Mark Otto1-5/+5
Removed data-toggle class when it wasn't been applied
2013-08-02Added short instruction for obtaining respond.jsBryan Keiren1-1/+1
The Getting-Started page only lists the actual instructions for respond.js (its purpose and source) *after* listing a piece of example HTML code for the user to copy and paste. It would probably be more clear if that piece of HTML code actually lists where the user can obtain respond.js. Otherwise the user has to scroll down and read 1 specific line on the rest of the page (under the 'IE 8 and 9' compatibility section), in order to know that respond.js can be obtained from a GitHub page (and that it is in fact NOT part of the downloadable Bootstrap file that's provided earlier on the page, even though the use of response.js in the example HTML code seems to suggest that it *is* part of the Bootstrap download). It's a minor issue but this fix should make it just a little bit more clear to a user how the example HTML code works (lest they copy/paste it and find out the browser can't find respond.js).
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
"from" => "form"
2013-08-01Removed data-toggle class when it wasn't been appliedGuillermo González de Agüero1-5/+5
2013-08-01Fix #8944Guillermo González de Agüero1-0/+6
2013-08-01Merge pull request #8965 from leonardovcid/patch-1Chris Rebert1-1/+1
Correct comment which is showing a wrong mixin call example (mixins.less)
2013-08-01Added classes for lg-pull, lg-push, lg-offset, sm-pull, sm-push, sm-offsetJeff Tickle5-83/+220
2013-08-01Update input-groups.lessBass Jobsen1-1/+3
align inline radio and checkbox groups with their label for horizontal forms, see http://stackoverflow.com/q/17990310/1596547 (Question 2)
2013-08-01Correct comment which is showing a wrong mixin call example (mixins.less)leonardovcid1-1/+1
I was copy-pasting the example and it wasn't working. Then I found that the example in the comment was a typo. Thanks
2013-07-31fixes #8892Jacob Thornton2-2/+2
2013-07-31fixes #8864Jacob Thornton3-5/+9