]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
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 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 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.

11 years agoMerge pull request #12519 from twbs/bower-badge
Mark Otto [Sun, 2 Feb 2014 19:29:02 +0000 (11:29 -0800)] 
Merge pull request #12519 from twbs/bower-badge

add Bower badge to README

11 years agoadd note to CONTRIBUTING.md about `outline: none` 12521/head
Chris Rebert [Sun, 2 Feb 2014 07:19:16 +0000 (23:19 -0800)] 
add note to CONTRIBUTING.md about `outline: none`

11 years agoadd Bower badge to README 12519/head
Chris Rebert [Sun, 2 Feb 2014 05:25:19 +0000 (21:25 -0800)] 
add Bower badge to README

11 years agoImprove alignment of the dashboard placeholder images 12512/head
Zlatan Vasović [Sat, 1 Feb 2014 21:46:55 +0000 (22:46 +0100)] 
Improve alignment of the dashboard placeholder images
Fixes #12435

11 years agoMerge pull request #12503 from ZDroid/ed
Chris Rebert [Sat, 1 Feb 2014 21:35:12 +0000 (13:35 -0800)] 
Merge pull request #12503 from ZDroid/ed

Don't re-set indent style for [*.py]

11 years agoDon't re-set indent style for [*.py] 12503/head
Zlatan Vasović [Sat, 1 Feb 2014 13:37:19 +0000 (14:37 +0100)] 
Don't re-set indent style for [*.py]

Just inherit it from [*].

11 years agomv .img-responsive docs from Overview to Images section 12499/head
Chris Rebert [Sat, 1 Feb 2014 08:26:46 +0000 (00:26 -0800)] 
mv .img-responsive docs from Overview to Images section

11 years agoMerge pull request #12480 from twbs/clarify-jquery-err-msg
Chris Rebert [Fri, 31 Jan 2014 22:13:27 +0000 (14:13 -0800)] 
Merge pull request #12480 from twbs/clarify-jquery-err-msg

Clarify JS error message about missing jQuery

11 years agogrunt after last commits
Mark Otto [Fri, 31 Jan 2014 21:40:32 +0000 (13:40 -0800)] 
grunt after last commits

11 years agoMerge pull request #12448 from PHLAK/master
Mark Otto [Fri, 31 Jan 2014 21:39:23 +0000 (13:39 -0800)] 
Merge pull request #12448 from PHLAK/master

Fix issue causing .navbar-brand element height to be shorter than .navbar height

11 years agoUse scss option instead of css for better highlighting
Mark Otto [Fri, 31 Jan 2014 21:12:31 +0000 (13:12 -0800)] 
Use scss option instead of css for better highlighting

11 years agofix #12484
Chris Rebert [Fri, 31 Jan 2014 18:32:32 +0000 (10:32 -0800)] 
fix #12484

11 years agomost of Bootstrap's components are pure CSS and thus don't require jQuery 12480/head
Chris Rebert [Fri, 31 Jan 2014 17:50:45 +0000 (09:50 -0800)] 
most of Bootstrap's components are pure CSS and thus don't require jQuery

Refs https://news.ycombinator.com/item?id=7156305

11 years agoMerge pull request #12463 from XhmikosR/12440
Chris Rebert [Fri, 31 Jan 2014 08:40:43 +0000 (00:40 -0800)] 
Merge pull request #12463 from XhmikosR/12440

Downgrade holder.js to v2.2.0.

11 years agoDowngrade holder.js to v2.2.0. 12463/head
XhmikosR [Fri, 31 Jan 2014 07:26:11 +0000 (09:26 +0200)] 
Downgrade holder.js to v2.2.0.

Fixes #12440.

11 years agofix "pading-right" [sic] typo in dashboard.css; fixes #12455
Chris Rebert [Fri, 31 Jan 2014 04:39:12 +0000 (20:39 -0800)] 
fix "pading-right" [sic] typo in dashboard.css; fixes #12455

11 years agouse correct+newer name for retina mixin in docs; fixes #12450
Chris Rebert [Thu, 30 Jan 2014 22:46:58 +0000 (14:46 -0800)] 
use correct+newer name for retina mixin in docs; fixes #12450

