]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
11 years agoonly ignore /.* 14050/head
Mark Otto [Sun, 6 Jul 2014 04:20:09 +0000 (21:20 -0700)] 
only ignore /.*

11 years agogrunt
Mark Otto [Sun, 6 Jul 2014 03:17:57 +0000 (20:17 -0700)] 
grunt

11 years agoMerge pull request #13920 from AndreiRailean/patch-1
Mark Otto [Sun, 6 Jul 2014 03:16:10 +0000 (20:16 -0700)] 
Merge pull request #13920 from AndreiRailean/patch-1

assign background to row of .table-striped

11 years agogrunt
Mark Otto [Sun, 6 Jul 2014 03:10:44 +0000 (20:10 -0700)] 
grunt

11 years agoMerge pull request #13923 from ilikeprograms/gray-base-variable
Mark Otto [Sun, 6 Jul 2014 03:04:47 +0000 (20:04 -0700)] 
Merge pull request #13923 from ilikeprograms/gray-base-variable

Added @gray-base variable to make @gray-{shade} reference, also allows @...

11 years agoFixes #13967: Don't reset the cite element's font-style
Mark Otto [Sun, 6 Jul 2014 03:02:02 +0000 (20:02 -0700)] 
Fixes #13967: Don't reset the cite element's font-style

11 years agoFixes #13953: Remove the progress bar min-width styles for low percentages to avoid...
Mark Otto [Sun, 6 Jul 2014 03:01:18 +0000 (20:01 -0700)] 
Fixes #13953: Remove the progress bar min-width styles for low percentages to avoid jumping progress

11 years agoFixes #13943: Lighten the navbar inverse link color more since our text contrast...
Mark Otto [Sun, 6 Jul 2014 02:59:50 +0000 (19:59 -0700)] 
Fixes #13943: Lighten the navbar inverse link color more since our text contrast change in v3.2.0

11 years agogrunt
Mark Otto [Sun, 6 Jul 2014 02:57:15 +0000 (19:57 -0700)] 
grunt

11 years agoMerge pull request #13464 from nickcolley/#13325-navbar-right-first
Mark Otto [Sun, 6 Jul 2014 01:51:47 +0000 (18:51 -0700)] 
Merge pull request #13464 from nickcolley/#13325-navbar-right-first

Changed last-child to first-child to fix #13325

11 years agoMerge pull request #14047 from twbs/kbd
XhmikosR [Sat, 5 Jul 2014 15:38:50 +0000 (18:38 +0300)] 
Merge pull request #14047 from twbs/kbd

Docs: add missing example code code for `kbd` after #13351.

11 years agoDocs: add missing example code code for `kbd` after #13351. 14047/head
XhmikosR [Sat, 5 Jul 2014 12:51:03 +0000 (15:51 +0300)] 
Docs: add missing example code code for `kbd` after #13351.

11 years agoMerge pull request #14037 from twbs/close-13892
Chris Rebert [Fri, 4 Jul 2014 00:41:42 +0000 (17:41 -0700)] 
Merge pull request #14037 from twbs/close-13892

Add Wall of Browser Bugs entry for #13892

11 years agoAdd Wall of Browser Bugs entry for #13892 14037/head
Chris Rebert [Fri, 4 Jul 2014 00:17:18 +0000 (17:17 -0700)] 
Add Wall of Browser Bugs entry for #13892

Closes #13892.
[skip sauce]

11 years agoMerge pull request #13986 from twbs/address-13874
Chris Rebert [Thu, 3 Jul 2014 18:07:50 +0000 (11:07 -0700)] 
Merge pull request #13986 from twbs/address-13874

docs: use valid JSON in compound option value examples

11 years agoMerge pull request #13998 from steelywing/patch-1
Chris Rebert [Thu, 3 Jul 2014 17:52:42 +0000 (10:52 -0700)] 
Merge pull request #13998 from steelywing/patch-1

11 years agono need to create $.Event
Wing [Tue, 1 Jul 2014 02:22:18 +0000 (10:22 +0800)] 
no need to create $.Event

