]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
11 years agoFixes #10147: Remove outline from carousel controls on focus
Mark Otto [Thu, 28 Nov 2013 23:37:11 +0000 (15:37 -0800)] 
Fixes #10147: Remove outline from carousel controls on focus

11 years agoFixes #10483 and #10357: Make .container mixin-friendly by moving the width declarati...
Mark Otto [Thu, 28 Nov 2013 22:22:31 +0000 (14:22 -0800)] 
Fixes #10483 and #10357: Make .container mixin-friendly by moving the width declarations within one class

11 years agoFixes #11553: Prevent double border on tables in panels without thead content
Mark Otto [Thu, 28 Nov 2013 20:49:51 +0000 (12:49 -0800)] 
Fixes #11553: Prevent double border on tables in panels without thead content

11 years agoFixes #11516: Invert dropdown divider border in navbars
Mark Otto [Thu, 28 Nov 2013 20:39:39 +0000 (12:39 -0800)] 
Fixes #11516: Invert dropdown divider border in navbars

11 years agorun grunt after last merge
Mark Otto [Thu, 28 Nov 2013 20:34:42 +0000 (12:34 -0800)] 
run grunt after last merge

11 years agoMerge pull request #11551 from masterbee/outlinetweak
Mark Otto [Thu, 28 Nov 2013 20:31:18 +0000 (12:31 -0800)] 
Merge pull request #11551 from masterbee/outlinetweak

removed color treatment of outline for easier integration

11 years agoMerge branch 'master' into pr/11614
Mark Otto [Thu, 28 Nov 2013 19:57:12 +0000 (11:57 -0800)] 
Merge branch 'master' into pr/11614

Conflicts:
dist/css/bootstrap.min.css

11 years agoFixes #11634: Add warning to docs to not combine icon classes with other elements
Mark Otto [Thu, 28 Nov 2013 19:38:28 +0000 (11:38 -0800)] 
Fixes #11634: Add warning to docs to not combine icon classes with other elements

11 years agogrunt after merge of last pr; unsure why, but this is rengerating the banners and...
Mark Otto [Thu, 28 Nov 2013 19:33:00 +0000 (11:33 -0800)] 
grunt after merge of last pr; unsure why, but this is rengerating the banners and spacing

11 years agoMerge pull request #11642 from tlindig/caret_color_fix
Mark Otto [Thu, 28 Nov 2013 18:45:11 +0000 (10:45 -0800)] 
Merge pull request #11642 from tlindig/caret_color_fix

removed all caret border color settings.

11 years agoadd builded files from dist/ 11642/head
Tobias Lindig [Thu, 28 Nov 2013 17:40:15 +0000 (18:40 +0100)] 
add builded files from dist/

11 years agoremoved all caret border color settings.
Tobias Lindig [Thu, 28 Nov 2013 16:41:43 +0000 (17:41 +0100)] 
removed all caret border color settings.

11 years agorun grunt
Mark Otto [Tue, 26 Nov 2013 23:21:27 +0000 (15:21 -0800)] 
run grunt

11 years agoMerge pull request #11616 from ZDroid/remove-window
Chris Rebert [Tue, 26 Nov 2013 17:20:56 +0000 (09:20 -0800)] 
Merge pull request #11616 from ZDroid/remove-window

Remove redundant 'window.'

11 years agoRemove redundant 'window.' 11616/head
Zlatan Vasović [Tue, 26 Nov 2013 07:43:26 +0000 (08:43 +0100)] 
Remove redundant 'window.'

11 years agoFix for Issue #11411 11614/head
Jesse Mandel [Mon, 25 Nov 2013 23:19:11 +0000 (15:19 -0800)] 
Fix for Issue #11411

11 years agoMerge pull request #11612 from JerryChr/master
Chris Rebert [Mon, 25 Nov 2013 19:54:46 +0000 (11:54 -0800)] 
Merge pull request #11612 from JerryChr/master

Removed unnecessary semicolon

11 years agoRemoved unnecessary semicolon 11612/head
Jerri Christiansen [Mon, 25 Nov 2013 19:41:00 +0000 (20:41 +0100)] 
Removed unnecessary semicolon

