]>
git.ipfire.org Git - thirdparty/bootstrap.git/log
Quy Ton [Sun, 9 Feb 2014 17:18:11 +0000 (09:18 -0800)]
Reorder links
Mark Otto [Sun, 9 Feb 2014 07:24:16 +0000 (23:24 -0800)]
Fixes #12610: Better and more consistent prefixing of docs CSS with .bs-docs-
Mark Otto [Sun, 9 Feb 2014 01:30:40 +0000 (17:30 -0800)]
grunt dist
Mark Otto [Sun, 9 Feb 2014 01:29:25 +0000 (17:29 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sun, 9 Feb 2014 01:29:10 +0000 (17:29 -0800)]
Fixes #12625: Only remove first list group item's top and last list group item's bottom borders when the list group is first or last
Mark Otto [Sun, 9 Feb 2014 01:19:45 +0000 (17:19 -0800)]
Mention limitation of form validation feedback icons with input groups
Mark Otto [Sun, 9 Feb 2014 00:59:59 +0000 (16:59 -0800)]
Merge pull request #12433 from tagliala/list-inline-first-element-fix
Fix first element padding of list-inline
Mark Otto [Sun, 9 Feb 2014 00:56:59 +0000 (16:56 -0800)]
brace position
Mark Otto [Sun, 9 Feb 2014 00:52:22 +0000 (16:52 -0800)]
Merge branch 'master' into fix-12154
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Mark Otto [Sun, 9 Feb 2014 00:43:58 +0000 (16:43 -0800)]
grunt
Mark Otto [Sun, 9 Feb 2014 00:13:30 +0000 (16:13 -0800)]
grunt
Mark Otto [Sun, 9 Feb 2014 00:03:25 +0000 (16:03 -0800)]
Merge pull request #12552 from stoudenmire/carousel-icon-classname-fix
Fixes two typos in carousel.less
Mark Otto [Sun, 9 Feb 2014 00:01:56 +0000 (16:01 -0800)]
Merge branch 'master' into pr/12462
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Mark Otto [Sat, 8 Feb 2014 23:53:18 +0000 (15:53 -0800)]
Merge branch 'pr/12579'
Mark Otto [Sat, 8 Feb 2014 23:51:38 +0000 (15:51 -0800)]
grunt
XhmikosR [Sat, 8 Feb 2014 23:48:13 +0000 (01:48 +0200)]
Merge pull request #12655 from twbs/holder.js
Update holder.js to v2.3.1.
Mark Otto [Sat, 8 Feb 2014 23:46:51 +0000 (15:46 -0800)]
Merge pull request #12645 from ZDroid/docs-js-semicolons
Omit semicolons consistently in docs
Mark Otto [Sat, 8 Feb 2014 23:44:13 +0000 (15:44 -0800)]
grunt
Mark Otto [Sat, 8 Feb 2014 23:37:35 +0000 (15:37 -0800)]
Merge branch 'master' into pr/12639
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Mark Otto [Sat, 8 Feb 2014 23:24:43 +0000 (15:24 -0800)]
Merge pull request #12659 from ZDroid/blockquote-font-size
Fix #12656: add @blockquote-font-size
Chris Rebert [Sat, 8 Feb 2014 21:34:36 +0000 (13:34 -0800)]
Merge pull request #12632 from ZDroid/exclude-jade
Exclude jade files from docs
Zlatan Vasović [Sat, 8 Feb 2014 19:34:26 +0000 (20:34 +0100)]
Move jade files to docs/jade/
Zlatan Vasović [Sat, 8 Feb 2014 21:11:49 +0000 (22:11 +0100)]
Fix #12656: add @blockquote-font-size
XhmikosR [Sat, 8 Feb 2014 06:20:17 +0000 (08:20 +0200)]
Update holder.js to v2.3.1.
Fix #12653.
Chris Rebert [Sat, 8 Feb 2014 02:51:32 +0000 (18:51 -0800)]
disable BrowserStack tests due to flakiness
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
Mark Otto [Sat, 8 Feb 2014 02:50:41 +0000 (18:50 -0800)]
Merge pull request #12633 from twbs/panels_and_tables
Properly reset borders on table cells in panels
Mark Otto [Sat, 8 Feb 2014 02:36:27 +0000 (18:36 -0800)]
Merge branch 'master' into panels_and_tables
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Mark Otto [Fri, 7 Feb 2014 23:44:50 +0000 (15:44 -0800)]
Nuke shit I added in
4d7b2ddba92e47f923d22d9d7b23cb7b0a3e0bc2 that shouldn't come until v4
Julian Thilo [Fri, 7 Feb 2014 22:21:32 +0000 (23:21 +0100)]
Fix wrong id
Chris Rebert [Fri, 7 Feb 2014 20:44:51 +0000 (12:44 -0800)]
Merge pull request #12648 from ZDroid/index.html-only
Replace wildcard with file name
Zlatan Vasović [Fri, 7 Feb 2014 19:48:12 +0000 (20:48 +0100)]
Replace wildcard with file name
Zlatan Vasović [Fri, 7 Feb 2014 18:31:08 +0000 (19:31 +0100)]
Omit semicolons consistently in docs
Chris Rebert [Fri, 7 Feb 2014 17:36:39 +0000 (09:36 -0800)]
Merge pull request #12636 from ZDroid/grunt-jshintrc
Avoid setting `jshint node: true` in every Grunt JS file
Chris Rebert [Fri, 7 Feb 2014 17:28:08 +0000 (09:28 -0800)]
Merge pull request #12637 from ZDroid/text-truncate-typo
Fix .text-truncate() typo
Bas Bosman [Fri, 7 Feb 2014 13:14:32 +0000 (14:14 +0100)]
Drop -o-user-select
Zlatan Vasović [Fri, 7 Feb 2014 12:40:32 +0000 (13:40 +0100)]
Fix .text-truncate() typo
Zlatan Vasović [Fri, 7 Feb 2014 12:34:17 +0000 (13:34 +0100)]
Avoid setting `jshint node: true` in every Grunt JS file
Mark Otto [Fri, 7 Feb 2014 10:58:10 +0000 (02:58 -0800)]
Fixes #12486: Restore full width inputs for input groups in inline forms and navbars
Mark Otto [Fri, 7 Feb 2014 10:44:04 +0000 (02:44 -0800)]
Follow up to
1bdd59b18c2d1b2409d0422a60e8c007053202df , to better position the sidebar so the potential scrollbar doesn't get hidden by the navbar
Mark Otto [Fri, 7 Feb 2014 10:38:01 +0000 (02:38 -0800)]
Fixes #12447: Properly reset borders on table cells in panels
Mark Otto [Fri, 7 Feb 2014 10:24:37 +0000 (02:24 -0800)]
grunt for days
Mark Otto [Fri, 7 Feb 2014 10:13:39 +0000 (02:13 -0800)]
Merge pull request #12629 from twbs/search_inputs_ios
Override iOS search input's extra round corners
Mark Otto [Fri, 7 Feb 2014 10:08:32 +0000 (02:08 -0800)]
Override iOS search input's extra round corners
Mark Otto [Fri, 7 Feb 2014 09:49:12 +0000 (01:49 -0800)]
Fixes #12477: Clarify IE support in docs
Mark Otto [Fri, 7 Feb 2014 09:41:46 +0000 (01:41 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Fri, 7 Feb 2014 09:41:04 +0000 (01:41 -0800)]
Fixes #12590: Add Korean translation link
Mark Otto [Fri, 7 Feb 2014 09:39:00 +0000 (01:39 -0800)]
Merge pull request #12319 from twbs/address-12007
Clarify target of dropdown events
Mark Otto [Fri, 7 Feb 2014 09:33:27 +0000 (01:33 -0800)]
clarify comment
Mark Otto [Fri, 7 Feb 2014 09:31:42 +0000 (01:31 -0800)]
consistency
Mark Otto [Fri, 7 Feb 2014 09:27:07 +0000 (01:27 -0800)]
Fixes #12526: Add scrollbars when necessary to the Dashboard example's sidebar
Mark Otto [Fri, 7 Feb 2014 09:21:58 +0000 (01:21 -0800)]
Fixes #12555: Rearrange variables to place grids and containers closer
Mark Otto [Fri, 7 Feb 2014 09:16:34 +0000 (01:16 -0800)]
Fixes #12614: Add progress bar example with visible label
Mark Otto [Fri, 7 Feb 2014 09:10:21 +0000 (01:10 -0800)]
Fixes #12611: Mention limitation of one plugin's data attributes per element
Mark Otto [Fri, 7 Feb 2014 08:48:25 +0000 (00:48 -0800)]
Merge pull request #12497 from twbs/container-fluid-is-now-a-thing
rm DIY full-width callout now that there's .container-fluid
Mark Otto [Fri, 7 Feb 2014 03:34:46 +0000 (19:34 -0800)]
property order because @zdroid <3
Mark Otto [Fri, 7 Feb 2014 03:32:31 +0000 (19:32 -0800)]
Merge pull request #12620 from twbs/thumbnail-extend
use :extend in thumbnail Less
Mark Otto [Fri, 7 Feb 2014 03:31:29 +0000 (19:31 -0800)]
Merge pull request #12502 from ZDroid/moz
Remove redundant :-moz-placeholder styles
Mark Otto [Fri, 7 Feb 2014 02:52:03 +0000 (18:52 -0800)]
Merge branch 'master' into thumbnail-extend
Conflicts:
dist/css/bootstrap.css
Mark Otto [Fri, 7 Feb 2014 02:49:21 +0000 (18:49 -0800)]
Merge pull request #12621 from twbs/carousel-img-responsive-extend
use :extend(.img-responsive) in Carousel's Less
Chris Rebert [Thu, 6 Feb 2014 23:52:26 +0000 (15:52 -0800)]
use :extend(.img-responsive) in Carousel's Less
Chris Rebert [Thu, 6 Feb 2014 23:39:15 +0000 (15:39 -0800)]
use :extend in thumbnail Less
Chris Rebert [Thu, 6 Feb 2014 23:12:14 +0000 (15:12 -0800)]
Merge pull request #12613 from twbs/sized-btn-group-extend
use Less' extend feature in btn-group-lg etc.
XhmikosR [Thu, 6 Feb 2014 21:35:15 +0000 (23:35 +0200)]
Merge pull request #12616 from twbs/jszip
Update jzip to v2.1.0.
XhmikosR [Thu, 6 Feb 2014 21:34:02 +0000 (23:34 +0200)]
bs-raw-files-generator.js: use the global directive to define the `btoa` variable.
XhmikosR [Thu, 6 Feb 2014 21:10:37 +0000 (23:10 +0200)]
Update jzip to v2.1.0.
XhmikosR [Thu, 6 Feb 2014 19:04:36 +0000 (21:04 +0200)]
Merge pull request #12605 from ZDroid/license-object
Use license object instead of licenses array
Chris Rebert [Thu, 6 Feb 2014 18:51:49 +0000 (10:51 -0800)]
use Less' extend feature in btn-group-lg etc.
Chris Rebert [Thu, 6 Feb 2014 18:42:01 +0000 (10:42 -0800)]
Merge pull request #12612 from ZDroid/grunt-path
Update grunt paths
Zlatan Vasović [Thu, 6 Feb 2014 18:39:45 +0000 (19:39 +0100)]
Update grunt paths
Zlatan Vasović [Thu, 6 Feb 2014 10:37:39 +0000 (11:37 +0100)]
Use license object instead of licenses array
Supergibbs [Fri, 31 Jan 2014 05:49:37 +0000 (21:49 -0800)]
Added border radiuses to table when in a panel. Fixes #12461
Mark Otto [Wed, 5 Feb 2014 22:11:46 +0000 (14:11 -0800)]
Merge pull request #12465 from XhmikosR/docs-img
Docs: losslessly compress images.
Mark Otto [Wed, 5 Feb 2014 21:54:53 +0000 (13:54 -0800)]
Merge pull request #12534 from Techwraith/patch-1
Allow the bootstrap package in npm to expose css and less
Mark Otto [Wed, 5 Feb 2014 21:46:24 +0000 (13:46 -0800)]
add basic back to top link to docs sidenavs, fixes #12589
Chris Rebert [Wed, 5 Feb 2014 18:45:05 +0000 (10:45 -0800)]
possibly avoid some extra S3 charges
Refs https://github.com/boto/boto/issues/2078
Mark Otto [Wed, 5 Feb 2014 03:27:25 +0000 (19:27 -0800)]
grunt dist--includes changes from #12025 and decimal changes, likely from a change in dependencies
Mark Otto [Wed, 5 Feb 2014 02:29:05 +0000 (18:29 -0800)]
Merge pull request #12025 from ZDroid/clean-visibility-mess
Fix #12015 and minify styles
Mark Otto [Wed, 5 Feb 2014 00:21:23 +0000 (16:21 -0800)]
Merge pull request #12512 from ZDroid/placeholder-img-fix
Improve alignment of the dashboard placeholder images
Chris Rebert [Tue, 4 Feb 2014 23:33:58 +0000 (15:33 -0800)]
Merge pull request #12583 from twbs/grunt-directory
reorganize all grunt tasks into one directory
Chris Rebert [Tue, 4 Feb 2014 21:21:45 +0000 (13:21 -0800)]
Merge pull request #12554 from ZDroid/grunt-test-note
Add `grunt test` note
Chris Rebert [Tue, 4 Feb 2014 21:18:54 +0000 (13:18 -0800)]
reorganize all grunt tasks into one directory
also fixes #12581
Zlatan Vasović [Mon, 3 Feb 2014 16:20:31 +0000 (17:20 +0100)]
Add `grunt test` note
Panayiotis Lipiridis [Tue, 4 Feb 2014 12:56:42 +0000 (13:56 +0100)]
Sticky footers without any wrappers
Mark Otto [Tue, 4 Feb 2014 10:04:23 +0000 (02:04 -0800)]
Reorder grunt dist tasks to ensure JS gets copied over
Mark Otto [Tue, 4 Feb 2014 10:01:45 +0000 (02:01 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Tue, 4 Feb 2014 10:01:31 +0000 (02:01 -0800)]
Fixes #12470: Scope large modal styles to minimum viewport width
Chris Rebert [Tue, 4 Feb 2014 09:58:40 +0000 (01:58 -0800)]
Merge pull request #12574 from twbs/os-x-chrome-busted
disable OS X Chrome in Selenium tests to fix the build
Chris Rebert [Tue, 4 Feb 2014 09:51:40 +0000 (01:51 -0800)]
disable OS X Chrome in Selenium tests to fix the build
Mark Otto [Tue, 4 Feb 2014 09:49:29 +0000 (01:49 -0800)]
Merge pull request #12521 from twbs/outline-none-note
add note to CONTRIBUTING.md about `outline: none`
XhmikosR [Fri, 31 Jan 2014 17:08:22 +0000 (19:08 +0200)]
Compress examples screenshots with kraken.io.
Before: 1,12 MB (1.174.728 bytes)
After: 1,11 MB (1.173.614 bytes)
XhmikosR [Fri, 31 Jan 2014 07:31:51 +0000 (09:31 +0200)]
Docs: losslessly compress images.
Before: 25,1 KB (25.773 bytes)
After: 23,7 KB (24.352 bytes)
Mark Otto [Tue, 4 Feb 2014 09:23:16 +0000 (01:23 -0800)]
Merge pull request #12570 from XhmikosR/libs
Update docs libs
Mark Otto [Tue, 4 Feb 2014 09:22:29 +0000 (01:22 -0800)]
Merge pull request #12572 from XhmikosR/master
Gruntfile.js: Move common uglify properties together.
XhmikosR [Fri, 31 Jan 2014 07:23:31 +0000 (09:23 +0200)]
Gruntfile.js: Move common uglify properties together.
XhmikosR [Mon, 3 Feb 2014 09:46:34 +0000 (11:46 +0200)]
Update less.js to v1.6.2.
XhmikosR [Tue, 4 Feb 2014 09:00:57 +0000 (11:00 +0200)]
Update jszip to the latest git (https://github.com/Stuk/jszip/commit/
202003821ddd1b5295ddec23ed8e421464bc0c44 ).
XhmikosR [Wed, 29 Jan 2014 05:55:30 +0000 (07:55 +0200)]
Update Filesaver.js to the latest git (2014-01-24).
Chris Rebert [Tue, 4 Feb 2014 09:00:32 +0000 (01:00 -0800)]
Merge pull request #12499 from twbs/move-responsive-imgs-sect
move .img-responsive docs from Overview to Images section
Mark Otto [Tue, 4 Feb 2014 08:55:54 +0000 (00:55 -0800)]
Merge pull request #12568 from XhmikosR/examples-csscomb
Add examples in csscomb
XhmikosR [Fri, 31 Jan 2014 22:05:05 +0000 (00:05 +0200)]
Remove double semicolon.