]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
11 years agoFixes #11351: Correct grid class reset on input groups by using attribute selector...
Mark Otto [Sat, 30 Nov 2013 20:52:08 +0000 (12:52 -0800)] 
Fixes #11351: Correct grid class reset on input groups by using attribute selector, not an old class from v3 betas

11 years agoFix up new margins on modals by not setting auto until screen-sm-min
Mark Otto [Sat, 30 Nov 2013 19:56:06 +0000 (11:56 -0800)] 
Fix up new margins on modals by not setting auto until screen-sm-min

11 years agoMerge pull request #11657 from ZDroid/homepage
Mark Otto [Sat, 30 Nov 2013 19:46:22 +0000 (11:46 -0800)] 
Merge pull request #11657 from ZDroid/homepage

Use pkg.homepage

11 years agoUse pkg.homepage 11657/head
Zlatan Vasović [Sat, 30 Nov 2013 15:11:41 +0000 (16:11 +0100)] 
Use pkg.homepage

11 years agoMerge pull request #11124 from StevenBlack/issue.11098
Mark Otto [Sat, 30 Nov 2013 08:58:39 +0000 (00:58 -0800)] 
Merge pull request #11124 from StevenBlack/issue.11098

Fixes issue #11098 -- Button documentation.

11 years agoMerge branch 'master' into pr/11299
Mark Otto [Sat, 30 Nov 2013 08:55:00 +0000 (00:55 -0800)] 
Merge branch 'master' into pr/11299