11 years agoMerge pull request #11598 from ZDroid/customizer-breaks
Chris Rebert [Sat, 23 Nov 2013 20:17:32 +0000 (12:17 -0800)] 
Merge pull request #11598 from ZDroid/customizer-breaks

Fix #11594

11 years agoMerge pull request #11599 from westonplatter/explicit_fonts
Chris Rebert [Sat, 23 Nov 2013 20:10:33 +0000 (12:10 -0800)] 
Merge pull request #11599 from westonplatter/explicit_fonts

explicitly call out font files

11 years agoexplicitly call out font files 11599/head
Weston Platter [Sat, 23 Nov 2013 19:23:18 +0000 (12:23 -0700)] 
explicitly call out font files

Using wildcards to specify fonts causes errors for other
npm modules, EG, https://github.com/blittle/bower-installer/issues/33.
Additionally, it’s better to lock down files included in a
library.

11 years agoFix #11594 11598/head
Zlatan Vasović [Sat, 23 Nov 2013 17:29:27 +0000 (18:29 +0100)] 
Fix #11594

11 years agoMerge pull request #11597 from ZDroid/deps-grunt-recess-kickup
Chris Rebert [Sat, 23 Nov 2013 17:16:32 +0000 (09:16 -0800)] 
Merge pull request #11597 from ZDroid/deps-grunt-recess-kickup

Kick up grunt-recess dependency

11 years agoKick up grunt-recess dependency 11597/head
Zlatan Vasović [Sat, 23 Nov 2013 16:41:31 +0000 (17:41 +0100)] 
Kick up grunt-recess dependency

11 years agoMerge pull request #11534 from twbs/doc-async-modals
Chris Rebert [Thu, 21 Nov 2013 23:40:12 +0000 (15:40 -0800)] 
Merge pull request #11534 from twbs/doc-async-modals

document that modal show()/hide() return before animation finishes

11 years agoadd more missing role="form"-s
Chris Rebert [Thu, 21 Nov 2013 20:02:54 +0000 (12:02 -0800)] 
add more missing role="form"-s

11 years agoMerge pull request #11567 from neilhem/master
Chris Rebert [Thu, 21 Nov 2013 19:49:24 +0000 (11:49 -0800)] 
Merge pull request #11567 from neilhem/master

add role form for horizontal form example

11 years agoMerge pull request #11578 from barraponto/patch-1
Chris Rebert [Thu, 21 Nov 2013 19:05:45 +0000 (11:05 -0800)] 
Merge pull request #11578 from barraponto/patch-1

Make it clear there's a nested media element in the first example

11 years agoMake it clear there's a nested media element in the first example 11578/head
Capi Etheriel [Thu, 21 Nov 2013 17:13:05 +0000 (15:13 -0200)] 
Make it clear there's a nested media element in the first example

11 years agoadd role form for horizontal form example 11567/head
Rakhat Jabagin [Thu, 21 Nov 2013 06:03:06 +0000 (12:03 +0600)] 
add role form for horizontal form example

11 years agoremoved color treatment of outline 11551/head
Mario Bonito [Wed, 20 Nov 2013 03:24:26 +0000 (22:24 -0500)] 
removed color treatment of outline

11 years agoMerge pull request #11172 from yokomizor/git_ignore_bower_components
Chris Rebert [Tue, 19 Nov 2013 22:15:09 +0000 (14:15 -0800)] 
Merge pull request #11172 from yokomizor/git_ignore_bower_components

added bower_components to .gitignore

11 years agofixes part of #11117: doc that modal show()/hide() return before animation finishes 11534/head
Chris Rebert [Tue, 19 Nov 2013 03:59:09 +0000 (19:59 -0800)] 
fixes part of #11117: doc that modal show()/hide() return before animation finishes

11 years agofix #11089: document modal show+shown events' relatedTarget property
Chris Rebert [Tue, 19 Nov 2013 03:28:37 +0000 (19:28 -0800)] 
fix #11089: document modal show+shown events' relatedTarget property

