]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
11 years agoUpdate holder.js to v2.3.1. 12655/head
XhmikosR [Sat, 8 Feb 2014 06:20:17 +0000 (08:20 +0200)] 
Update holder.js to v2.3.1.

Fix #12653.

11 years agodisable BrowserStack tests due to flakiness
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

11 years agoMerge pull request #12633 from twbs/panels_and_tables
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

11 years agoMerge branch 'master' into panels_and_tables 12633/head
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

11 years agoNuke shit I added in 4d7b2ddba92e47f923d22d9d7b23cb7b0a3e0bc2 that shouldn't come...
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

11 years agoFix wrong id
Julian Thilo [Fri, 7 Feb 2014 22:21:32 +0000 (23:21 +0100)] 
Fix wrong id

11 years agoMerge pull request #12648 from ZDroid/index.html-only
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

11 years agoReplace wildcard with file name 12648/head
Zlatan Vasović [Fri, 7 Feb 2014 19:48:12 +0000 (20:48 +0100)] 
Replace wildcard with file name

11 years agoMerge pull request #12636 from ZDroid/grunt-jshintrc
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

11 years agoMerge pull request #12637 from ZDroid/text-truncate-typo
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

11 years agoFix .text-truncate() typo 12637/head
Zlatan Vasović [Fri, 7 Feb 2014 12:40:32 +0000 (13:40 +0100)] 
Fix .text-truncate() typo

11 years agoAvoid setting `jshint node: true` in every Grunt JS file 12636/head
Zlatan Vasović [Fri, 7 Feb 2014 12:34:17 +0000 (13:34 +0100)] 
Avoid setting `jshint node: true` in every Grunt JS file

11 years agoFixes #12486: Restore full width inputs for input groups in inline forms and navbars
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

11 years agoFollow up to 1bdd59b18c2d1b2409d0422a60e8c007053202df, to better position the sidebar...
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

11 years agoFixes #12447: Properly reset borders on table cells in panels
Mark Otto [Fri, 7 Feb 2014 10:38:01 +0000 (02:38 -0800)] 
Fixes #12447: Properly reset borders on table cells in panels

11 years agogrunt for days
Mark Otto [Fri, 7 Feb 2014 10:24:37 +0000 (02:24 -0800)] 
grunt for days

11 years agoMerge pull request #12629 from twbs/search_inputs_ios
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

11 years agoOverride iOS search input's extra round corners 12629/head
Mark Otto [Fri, 7 Feb 2014 10:08:32 +0000 (02:08 -0800)] 
Override iOS search input's extra round corners

