aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-02-10chrome => googlechrome in Sauce; fixes #12647Chris Rebert1-3/+3
2014-02-10Use different coding style for GruntfileZlatan Vasović7-28/+46
Fixes #12657
2014-02-10fix indentation in GruntfileChris Rebert1-4/+4
2014-02-10update docs to include+use .sr-only-focusableChris Rebert4-6/+7
2014-02-10add .sr-only-focusable; fixes #12259Chris Rebert2-0/+25
2014-02-10tweak phrasing for hopefully greater clarityChris Rebert1-1/+1
2014-02-10add copyright header to shrinkwrap.js; fixes #12643Chris Rebert1-0/+6
2014-02-10use @popover-arrow-width for offset the popover to account for the popover arrowTobias Lindig1-4/+4
2014-02-10Make both .scale(X) and .scale(X, Y) both workRuben Stolk1-14/+28
2014-02-09Merge pull request #12671 from Quy/masterJulian Thilo1-2/+2
Update docs prefixing
2014-02-09Update docs prefixingQuy Ton1-2/+2
2014-02-09Merge pull request #12668 from Quy/masterJulian Thilo1-1/+1
Reorder links
2014-02-09Reorder linksQuy Ton1-1/+1
2014-02-08Fixes #12610: Better and more consistent prefixing of docs CSS with .bs-docs-Mark Otto6-93/+93
2014-02-08i'm an idiotMark Otto1-1/+1
2014-02-08Update teams to remove two Sass folks and add new Core memberMark Otto3-56/+44
2014-02-08grunt distMark Otto5-7/+5
2014-02-08Merge branch 'master' of github.com:twbs/bootstrapMark Otto1-4/+1
2014-02-08Fixes #12625: Only remove first list group item's top and last list group ↵Mark Otto6-18/+12
item's bottom borders when the list group is first or last
2014-02-08Mention limitation of form validation feedback icons with input groupsMark Otto1-0/+4
2014-02-08Merge pull request #12433 from tagliala/list-inline-first-element-fixMark Otto1-4/+1
Fix first element padding of list-inline
2014-02-08brace positionMark Otto1-2/+1
2014-02-08Merge branch 'master' into fix-12154Mark Otto160-10641/+12885
Conflicts: dist/css/bootstrap.css.map dist/css/bootstrap.min.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css
2014-02-08gruntMark Otto1-1/+1
2014-02-08gruntMark Otto1-1/+1
2014-02-08grunt with new mixinsMark Otto11-156/+160
2014-02-08gruntMark Otto6-7/+7
2014-02-08Merge pull request #12552 from stoudenmire/carousel-icon-classname-fixMark Otto1-2/+2
Fixes two typos in carousel.less
2014-02-08Merge branch 'master' into pr/12462Mark Otto46-460/+676
Conflicts: dist/css/bootstrap.css.map dist/css/bootstrap.min.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css
2014-02-08Merge branch 'pr/12579'Mark Otto4-84/+64
2014-02-08gruntMark Otto1-1/+1
2014-02-09Merge pull request #12655 from twbs/holder.jsXhmikosR2-86/+234
Update holder.js to v2.3.1.
2014-02-08Merge pull request #12645 from ZDroid/docs-js-semicolonsMark Otto4-16/+16
Omit semicolons consistently in docs
2014-02-08gruntMark Otto2-1/+6
2014-02-08Merge branch 'master' into pr/12639Mark Otto21-104/+102
Conflicts: dist/css/bootstrap.css.map dist/css/bootstrap.min.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css
2014-02-08Merge pull request #12659 from ZDroid/blockquote-font-sizeMark Otto2-1/+3
Fix #12656: add @blockquote-font-size
2014-02-08Merge pull request #12632 from ZDroid/exclude-jadeChris Rebert4-3/+5
Exclude jade files from docs
2014-02-08Move jade files to docs/jade/Zlatan Vasović4-3/+5
2014-02-08Fix #12656: add @blockquote-font-sizeZlatan Vasović2-1/+3
2014-02-08Update holder.js to v2.3.1.XhmikosR2-86/+234
Fix #12653.
2014-02-07disable BrowserStack tests due to flakinessChris Rebert1-1/+1
Running "browserstack_runner" task Using config: /home/travis/build/twbs/bootstrap/browserstack.json Launching server on port: 8888 Downloading tunnel jar to `/home/travis/build/twbs/bootstrap/node_modules/browserstack-runner/lib/BrowserStackTunnel.jar` Launching tunnel Error: Invalid or corrupt jarfile /home/travis/build/twbs/bootstrap/node_modules/browserstack-runner/lib/BrowserStackTunnel.jar [Runner alert] Tunnel launch timeout Exiting Non existent tunnel
2014-02-07Merge pull request #12633 from twbs/panels_and_tablesMark Otto6-84/+85
Properly reset borders on table cells in panels
2014-02-07Merge branch 'master' into panels_and_tablesMark Otto15-19/+28
Conflicts: dist/css/bootstrap.css.map dist/css/bootstrap.min.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css
2014-02-07Nuke shit I added in 4d7b2ddba92e47f923d22d9d7b23cb7b0a3e0bc2 that shouldn't ↵Mark Otto6-9/+4
come until v4
2014-02-07Fix wrong idJulian Thilo1-1/+1
2014-02-07Merge pull request #12648 from ZDroid/index.html-onlyChris Rebert1-1/+1
Replace wildcard with file name
2014-02-07Replace wildcard with file nameZlatan Vasović1-1/+1
2014-02-07Omit semicolons consistently in docsZlatan Vasović4-16/+16
2014-02-07Merge pull request #12636 from ZDroid/grunt-jshintrcChris Rebert6-6/+4
Avoid setting `jshint node: true` in every Grunt JS file
2014-02-07Merge pull request #12637 from ZDroid/text-truncate-typoChris Rebert1-2/+2
Fix .text-truncate() typo