11 years agoadd explanatory comment Re: #11526
Chris Rebert [Mon, 18 Nov 2013 22:22:17 +0000 (14:22 -0800)] 
add explanatory comment Re: #11526

11 years agoMerge pull request #11514 from twbs/navbar-text-float-breakpoint
Julian Thilo [Mon, 18 Nov 2013 22:02:17 +0000 (14:02 -0800)] 
Merge pull request #11514 from twbs/navbar-text-float-breakpoint

Fix #11513: Don't always float navbar-text

11 years agoMerge pull request #11526 from erikflowers/firefox-placeholder-fix
Mark Otto [Mon, 18 Nov 2013 21:42:52 +0000 (13:42 -0800)] 
Merge pull request #11526 from erikflowers/firefox-placeholder-fix

Firefox placeholder text is faded out and not the full color.

11 years ago- Firefox placeholder text is faded out and not the full color. Adding opacity:1... 11526/head
Erik Flowers [Mon, 18 Nov 2013 18:58:14 +0000 (11:58 -0700)] 
- Firefox placeholder text is faded out and not the full color. Adding opacity:1 to it returns it to the proper color
- (this is a re-commit since I messed up my branch last time and failed the travis build)

11 years agoMerge pull request #11521 from valera-rozuvan/patch-1
Chris Rebert [Mon, 18 Nov 2013 09:57:56 +0000 (01:57 -0800)] 
Merge pull request #11521 from valera-rozuvan/patch-1

Update dropdown.js

11 years agoUpdate dropdown.js 11521/head
Valera Rozuvan [Mon, 18 Nov 2013 09:55:33 +0000 (11:55 +0200)] 
Update dropdown.js

11 years agoRun grunt dist 11514/head
Julian Thilo [Sun, 17 Nov 2013 22:45:42 +0000 (23:45 +0100)] 
Run grunt dist

11 years agoFix #11513: Don't always float navbar-text
Julian Thilo [Sun, 17 Nov 2013 22:07:28 +0000 (23:07 +0100)] 
Fix #11513: Don't always float navbar-text

`navbar-text` should only float when the navbar is expanded on larger
screens, otherwise the element might be (hidden) behind `navbar-nav`.
Fixes #11513.
X-Ref: #8820 #8815

11 years agoMerge pull request #11509 from ZDroid/fix-indents
Chris Rebert [Sun, 17 Nov 2013 10:02:00 +0000 (02:02 -0800)] 
Merge pull request #11509 from ZDroid/fix-indents

Fix some weird indents

11 years agoFix some weird indents 11509/head
Zlatan Vasović [Sun, 17 Nov 2013 09:24:31 +0000 (10:24 +0100)] 
Fix some weird indents

11 years agofixes #11449: use menlo over monaco
Mark Otto [Sun, 17 Nov 2013 02:01:59 +0000 (18:01 -0800)] 
fixes #11449: use menlo over monaco

11 years agofixes #10744: back to solid borders on carets
Mark Otto [Sun, 17 Nov 2013 01:48:31 +0000 (17:48 -0800)] 
fixes #10744: back to solid borders on carets

11 years agofixes #11477 and updates slid event in carousel with namespace
fat [Fri, 15 Nov 2013 07:58:29 +0000 (23:58 -0800)] 
fixes #11477 and updates slid event in carousel with namespace

11 years agoMerge pull request #10353 from rwillrich/ignore-files
Chris Rebert [Thu, 14 Nov 2013 23:37:22 +0000 (15:37 -0800)] 
Merge pull request #10353 from rwillrich/ignore-files

Bower: Ignore development and documentation files on bower.json. Fix #10313

11 years agoMerge pull request #11476 from ZDroid/keyframes
Julian Thilo [Thu, 14 Nov 2013 09:14:06 +0000 (01:14 -0800)] 
Merge pull request #11476 from ZDroid/keyframes

Remove unusual keyframes prefixes

11 years agoRemove unusual keyframes prefixes 11476/head
Zlatan Vasović [Wed, 13 Nov 2013 21:32:46 +0000 (22:32 +0100)] 
Remove unusual keyframes prefixes