`trigger()` can handle string argument

11 years agotrigger 'affixed.bs.affix' instead of 'affixed'
Wing [Tue, 1 Jul 2014 02:12:46 +0000 (10:12 +0800)] 
trigger 'affixed.bs.affix' instead of 'affixed'

Original is triggering `affixed` not `affixed.bs.affix`, only `.on('affixed.bs.affix', ...)` also catch `affixed` event.

Closes #13998.

11 years agoMerge pull request #14030 from BBosman/double-cursor
Mark Otto [Thu, 3 Jul 2014 16:57:36 +0000 (09:57 -0700)] 
Merge pull request #14030 from BBosman/double-cursor

Remove superfluous cursor:pointer

11 years agoRemove superfluous cursor:pointer 14030/head
Bas Bosman [Thu, 3 Jul 2014 11:17:14 +0000 (13:17 +0200)] 
Remove superfluous cursor:pointer

11 years agogrunt
Mark Otto [Thu, 3 Jul 2014 07:57:37 +0000 (00:57 -0700)] 
grunt

11 years agoFixes #12738 again: use max-device-width instead of max-width for .navbar-collapse...
Mark Otto [Thu, 3 Jul 2014 07:55:32 +0000 (00:55 -0700)] 
Fixes #12738 again: use max-device-width instead of max-width for .navbar-collapse height in landscape devices

11 years agogrunt
Mark Otto [Thu, 3 Jul 2014 06:44:56 +0000 (23:44 -0700)] 
grunt

11 years agotypo
Mark Otto [Thu, 3 Jul 2014 06:35:37 +0000 (23:35 -0700)] 
typo

11 years agoFixes #13989: Don't extend the input sizes; manually chain the selectors
Mark Otto [Thu, 3 Jul 2014 06:14:23 +0000 (23:14 -0700)] 
Fixes #13989: Don't extend the input sizes; manually chain the selectors

11 years agoMerge branch 'master' into pr/14005
Mark Otto [Thu, 3 Jul 2014 05:55:01 +0000 (22:55 -0700)] 
Merge branch 'master' into pr/14005

11 years agomerge in and resolve conflicts
Mark Otto [Thu, 3 Jul 2014 05:54:56 +0000 (22:54 -0700)] 
merge in and resolve conflicts

11 years agofix new form validation
Mark Otto [Thu, 3 Jul 2014 05:12:39 +0000 (22:12 -0700)] 
fix new form validation

11 years agoMerge branch 'pr/14011'
Mark Otto [Thu, 3 Jul 2014 05:06:32 +0000 (22:06 -0700)] 
Merge branch 'pr/14011'

11 years agofix up examples
Mark Otto [Thu, 3 Jul 2014 05:06:28 +0000 (22:06 -0700)] 
fix up examples

11 years agoclarify the iOS virtual keyboard bug with respect to navbars
Chris Rebert [Thu, 3 Jul 2014 00:09:13 +0000 (17:09 -0700)] 
clarify the iOS virtual keyboard bug with respect to navbars

11 years agoMoves checkbox/radios into "Validation states" example. 14011/head
Zac Echola [Wed, 2 Jul 2014 16:32:25 +0000 (11:32 -0500)] 
Moves checkbox/radios into "Validation states" example.

11 years agoDocuments radio and checkbox validation states
Zac Echola [Wed, 2 Jul 2014 15:15:22 +0000 (10:15 -0500)] 
Documents radio and checkbox validation states

References #14010

fixing duped IDs

fix ALL the duped IDs.

make example id match actual id

11 years agoMerge pull request #14001 from twbs/docs-dist
XhmikosR [Wed, 2 Jul 2014 08:52:08 +0000 (11:52 +0300)] 
Merge pull request #14001 from twbs/docs-dist

Copy all files in docs/dist.

11 years agoplace feedback icon lower, only if it really need 14005/head
Boris Serdyuk [Tue, 1 Jul 2014 15:15:00 +0000 (19:15 +0400)] 
place feedback icon lower, only if it really need

