]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
11 years agofix broken link in CONTRIBUTING.md
Chris Rebert [Wed, 4 Dec 2013 06:08:26 +0000 (22:08 -0800)] 
fix broken link in CONTRIBUTING.md

11 years agoMerge pull request #11701 from twbs/sauce-labs
Chris Rebert [Wed, 4 Dec 2013 05:58:43 +0000 (21:58 -0800)] 
Merge pull request #11701 from twbs/sauce-labs

switch to Sauce Labs for our cross-browser JS unit testing needs

11 years agoswitch to Sauce Labs for our cross-browser JS unit testing needs 11701/head
Chris Rebert [Wed, 4 Dec 2013 02:42:31 +0000 (18:42 -0800)] 
switch to Sauce Labs for our cross-browser JS unit testing needs

Fixes #11087

11 years agofix invalid HTML in components.html
Chris Rebert [Wed, 4 Dec 2013 04:10:55 +0000 (20:10 -0800)] 
fix invalid HTML in components.html

type="button" doesn't make sense for an <a>

11 years agogrunt
Chris Rebert [Tue, 3 Dec 2013 21:54:56 +0000 (13:54 -0800)] 
grunt

11 years agoadd comment regarding #11598
Chris Rebert [Tue, 3 Dec 2013 21:31:47 +0000 (13:31 -0800)] 
add comment regarding #11598

11 years agoMerge pull request #11691 from twbs/xs-grid-docs-fix
Chris Rebert [Tue, 3 Dec 2013 19:28:57 +0000 (11:28 -0800)] 
Merge pull request #11691 from twbs/xs-grid-docs-fix

document that XS grid supports offsets and push/pull

11 years agoaccount for #11050 in the docs 11691/head
Chris Rebert [Tue, 3 Dec 2013 19:22:52 +0000 (11:22 -0800)] 
account for #11050 in the docs

11 years agoreference root issue in explanatory comment
Chris Rebert [Tue, 3 Dec 2013 19:14:13 +0000 (11:14 -0800)] 
reference root issue in explanatory comment

11 years agoadd .gitattributes file to enforce Unix newlines within the repo
Chris Rebert [Tue, 3 Dec 2013 19:06:31 +0000 (11:06 -0800)] 
add .gitattributes file to enforce Unix newlines within the repo

11 years agoGruntfile.js: Set line feed char to '\n' to get same result on all platforms.
Tobias Lindig [Tue, 3 Dec 2013 11:07:57 +0000 (12:07 +0100)] 
Gruntfile.js: Set line feed char to '\n' to get same result on all platforms.

11 years agoMerge pull request #11690 from lipis/patch-2
Chris Rebert [Tue, 3 Dec 2013 18:44:15 +0000 (10:44 -0800)] 
Merge pull request #11690 from lipis/patch-2

Get rid of empty line before the last closing bracket

11 years agoGet rid of empty line before the last closing bracket 11690/head
Lipis [Tue, 3 Dec 2013 14:03:07 +0000 (15:03 +0100)] 
Get rid of empty line before the last closing bracket

11 years agoMerge pull request #10662 from kevinlisota/thumbnail-images
Mark Otto [Mon, 2 Dec 2013 05:18:41 +0000 (21:18 -0800)] 
Merge pull request #10662 from kevinlisota/thumbnail-images

add responsive CSS to hyperlinked images when thumbnail caption markup used

11 years agoMerge pull request #11667 from neilhem/master
Mark Otto [Mon, 2 Dec 2013 04:48:43 +0000 (20:48 -0800)] 
Merge pull request #11667 from neilhem/master

replace double quotation marks with single in code examples

11 years agoreplace double quotation marks with single in code examples 11667/head
Rakhat Jabagin [Mon, 2 Dec 2013 04:39:53 +0000 (10:39 +0600)] 
replace double quotation marks with single in code examples

11 years agoMerge branch 'master' into pr/11412
Mark Otto [Mon, 2 Dec 2013 04:27:30 +0000 (20:27 -0800)] 
Merge branch 'master' into pr/11412

Conflicts:
dist/js/bootstrap.min.js

11 years agogrunt dist
Mark Otto [Mon, 2 Dec 2013 04:27:14 +0000 (20:27 -0800)] 
grunt dist

11 years agoadd comment
Mark Otto [Mon, 2 Dec 2013 04:27:09 +0000 (20:27 -0800)] 
add comment

