]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
11 years agoMerge branch 'master' of https://github.com/twbs/bootstrap into correction 11772/head
kostyatretyak [Sun, 8 Dec 2013 07:13:22 +0000 (09:13 +0200)] 
Merge branch 'master' of https://github.com/twbs/bootstrap into correction

11 years agoFixed some errors in the docs javascript.html
kostyatretyak [Sun, 8 Dec 2013 07:11:43 +0000 (09:11 +0200)] 
Fixed some errors in the docs javascript.html

11 years agoimprove icon display on narrow devices
Mark Otto [Sun, 8 Dec 2013 00:28:29 +0000 (16:28 -0800)] 
improve icon display on narrow devices

11 years agoprevent horizontal scroll on components
Mark Otto [Sun, 8 Dec 2013 00:22:43 +0000 (16:22 -0800)] 
prevent horizontal scroll on components

11 years agoShorter download text because narrow viewports
Mark Otto [Sun, 8 Dec 2013 00:22:00 +0000 (16:22 -0800)] 
Shorter download text because narrow viewports

11 years agoFixes #11729: Show code snippets on mobile views
Mark Otto [Sun, 8 Dec 2013 00:21:46 +0000 (16:21 -0800)] 
Fixes #11729: Show code snippets on mobile views

11 years agoFixes #11756: Mention document mode checking ability in IE comaptibility modes
Mark Otto [Sat, 7 Dec 2013 23:57:17 +0000 (15:57 -0800)] 
Fixes #11756: Mention document mode checking ability in IE comaptibility modes

11 years agoMerge branch 'pr/11138'
Mark Otto [Sat, 7 Dec 2013 22:10:41 +0000 (14:10 -0800)] 
Merge branch 'pr/11138'

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

11 years agoContextual list group cleanup
Mark Otto [Sat, 7 Dec 2013 22:09:03 +0000 (14:09 -0800)] 
Contextual list group cleanup

* Adds nav link to sidebar for contextual classes
* Refactors to use prefixed classes, like .list-group-item-info, instead of chained classes
* Adds default and linked variations to example in docs

11 years agogrunt dist after adding .text-justify
Mark Otto [Sat, 7 Dec 2013 20:19:17 +0000 (12:19 -0800)] 
grunt dist after adding .text-justify

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

11 years agoFixes #11193: Add kbd element styles to indicate user input via keyboard
Mark Otto [Sat, 7 Dec 2013 20:18:13 +0000 (12:18 -0800)] 
Fixes #11193: Add kbd element styles to indicate user input via keyboard

11 years agoMerge pull request #11675 from GraceNut/feature/text-justify
Mark Otto [Sat, 7 Dec 2013 19:58:31 +0000 (11:58 -0800)] 
Merge pull request #11675 from GraceNut/feature/text-justify

Added text-justify class to type.less

11 years agoFixes #10884: Adds .info variant to contextual table classes
Mark Otto [Sat, 7 Dec 2013 19:56:35 +0000 (11:56 -0800)] 
Fixes #10884: Adds .info variant to contextual table classes

11 years agoReorder button and table variants for consistent order
Mark Otto [Sat, 7 Dec 2013 19:47:37 +0000 (11:47 -0800)] 
Reorder button and table variants for consistent order

11 years agoFixes #11766: Use color var for background on badges in buttons to restore proper...
Mark Otto [Sat, 7 Dec 2013 19:45:11 +0000 (11:45 -0800)] 
Fixes #11766: Use color var for background on badges in buttons to restore proper background to default button badge