11 years agoFixes #12477: Clarify IE support in docs
Mark Otto [Fri, 7 Feb 2014 09:49:12 +0000 (01:49 -0800)] 
Fixes #12477: Clarify IE support in docs

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Fri, 7 Feb 2014 09:41:46 +0000 (01:41 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoFixes #12590: Add Korean translation link
Mark Otto [Fri, 7 Feb 2014 09:41:04 +0000 (01:41 -0800)] 
Fixes #12590: Add Korean translation link

11 years agoMerge pull request #12319 from twbs/address-12007
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

11 years agoclarify comment
Mark Otto [Fri, 7 Feb 2014 09:33:27 +0000 (01:33 -0800)] 
clarify comment

11 years agoconsistency
Mark Otto [Fri, 7 Feb 2014 09:31:42 +0000 (01:31 -0800)] 
consistency

11 years agoFixes #12526: Add scrollbars when necessary to the Dashboard example's sidebar
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

11 years agoFixes #12555: Rearrange variables to place grids and containers closer
Mark Otto [Fri, 7 Feb 2014 09:21:58 +0000 (01:21 -0800)] 
Fixes #12555: Rearrange variables to place grids and containers closer

11 years agoFixes #12614: Add progress bar example with visible label
Mark Otto [Fri, 7 Feb 2014 09:16:34 +0000 (01:16 -0800)] 
Fixes #12614: Add progress bar example with visible label

11 years agoFixes #12611: Mention limitation of one plugin's data attributes per element
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

11 years agoMerge pull request #12497 from twbs/container-fluid-is-now-a-thing
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

11 years agoproperty order because @zdroid <3
Mark Otto [Fri, 7 Feb 2014 03:34:46 +0000 (19:34 -0800)] 
property order because @zdroid <3

11 years agoMerge pull request #12620 from twbs/thumbnail-extend
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

11 years agoMerge pull request #12502 from ZDroid/moz
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

11 years agoMerge branch 'master' into thumbnail-extend 12620/head
Mark Otto [Fri, 7 Feb 2014 02:52:03 +0000 (18:52 -0800)] 
Merge branch 'master' into thumbnail-extend

Conflicts:
dist/css/bootstrap.css

11 years agoMerge pull request #12621 from twbs/carousel-img-responsive-extend
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

11 years agouse :extend(.img-responsive) in Carousel's Less 12621/head
Chris Rebert [Thu, 6 Feb 2014 23:52:26 +0000 (15:52 -0800)] 
use :extend(.img-responsive) in Carousel's Less

11 years agouse :extend in thumbnail Less
Chris Rebert [Thu, 6 Feb 2014 23:39:15 +0000 (15:39 -0800)] 
use :extend in thumbnail Less

11 years agoMerge pull request #12613 from twbs/sized-btn-group-extend
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.

11 years agoMerge pull request #12616 from twbs/jszip
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.

11 years agobs-raw-files-generator.js: use the global directive to define the `btoa` variable.
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.

11 years agoUpdate jzip to v2.1.0. 12616/head
XhmikosR [Thu, 6 Feb 2014 21:10:37 +0000 (23:10 +0200)] 
Update jzip to v2.1.0.

11 years agoMerge pull request #12605 from ZDroid/license-object
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

11 years agouse Less' extend feature in btn-group-lg etc. 12613/head
Chris Rebert [Thu, 6 Feb 2014 18:51:49 +0000 (10:51 -0800)] 
use Less' extend feature in btn-group-lg etc.

11 years agoMerge pull request #12612 from ZDroid/grunt-path
Chris Rebert [Thu, 6 Feb 2014 18:42:01 +0000 (10:42 -0800)] 
Merge pull request #12612 from ZDroid/grunt-path

Update grunt paths

11 years agoUpdate grunt paths 12612/head
Zlatan Vasović [Thu, 6 Feb 2014 18:39:45 +0000 (19:39 +0100)] 
Update grunt paths

11 years agoUse license object instead of licenses array 12605/head
Zlatan Vasović [Thu, 6 Feb 2014 10:37:39 +0000 (11:37 +0100)] 
Use license object instead of licenses array

11 years agoMerge pull request #12465 from XhmikosR/docs-img
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.

11 years agoMerge pull request #12534 from Techwraith/patch-1 12112/head
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

11 years agoadd basic back to top link to docs sidenavs, fixes #12589
Mark Otto [Wed, 5 Feb 2014 21:46:24 +0000 (13:46 -0800)] 
add basic back to top link to docs sidenavs, fixes #12589

11 years agopossibly avoid some extra S3 charges
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

11 years agogrunt dist--includes changes from #12025 and decimal changes, likely from a change...
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

11 years agoMerge pull request #12025 from ZDroid/clean-visibility-mess
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

11 years agoMerge pull request #12512 from ZDroid/placeholder-img-fix
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

11 years agoMerge pull request #12583 from twbs/grunt-directory
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

11 years agoMerge pull request #12554 from ZDroid/grunt-test-note
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

11 years agoreorganize all grunt tasks into one directory 12583/head
Chris Rebert [Tue, 4 Feb 2014 21:18:54 +0000 (13:18 -0800)] 
reorganize all grunt tasks into one directory

also fixes #12581

11 years agoAdd `grunt test` note 12554/head
Zlatan Vasović [Mon, 3 Feb 2014 16:20:31 +0000 (17:20 +0100)] 
Add `grunt test` note

11 years agoReorder grunt dist tasks to ensure JS gets copied over
Mark Otto [Tue, 4 Feb 2014 10:04:23 +0000 (02:04 -0800)] 
Reorder grunt dist tasks to ensure JS gets copied over

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Tue, 4 Feb 2014 10:01:45 +0000 (02:01 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoFixes #12470: Scope large modal styles to minimum viewport width
Mark Otto [Tue, 4 Feb 2014 10:01:31 +0000 (02:01 -0800)] 
Fixes #12470: Scope large modal styles to minimum viewport width

11 years agoMerge pull request #12574 from twbs/os-x-chrome-busted
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

11 years agodisable OS X Chrome in Selenium tests to fix the build 12574/head
Chris Rebert [Tue, 4 Feb 2014 09:51:40 +0000 (01:51 -0800)] 
disable OS X Chrome in Selenium tests to fix the build

11 years agoMerge pull request #12521 from twbs/outline-none-note
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`

11 years agoCompress examples screenshots with kraken.io. 12465/head
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)

11 years agoDocs: losslessly compress images.
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)

11 years agoMerge pull request #12570 from XhmikosR/libs
Mark Otto [Tue, 4 Feb 2014 09:23:16 +0000 (01:23 -0800)] 
Merge pull request #12570 from XhmikosR/libs

Update docs libs

11 years agoMerge pull request #12572 from XhmikosR/master
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.

11 years agoGruntfile.js: Move common uglify properties together. 12572/head
XhmikosR [Fri, 31 Jan 2014 07:23:31 +0000 (09:23 +0200)] 
Gruntfile.js: Move common uglify properties together.

11 years agoUpdate less.js to v1.6.2. 12570/head
XhmikosR [Mon, 3 Feb 2014 09:46:34 +0000 (11:46 +0200)] 
Update less.js to v1.6.2.

11 years agoUpdate jszip to the latest git (https://github.com/Stuk/jszip/commit/202003821ddd1b52...
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).

11 years agoUpdate Filesaver.js to the latest git (2014-01-24).
XhmikosR [Wed, 29 Jan 2014 05:55:30 +0000 (07:55 +0200)] 
Update Filesaver.js to the latest git (2014-01-24).

11 years agoMerge pull request #12499 from twbs/move-responsive-imgs-sect
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

11 years agoMerge pull request #12568 from XhmikosR/examples-csscomb
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

11 years agoRemove double semicolon. 12568/head
XhmikosR [Fri, 31 Jan 2014 22:05:05 +0000 (00:05 +0200)] 
Remove double semicolon.

11 years agoAdd examples/**/*.css in csscomb task.
XhmikosR [Fri, 31 Jan 2014 12:20:33 +0000 (14:20 +0200)] 
Add examples/**/*.css in csscomb task.

11 years agoMerge pull request #12466 from XhmikosR/12457
Mark Otto [Tue, 4 Feb 2014 08:27:12 +0000 (00:27 -0800)] 
Merge pull request #12466 from XhmikosR/12457

Add examples/css in the csslint task.

11 years agoDon't offset customizer alert, grunt dist
Mark Otto [Tue, 4 Feb 2014 08:18:34 +0000 (00:18 -0800)] 
Don't offset customizer alert, grunt dist

11 years agoMerge pull request #12553 from ZDroid/nocf
Mark Otto [Tue, 4 Feb 2014 07:48:39 +0000 (23:48 -0800)] 
Merge pull request #12553 from ZDroid/nocf

Remove comma first rule

11 years agoMerge pull request #12533 from 1000hz/tighten-popover-arrows-scope
Mark Otto [Tue, 4 Feb 2014 07:40:52 +0000 (23:40 -0800)] 
Merge pull request #12533 from 1000hz/tighten-popover-arrows-scope

Scope popover arrow css to direct descendant

11 years agofix #12494 in the migration docs
Chris Rebert [Tue, 4 Feb 2014 07:05:51 +0000 (23:05 -0800)] 
fix #12494 in the migration docs

11 years agoExamples: fix csslint errors. 12466/head
XhmikosR [Fri, 31 Jan 2014 12:03:42 +0000 (14:03 +0200)] 
Examples: fix csslint errors.

11 years agoAdd examples/**/*css in the csslint task.
XhmikosR [Fri, 31 Jan 2014 09:49:33 +0000 (11:49 +0200)] 
Add examples/**/*css in the csslint task.

Fixes #12457.

11 years agofix #12566
Chris Rebert [Mon, 3 Feb 2014 20:19:50 +0000 (12:19 -0800)] 
fix #12566

11 years agodie tabs, die!
Chris Rebert [Mon, 3 Feb 2014 18:02:58 +0000 (10:02 -0800)] 
die tabs, die!

11 years agoRemove comma first rule 12553/head
Zlatan Vasović [Mon, 3 Feb 2014 16:12:59 +0000 (17:12 +0100)] 
Remove comma first rule

Removes outdated coding style rule.

11 years agoSafari's justified nav bug is still present as of Safari v7.0.1; fixes #12454
Chris Rebert [Mon, 3 Feb 2014 10:38:18 +0000 (02:38 -0800)] 
Safari's justified nav bug is still present as of Safari v7.0.1; fixes #12454

11 years agoMerge pull request #12546 from twbs/modal-hiding-now-implicit
Chris Rebert [Mon, 3 Feb 2014 10:13:16 +0000 (02:13 -0800)] 
Merge pull request #12546 from twbs/modal-hiding-now-implicit

Mention .modal.fade.hide => .modal.fade in migration docs

11 years agofix #12541 12546/head
Chris Rebert [Mon, 3 Feb 2014 10:11:25 +0000 (02:11 -0800)] 
fix #12541

11 years agoMerge pull request #12545 from twbs/arrivederci-help-inline
Chris Rebert [Mon, 3 Feb 2014 10:05:31 +0000 (02:05 -0800)] 
Merge pull request #12545 from twbs/arrivederci-help-inline

add removal of .help-inline to the migration guide

11 years agoadd removal of .help-inline to the migration guide; fixes #12539 12545/head
Chris Rebert [Mon, 3 Feb 2014 10:04:17 +0000 (02:04 -0800)] 
add removal of .help-inline to the migration guide; fixes #12539

11 years agoMerge pull request #12544 from twbs/sayonara-inverse-btn
Chris Rebert [Mon, 3 Feb 2014 09:58:46 +0000 (01:58 -0800)] 
Merge pull request #12544 from twbs/sayonara-inverse-btn

add .btn-inverse removal to migration guide

11 years agoadd .btn-inverse removal to migration guide; fixes #12538 12544/head
Chris Rebert [Mon, 3 Feb 2014 09:57:45 +0000 (01:57 -0800)] 
add .btn-inverse removal to migration guide; fixes #12538

11 years agoMerge pull request #12543 from twbs/fix-12540
Chris Rebert [Mon, 3 Feb 2014 09:54:13 +0000 (01:54 -0800)] 
Merge pull request #12543 from twbs/fix-12540

Fixes #12540

11 years agofix #12540 12543/head
Chris Rebert [Mon, 3 Feb 2014 09:44:50 +0000 (01:44 -0800)] 
fix #12540

11 years agofix #12527
Chris Rebert [Mon, 3 Feb 2014 06:51:19 +0000 (22:51 -0800)] 
fix #12527

11 years agoupdate docs about destination of remote modal content; fixes #12494
Chris Rebert [Mon, 3 Feb 2014 06:11:18 +0000 (22:11 -0800)] 
update docs about destination of remote modal content; fixes #12494

11 years agoMerge pull request #12517 from twbs/getting-started-SO
Chris Rebert [Mon, 3 Feb 2014 05:44:40 +0000 (21:44 -0800)] 
Merge pull request #12517 from twbs/getting-started-SO

add StackOverflow to Community section of Getting Started docs

11 years agoadd StackOverflow to Community section of Getting Started docs 12517/head
Chris Rebert [Sun, 2 Feb 2014 04:57:00 +0000 (20:57 -0800)] 
add StackOverflow to Community section of Getting Started docs

11 years agofix #12531
Chris Rebert [Mon, 3 Feb 2014 05:38:25 +0000 (21:38 -0800)] 
fix #12531

11 years agoAllow the bootstrap package in npm to expose css and less 12534/head
Daniel Erickson [Mon, 3 Feb 2014 01:33:40 +0000 (17:33 -0800)] 
Allow the bootstrap package in npm to expose css and less

11 years agoTightening up popover arrow css scope to apply only to direct descendant arrows. 12533/head
Cina S [Sun, 2 Feb 2014 22:14:22 +0000 (16:14 -0600)] 
Tightening up popover arrow css scope to apply only to direct descendant arrows.