Conflicts:
dist/css/bootstrap.min.css
docs-assets/js/raw-files.js

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sat, 30 Nov 2013 08:43:27 +0000 (00:43 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoAlternate fix for #11303: add link to site in banner and remove @mdo and @fat usernam...
Mark Otto [Sat, 30 Nov 2013 08:42:36 +0000 (00:42 -0800)] 
Alternate fix for #11303: add link to site in banner and remove @mdo and @fat usernames from it

11 years agoMerge pull request #11329 from ZDroid/patch-1
Mark Otto [Sat, 30 Nov 2013 08:40:32 +0000 (00:40 -0800)] 
Merge pull request #11329 from ZDroid/patch-1

Add 'in' to complete thought

11 years agoMerge pull request #11330 from maxwellium/patch-1
Mark Otto [Sat, 30 Nov 2013 08:39:00 +0000 (00:39 -0800)] 
Merge pull request #11330 from maxwellium/patch-1

fixing offcanvas example for chrome

11 years agoMerge pull request #11369 from ssorallen/speedier-js-loading
Mark Otto [Sat, 30 Nov 2013 08:32:39 +0000 (00:32 -0800)] 
Merge pull request #11369 from ssorallen/speedier-js-loading

Speedier jQuery and Twitter widgets.js

11 years agoMerge branch 'master' into pr/11388
Mark Otto [Sat, 30 Nov 2013 08:26:53 +0000 (00:26 -0800)] 
Merge branch 'master' into pr/11388

Conflicts:
dist/css/bootstrap.min.css

11 years agoMerge pull request #11434 from ZDroid/fix-11433
Mark Otto [Sat, 30 Nov 2013 08:23:16 +0000 (00:23 -0800)] 
Merge pull request #11434 from ZDroid/fix-11433

Fix #11433: Better documentation for validation states

11 years agoMerge pull request #11432 from masterbee/WCAG2-color-contrast
Mark Otto [Sat, 30 Nov 2013 08:21:47 +0000 (00:21 -0800)] 
Merge pull request #11432 from masterbee/WCAG2-color-contrast

Corrected color contrast to WCAG 2.0 AA (Accessibility Tweak) - Forms and Alerts

11 years agoMerge pull request #11502 from 1000hz/patch-1
Mark Otto [Sat, 30 Nov 2013 07:55:43 +0000 (23:55 -0800)] 
Merge pull request #11502 from 1000hz/patch-1

Add missing data namespace for dropdown

11 years agoMerge pull request #11511 from ZDroid/fix-xs-comments
Mark Otto [Sat, 30 Nov 2013 07:46:35 +0000 (23:46 -0800)] 
Merge pull request #11511 from ZDroid/fix-xs-comments

Fix comments for extra small grid

11 years agoMerge pull request #11585 from thriqon/master
Mark Otto [Sat, 30 Nov 2013 07:45:35 +0000 (23:45 -0800)] 
Merge pull request #11585 from thriqon/master

Issue #11550 : Easily copyable classes

11 years agoMerge pull request #11617 from guybedford/master
Mark Otto [Sat, 30 Nov 2013 07:43:01 +0000 (23:43 -0800)] 
Merge pull request #11617 from guybedford/master

include jspm package configuration

11 years agoMerge branch 'pr/11493'
Mark Otto [Sat, 30 Nov 2013 07:30:26 +0000 (23:30 -0800)] 
Merge branch 'pr/11493'

Conflicts:
dist/css/bootstrap.min.css

11 years agogrunt to get dist files
Mark Otto [Sat, 30 Nov 2013 07:29:34 +0000 (23:29 -0800)] 
grunt to get dist files

11 years agoFix #10979: Don't use .img-thumbnail as a mixin for .thumbnail to avoid dupe and...
Mark Otto [Sat, 30 Nov 2013 07:19:04 +0000 (23:19 -0800)] 
Fix #10979: Don't use .img-thumbnail as a mixin for .thumbnail to avoid dupe and unnecessary styles

11 years agoFixes #11425: Use margin instead of padding on .modal-dialog to enable click-thru...
Mark Otto [Sat, 30 Nov 2013 06:03:49 +0000 (22:03 -0800)] 
Fixes #11425: Use margin instead of padding on .modal-dialog to enable click-thru to .modal-backdrop

11 years agoImplement #11174 to fix #10936: increase height of large inputs to fix Firefox incons...
Mark Otto [Sat, 30 Nov 2013 05:59:28 +0000 (21:59 -0800)] 
Implement #11174 to fix #10936: increase height of large inputs to fix Firefox inconsistencies

11 years agofixes #10699: use xs grid classes in regular thumbnail docs
Mark Otto [Sat, 30 Nov 2013 05:08:16 +0000 (21:08 -0800)] 
fixes #10699: use xs grid classes in regular thumbnail docs

11 years agoimprove affix docs with step-by-step walk through of plugin behavior and required CSS
Mark Otto [Sat, 30 Nov 2013 04:39:00 +0000 (20:39 -0800)] 
improve affix docs with step-by-step walk through of plugin behavior and required CSS

11 years agoUpdate scrollspy docs to more clearly indicate usage
Mark Otto [Sat, 30 Nov 2013 04:25:07 +0000 (20:25 -0800)] 
Update scrollspy docs to more clearly indicate usage

11 years agoFixes #11390: Add max-width to containers within jumbotrons to avoid horizontal scrollbar
Mark Otto [Sat, 30 Nov 2013 02:33:59 +0000 (18:33 -0800)] 
Fixes #11390: Add max-width to containers within jumbotrons to avoid horizontal scrollbar

11 years agoFixes #11468: Prevent default gradient on in Firefox for Android
Mark Otto [Sat, 30 Nov 2013 01:47:27 +0000 (17:47 -0800)] 
Fixes #11468: Prevent default gradient  on  in Firefox for Android

11 years agoMerge branch 'master' into pr/11414
Mark Otto [Thu, 28 Nov 2013 23:55:17 +0000 (15:55 -0800)] 
Merge branch 'master' into pr/11414

Conflicts:
dist/css/bootstrap.min.css

11 years agogrunt
Mark Otto [Thu, 28 Nov 2013 23:45:45 +0000 (15:45 -0800)] 
grunt

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 agoinclude jspm package configuration 11617/head
Guy Bedford [Tue, 26 Nov 2013 10:10:06 +0000 (12:10 +0200)] 
include jspm package configuration

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 agoIssue #11550 : Easily copyable classes 11585/head
Jonas Weber [Thu, 21 Nov 2013 21:54:02 +0000 (22:54 +0100)] 
Issue #11550 : Easily copyable classes

Removed all the periods. Tested in Chrome and Firefox
(current versions). In Chrome you get a stray newline when
triple-clicking, in Firefox it is clean.

fixes #11550

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 agoAdd 'in' to complete thought 11329/head
Zlatan Vasović [Fri, 1 Nov 2013 21:52:52 +0000 (22:52 +0100)] 
Add 'in' to complete thought

Simple grammar fix.

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 agoThere are xs-offsets, -pushes and -pulls! 11511/head
Zlatan Vasović [Sun, 17 Nov 2013 20:15:25 +0000 (21:15 +0100)] 
There are xs-offsets, -pushes and -pulls!

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 agoAdd missing data namespace for dropdown 11502/head
Cina S. [Sat, 16 Nov 2013 15:43:47 +0000 (09:43 -0600)] 
Add missing data namespace for dropdown

11 years agoFixed button group button not being 100% width 11493/head
Sam Blowes [Fri, 15 Nov 2013 16:17:40 +0000 (16:17 +0000)] 
Fixed button group button not being 100% width

Example of issue here.
https://dl.dropboxusercontent.com/u/14037764/Development/stackoverflow/bootstrap/vertical-btn.PNG

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 agoBetter documentation for validation states 11434/head
Zlatan Vasović [Sat, 9 Nov 2013 21:00:34 +0000 (22:00 +0100)] 
Better documentation for validation states

11 years agoCorrected color contrast to WCAG 2.0 AA 11432/head
Mario Bonito [Sat, 9 Nov 2013 18:03:21 +0000 (13:03 -0500)] 
Corrected color contrast to WCAG 2.0 AA

11 years agoAdd missing `.small` styles and docs 11414/head
Zlatan Vasović [Fri, 8 Nov 2013 09:30:15 +0000 (10:30 +0100)] 
Add missing `.small` styles and docs

11 years agoSimplify table state styles 11388/head
Zlatan Vasović [Thu, 7 Nov 2013 08:53:33 +0000 (09:53 +0100)] 
Simplify table state styles

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