]>
git.ipfire.org Git - thirdparty/bootstrap.git/log
Mark Otto [Thu, 23 Jan 2014 19:04:45 +0000 (13:04 -0600)]
add temp zip file that works
Mark Otto [Thu, 5 Dec 2013 16:56:33 +0000 (08:56 -0800)]
Merge branch 'master' into gh-pages
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)
kostyatretyak [Thu, 5 Dec 2013 10:33:55 +0000 (12:33 +0200)]
Added links to Ukrainian translation website
Mark Otto [Thu, 5 Dec 2013 06:54:03 +0000 (22:54 -0800)]
one last grunt
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
Zlatan Vasović [Thu, 5 Dec 2013 06:43:50 +0000 (07:43 +0100)]
Remove redundant, duplicate comment
Mark Otto [Thu, 5 Dec 2013 06:34:25 +0000 (22:34 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
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.
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
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
Mark Otto [Thu, 5 Dec 2013 05:22:24 +0000 (21:22 -0800)]
grunt
Mark Otto [Thu, 5 Dec 2013 05:13:33 +0000 (21:13 -0800)]
Fixes #11712: Better support for .table-responsive within .panel's
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
Mark Otto [Thu, 5 Dec 2013 04:45:57 +0000 (20:45 -0800)]
Merge pull request #11710 from JoahG/bootstrap-thumb
Updates Jumbotron thumbnail
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
Cyrus Stoller [Wed, 4 Dec 2013 09:16:33 +0000 (01:16 -0800)]
Add a migration tip for .label-important to .label-danger
Joah Gerstenberg [Wed, 4 Dec 2013 12:26:12 +0000 (06:26 -0600)]
Updates Bootstrap thumbnail
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.
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
Cyrus Stoller [Wed, 4 Dec 2013 08:34:38 +0000 (00:34 -0800)]
Add a migration tip for .label to .label-default
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
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
Chris Rebert [Wed, 4 Dec 2013 06:08:26 +0000 (22:08 -0800)]
fix broken link in CONTRIBUTING.md
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
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
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>
Chris Rebert [Wed, 4 Dec 2013 02:03:04 +0000 (18:03 -0800)]
fix .btn-group-xs portion of #10979
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
Chris Rebert [Tue, 3 Dec 2013 21:57:28 +0000 (13:57 -0800)]
add <table> case to responsive-visibility mixin; see #10056
Chris Rebert [Tue, 3 Dec 2013 21:54:56 +0000 (13:54 -0800)]
grunt
Chris Rebert [Tue, 3 Dec 2013 21:31:47 +0000 (13:31 -0800)]
add comment regarding #11598
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
Chris Rebert [Tue, 3 Dec 2013 19:22:52 +0000 (11:22 -0800)]
account for #11050 in the docs
Chris Rebert [Tue, 3 Dec 2013 19:14:13 +0000 (11:14 -0800)]
reference root issue in explanatory comment
Chris Rebert [Tue, 3 Dec 2013 19:06:31 +0000 (11:06 -0800)]
add .gitattributes file to enforce Unix newlines within the repo
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.
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
Lipis [Tue, 3 Dec 2013 14:03:07 +0000 (15:03 +0100)]
Get rid of empty line before the last closing bracket
XhmikosR [Mon, 2 Dec 2013 12:15:57 +0000 (14:15 +0200)]
Update filesaver.js to the latest git.
XhmikosR [Mon, 2 Dec 2013 12:13:10 +0000 (14:13 +0200)]
Update jszip.js to the latest git.
XhmikosR [Mon, 2 Dec 2013 12:12:46 +0000 (14:12 +0200)]
Update holder.js to v2.2.
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
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
Rakhat Jabagin [Mon, 2 Dec 2013 04:39:53 +0000 (10:39 +0600)]
replace double quotation marks with single in code examples
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
Mark Otto [Mon, 2 Dec 2013 04:27:14 +0000 (20:27 -0800)]
grunt dist
Mark Otto [Mon, 2 Dec 2013 04:27:09 +0000 (20:27 -0800)]
add comment
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
Mark Otto [Mon, 2 Dec 2013 03:31:52 +0000 (19:31 -0800)]
bump version numbers to 3.0.3
Mark Otto [Mon, 2 Dec 2013 03:30:10 +0000 (19:30 -0800)]
grunt
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/.
Mark Otto [Mon, 2 Dec 2013 02:35:58 +0000 (18:35 -0800)]
grunt
Mark Otto [Mon, 2 Dec 2013 02:13:27 +0000 (18:13 -0800)]
Fixes #11357: Vertically center sm and xs buttons in the navbar
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
Mark Otto [Mon, 2 Dec 2013 01:25:37 +0000 (17:25 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
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
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
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
Zlatan Vasović [Sun, 1 Dec 2013 08:18:27 +0000 (09:18 +0100)]
Use mixin instead of whole code
Mark Otto [Sun, 1 Dec 2013 07:38:39 +0000 (23:38 -0800)]
Add docs example to go with #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
Mark Otto [Sun, 1 Dec 2013 07:35:08 +0000 (23:35 -0800)]
grunt
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
Mark Otto [Sun, 1 Dec 2013 07:08:41 +0000 (23:08 -0800)]
Remove browser default top margin from dl elements
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
Mark Otto [Sun, 1 Dec 2013 06:41:43 +0000 (22:41 -0800)]
Shorten sticky footer examples footer content to prevent wrapping
Mark Otto [Sun, 1 Dec 2013 05:17:53 +0000 (21:17 -0800)]
grunt
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
Mark Otto [Sun, 1 Dec 2013 00:37:49 +0000 (16:37 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
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
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
Mark Otto [Sun, 1 Dec 2013 00:21:19 +0000 (16:21 -0800)]
grunt
Mark Otto [Sun, 1 Dec 2013 00:18:07 +0000 (16:18 -0800)]
Fixes #11277: Drop the abbr element from the .initialism selector
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
Mark Otto [Sun, 1 Dec 2013 00:08:49 +0000 (16:08 -0800)]
Fixes #11444: Use @navbar-padding-vertical for nav links padding
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
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
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
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
Mark Otto [Sat, 30 Nov 2013 20:52:45 +0000 (12:52 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
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
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
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
Mark Otto [Sat, 30 Nov 2013 19:46:22 +0000 (11:46 -0800)]
Merge pull request #11657 from ZDroid/homepage
Use pkg.homepage
Zlatan Vasović [Sat, 30 Nov 2013 15:11:41 +0000 (16:11 +0100)]
Use pkg.homepage
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.
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
Mark Otto [Sat, 30 Nov 2013 08:43:27 +0000 (00:43 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
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
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
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
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
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
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
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
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
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
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
Mark Otto [Sat, 30 Nov 2013 07:43:01 +0000 (23:43 -0800)]
Merge pull request #11617 from guybedford/master
include jspm package configuration