11 years agoMerge pull request #11499 from bassjobsen/patch-3
Mark Otto [Mon, 2 Dec 2013 04:18:40 +0000 (20:18 -0800)] 
Merge pull request #11499 from bassjobsen/patch-3

fix navbar dropdown window resize bug

11 years agobump version numbers to 3.0.3
Mark Otto [Mon, 2 Dec 2013 03:31:52 +0000 (19:31 -0800)] 
bump version numbers to 3.0.3

11 years agogrunt
Mark Otto [Mon, 2 Dec 2013 03:30:10 +0000 (19:30 -0800)] 
grunt

11 years agoRework navbar padding and margins for right aligned last-child elements
Mark Otto [Mon, 2 Dec 2013 03:27:33 +0000 (19:27 -0800)] 
Rework navbar padding and margins for right aligned last-child elements

This slight reworking of the navbar spacing was brought about by a
problem noted in #11530: use of `.navbar-form.navbar-right` leaves an
extra 15px of space on the right.

Here’s what’s new:

* Removed the `padding` on `.navbar-collapse` within static top, fixed
top, and fixed bottom navbars. Meaning, it’s still there for the
default navbar. This was the root cause of the extra 15px padding for
navbar forms.
* As part of this, I also replaced the existing negative margin
overrides for last-child elements with more contextual ones within
their sub-components.

Overall not too different, but should be more effective now and easier
to work with now.

For example of new changes, see http://jsbin.com/odeSiSo/1/.

11 years agogrunt
Mark Otto [Mon, 2 Dec 2013 02:35:58 +0000 (18:35 -0800)] 
grunt

11 years agoFixes #11357: Vertically center sm and xs buttons in the navbar
Mark Otto [Mon, 2 Dec 2013 02:13:27 +0000 (18:13 -0800)] 
Fixes #11357: Vertically center sm and xs buttons in the navbar