11 years agogrunt dist
Mark Otto [Sat, 7 Dec 2013 19:44:32 +0000 (11:44 -0800)] 
grunt dist

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sat, 7 Dec 2013 19:41:02 +0000 (11:41 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoFixes #11764: Add meta data to docs for description, keywords, and authors
Mark Otto [Sat, 7 Dec 2013 19:40:08 +0000 (11:40 -0800)] 
Fixes #11764: Add meta data to docs for description, keywords, and authors

11 years agoMerge pull request #11757 from ZDroid/darken-toggle
Mark Otto [Sat, 7 Dec 2013 19:34:03 +0000 (11:34 -0800)] 
Merge pull request #11757 from ZDroid/darken-toggle

Darken navbar toggle icon bar to meet WCAG

11 years agogrunt
Mark Otto [Sat, 7 Dec 2013 19:32:39 +0000 (11:32 -0800)] 
grunt

11 years agoFixes #11760: Remove mailing list links from readme and about pages
Mark Otto [Sat, 7 Dec 2013 19:22:38 +0000 (11:22 -0800)] 
Fixes #11760: Remove mailing list links from readme and about pages

Links are dead now since Google blacklisted the group for massive spam,
which they could be of no help in resolving. We’ll have a new official
forum for discussions soon folks <3.

11 years agoMerge pull request #11765 from ZDroid/docs-min-js
Mark Otto [Sat, 7 Dec 2013 19:09:43 +0000 (11:09 -0800)] 
Merge pull request #11765 from ZDroid/docs-min-js

Load minified Bootstrap JS code

11 years agoLoad minified Bootstrap JS code 11765/head
Zlatan Vasović [Sat, 7 Dec 2013 09:27:28 +0000 (10:27 +0100)] 
Load minified Bootstrap JS code

11 years agoMerge pull request #11761 from twbs/jscs
Mark Otto [Sat, 7 Dec 2013 03:33:53 +0000 (19:33 -0800)] 
Merge pull request #11761 from twbs/jscs

add JavaScript Code Style checker integration

11 years agointegrate JSCS 11761/head
Chris Rebert [Sat, 7 Dec 2013 00:51:38 +0000 (16:51 -0800)] 
integrate JSCS

11 years agofix some JS to pass jscs
Chris Rebert [Sat, 7 Dec 2013 00:51:59 +0000 (16:51 -0800)] 
fix some JS to pass jscs

11 years agoMerge pull request #11745 from XhmikosR/function-spaces
Chris Rebert [Sat, 7 Dec 2013 00:43:09 +0000 (16:43 -0800)] 
Merge pull request #11745 from XhmikosR/function-spaces

Be consistent with function () spaces

11 years agoMerge pull request #11758 from ZDroid/rm-brstck-bower
Chris Rebert [Fri, 6 Dec 2013 21:45:58 +0000 (13:45 -0800)] 
Merge pull request #11758 from ZDroid/rm-brstck-bower

Drop browserstack.json from bower.json ignore

11 years agoDrop browserstack.json from bower.json ignore 11758/head
Zlatan Vasović [Fri, 6 Dec 2013 21:45:17 +0000 (22:45 +0100)] 
Drop browserstack.json from bower.json ignore

11 years agoDarken icon bar to meet WCAG 11757/head
Zlatan Vasović [Fri, 6 Dec 2013 21:34:29 +0000 (22:34 +0100)] 
Darken icon bar to meet WCAG

11 years agoMerge pull request #11755 from twbs/track-customize-js
Mark Otto [Fri, 6 Dec 2013 21:21:00 +0000 (13:21 -0800)] 
Merge pull request #11755 from twbs/track-customize-js

track customize.js so that customizer works on GitHub Pages site

11 years agoneed customize.js to be tracked for it to work on GitHub Pages 11755/head
Chris Rebert [Fri, 6 Dec 2013 19:35:46 +0000 (11:35 -0800)] 
need customize.js to be tracked for it to work on GitHub Pages

follow-up to #11738

11 years agogrunt
Chris Rebert [Fri, 6 Dec 2013 19:33:18 +0000 (11:33 -0800)] 
grunt

11 years agoMerge pull request #11738 from XhmikosR/min-assets
Mark Otto [Fri, 6 Dec 2013 19:27:19 +0000 (11:27 -0800)] 
Merge pull request #11738 from XhmikosR/min-assets

Minify docs-assets too.

11 years agoMerge pull request #11742 from vincentchan/master
Chris Rebert [Fri, 6 Dec 2013 17:44:15 +0000 (09:44 -0800)] 
Merge pull request #11742 from vincentchan/master

Added link to Bootstrap in French (in about.html)

11 years agoMerge pull request #11740 from XhmikosR/trailing-spaces
Chris Rebert [Fri, 6 Dec 2013 17:42:39 +0000 (09:42 -0800)] 
Merge pull request #11740 from XhmikosR/trailing-spaces

Remove trailing spaces

11 years agoUse a space before functions' bracket consistently. 11745/head
XhmikosR [Fri, 6 Dec 2013 10:23:08 +0000 (12:23 +0200)] 
Use a space before functions' bracket consistently.

11 years agoUse a space after function consistently.
XhmikosR [Fri, 6 Dec 2013 10:20:59 +0000 (12:20 +0200)] 
Use a space after function consistently.

11 years agoAdding Bootstrap in French 11742/head
Vincent Chan [Fri, 6 Dec 2013 10:33:20 +0000 (18:33 +0800)] 
Adding Bootstrap in French

11 years agobower.json: remove trailing spaces. 11740/head
XhmikosR [Fri, 6 Dec 2013 09:32:10 +0000 (11:32 +0200)] 
bower.json: remove trailing spaces.

11 years agoMinify docs-assets too. 11738/head
XhmikosR [Thu, 19 Sep 2013 14:41:14 +0000 (17:41 +0300)] 
Minify docs-assets too.

11 years agoMerge pull request #11723 from stof/patch-1
Chris Rebert [Fri, 6 Dec 2013 00:53:15 +0000 (16:53 -0800)] 
Merge pull request #11723 from stof/patch-1

Added the removal of tab-content and tab-pane in the migration guide

11 years agoMerge pull request #11733 from KostyaTretyak/edit
Chris Rebert [Fri, 6 Dec 2013 00:50:03 +0000 (16:50 -0800)] 
Merge pull request #11733 from KostyaTretyak/edit

Fixed some errors in the documentation

11 years agoThis is error? 11733/head
kostyatretyak [Fri, 6 Dec 2013 00:28:42 +0000 (02:28 +0200)] 
This is error?

11 years agoFixed another small error
kostyatretyak [Fri, 6 Dec 2013 00:03:35 +0000 (02:03 +0200)] 
Fixed another small error

11 years agoMerge branch 'master' of https://github.com/twbs/bootstrap into edit
kostyatretyak [Thu, 5 Dec 2013 23:36:53 +0000 (01:36 +0200)] 
Merge branch 'master' of https://github.com/twbs/bootstrap into edit

11 years agoAdded the removal of tab-content and tab-pane in the migration guide 11723/head
Christophe Coevoet [Thu, 5 Dec 2013 16:45:22 +0000 (17:45 +0100)] 
Added the removal of tab-content and tab-pane in the migration guide

11 years agoMerge pull request #11718 from KostyaTretyak/once v3.0.3
Mark Otto [Thu, 5 Dec 2013 16:09:10 +0000 (08:09 -0800)] 
Merge pull request #11718 from KostyaTretyak/once

Added link to Ukrainian translation website (in about.html)

11 years agoAdded links to Ukrainian translation website 11718/head
kostyatretyak [Thu, 5 Dec 2013 10:33:55 +0000 (12:33 +0200)] 
Added links to Ukrainian translation website

11 years agoone last grunt
Mark Otto [Thu, 5 Dec 2013 06:54:03 +0000 (22:54 -0800)] 
one last grunt

11 years agoMerge pull request #11714 from ZDroid/redundant-comment
Mark Otto [Thu, 5 Dec 2013 06:52:12 +0000 (22:52 -0800)] 
Merge pull request #11714 from ZDroid/redundant-comment

Remove redundant, duplicate comment

11 years agoRemove redundant, duplicate comment 11714/head
Zlatan Vasović [Thu, 5 Dec 2013 06:43:50 +0000 (07:43 +0100)] 
Remove redundant, duplicate comment

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Thu, 5 Dec 2013 06:34:25 +0000 (22:34 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoFixes #11610: Add @grid-float-breakpoint-max to better link navbar behavior across...
Mark Otto [Thu, 5 Dec 2013 06:32:56 +0000 (22:32 -0800)] 
Fixes #11610: Add @grid-float-breakpoint-max to better link navbar behavior across viewports and improve customization.

Also addresses #10371, #10395, and #10465.

11 years agoMerge pull request #11671 from XhmikosR/updates
Mark Otto [Thu, 5 Dec 2013 05:58:00 +0000 (21:58 -0800)] 
Merge pull request #11671 from XhmikosR/updates

Update 3rd party asset libraries

11 years agoMerge branch 'master' into gradient-prefix-cleanup 11694/head
Mark Otto [Thu, 5 Dec 2013 05:23:09 +0000 (21:23 -0800)] 
Merge branch 'master' into gradient-prefix-cleanup

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

11 years agogrunt
Mark Otto [Thu, 5 Dec 2013 05:22:24 +0000 (21:22 -0800)] 
grunt

11 years agoFixes #11712: Better support for .table-responsive within .panel's
Mark Otto [Thu, 5 Dec 2013 05:13:33 +0000 (21:13 -0800)] 
Fixes #11712: Better support for .table-responsive within .panel's

11 years agoFixes #11436: mention in docs that .container isn't nestable; update docs to mention...
Mark Otto [Thu, 5 Dec 2013 05:10:13 +0000 (21:10 -0800)] 
Fixes #11436: mention in docs that .container isn't nestable; update docs to mention width, not max-width

11 years agoMerge pull request #11710 from JoahG/bootstrap-thumb
Mark Otto [Thu, 5 Dec 2013 04:45:57 +0000 (20:45 -0800)] 
Merge pull request #11710 from JoahG/bootstrap-thumb

Updates Jumbotron thumbnail

11 years agoMerge pull request #11709 from mdxs/patch-1
Chris Rebert [Wed, 4 Dec 2013 18:50:50 +0000 (10:50 -0800)] 
Merge pull request #11709 from mdxs/patch-1

Dropping unused variable in dropdown.js

11 years agoAdd a migration tip for .label-important to .label-danger
Cyrus Stoller [Wed, 4 Dec 2013 09:16:33 +0000 (01:16 -0800)] 
Add a migration tip for .label-important to .label-danger

11 years agoUpdates Bootstrap thumbnail 11710/head
Joah Gerstenberg [Wed, 4 Dec 2013 12:26:12 +0000 (06:26 -0600)] 
Updates Bootstrap thumbnail

11 years agoDropping unused variable in dropdown.js 11709/head
mdxs [Wed, 4 Dec 2013 10:15:48 +0000 (11:15 +0100)] 
Dropping unused variable in dropdown.js

Dropping an unused variable in the Dropdown function inside the `dropdown.js` code.

There are no new/changed unit tests, as there are no feature/bug changes requiring new test cases.

For the record: I agree to dual-license this contribution under the Apache 2 and MIT licenses.

11 years agoMerge pull request #11705 from cyrusstoller/migration-guide
Chris Rebert [Wed, 4 Dec 2013 08:51:13 +0000 (00:51 -0800)] 
Merge pull request #11705 from cyrusstoller/migration-guide

Add a migration tip for .label to .label-default

11 years agoAdd a migration tip for .label to .label-default 11705/head
Cyrus Stoller [Wed, 4 Dec 2013 08:34:38 +0000 (00:34 -0800)] 
Add a migration tip for .label to .label-default

11 years agoMerge branch 'master' into responsive-visibility-table
Mark Otto [Wed, 4 Dec 2013 06:58:25 +0000 (22:58 -0800)] 
Merge branch 'master' into responsive-visibility-table

Conflicts:
dist/css/bootstrap.min.css

11 years agoMerge pull request #11697 from twbs/btn-xs-10979
Mark Otto [Wed, 4 Dec 2013 06:55:11 +0000 (22:55 -0800)] 
Merge pull request #11697 from twbs/btn-xs-10979

fix .btn-group-xs portion of #10979

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 agoCorrected a small error in the documentation
kostyatretyak [Wed, 4 Dec 2013 04:21:54 +0000 (06:21 +0200)] 
Corrected a small error in the documentation

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 agofix .btn-group-xs portion of #10979 11697/head
Chris Rebert [Wed, 4 Dec 2013 02:03:04 +0000 (18:03 -0800)] 
fix .btn-group-xs portion of #10979

11 years ago-moz and old webkit syntax removed for gradients based on
awebdeveloper [Tue, 19 Nov 2013 08:20:33 +0000 (13:50 +0530)] 
-moz and old webkit syntax removed for gradients based on
http://caniuse.com/#search=grad

11 years agoadd <table> case to responsive-visibility mixin; see #10056 11693/head
Chris Rebert [Tue, 3 Dec 2013 21:57:28 +0000 (13:57 -0800)] 
add <table> case to responsive-visibility mixin; see #10056

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 agoAdded text-justify class to type.less 11675/head
Haley [Mon, 2 Dec 2013 19:29:54 +0000 (13:29 -0600)] 
Added text-justify class to type.less

11 years agoUpdate filesaver.js to the latest git. 11671/head
XhmikosR [Mon, 2 Dec 2013 12:15:57 +0000 (14:15 +0200)] 
Update filesaver.js to the latest git.

11 years agoUpdate jszip.js to the latest git.
XhmikosR [Mon, 2 Dec 2013 12:13:10 +0000 (14:13 +0200)] 
Update jszip.js to the latest git.

11 years agoUpdate holder.js to v2.2.
XhmikosR [Mon, 2 Dec 2013 12:12:46 +0000 (14:12 +0200)] 
Update holder.js to v2.2.

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/.