aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-08-04Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wipMark Otto3-5/+5
2013-08-04Merge pull request #9079 from liuyl/buttongroupsMark Otto3-5/+5
Fix #7108: btn group styling
2013-08-04run grunt distMark Otto1-1/+1
2013-08-05Remove type attribute of tag "script".vsn4ik3-5/+4
In HTML5 in tag script, the type attribute is no longer required. The default value is "text/javascript". http://www.w3.org/TR/html5/scripting-1.html#attr-script-type
2013-08-04tooltip.js: add missing spaceChris Rebert1-1/+1
2013-08-05btngroupsliuyl3-5/+5
2013-08-04fixes #8880fat4-25/+57
2013-08-04Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wipfat20-393/+487
2013-08-04remove js anchor interferencefat2-9/+0
2013-08-04trivial docs grammar improvementsChris Rebert2-2/+2
2013-08-03Merge pull request #9059 from twbs/nested-btn-groups-docsChris Rebert1-4/+19
adjust description & give source for nested `.btn-group`s example
2013-08-03adjust description & give source for nested `.btn-group`s exampleChris Rebert1-4/+19
2013-08-03components.html: rm disconnected sentence fragmentChris Rebert1-1/+1
2013-08-03streamline $().dropdown('toggle') descriptionChris Rebert1-1/+1
2013-08-03JS docs: capitalize BootstrapChris Rebert1-3/+3
2013-08-03Merge pull request #9056 from twbs/large-to-lg-etcMark Otto16-121/+142
Greater standardization of sizing terminology
2013-08-03add missing ref to .btn-xs in button sizes docsChris Rebert1-1/+1
2013-08-03add .btn-xs to .btn-group exampleChris Rebert1-0/+21
2013-08-03rm stray space in components.htmlChris Rebert1-1/+1
2013-08-03Greater standardization of sizing terminologyChris Rebert16-121/+121
In class names: * large => lg * small => sm * mini => xs ("Extra small") In screen size categories: * Tiny => Extra small
2013-08-03Merge pull request #9052 from liuyl/inputgroupsMark Otto3-2/+6
fix #9051
2013-08-04add line-heightliuyl3-2/+6
2013-08-03Merge pull request #9036 from eratzlaff/3.0.0-wipMark Otto2-3/+3
Change value with variables for btn-large, btn-small and pagination
2013-08-03Merge pull request #9050 from jonschlinkert/3.0.0-wipMark Otto1-114/+131
organizes the Gruntfile a bit and makes better use of Grunt conventions
2013-08-03This pull request organizes the Gruntfile, makes better use of Grunt ↵Jon Schlinkert1-114/+131
conventions and placates my OCD. Changes in the Gruntfile: * Use two spaces for consistency with the rest of the codebase. * Tasks are now organize based on task type. since lodash templates are used across tasks/targets, this makes it easier to follow. * Use `src-dest` files format when only src-dest pairing is necessary. This saves a line over the files-object format, but more importantly it allows use the src or dest in lodash templates (e.g. `<%= concat.bootstrap.src %>`), which isn't possible in the files-object or files-array formats. * Make the explicit order of the javascript files more obvious in concat task , maybe just a tiny bit more usable and easier to customize - but really just OCD * Use `<%= pkg.name %>` variable for dest CSS, both for consistency with how javascript targets are defined, and to make it just little easier for devs to customize bootstrap. ran the build to test, everything seems good.
2013-08-03Merge pull request #9045 from naneau/3.0.0-wipMark Otto1-1/+1
using @line-height-computed in .navbar-nav link
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
generated by cgit v1.2.3 (git 2.25.1) at 2026-07-20 12:49:24 +0000