11 years agoFixes #9927: Update non-responsive example to prevent .navbar-collapse border from...
Mark Otto [Mon, 2 Dec 2013 02:06:57 +0000 (18:06 -0800)] 
Fixes #9927: Update non-responsive example to prevent .navbar-collapse border from increasing height and increase specificity of nav selectors to keep dropdowns looking the same

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Mon, 2 Dec 2013 01:25:37 +0000 (17:25 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agofixes #11508: mention in docs that inline forms only work at 768px and up
Mark Otto [Sun, 1 Dec 2013 21:51:17 +0000 (13:51 -0800)] 
fixes #11508: mention in docs that inline forms only work at 768px and up

11 years agoMerge pull request #11662 from ZDroid/deprecation-fix
Mark Otto [Sun, 1 Dec 2013 19:16:17 +0000 (11:16 -0800)] 
Merge pull request #11662 from ZDroid/deprecation-fix

Use mixin instead of whole code

11 years agoFixes #10941: Fix Glyphicons path for those importing bootstrap.less from another...
Mark Otto [Sun, 1 Dec 2013 08:20:47 +0000 (00:20 -0800)] 
Fixes #10941: Fix Glyphicons path for those importing bootstrap.less from another directory

11 years agoUse mixin instead of whole code 11662/head
Zlatan Vasović [Sun, 1 Dec 2013 08:18:27 +0000 (09:18 +0100)] 
Use mixin instead of whole code

11 years agoAdd docs example to go with #11536
Mark Otto [Sun, 1 Dec 2013 07:38:39 +0000 (23:38 -0800)] 
Add docs example to go with #11536

11 years agoMerge branch 'master' into pr/11536
Mark Otto [Sun, 1 Dec 2013 07:35:56 +0000 (23:35 -0800)] 
Merge branch 'master' into pr/11536

Conflicts:
dist/css/bootstrap.min.css

11 years agogrunt
Mark Otto [Sun, 1 Dec 2013 07:35:08 +0000 (23:35 -0800)] 
grunt

11 years agoFixes #11658: Increase min-height of .radio and .checkbox for horizontal forms to...
Mark Otto [Sun, 1 Dec 2013 07:17:43 +0000 (23:17 -0800)] 
Fixes #11658: Increase min-height of .radio and .checkbox for horizontal forms to ensure alignment of content below

11 years agoRemove browser default top margin from dl elements
Mark Otto [Sun, 1 Dec 2013 07:08:41 +0000 (23:08 -0800)] 
Remove browser default top margin from dl elements

11 years agoFixes #11623: Reset position to static for grid columns within tables to unfuck borde...
Mark Otto [Sun, 1 Dec 2013 07:04:55 +0000 (23:04 -0800)] 
Fixes #11623: Reset position to static for grid columns within tables to unfuck borders in IE9/10 and Firefox

11 years agoShorten sticky footer examples footer content to prevent wrapping
Mark Otto [Sun, 1 Dec 2013 06:41:43 +0000 (22:41 -0800)] 
Shorten sticky footer examples footer content to prevent wrapping

11 years agogrunt
Mark Otto [Sun, 1 Dec 2013 05:17:53 +0000 (21:17 -0800)] 
grunt

11 years agoFixes #10716: Update what's included docs to add info on both download options
Mark Otto [Sun, 1 Dec 2013 05:05:39 +0000 (21:05 -0800)] 
Fixes #10716: Update what's included docs to add info on both download options

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sun, 1 Dec 2013 00:37:49 +0000 (16:37 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoFixes #11268: Account for badges within buttons by matching background to text color...
Mark Otto [Sun, 1 Dec 2013 00:29:52 +0000 (16:29 -0800)] 
Fixes #11268: Account for badges within buttons by matching background to text color and text color to background

11 years agoMerge pull request #11217 from ZDroid/nest
Mark Otto [Sun, 1 Dec 2013 00:26:38 +0000 (16:26 -0800)] 
Merge pull request #11217 from ZDroid/nest

Add quick fix to labels and badges in buttons

11 years agogrunt
Mark Otto [Sun, 1 Dec 2013 00:21:19 +0000 (16:21 -0800)] 
grunt

11 years agoFixes #11277: Drop the abbr element from the .initialism selector
Mark Otto [Sun, 1 Dec 2013 00:18:07 +0000 (16:18 -0800)] 
Fixes #11277: Drop the abbr element from the .initialism selector

11 years agoFixes #11420: Update migration guide on split of .visible-/.hidden-desktop into ...
Mark Otto [Sun, 1 Dec 2013 00:16:24 +0000 (16:16 -0800)] 
Fixes #11420: Update migration guide on split of .visible-/.hidden-desktop into .visible-/.hidden-md and .visible-/.hidden-lg

11 years agoFixes #11444: Use @navbar-padding-vertical for nav links padding
Mark Otto [Sun, 1 Dec 2013 00:08:49 +0000 (16:08 -0800)] 
Fixes #11444: Use @navbar-padding-vertical for nav links padding

11 years agoFixes #11402: Set width: auto; to select.form-control within .form-inline
Mark Otto [Sat, 30 Nov 2013 23:57:25 +0000 (15:57 -0800)] 
Fixes #11402: Set width: auto; to select.form-control within .form-inline

11 years agoFixes #11515: Reorder the headings with body text and text emphasis classes
Mark Otto [Sat, 30 Nov 2013 22:58:35 +0000 (14:58 -0800)] 
Fixes #11515: Reorder the headings with body text and text emphasis classes

11 years agoFixes #11544: Add color: inherit; to .panel-title to ensure proper text color when...
Mark Otto [Sat, 30 Nov 2013 22:53:54 +0000 (14:53 -0800)] 
Fixes #11544: Add color: inherit; to .panel-title to ensure proper text color when customizing @headings-color

11 years agoMerge branch 'master' into pr/11648
Mark Otto [Sat, 30 Nov 2013 21:09:55 +0000 (13:09 -0800)] 
Merge branch 'master' into pr/11648

Conflicts:
dist/css/bootstrap.min.css
less/grid.less

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sat, 30 Nov 2013 20:52:45 +0000 (12:52 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

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 agoMerge pull request #11398 from thelukemcdonald/master
Mark Otto [Sat, 30 Nov 2013 20:47:07 +0000 (12:47 -0800)] 
Merge pull request #11398 from thelukemcdonald/master

Don't print .clearfix() comment references

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 agoRemove redundant comments 11648/head
Zlatan Vasović [Fri, 29 Nov 2013 10:37:06 +0000 (11:37 +0100)] 
Remove redundant comments

11 years agoAdd missing last column float
Zlatan Vasović [Fri, 29 Nov 2013 07:37:54 +0000 (08:37 +0100)] 
Add missing last column float

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