11 years agoJustified Nav rendering bug fixed in Chrome as of v31.0.1650.48
Chris Rebert [Wed, 13 Nov 2013 20:03:03 +0000 (12:03 -0800)] 
Justified Nav rendering bug fixed in Chrome as of v31.0.1650.48

11 years agoMerge pull request #11385 from twbs/justified-nav-example-warning
Chris Rebert [Mon, 11 Nov 2013 22:44:40 +0000 (14:44 -0800)] 
Merge pull request #11385 from twbs/justified-nav-example-warning

add warning about WebKit bug to the justified nav example itself

11 years agoMerge pull request #11376 from twbs/double-click-radio-fix
Chris Rebert [Mon, 11 Nov 2013 01:33:12 +0000 (17:33 -0800)] 
Merge pull request #11376 from twbs/double-click-radio-fix

Double-clicking on a .btn-ized radio button shouldn't de-select it

11 years ago<3 @asselin for figuring out this combo of 2 patches for #9920; re-grunt 11376/head
Chris Rebert [Wed, 6 Nov 2013 06:20:29 +0000 (22:20 -0800)] 
<3 @asselin for figuring out this combo of 2 patches for #9920; re-grunt

11 years agoDon't deselect radio buttons in data-toggle; fixes #9920
Brian Leonard [Mon, 2 Sep 2013 05:23:31 +0000 (22:23 -0700)] 
Don't deselect radio buttons in data-toggle; fixes #9920

Merges #10787

11 years agoAdd unit test for #9920
Nathan Muir [Tue, 3 Sep 2013 02:23:51 +0000 (12:23 +1000)] 
Add unit test for #9920

Merges #10385

11 years agoMerge pull request #11409 from twbs/add-release-checklist
Chris Rebert [Mon, 11 Nov 2013 01:17:15 +0000 (17:17 -0800)] 
Merge pull request #11409 from twbs/add-release-checklist

add release checklist to CONTRIBUTING file

11 years agoadd release checklist to CONTRIBUTING file; fixes #11290 11409/head
Chris Rebert [Thu, 7 Nov 2013 21:15:46 +0000 (13:15 -0800)] 
add release checklist to CONTRIBUTING file; fixes #11290

11 years agomore nesting in table.less
Chris Rebert [Thu, 7 Nov 2013 02:38:27 +0000 (18:38 -0800)] 
more nesting in table.less

11 years agouse nesting to make .table-striped & .table-hover mixin-able again; fixes #11387
Chris Rebert [Thu, 7 Nov 2013 02:32:35 +0000 (18:32 -0800)] 
use nesting to make .table-striped & .table-hover mixin-able again; fixes #11387

11 years agoadd warning about WebKit bug to the justified nav example itself 11385/head
Chris Rebert [Wed, 6 Nov 2013 23:21:07 +0000 (15:21 -0800)] 
add warning about WebKit bug to the justified nav example itself

11 years agoupdate remaining version numbers v3.0.2
Chris Rebert [Wed, 6 Nov 2013 21:16:40 +0000 (13:16 -0800)] 
update remaining version numbers

11 years agogrunt
Mark Otto [Wed, 6 Nov 2013 21:10:51 +0000 (13:10 -0800)] 
grunt

11 years agobump links to 3.0.2; change readme download to release URL format
Mark Otto [Wed, 6 Nov 2013 21:09:35 +0000 (13:09 -0800)] 
bump links to 3.0.2; change readme download to release URL format

11 years agoFixes #11295: Restore offset, push, and pull zero classes (e.g., .col-md-offset-0)
Mark Otto [Wed, 6 Nov 2013 21:03:08 +0000 (13:03 -0800)] 
Fixes #11295: Restore offset, push, and pull zero classes (e.g., .col-md-offset-0)

11 years agorun grunt after version bumps
Mark Otto [Wed, 6 Nov 2013 21:02:15 +0000 (13:02 -0800)] 
run grunt after version bumps

11 years agobump versions to v3.0.2
Mark Otto [Wed, 6 Nov 2013 20:57:28 +0000 (12:57 -0800)] 
bump versions to v3.0.2