11 years agoFix issue causing .navbar-brand element height to be shorter than .navbar height 12448/head
Chris Kankiewicz [Thu, 30 Jan 2014 21:59:54 +0000 (14:59 -0700)] 
Fix issue causing .navbar-brand element height to be shorter than .navbar height

11 years agoMerge pull request #12445 from twbs/browserstack-runner-update
Chris Rebert [Thu, 30 Jan 2014 21:01:07 +0000 (13:01 -0800)] 
Merge pull request #12445 from twbs/browserstack-runner-update

update to browserstack-runner v0.1.0

11 years agoMerge pull request #12444 from twbs/grunt-saucelabs-update
Chris Rebert [Thu, 30 Jan 2014 21:00:46 +0000 (13:00 -0800)] 
Merge pull request #12444 from twbs/grunt-saucelabs-update

update to grunt-saucelabs v5.0.0

11 years agoupdate to browserstack-runner v0.1.0 12445/head
Chris Rebert [Thu, 30 Jan 2014 20:32:30 +0000 (12:32 -0800)] 
update to browserstack-runner v0.1.0

11 years agoupdate to grunt-saucelabs v5.0.0 12444/head
Chris Rebert [Thu, 30 Jan 2014 20:30:55 +0000 (12:30 -0800)] 
update to grunt-saucelabs v5.0.0

11 years agorm duplicate warning callouts in Input Groups docs
Chris Rebert [Thu, 30 Jan 2014 20:24:45 +0000 (12:24 -0800)] 
rm duplicate warning callouts in Input Groups docs

11 years agoApply eaa2b83 to master as well
Julian Thilo [Thu, 30 Jan 2014 20:16:48 +0000 (21:16 +0100)] 
Apply eaa2b83 to master as well

11 years agoMerge pull request #12436 from XhmikosR/jquery
Chris Rebert [Thu, 30 Jan 2014 19:12:40 +0000 (11:12 -0800)] 
Merge pull request #12436 from XhmikosR/jquery

Update jQuery to v1.11.0.

11 years agoUpdate jQuery to v1.11.0. 12436/head
XhmikosR [Thu, 30 Jan 2014 17:55:11 +0000 (19:55 +0200)] 
Update jQuery to v1.11.0.

Also, use Google's CDN per #11369.

11 years agorm outdated note about lack of .col-{xs,sm}-offset-0; fixes #12439
Chris Rebert [Thu, 30 Jan 2014 18:49:43 +0000 (10:49 -0800)] 
rm outdated note about lack of .col-{xs,sm}-offset-0; fixes #12439

11 years agonote specific versions of IE where progress bar animation supported; fixes #12437
Chris Rebert [Thu, 30 Jan 2014 18:42:44 +0000 (10:42 -0800)] 
note specific versions of IE where progress bar animation supported; fixes #12437

11 years agoBump versions, run grunt v3.1.0
Mark Otto [Thu, 30 Jan 2014 16:30:37 +0000 (08:30 -0800)] 
Bump versions, run grunt

11 years agogrunt
Mark Otto [Thu, 30 Jan 2014 16:14:18 +0000 (08:14 -0800)] 
grunt

11 years agoMerge pull request #12432 from ChrisRiddell/signin-email-fix
Julian Thilo [Thu, 30 Jan 2014 12:54:19 +0000 (04:54 -0800)] 
Merge pull request #12432 from ChrisRiddell/signin-email-fix

Wrong input css for signin example

11 years agoits an email input 12432/head
Chris Riddell [Thu, 30 Jan 2014 12:44:05 +0000 (23:14 +1030)] 
its an email input

11 years agogrunt
Mark Otto [Thu, 30 Jan 2014 06:44:06 +0000 (22:44 -0800)] 
grunt

11 years agoMerge branch 'master' into pr/12388
Mark Otto [Thu, 30 Jan 2014 06:18:29 +0000 (22:18 -0800)] 
Merge branch 'master' into pr/12388

Conflicts:
dist/css/bootstrap.min.css

