Skip to content
This repository
  • 505 commits
  • 176 files changed
  • 17 comments
  • 23 contributors
This comparison is big! We're only showing the most recent 250 commits
Jul 19, 2012
Mark Otto fixes #4103: simpler fix for tfoot in .table-border 3c1a0fb
Mark Otto nuke commented out code from last fix 1d4660b
Jul 20, 2012
Jon Stevens on destroy, also hide. issue #3880, pull #4104 117f65d
Mark Otto tweak docs masthead links hover ee750bb
Mark Otto move from downloads.html to customize.html to better match purpose of…
… page, fix up customize page layout to match other docs, link style refinement to jumbotrons
b9105b9
Jul 22, 2012
Jacob add haunt w/ issue guideline spec 6c2fa94
Jacob change haunt to write 77dea2c
Jacob *face palm* 8281a90
Jon Stevens simplify things to one line. pull #4104 393f4a7
Mark Otto fixes #4136: use @dropdownBorder var, but keep IE7-8 fallback 5b8ff70
Mark Otto Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip e9f374f
Jon Stevens remove the ns option d76c899
Jacob Merge pull request #4104 from lookfirst/2.1.0-wip-fix-destroy
namespace the events for popover/tooltip
48fc0ad
Jacob adds minLength #3960 fae6c36
Jacob Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into…
… 2.1.0-wip
fa1e1e3
Jacob Merge pull request #3842 from alienlebarge/2.1.0-wip
<img /> tag with `height` attr are not responsive
cf70fb6
Jacob some progress on affix plugin dcf7569
Jacob Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into…
… 2.1.0-wip
e25bcb9
Jul 23, 2012
Aleksey V. Zapparov Fix transition end name for opera 11+12
Fix transition end name for Opera 11 and Opera 12.
Should fix issues: #3896, #3897, #4157, #4158
76cfe17
Mark Otto fixes #4148, readme typo b05fc00
Mark Otto more alignment fixes for customize page 5b8838a
Jacob Merge pull request #4159 from ixti/opera11-transitions-fix
Fix transition end name for opera 11+12
685785d
Jacob following #4148 5247b15
Jacob delete this test for now - as affix is still heavily underdevelopment 614d52b
Mark Otto make docs scroll over jumbotrons, but only for 980px up 0dda2c4
Mark Otto Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
Conflicts:
	docs/assets/css/docs.css
	docs/base-css.html
	docs/components.html
	docs/customize.html
	docs/getting-started.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/customize.mustache
	docs/templates/pages/getting-started.mustache
	docs/templates/pages/javascript.mustache
	docs/templates/pages/scaffolding.mustache
f085dba
Jacob Merge pull request #4166 from jonathansampson/2.1.0-wip
IE10 uses 'transition' and 'transitionend'
802ced9
Mark Otto tweak docs shadows 6245886
Mark Otto fixes #4156: don't override border radius if stacked nav has one child cd441e0
Mark Otto Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 7ce048b
Jul 24, 2012
Jonathan Sampson IE10 uses 'transition' and 'transitionend'
msTransition, while supported in IE, should be ignored in favor of the
unprefixed property. Additionally, MSTransitionEnd should also be
ignored in favor of the unprefixed event transitionend.

Current unit test requires no attention in light of this change.

MSDN:
http://msdn.microsoft.com/en-us/library/ie/hh673535(v=vs.85).aspx#transitions_dom_events
2a0cf0f
Jacob slightly fix side bar 4ea7c47
Jacob Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into…
… 2.1.0-wip

Conflicts:
	docs/assets/css/docs.css
	docs/javascript.html
	docs/templates/pages/javascript.mustache
