]>
git.ipfire.org Git - thirdparty/bootstrap.git/log
Mark Otto [Sun, 8 Dec 2013 00:22:43 +0000 (16:22 -0800)]
prevent horizontal scroll on components
Mark Otto [Sun, 8 Dec 2013 00:22:00 +0000 (16:22 -0800)]
Shorter download text because narrow viewports
Mark Otto [Sun, 8 Dec 2013 00:21:46 +0000 (16:21 -0800)]
Fixes #11729: Show code snippets on mobile views
Mark Otto [Sat, 7 Dec 2013 23:57:17 +0000 (15:57 -0800)]
Fixes #11756: Mention document mode checking ability in IE comaptibility modes
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
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
Mark Otto [Sat, 7 Dec 2013 20:19:17 +0000 (12:19 -0800)]
grunt dist after adding .text-justify
Mark Otto [Sat, 7 Dec 2013 20:18:52 +0000 (12:18 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
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
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
Mark Otto [Sat, 7 Dec 2013 19:56:35 +0000 (11:56 -0800)]
Fixes #10884: Adds .info variant to contextual table classes
Mark Otto [Sat, 7 Dec 2013 19:47:37 +0000 (11:47 -0800)]
Reorder button and table variants for consistent order
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
Mark Otto [Sat, 7 Dec 2013 19:44:32 +0000 (11:44 -0800)]
grunt dist
Mark Otto [Sat, 7 Dec 2013 19:41:02 +0000 (11:41 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
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
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
Mark Otto [Sat, 7 Dec 2013 19:32:39 +0000 (11:32 -0800)]
grunt
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.
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
Zlatan Vasović [Sat, 7 Dec 2013 09:27:28 +0000 (10:27 +0100)]
Load minified Bootstrap JS code
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
Chris Rebert [Sat, 7 Dec 2013 00:51:38 +0000 (16:51 -0800)]
integrate JSCS
Chris Rebert [Sat, 7 Dec 2013 00:51:59 +0000 (16:51 -0800)]
fix some JS to pass jscs
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
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
Zlatan Vasović [Fri, 6 Dec 2013 21:45:17 +0000 (22:45 +0100)]
Drop browserstack.json from bower.json ignore
Zlatan Vasović [Fri, 6 Dec 2013 21:34:29 +0000 (22:34 +0100)]
Darken icon bar to meet WCAG
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
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
Chris Rebert [Fri, 6 Dec 2013 19:33:18 +0000 (11:33 -0800)]
grunt
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.
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)
Chris Rebert [Fri, 6 Dec 2013 17:42:39 +0000 (09:42 -0800)]
Merge pull request #11740 from XhmikosR/trailing-spaces
Remove trailing spaces
XhmikosR [Fri, 6 Dec 2013 10:23:08 +0000 (12:23 +0200)]
Use a space before functions' bracket consistently.
XhmikosR [Fri, 6 Dec 2013 10:20:59 +0000 (12:20 +0200)]
Use a space after function consistently.
Vincent Chan [Fri, 6 Dec 2013 10:33:20 +0000 (18:33 +0800)]
Adding Bootstrap in French
XhmikosR [Fri, 6 Dec 2013 09:32:10 +0000 (11:32 +0200)]
bower.json: remove trailing spaces.
XhmikosR [Thu, 19 Sep 2013 14:41:14 +0000 (17:41 +0300)]
Minify docs-assets too.
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
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
kostyatretyak [Fri, 6 Dec 2013 00:28:42 +0000 (02:28 +0200)]
This is error?
kostyatretyak [Fri, 6 Dec 2013 00:03:35 +0000 (02:03 +0200)]
Fixed another small error
kostyatretyak [Thu, 5 Dec 2013 23:36:53 +0000 (01:36 +0200)]
Merge branch 'master' of https://github.com/twbs/bootstrap into edit
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
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
kostyatretyak [Wed, 4 Dec 2013 04:21:54 +0000 (06:21 +0200)]
Corrected a small error in the documentation
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
Haley [Mon, 2 Dec 2013 19:29:54 +0000 (13:29 -0600)]
Added text-justify class to type.less
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