11 years agoCopy all files in docs/dist. 14001/head
XhmikosR [Tue, 1 Jul 2014 04:35:33 +0000 (07:35 +0300)] 
Copy all files in docs/dist.

Now we are on par with what we have on the gh-pages dist/ folder.

11 years agoUpdate dependencies.
XhmikosR [Tue, 1 Jul 2014 04:24:14 +0000 (07:24 +0300)] 
Update dependencies.

11 years agoMerge pull request #13988 from twbs/fix-13896
Chris Rebert [Mon, 30 Jun 2014 21:49:11 +0000 (14:49 -0700)] 
Merge pull request #13988 from twbs/fix-13896

doc that you can't use both data-ride and $().carousel() on the same carousel

11 years agoMerge pull request #13993 from twbs/fix-13964
Mark Otto [Mon, 30 Jun 2014 18:39:37 +0000 (11:39 -0700)] 
Merge pull request #13993 from twbs/fix-13964

Fix #13964

11 years agofix #13964 13993/head
Chris Rebert [Mon, 30 Jun 2014 17:27:55 +0000 (10:27 -0700)] 
fix #13964

11 years agoUpdate dependencies.
XhmikosR [Mon, 30 Jun 2014 15:35:17 +0000 (18:35 +0300)] 
Update dependencies.

11 years agoMerge pull request #13992 from pjrobertson/master
Julian Thilo [Mon, 30 Jun 2014 15:10:57 +0000 (17:10 +0200)] 
Merge pull request #13992 from pjrobertson/master

Fix inconsistency between demo and displayed code for modal demo

11 years agoFix inconsistency between demo and displayed code for modal demo 13992/head
Patrick Robertson [Mon, 30 Jun 2014 12:19:18 +0000 (19:19 +0700)] 
Fix inconsistency between demo and displayed code for modal demo

Fixes #13991

11 years agodoc that you can't use both data-ride and $().carousel() on the same carousel; fixes... 13988/head
Chris Rebert [Mon, 30 Jun 2014 04:16:44 +0000 (21:16 -0700)] 
doc that you can't use both data-ride and $().carousel() on the same carousel; fixes #13896

[skip sauce]

11 years agodocs: use valid JSON in compound option value examples 13986/head
Chris Rebert [Mon, 30 Jun 2014 04:08:27 +0000 (21:08 -0700)] 
docs: use valid JSON in compound option value examples

Fixes #13874.
[skip sauce]

11 years agofix #13979
Chris Rebert [Mon, 30 Jun 2014 02:58:09 +0000 (19:58 -0700)] 
fix #13979

11 years agoUpdate to Jekyll 2.1.x.
XhmikosR [Sun, 29 Jun 2014 05:39:40 +0000 (08:39 +0300)] 
Update to Jekyll 2.1.x.

11 years agoMerge pull request #13954 from hnrch02/persist-preview-theme
Mark Otto [Sun, 29 Jun 2014 04:43:04 +0000 (21:43 -0700)] 
Merge pull request #13954 from hnrch02/persist-preview-theme

Save "Preview theme" state; resolves #13940

11 years agofixes #13968
Mark Otto [Sat, 28 Jun 2014 23:23:06 +0000 (16:23 -0700)] 
fixes #13968

11 years agoUpdate "grunt-autoprefixer".
XhmikosR [Fri, 27 Jun 2014 04:35:22 +0000 (07:35 +0300)] 
Update "grunt-autoprefixer".

11 years agoSave "Preview theme" state; resolves #13940 13954/head
Heinrich Fenkart [Fri, 27 Jun 2014 00:08:58 +0000 (02:08 +0200)] 
Save "Preview theme" state; resolves #13940

11 years agoMerge pull request #13931 from ByScripts/patch-1
Mark Otto [Thu, 26 Jun 2014 21:47:44 +0000 (14:47 -0700)] 
Merge pull request #13931 from ByScripts/patch-1

Remove "pointer" cursor on disabled list-group-item

11 years agoJSCS hotfix
Chris Rebert [Thu, 26 Jun 2014 20:01:15 +0000 (13:01 -0700)] 
JSCS hotfix

[skip sauce] [skip validator]

11 years agoMerge pull request #13947 from twbs/fix-13937
Chris Rebert [Thu, 26 Jun 2014 19:25:05 +0000 (12:25 -0700)] 
Merge pull request #13947 from twbs/fix-13937

Fix popover live demos in docs

11 years agoregenerate docs.min.js 13947/head
Chris Rebert [Thu, 26 Jun 2014 19:17:37 +0000 (12:17 -0700)] 
regenerate docs.min.js

[skip sauce]

11 years agodocs: minor correction to the focus-triggered popover demo explanation
Chris Rebert [Thu, 26 Jun 2014 19:15:20 +0000 (12:15 -0700)] 
docs: minor correction to the focus-triggered popover demo explanation

11 years agoadd docs JS to activate popover demos; fixes #13937
Chris Rebert [Thu, 26 Jun 2014 18:41:40 +0000 (11:41 -0700)] 
add docs JS to activate popover demos; fixes #13937

11 years agoMerge pull request #13946 from rufo/patch-1
Chris Rebert [Thu, 26 Jun 2014 19:12:37 +0000 (12:12 -0700)] 
Merge pull request #13946 from rufo/patch-1

Fixed apostrophe typo on home page

11 years agoFixed crazy-making typo on home page 13946/head
Rufo Sanchez [Thu, 26 Jun 2014 19:09:59 +0000 (15:09 -0400)] 
Fixed crazy-making typo on home page

...at least if you're a writing nerd :P "Bootstrap ships with vanilla CSS, but *its* source code..."

11 years agoMerge pull request #13939 from twbs/tree-shaking
Mark Otto [Thu, 26 Jun 2014 18:46:45 +0000 (11:46 -0700)] 
Merge pull request #13939 from twbs/tree-shaking

Remove apparent dead code from docs JS

11 years agoMerge pull request #13942 from twbs/docs-grunt-13938
Chris Rebert [Thu, 26 Jun 2014 18:38:41 +0000 (11:38 -0700)] 
Merge pull request #13942 from twbs/docs-grunt-13938

Fix link to compiling info.

11 years agoFix link to compiling info. Fixes #13938. 13942/head
XhmikosR [Thu, 26 Jun 2014 18:05:50 +0000 (21:05 +0300)] 
Fix link to compiling info. Fixes #13938.

[skip sauce]

11 years agorm apparent dead code from docs JS 13939/head
Chris Rebert [Thu, 26 Jun 2014 17:53:55 +0000 (10:53 -0700)] 
rm apparent dead code from docs JS

.bs-docs-navbar class doesn't seem to be used anywhere at all

11 years agoadd comment explaining which demos this JS is for
Chris Rebert [Thu, 26 Jun 2014 17:52:12 +0000 (10:52 -0700)] 
add comment explaining which demos this JS is for

11 years agofix class names in popover live examples in docs
Chris Rebert [Thu, 26 Jun 2014 17:51:07 +0000 (10:51 -0700)] 
fix class names in popover live examples in docs

11 years agomaxcdn urls v3.2.0
Mark Otto [Thu, 26 Jun 2014 16:36:48 +0000 (09:36 -0700)] 
maxcdn urls

11 years agobump to v3.2.0
Mark Otto [Thu, 26 Jun 2014 16:13:24 +0000 (09:13 -0700)] 
bump to v3.2.0

11 years agoChange cursor from "default" to "not-allowed" if disabled 13931/head
Thierry Goettelmann [Thu, 26 Jun 2014 14:31:37 +0000 (16:31 +0200)] 
Change cursor from "default" to "not-allowed" if disabled

11 years agoRemove "pointer" cursor on disabled list-group-item
Thierry Goettelmann [Thu, 26 Jun 2014 13:50:20 +0000 (15:50 +0200)] 
Remove "pointer" cursor on disabled list-group-item

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Thu, 26 Jun 2014 09:49:35 +0000 (02:49 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agogrunt
Mark Otto [Thu, 26 Jun 2014 09:49:21 +0000 (02:49 -0700)] 
grunt

11 years agoMerge pull request #13574 from twbs/reinstate-13470
Mark Otto [Thu, 26 Jun 2014 07:06:02 +0000 (00:06 -0700)] 
Merge pull request #13574 from twbs/reinstate-13470

Delete redundant Grunt info in README (Merge before shipping)

11 years agogrunt
Mark Otto [Thu, 26 Jun 2014 06:03:40 +0000 (23:03 -0700)] 
grunt

11 years agoMerge pull request #13905 from Jimtrim/patch-1
Mark Otto [Thu, 26 Jun 2014 05:29:02 +0000 (22:29 -0700)] 
Merge pull request #13905 from Jimtrim/patch-1

Update cover.css

11 years agoMozilla bug says the fix targeted v31
Chris Rebert [Thu, 26 Jun 2014 01:04:49 +0000 (18:04 -0700)] 
Mozilla bug says the fix targeted v31

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Wed, 25 Jun 2014 23:57:22 +0000 (16:57 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

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 agofixes #13912: make radios/checkboxes work with inline forms again
Mark Otto [Wed, 25 Jun 2014 23:56:36 +0000 (16:56 -0700)] 
fixes #13912: make radios/checkboxes work with inline forms again

11 years agoFixed @gray-base value being once space short 13923/head
Thomas Coleman [Wed, 25 Jun 2014 15:09:57 +0000 (16:09 +0100)] 
Fixed @gray-base value being once space short

11 years agoAdded @gray-base variable to make @gray-{shade} reference, also allows @gray-base...
Thomas Coleman [Wed, 25 Jun 2014 14:00:41 +0000 (15:00 +0100)] 
Added @gray-base variable to make @gray-{shade} reference, also allows @gray-base to be modified with less#modifyVars and the vars to cascade

11 years agoremoving redundant background declarations on TDs 13920/head
Andrei Railean [Wed, 25 Jun 2014 05:16:25 +0000 (15:16 +1000)] 
removing redundant background declarations on TDs

11 years agoassign background to row of .table-striped
Andrei Railean [Wed, 25 Jun 2014 04:01:34 +0000 (14:01 +1000)] 
assign background to row of .table-striped

if background is not set on row, striping doesn't work properly in responsive tables where row and cells are set to  display: block.

11 years agoRun `grunt`.
XhmikosR [Tue, 24 Jun 2014 22:53:18 +0000 (01:53 +0300)] 
Run `grunt`.

Revert a991cd572c8b3cafa6228915ca86f7a0cdd26e2d.

11 years agoRevert "Revert "Turn off clean-css' advanced optimizations.""
XhmikosR [Tue, 24 Jun 2014 22:53:10 +0000 (01:53 +0300)] 
Revert "Revert "Turn off clean-css' advanced optimizations.""

This reverts commit e31c2edf885efd42d2e755f189cc15125d977d70.

11 years agogrunt dist; closes #13914
Chris Rebert [Tue, 24 Jun 2014 21:55:51 +0000 (14:55 -0700)] 
grunt dist; closes #13914

11 years agoRevert "Turn off clean-css' advanced optimizations."
Chris Rebert [Tue, 24 Jun 2014 21:54:51 +0000 (14:54 -0700)] 
Revert "Turn off clean-css' advanced optimizations."

This reverts commit 25ca51319b016bc4e42e1ba882d6f191e001d65d.

11 years agoupdate shrinkwrap to get clean-css v2.2.3
Chris Rebert [Tue, 24 Jun 2014 21:49:44 +0000 (14:49 -0700)] 
update shrinkwrap to get clean-css v2.2.3

Refs #13914
Refs https://github.com/GoalSmashers/clean-css/issues/302

11 years agoMerge pull request #13781 from twbs/saucier
Chris Rebert [Tue, 24 Jun 2014 20:18:46 +0000 (13:18 -0700)] 
Merge pull request #13781 from twbs/saucier

Reenable additional Sauce browsers

11 years agoreenable Win7 IE8-9 in Sauce 13781/head
Chris Rebert [Tue, 10 Jun 2014 19:24:56 +0000 (12:24 -0700)] 
reenable Win7 IE8-9 in Sauce

11 years agoreenable OS X Chrome in Sauce
Chris Rebert [Tue, 10 Jun 2014 19:23:48 +0000 (12:23 -0700)] 
reenable OS X Chrome in Sauce

11 years agoMerge pull request #13918 from twbs/sauce-with-retries
Chris Rebert [Tue, 24 Jun 2014 19:36:18 +0000 (12:36 -0700)] 
Merge pull request #13918 from twbs/sauce-with-retries

Enable retrying of timed-out Sauce tests

11 years agoMerge pull request #13916 from glebm/variable-order
Mark Otto [Tue, 24 Jun 2014 19:21:10 +0000 (12:21 -0700)] 
Merge pull request #13916 from glebm/variable-order

Move variable declaration before its use (for Sass)

11 years agoretry each test up to 3 times in the event of timeout 13918/head
Chris Rebert [Tue, 24 Jun 2014 19:12:21 +0000 (12:12 -0700)] 
retry each test up to 3 times in the event of timeout

Big thanks to @gvas for https://github.com/axemclion/grunt-saucelabs/pull/136 ! <3

11 years agoupgrade grunt-saucelabs to ~8.1.0
Chris Rebert [Tue, 24 Jun 2014 19:11:39 +0000 (12:11 -0700)] 
upgrade grunt-saucelabs to ~8.1.0

update shrinkwrap too

11 years agoMove variable declaration before its use for Sass 13916/head
Gleb Mazovetskiy [Tue, 24 Jun 2014 16:30:24 +0000 (18:30 +0200)] 
Move variable declaration before its use for Sass

In Sass, variable must be declared before it is used.
This also removes Miscellaneous section, because horizontal line color
and form / list paddings are Typography.

11 years agoMerge pull request #13913 from hnrch02/webkit-keyframes
Chris Rebert [Tue, 24 Jun 2014 16:12:27 +0000 (09:12 -0700)] 
Merge pull request #13913 from hnrch02/webkit-keyframes

Partly revert cb7eb674accd24b6b73f26ef23cf4a301b6ebfaf

11 years agoRun `grunt`.
XhmikosR [Tue, 24 Jun 2014 16:00:14 +0000 (19:00 +0300)] 
Run `grunt`.

11 years agoTurn off clean-css' advanced optimizations.
XhmikosR [Tue, 24 Jun 2014 15:57:33 +0000 (18:57 +0300)] 
Turn off clean-css' advanced optimizations.

Works around #13914.

We might give it another go in the future but the stuff this breaks over the time does not justify having it enabled. The gain in size is negligible:

dist/css/bootstrap.min.css: 108.65 kB → 109.5 kB
dist/css/bootstrap-theme.min.css: 18.84 kB → 18.86 kB
docs/assets/css/docs.min.css: 20.44 kB → 20.61 kB

11 years agoUpdate dependencies.
XhmikosR [Tue, 24 Jun 2014 07:54:19 +0000 (10:54 +0300)] 
Update dependencies.

11 years agoPartly revert cb7eb674accd24b6b73f26ef23cf4a301b6ebfaf 13913/head
Heinrich Fenkart [Tue, 24 Jun 2014 15:08:16 +0000 (17:08 +0200)] 
Partly revert cb7eb674accd24b6b73f26ef23cf4a301b6ebfaf

Fixes #13911

11 years agoMerge branch 'fix-13386'
fat [Tue, 24 Jun 2014 06:08:44 +0000 (23:08 -0700)] 
Merge branch 'fix-13386'