11 years agofix #11378
Chris Rebert [Wed, 6 Nov 2013 18:30:39 +0000 (10:30 -0800)] 
fix #11378

11 years agoMerge pull request #11273 from benji07/patch-1
Chris Rebert [Wed, 6 Nov 2013 07:36:48 +0000 (23:36 -0800)] 
Merge pull request #11273 from benji07/patch-1

Add a branch alias

11 years agoAdd a branch alias 11273/head
Benjamin Lévêque [Tue, 29 Oct 2013 15:14:36 +0000 (16:14 +0100)] 
Add a branch alias

Add a branch alias to be able to require 3.0.* version (use the branch master if minimum-stability is dev or use a tag if it's defined to stable)

11 years agore-grunt
Chris Rebert [Wed, 6 Nov 2013 00:58:18 +0000 (16:58 -0800)] 
re-grunt

11 years agoMerge pull request #10039 from daguej/js-refs
Chris Rebert [Wed, 6 Nov 2013 00:55:55 +0000 (16:55 -0800)] 
Merge pull request #10039 from daguej/js-refs

Don't explicitly reference global jQuery

11 years agofix 1 remaining instance of #11349
Chris Rebert [Wed, 6 Nov 2013 00:37:54 +0000 (16:37 -0800)] 
fix 1 remaining instance of #11349

11 years agoMerge pull request #11349 from alefteris/examples-navbar-sr-only
Chris Rebert [Wed, 6 Nov 2013 00:35:14 +0000 (16:35 -0800)] 
Merge pull request #11349 from alefteris/examples-navbar-sr-only

Add toogle nav for screen readers in examples

11 years agoMerge pull request #11327 from ZDroid/nestnail
Chris Rebert [Wed, 6 Nov 2013 00:20:53 +0000 (16:20 -0800)] 
Merge pull request #11327 from ZDroid/nestnail

Use nesting for thumbnail styles

11 years agoMerge pull request #11335 from twbs/version-number-updater
Chris Rebert [Mon, 4 Nov 2013 19:24:32 +0000 (11:24 -0800)] 
Merge pull request #11335 from twbs/version-number-updater

add Grunt task to change version numbers

11 years agoadd Grunt task to change version numbers; fixes #11332 11335/head
Chris Rebert [Sat, 2 Nov 2013 01:15:25 +0000 (18:15 -0700)] 
add Grunt task to change version numbers; fixes #11332

11 years agoupdate node.js to v0.10.x (current stable)
Chris Rebert [Mon, 4 Nov 2013 18:41:10 +0000 (10:41 -0800)] 
update node.js to v0.10.x (current stable)

11 years agoMerge pull request #11354 from Ore4444/patch-1
Chris Rebert [Mon, 4 Nov 2013 16:54:37 +0000 (08:54 -0800)] 
Merge pull request #11354 from Ore4444/patch-1

Fixed links

11 years agoFixed links 11354/head
Ore Landau [Mon, 4 Nov 2013 10:33:43 +0000 (12:33 +0200)] 
Fixed links

Links to same-page anchors were treated as external links.

11 years agoAdd toogle nav for screen readers in examples 11349/head
Thanos Lefteris [Sun, 3 Nov 2013 19:08:24 +0000 (21:08 +0200)] 
Add toogle nav for screen readers in examples

11 years agoMerge pull request #11345 from pborreli/patch-3
Chris Rebert [Sun, 3 Nov 2013 03:11:08 +0000 (20:11 -0700)] 
Merge pull request #11345 from pborreli/patch-3

Removed duplicated class change from migration instructions

11 years agoRemoved duplicated class change from migration instructions 11345/head
Pascal Borreli [Sun, 3 Nov 2013 03:08:11 +0000 (03:08 +0000)] 
Removed duplicated class change from migration instructions

11 years agoMerge pull request #11336 from twbs/fix-11317
Chris Rebert [Sat, 2 Nov 2013 22:06:16 +0000 (15:06 -0700)] 
Merge pull request #11336 from twbs/fix-11317

don't use nonstandard window.location.origin in customizer JS

11 years agoFix #7398 in Basic template
Julian Thilo [Sat, 2 Nov 2013 12:34:31 +0000 (13:34 +0100)] 
Fix #7398 in Basic template

See https://github.com/twbs/bootstrap/issues/7398#issuecomment-27617890 for details.
Thanks @martinburger

11 years agoMerge pull request #11338 from ZDroid/nestform
Julian Thilo [Sat, 2 Nov 2013 12:27:30 +0000 (05:27 -0700)] 
Merge pull request #11338 from ZDroid/nestform

Use nesting for .placeholder()

11 years agoUse nesting for .placeholder() 11338/head
Zlatan Vasović [Sat, 2 Nov 2013 08:35:51 +0000 (09:35 +0100)] 
Use nesting for .placeholder()

11 years agodon't use nonstandard window.location.origin in customizer JS; fixes #11317 11336/head
Chris Rebert [Sat, 2 Nov 2013 01:56:27 +0000 (18:56 -0700)] 
don't use nonstandard window.location.origin in customizer JS; fixes #11317

11 years agoMerge pull request #11334 from glebm/patch-2
Chris Rebert [Sat, 2 Nov 2013 01:29:45 +0000 (18:29 -0700)] 
Merge pull request #11334 from glebm/patch-2

& > == >

11 years ago& > == > 11334/head
Gleb Mazovetskiy [Sat, 2 Nov 2013 01:19:11 +0000 (02:19 +0100)] 
& > == >

11 years agoupdate version numbers in JS file comment headers to v3.0.1 & regrunt
Chris Rebert [Sat, 2 Nov 2013 00:15:34 +0000 (17:15 -0700)] 
update version numbers in JS file comment headers to v3.0.1 & regrunt

11 years agoMerge pull request #11331 from xt0rted/patch-1
Julian Thilo [Fri, 1 Nov 2013 23:38:08 +0000 (16:38 -0700)] 
Merge pull request #11331 from xt0rted/patch-1

Update customizer.js

11 years agoUpdate customizer.js 11331/head
Brian Surowiec [Fri, 1 Nov 2013 23:27:08 +0000 (19:27 -0400)] 
Update customizer.js

11 years agoUse nesting for thumbnail styles 11327/head
Zlatan Vasović [Fri, 1 Nov 2013 21:09:01 +0000 (22:09 +0100)] 
Use nesting for thumbnail styles

11 years agoMerge pull request #11324 from boki-/patch-1
Julian Thilo [Fri, 1 Nov 2013 18:36:30 +0000 (11:36 -0700)] 
Merge pull request #11324 from boki-/patch-1

Update README.md

11 years agoUpdate README.md 11324/head
Bogdan [Fri, 1 Nov 2013 18:30:27 +0000 (19:30 +0100)] 
Update README.md

Row 13 link update to tag v3.0.1

11 years agoMerge pull request #11315 from AJAlabs/master
Chris Rebert [Thu, 31 Oct 2013 20:36:52 +0000 (13:36 -0700)] 
Merge pull request #11315 from AJAlabs/master

Added navigation role to example navbars

11 years agoAdded navigation role to example navbars 11315/head
AJ Acevedo [Thu, 31 Oct 2013 20:09:41 +0000 (16:09 -0400)] 
Added navigation role to example navbars

As per the docs:
http://getbootstrap.com/components/#navbar-default

  modified:   examples/carousel/index.html
  modified:   examples/jumbotron/index.html
  modified:   examples/navbar-fixed-top/index.html
  modified:   examples/navbar-static-top/index.html
  modified:   examples/navbar/index.html
  modified:   examples/non-responsive/index.html
  modified:   examples/starter-template/index.html
  modified:   examples/sticky-footer-navbar/index.html
  modified:   examples/theme/index.html

11 years ago3.0.1 v3.0.1
Mark Otto [Wed, 30 Oct 2013 17:03:56 +0000 (10:03 -0700)] 
3.0.1

11 years agomore grunt
Mark Otto [Wed, 30 Oct 2013 15:00:32 +0000 (08:00 -0700)] 
more grunt