5b2f2ed
Jacob fix scroll thinggg e38fa4b
Mark Otto fix h3 in modal and make modal unhidden by removing important from ea…
…rlier issue
4912dd4
Mark Otto modal heading line-height c37aa99
Mark Otto fixes #4118: responsive modal gets width auto and improved positionin…
…g for narrower widths
87aa610
Mark Otto Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 394922a
Jacob added fade out on scroll - we can pull this if you prefer it c98b75c
Jacob Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into…
… 2.1.0-wip
e2fc202
Mark Otto fix search form, mostly in navbar 7590e65
Mark Otto wrap footer in bs docs canvas for scrolling doodad b7b4fd5
Mark Otto Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip fa6a131
Jacob don't bite so hard c10a357
Mark Otto simplify styles for bs docs nav 880bdbc
Jul 26, 2012
Mark Otto indenting and such f75277e
Mark Otto rerun make 4bb2a13
Mark Otto fix js docs formatting 7906772
Mark Otto increase height of homepage jumbotron, update vars and styles of popo…
…vers
6474190
Jul 27, 2012
Mark Otto add image styles, for now to scaffolding (soon to own file) 1e9b450
Mark Otto add basic support for sub menus in dropdown menus 9d5c431
Mark Otto add docs for sub menu support on dropdowns, add caret via :after to s…
…ubmenu toggles
16b4ac0
Mark Otto add .btn-block for a full-width button option fe6a4b0
Jul 29, 2012
Mark Otto reverse navbar styles to save code a30045d
Mark Otto clear out docs assets, update and png crush features image 5184da3
Mark Otto fixes #4210: indenting on hero example e56a700
Mark Otto use shorthand on form field transitions for box-shadow mixin 134d11b
Mark Otto Merge branch '2.1.0-wip-navbar' into 2.1.0-wip 761429d
Mark Otto remove gradient, border, and box-shadow from .breadcrumb to different…
…iate from nav and buttons
87ce348
Mark Otto more breadcrumb tweaks for contrast d63ebe3
Mark Otto fixes #3694: provide override classes for .hide and .pull-right for g…
…rid columns
22a9a83
Mark Otto fix footer in responsive 84a9c74
Mark Otto fixes #4221: correct border-collapse property for IE7 hack cfac4bb
Jul 30, 2012
Mark Otto fix examples collapse classes, rename navbar-redux to navbar and dele…
…te the old one
b635431
Mark Otto fixes #3858: add var for responsive navbar. also add additional examp…
…les to navbar docs
04164e4
Mark Otto new fav and touch icons to match new masthead 6bf661a
Graham Conzett Add 'dist' directory to .gitignore
Allows you to keep a 'dist' directory in the repository as a target build location.
This can be useful if you have bootstrap as a submodule in a project and want to build it,
but still keep it self-contained. Similar to how jQuery does their default builds:
https://github.com/jquery/jquery/#how-to-build-your-own-jquery
178397a
Mark Otto fix navbar form alignment, and update examples to show these cases 7fa99fb
Mark Otto update button styles to use updated 14px base font size, align carets…
… to others with no opacity changes
b2ebd5c
Mark Otto Merge pull request #4229 from conzett/master
Add 'dist' directory to .gitignore
1f30faa
Mark Otto fixes #3900: nudge badges in buttons up 1px a9bf1e6
Mark Otto Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip be8d524
Mark Otto fixes #3665: ensure inputs in a fluid row maintain grid sizing 364dbb7
Mark Otto fix download page links 0e62011
Mark Otto remove position from labels/badges in mini btns 59eba9a
Mark Otto fixes #3615: remove last-child hack for IE7 since IE7 doesn't support…
… :last-child
196fb1d
Mark Otto place chevrons first in sidenav in docs, fix ie7 bugs for said sidenav 9795e9b
Jul 31, 2012
Mark Otto reorder docs css e191964
Mark Otto copy edits to docs 31b30ab
Kyle Robinson Young Use ref instead of label when checking branches in issue-guidelines 1f70dd7
Aug 01, 2012
Jacob Merge pull request #4241 from shama/issue-guidelines
Use ref instead of label when checking branches in issue-guidelines
6905dbe
Mark Otto fixes #4253: hover on responsive navbar 060e216
Mark Otto increase margin on checkboxes and radios to center properly fab1a80
Mark Otto pulsing download button on homepage 5637c6f
Mark Otto increase horizontal padding on inputs given new font-size 735001c
Mark Otto fix jank button on docs homepage e8fd7e6
Mark Otto add compability note to image styles 7aaf141
Mark Otto darken default button borders b979cd9
Mark Otto add components section to docs for isolated examples fbc0536
Mark Otto add popover and tooltip components fe93b92
Mark Otto remove the canvas slider doodad c2e899f
Mark Otto increase padding on navbar responsive nav links, fix footer margins 7232305
Mark Otto add test for textarea at .span12, really fix docs footer 3c742fc
Mark Otto fixes #4254: make .span12 expand full width of a parent when responsive 1bb7c0e
Mark Otto label new css test 225d0e0
close #3531 added focus handling and removed the badly announced "tim…
…es" close button from screenreaders
6977d35
Jacob Merge pull request #4257 from ginader/modal-accessibility
close #3531 added focus handling and removed the badly announced "times"...
7ec1778
Jacob aria-labelledby="myModalLabel" aria-hidden="true" 48546c2
Mark Otto decrease box-shadow 86a577d
Mark Otto Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 4a84145
Mark Otto add select element responsive CSS test fc7ecd7
Mark Otto add test for #4236: button group, one button with text and one with i…
…con, now line up properly
1e2edae
Mark Otto fixes #4207: redeclare box-shadow on .formFieldState() mixin so trans…
…itions work in WebKit
1482030
Mark Otto cut down on selectors on .formFieldState() mixin to origin input catc…
…hall
d27dcf3
Mark Otto decrease docs nav padding 33c6ab9
Aug 02, 2012
Jacob fix indexof on array for ie8 2b2b330
Jacob Merge branch '2.1.0-wip' of http://github.com/twitter/bootstrap into …
…2.1.0-wip
88deb08
Aug 03, 2012
Florian Pfitzer Fixes vertical-three-colors in Firefox fa38ab5
Aug 05, 2012
Christian Update docs/templates/pages/javascript.mustache
Amended all mentions of 'Javascript' and 'javascript' in the body text to the correct 'JavaScript'.
25c6175
Mark Otto fixes #4277: typo f61dd72
Mark Otto Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 3823d29
Aug 06, 2012
rilian optimizing images on 2.1.0-wip branch; saving couple of KBs from package 80a645b
Aug 07, 2012
Mark Otto Merge pull request #4289 from coliff/patch-4
Update docs/templates/pages/javascript.mustache
aeed751
Mark Otto run make after merging #4289 0cb3ba6
Mark Otto fixes #4295: add vars for pagination 8ed77c4
Mark Otto Merge pull request #4300 from rilian/2.1.0-wip
optimizing images on 2.1.0-wip branch; saving couple of KBs from package
a525a6f
Mark Otto fixes #4304: more specific selectors on table border classes to overr…
…ide .table-striped
4eee78e
Mark Otto speed up animation and brightness on docs download 03eee23
Mark Otto make twitter bird white in illustration on homepage to abide by brand…
… guidelines
85f1f22
Mark Otto fix chevron on js docs and run make after table changes 3c89f7b
Mark Otto reorg vars fields on customize page to ensure they are all in three c…
…olumns for time being
08e4475
Aug 08, 2012
Mark Otto add some simple styles for showing white icons on hover where appropr…
…iate
f6c7ac5
Aug 09, 2012
Mark Otto fix gh buttons e06c257
Mark Otto hotfix: github buttons urls 5df1e2c
Aug 13, 2012
Mark Otto running make on previous changes 9f8ce77
Ben Oakes Fix wording (presumed typo) e31f06b
Mark Otto Merge pull request #4367 from benjaminoakes/2.1.0-wip
Fix wording of "Button dropdowns" docs
cf4fd1a
Mark Otto Merge pull request #4372 from hho/patch-2
Fixed a typo in inverse navbar code sample
cf33664
Mark Otto fixes #4373: broken examples link on homepage 41f4c60
Mark Otto merge 0040a78
Mark Otto fixes #4342: navbar vars not in use, render navbar dividers 97a23ef
Mark Otto fixes #4265: restore chromium select fix 4bf93a2
Aug 14, 2012
Henning Hoefer Fixed a typo in inverse navbar code sample a74457a
Kyle Changed placeholders value of @baseFontSize and @baseLineHeight to th…
…e values specified in variables.less
d96047f
Kyle Amend placeholders values d684607
Andreas Cederström now with 13 custom jquery plugins 2df0a0f
Mark Otto Merge pull request #4376 from kylase/2.1.0-wip
Changed placeholders values
57ea6fe
Mark Otto Merge pull request #4384 from andriijas/2.1.0-wip-js-typo-fix
now with 13 custom jquery plugins
e9b04ac
Melvin Fix .thumbnail line-height f6ac297
Mark Otto Merge pull request #4393 from Nivl/2.1.0-wip
Fix .thumbnail line-height
75e5279
Mark Otto fixes #4395: scope dropdown menu caret in navbar to first level dropd…
…own only
2a6deb9
Mark Otto fixes #4396: pull right dropdown menus no longer overlaid by submenus 0b0d7f1
Mark Otto Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 662ffac
Mark Otto fixes #4371: scope hovers on table rows to tbody dbcd873
Mark Otto remove borders entirely from fixed navbars 50df524
Mark Otto fixes #4358: make select elements 30px tall to match inputs 5144c77
Mark Otto fix width of star github btn in docs a80dafb
Mark Otto add animation to docs download btn for firefox b14d946
Mark Otto fixes #3674: checkbox vertical alignment in IE9 780636d
Mark Otto remove bottom margin on radios and checkboxes f933a41
Mark Otto compensate for ie7 button padding with no borders, fix indentation f3479a3
Mark Otto navbar and dropdown fixes, for alignments and for ie7/8 dropdown hidd…
…en bugs from #3946
9c72246
Mark Otto Merge branch 'fix/center-text-navbar' of https://github.com/mikaelkae…
…l/bootstrap into mikaelkael-fix/center-text-navbar
61a8ef2
Mark Otto running make on prev merge 2ee0354
Mark Otto add affix plugin to downloads page e1659b2
Jacob get affix actually working and update docs dee5746
Jacob Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into…
… 2.1.0-wip
ae9a2bd
Jacob stray ; ff38c14
Mark Otto Merge pull request #4274 from Marmelatze/three-color-gradient
Force percentage value on .vertical-three-colors() gradient mixin.
b0437be
Aug 15, 2012
Mickael Perraud Center text in navbar with change to @baseLineHeight (18 -> 20px) 41093a3
Mickael Perraud Add affix.js to javascript compilation 6a15213
Toby Lawrence Updated margin adjustments of button-based icon overrides. 6bfa58e
Toby Lawrence Added default top margin of 1px for icons. ddefdbf
Toby Lawrence Removed pixel designation from a zeroed-out property. 27e9214
Toby Lawrence Fixed spelling error in forms documentation. 48f5626
Mark Otto Merge pull request #4406 from mikaelkael/fix/add-affix-to-compilation
Add affix.js to javascript compilation
74bda55
Mark Otto add transition to thumbnails ada5589
Mark Otto Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip fd509cb
Mark Otto tweak transition 54c645e
Aug 16, 2012
Natansh Verma Fixes typo for issue #4413. bb61175
Aug 17, 2012
Mark Otto fixes #4416 in a different way: scope active state of navbar links to…
… just the immediate navbar link, not dropdown elements
ded21eb
Mark Otto Merge pull request #4419 from natansh/2.1.0-wip
Fix typo to make dropdown active link show icon-white
39f779b
Mark Otto run make on previous commit's merge 51b43ac
Mark Otto change css version # 79e05d0
Mark Otto fixes #4417: proper height on thumbnail placeholder image b8715dd
Mark Otto additional navbar contrast: add inset shadow since we nuked the border b86e1fb
Mark Otto fixes #4421: add static top navbar class 077577c
Mark Otto fixes #4428: specifity on .search-query increased 9e6322d
Mark Otto fixes #4438: button groups in inline forms now render inline 2b22c0c
Mark Otto Merge branch '2.1.0-wip' of https://github.com/tobz/bootstrap into to…
…bz-2.1.0-wip
f9deb80
Mark Otto fix up padding on small buttons, add button examples 5b947b8
Mark Otto fixes #4260 and #4322: set vertical-align to top on input-prepend com…
…ponents to solve modal rounding issues
256a25f
Mark Otto nuke subnav styles from responsive navbar 1ae1945
Aug 18, 2012
Erik van der Kolk Add <caption> to Supported table markup example 05571db
Erik van der Kolk Change .help-block tag for "Forms => Default styles" example into <span> 0c24f51
Erik van der Kolk Make Forms => Default styles code snippet the same as example 7f5aa17
Erik van der Kolk Make Forms => Textarea code snippet the same as example c8b8d91
Erik van der Kolk Add multiple="multiple" to Forms => Selects as described in explanation 25f8ef3
Erik van der Kolk Fix typo a8b18b6
Erik van der Kolk Make Extending form ... => Search form code snippet the same as example 663fd4f
Erik van der Kolk Make Relative sizing code snippet the same as example 01dadc0
Erik van der Kolk Add missing placeholders and <select> in Grid sizing code snippet f37d4b0
Erik van der Kolk Add span5 from example into multiple grid inputs code snippet 263ed4e
Erik van der Kolk Add <input> into Help text code snippet as shown in example f4f6783
Erik van der Kolk Move code within <pre> tags as close to the left for Input focus a3c474c
Erik van der Kolk Improve doc for Button sizes 41253fb
Erik van der Kolk Improve doc for block level buttons 7b7a025
Erik van der Kolk Use one line per tag in code snippet for One class, multiple tags 04a20fb
Erik van der Kolk Fix typo in One class, multiple tags section 2ab0c8d
Erik van der Kolk Move code within <pre> tags as close to the left for Images section f1854a3
Erik van der Kolk Fix Heads up! part for Images section d8eb75d
Erik van der Kolk Improve description for Images section 97247a1
Erik van der Kolk Separate Buttons examples in Icon examples section and add code snippets d71efb8
Erik van der Kolk Add code snippet to Icon examples => Navigation section 8b76328
Erik van der Kolk Add code snippet to Icon examples => Form fields section 2327d30
Erik van der Kolk Replace Note: by Heads up! 3f12c74
Erik van der Kolk Move code within code snippet as close to the left for Basic block b7233a4
Erik van der Kolk Fix empty for attribute on labels in Horizontal form ae275dc
Erik van der Kolk Remove inexisting end tag </hr> dda951d
Mark Otto fixes #4445: .btn-link shouldn't have a pressed button-like state at …
…all, so nuking everything on :active as well
5063853
Mark Otto Merge branch '2.1.0-wip' of https://github.com/smerik/bootstrap into …
…smerik-2.1.0-wip
80ced60
Mark Otto modifications to new content 9ae137a
Mark Otto fixes #4444: clarify docs copy that new icon white style is intention…
…al on active and hover links in .nav and .dropdown-menu
4d2f584
Mark Otto fixes #4442: allow for .btn within a .btn-toolbar without .btn-group e6e0e2a
Mark Otto fixes #4044: make z-index of tooltips same as fixed navbar so they ov…
…erlay it if generated from within
e79eb75
Jacob removed some old stuff from application.js 1166b39
Jacob add note about .nav 937cfa6
Jacob fix component 44e35e9
Jacob add click option for tooltip, popover - make click default for popover 45dddc5
Jacob listen to touchstart for dropdowns on mobile c9cef74
Aug 19, 2012
Kai Dorschner Fix for thumbnails in responsive design 1e190d8
Mark Otto fixes #4451 manually: add .fade to modal example in both mustache and…
… html
c531a75
Mark Otto Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 8e271d6
Mark Otto font-size change on examples in getting started 7ed82c1
Mark Otto compy edits to docs bb85bbc
Mark Otto copy edits to base css page 47cf3cc
Mark Otto fixes #4455: improve small styles and add to docs 887f11d
Mark Otto fixes #4458: improve support for .btn + .btn in .btn-groups and .btn-…
…toolbars
b745b77
Mark Otto fixes #4462: mixins instead of vanilla css 94ba211
Mark Otto fixes #4460 and #4461: copy change for opera animations support e71e2b4
Mark Otto copy change for previous commit e4d4ef4
Mark Otto fix static navbar container issues, clean up docs presentation by unf…
…ixing the top navbar in favor of static one, start adding table of contents for longer sections of docs
4e979f0
Mark Otto pre font-size increase; revert static top navbar, undo contents secti…
…on for now
a667fd9
Mark Otto updated package and readme a12c19b
Mark Otto bump versions to 2.1.0 e510306
Aug 20, 2012
Jonas stack mutliple progress bars a1951ed
Mark Otto fixes #4469 manually: reset width on file inputs 73cf9c4
Mark Otto reorder jumbotron links afaee0c
Mark Otto Merge branch 'progress-multi-2.1.0-wip' of https://github.com/jpommer…
…ening/bootstrap into jpommerening-progress-multi-2.1.0-wip
47697c5
Mark Otto bump up height of progress bars, give some extra depth with stacking …
…bars, and then make the stacked bars actually work
2fda6a4
Mark Otto remove relative and top positioning from docs sidenav at narrow layout e596428
Mark Otto Merge branch 'patch-1' of https://github.com/krnlde/bootstrap into kr…
…nlde-patch-1
ed13ec5
Mark Otto run make and add comment 78cb09b
Mark Otto fix ie7 dropdowns examples in docs 6cf3752
Mark Otto fix vertical button-groups in ie7 58dd1f2
Mark Otto ie7 button group and button toggle padding changes 01572f0
Mark Otto fixes #4178: translate3d instead of translate aa2cec6
Jacob fMerge branch '2.1.0-wip'
Conflicts:
	docs/index.html
5d63e8e
Jacob small nits 2b5e090
Jacob fix afffix 9e0d87a