11 years agoFollow up to #11655: don't reset opacity on disabled buttons
Mark Otto [Thu, 30 Jan 2014 05:57:44 +0000 (21:57 -0800)] 
Follow up to #11655: don't reset opacity on disabled buttons

11 years agofix css url
Mark Otto [Thu, 30 Jan 2014 05:44:36 +0000 (21:44 -0800)] 
fix css url

11 years agoMerge pull request #12423 from ZDroid/name
Mark Otto [Thu, 30 Jan 2014 05:44:01 +0000 (21:44 -0800)] 
Merge pull request #12423 from ZDroid/name

Rename pack.min.css to docs.min.css to match with docs.min.js

11 years agoFix #12422: Reset height on multiple select in input size mixin
Mark Otto [Thu, 30 Jan 2014 05:34:10 +0000 (21:34 -0800)] 
Fix #12422: Reset height on multiple select in input size mixin

11 years agoFixes #12424: Account for Normalize change on figure element so that we don't potenti...
Mark Otto [Thu, 30 Jan 2014 05:23:23 +0000 (21:23 -0800)] 
Fixes #12424: Account for Normalize change on figure element so that we don't potentially screw folks over

11 years agoRename pack.min.css to docs.min.css to match with docs.min.js 12423/head
Zlatan Vasović [Wed, 29 Jan 2014 19:50:10 +0000 (20:50 +0100)] 
Rename pack.min.css to docs.min.css to match with docs.min.js

11 years agoMerge pull request #12415 from XhmikosR/master
Chris Rebert [Wed, 29 Jan 2014 01:35:09 +0000 (17:35 -0800)] 
Merge pull request #12415 from XhmikosR/master

Gruntfile.js: remove unused code.

11 years agoMerge pull request #12417 from ZDroid/cmt
Chris Rebert [Tue, 28 Jan 2014 23:54:23 +0000 (15:54 -0800)] 
Merge pull request #12417 from ZDroid/cmt

Remove redundant jshint comment

11 years agoRemove redundant jshint comment 12417/head
Zlatan Vasović [Tue, 28 Jan 2014 21:47:23 +0000 (22:47 +0100)] 
Remove redundant jshint comment

11 years agoGruntfile.js: remove unused code. 12415/head
XhmikosR [Tue, 28 Jan 2014 11:16:13 +0000 (13:16 +0200)] 
Gruntfile.js: remove unused code.

11 years agoMerge pull request #12406 from twbs/normalize_v3
Mark Otto [Tue, 28 Jan 2014 18:57:31 +0000 (10:57 -0800)] 
Merge pull request #12406 from twbs/normalize_v3

Upgrade to Normalize v3

11 years agogrunt 12406/head
Mark Otto [Tue, 28 Jan 2014 18:08:40 +0000 (10:08 -0800)] 
grunt

11 years agov3 instead of rc1
Mark Otto [Tue, 28 Jan 2014 18:07:33 +0000 (10:07 -0800)] 
v3 instead of rc1

11 years agoUpdate javascript.html
Julian Thilo [Mon, 27 Jan 2014 23:01:10 +0000 (00:01 +0100)] 
Update javascript.html

11 years agoFix typo
Julian Thilo [Mon, 27 Jan 2014 22:07:14 +0000 (23:07 +0100)] 
Fix typo

11 years agoRemove #8350's reset for number inputs since Normalize fixes those upstream
Mark Otto [Mon, 27 Jan 2014 20:25:39 +0000 (12:25 -0800)] 
Remove #8350's reset for number inputs since Normalize fixes those upstream

11 years agoRemove optgroup resets from #7611 since Normalize fixes those upstream
Mark Otto [Mon, 27 Jan 2014 20:24:35 +0000 (12:24 -0800)] 
Remove optgroup resets from #7611 since Normalize fixes those upstream

11 years agoUpgrade to Normalize v3-rc1 in prep for v3 final
Mark Otto [Mon, 27 Jan 2014 20:08:55 +0000 (12:08 -0800)] 
Upgrade to Normalize v3-rc1 in prep for v3 final

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Mon, 27 Jan 2014 17:42:33 +0000 (09:42 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap