]>
git.ipfire.org Git - thirdparty/bootstrap.git/log
Mark Otto [Tue, 4 Mar 2014 08:41:57 +0000 (00:41 -0800)]
Merge branch 'master' into rtl_via_css_flip
Conflicts:
docs/assets/js/raw-files.min.js
Mark Otto [Tue, 4 Mar 2014 08:30:40 +0000 (00:30 -0800)]
grunt
Mark Otto [Tue, 4 Mar 2014 08:27:08 +0000 (00:27 -0800)]
Merge pull request #12745 from ronnyhaase/panel-vars
Defined and use variables for .panel-heading & .panel-footer padding
Mark Otto [Tue, 4 Mar 2014 07:50:28 +0000 (23:50 -0800)]
fix nav
Mark Otto [Tue, 4 Mar 2014 07:50:04 +0000 (23:50 -0800)]
Rename RTL files and add some basic docs
Mark Otto [Tue, 4 Mar 2014 06:49:43 +0000 (22:49 -0800)]
Simplify gruntfile more to remove theme RTL
Mark Otto [Tue, 4 Mar 2014 05:56:40 +0000 (21:56 -0800)]
grunt
Mark Otto [Tue, 4 Mar 2014 05:54:07 +0000 (21:54 -0800)]
Don't RTL the theme file--no need
Mark Otto [Tue, 4 Mar 2014 05:52:56 +0000 (21:52 -0800)]
Merge branch 'rtl_via_css_flip' of github.com:twbs/bootstrap into rtl_via_css_flip
Conflicts:
Gruntfile.js
package.json
test-infra/npm-shrinkwrap.canonical.json
Mark Otto [Tue, 4 Mar 2014 05:50:03 +0000 (21:50 -0800)]
Merge branch 'master' into rtl_via_css_flip
Mark Otto [Tue, 4 Mar 2014 05:39:53 +0000 (21:39 -0800)]
Fixes #12593: Add support for table bodies and table rows to the collapse plugin
Mark Otto [Tue, 4 Mar 2014 05:27:20 +0000 (21:27 -0800)]
Merge pull request #12904 from twbs/keywords
add (more) keywords to package definition files
Mark Otto [Tue, 4 Mar 2014 03:41:02 +0000 (19:41 -0800)]
Merge pull request #12905 from twbs/buttons-migration
add data-toggle button.js change to migration docs
Chris Rebert [Mon, 3 Mar 2014 22:42:39 +0000 (14:42 -0800)]
add data-toggle button.js change to migration docs
Chris Rebert [Mon, 3 Mar 2014 22:20:37 +0000 (14:20 -0800)]
add more keywords to package.json & composer.json
Chris Rebert [Mon, 3 Mar 2014 22:20:07 +0000 (14:20 -0800)]
add 'keywords' field to bower.json
Mark Otto [Mon, 3 Mar 2014 22:18:22 +0000 (14:18 -0800)]
Match docs description
Mark Otto [Mon, 3 Mar 2014 22:18:03 +0000 (14:18 -0800)]
Match docs for description
XhmikosR [Sun, 2 Mar 2014 07:50:21 +0000 (09:50 +0200)]
Merge pull request #12864 from twbs/csslint-fix
Csslint fix
XhmikosR [Sun, 2 Mar 2014 07:27:01 +0000 (09:27 +0200)]
Update dependencies.
XhmikosR [Sun, 2 Mar 2014 07:10:21 +0000 (09:10 +0200)]
Merge pull request #12875 from twbs/less.js
Update Less.js
Chris Rebert [Sat, 1 Mar 2014 20:44:41 +0000 (12:44 -0800)]
Merge pull request #12890 from ZDroid/bower-json-keywords
Add bower.json keywords
Zlatan Vasović [Sat, 1 Mar 2014 20:42:31 +0000 (21:42 +0100)]
Add bower.json keywords
Chris Rebert [Sat, 1 Mar 2014 20:32:05 +0000 (12:32 -0800)]
Merge pull request #12889 from ZDroid/composer-json-keywor
Remove "bootstrap" keyword from composer.json
Zlatan Vasović [Sat, 1 Mar 2014 20:27:07 +0000 (21:27 +0100)]
Remove "bootstrap" keyword
XhmikosR [Sat, 1 Mar 2014 18:58:31 +0000 (20:58 +0200)]
Run `grunt`.
XhmikosR [Sat, 1 Mar 2014 18:14:31 +0000 (20:14 +0200)]
Update grunt-contib-less.
XhmikosR [Fri, 28 Feb 2014 07:39:28 +0000 (09:39 +0200)]
Update less.js to v1.7.0.
Chris Rebert [Fri, 28 Feb 2014 19:42:11 +0000 (11:42 -0800)]
Merge pull request #12880 from hnrch02/patch-1
Fix small typo in JavaScript docs
Heinrich Fenkart [Fri, 28 Feb 2014 19:11:02 +0000 (20:11 +0100)]
Fix small typo in JavaScript docs
XhmikosR [Fri, 28 Feb 2014 15:29:36 +0000 (17:29 +0200)]
Gruntfile.js: Remove extra comma.
Mark Otto [Thu, 27 Feb 2014 20:17:08 +0000 (12:17 -0800)]
100% less tumah
Mark Otto [Thu, 27 Feb 2014 20:12:44 +0000 (12:12 -0800)]
Merge pull request #12855 from lipis/patch-1
Added the very useful .animation-fill-mode() mixin
Mark Otto [Thu, 27 Feb 2014 19:13:18 +0000 (11:13 -0800)]
Merge pull request #12866 from twbs/sitemap
Add sitemap.xml and robots.txt files.
Mark Otto [Thu, 27 Feb 2014 19:08:24 +0000 (11:08 -0800)]
Fixes #12851: it's not a tumah
XhmikosR [Sun, 23 Feb 2014 11:33:33 +0000 (13:33 +0200)]
Add sitemap.xml and robots.txt files.
XhmikosR [Thu, 27 Feb 2014 09:21:52 +0000 (11:21 +0200)]
Move csslint overrides in Gruntfile.js.
This works around https://github.com/gruntjs/grunt-contrib-csslint/issues/26
XhmikosR [Thu, 27 Feb 2014 09:15:53 +0000 (11:15 +0200)]
Fix csslint errors.
XhmikosR [Thu, 27 Feb 2014 09:15:32 +0000 (11:15 +0200)]
Break csslint targets.
XhmikosR [Thu, 27 Feb 2014 08:58:27 +0000 (10:58 +0200)]
Merge pull request #12861 from twbs/docs-csscomb
Add docs.css in the CSSComb task.
XhmikosR [Thu, 27 Feb 2014 08:51:52 +0000 (10:51 +0200)]
Run csscomb before cssmin.
XhmikosR [Thu, 27 Feb 2014 08:12:52 +0000 (10:12 +0200)]
Add docs.css in the CSSComb task.
XhmikosR [Wed, 26 Feb 2014 17:32:59 +0000 (19:32 +0200)]
Run `grunt update-shrinkwrap`.
XhmikosR [Tue, 25 Feb 2014 23:25:57 +0000 (01:25 +0200)]
Bump grunt-jscs-checker.
XhmikosR [Wed, 26 Feb 2014 17:32:30 +0000 (19:32 +0200)]
Update load-grunt-tasks.
Chris Rebert [Wed, 26 Feb 2014 17:10:32 +0000 (09:10 -0800)]
Merge pull request #12829 from ZDroid/no-bs-keyword
Remove bootstrap keyword from package.json
Lipis [Wed, 26 Feb 2014 16:59:36 +0000 (17:59 +0100)]
Added the very useful .animation-fill-mode() mixin
I think that's the only animation property that was missing and it's quite useful.
https://developer.mozilla.org/en-US/docs/Web/CSS/animation-fill-mode
Zlatan Vasović [Mon, 24 Feb 2014 08:55:33 +0000 (09:55 +0100)]
Remove bootstrap keyword
Chris Rebert [Wed, 26 Feb 2014 03:40:15 +0000 (19:40 -0800)]
update boto & s3_cache.py
Chris Rebert [Wed, 26 Feb 2014 01:28:16 +0000 (17:28 -0800)]
grunt build-customizer-html
XhmikosR [Tue, 25 Feb 2014 23:23:52 +0000 (01:23 +0200)]
Run grunt dist.
Chris Rebert [Tue, 25 Feb 2014 18:38:41 +0000 (10:38 -0800)]
update shrinkwrap
Chris Rebert [Tue, 25 Feb 2014 04:46:45 +0000 (20:46 -0800)]
add Grunt task for css-flip-ing & add RTL to Gruntfile configs
Chris Rebert [Tue, 25 Feb 2014 18:17:44 +0000 (10:17 -0800)]
update GitHub issue link in comment
Mark Otto [Tue, 25 Feb 2014 03:22:41 +0000 (19:22 -0800)]
Use CSS Flip to generate RTL variation
Mark Otto [Tue, 25 Feb 2014 03:10:23 +0000 (19:10 -0800)]
grunt dist
Mark Otto [Mon, 24 Feb 2014 23:41:31 +0000 (15:41 -0800)]
Merge pull request #12837 from twbs/grid-docs
move grid classes cascade explanation into main grid docs section
Chris Rebert [Mon, 24 Feb 2014 23:10:46 +0000 (15:10 -0800)]
move grid classes cascade explanation into main grid docs section
Chris Rebert [Mon, 24 Feb 2014 22:43:09 +0000 (14:43 -0800)]
fix #12836
Thanks @Quy.
Chris Rebert [Mon, 24 Feb 2014 21:44:40 +0000 (13:44 -0800)]
Merge pull request #12834 from twbs/sauce-chrome-name
switch browserName from "googlechrome" to "chrome"
Chris Rebert [Mon, 24 Feb 2014 21:10:25 +0000 (13:10 -0800)]
switch browserName from "googlechrome" to "chrome" per @Jonahss in #12647
XhmikosR [Sat, 22 Feb 2014 11:23:37 +0000 (13:23 +0200)]
Update grunt-contrib-connect.
Mark Otto [Sun, 23 Feb 2014 06:46:03 +0000 (22:46 -0800)]
Fixes #12822: Scope panel collapse styles to immediate panel bodies only
Mark Otto [Sat, 22 Feb 2014 22:19:00 +0000 (14:19 -0800)]
Fixes #12808: Correct grid column values listed in Grid Options
Mark Otto [Sat, 22 Feb 2014 22:16:53 +0000 (14:16 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sat, 22 Feb 2014 22:16:11 +0000 (14:16 -0800)]
Fixes #12801: Add padding to the bottom of .form-control-static to match height of standard form controls
Chris Rebert [Sat, 22 Feb 2014 20:54:17 +0000 (12:54 -0800)]
Merge pull request #12818 from hebbet/patch-1
Remove second tbody from Supported browsers
hebbet [Sat, 22 Feb 2014 20:49:58 +0000 (21:49 +0100)]
Remove second tbody from Supported browsers
Removed the second tbody from "Internet Explorer 8 and 9" Table
Mark Otto [Sat, 22 Feb 2014 20:38:56 +0000 (12:38 -0800)]
Update modals to use more consistent padding—modal body and footer now match modal header
Mark Otto [Sat, 22 Feb 2014 20:20:53 +0000 (12:20 -0800)]
Merge branch 'master' into pr/12813
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Mark Otto [Sat, 22 Feb 2014 20:13:11 +0000 (12:13 -0800)]
Fixes #12756: Ensure horizontal dls are cleared by moving the clearfix out of the media query
Supergibbs [Sat, 22 Feb 2014 04:50:27 +0000 (20:50 -0800)]
Correctly set .btn-link colors in a .navbar and .navbar-inverse #12694
jonahss [Thu, 20 Feb 2014 05:27:50 +0000 (21:27 -0800)]
updated qunit test reporting so sauce labs can report failing tests
Mark Otto [Sat, 22 Feb 2014 01:42:25 +0000 (17:42 -0800)]
grunt
Mark Otto [Sat, 22 Feb 2014 01:36:47 +0000 (17:36 -0800)]
Merge pull request #12459 from rubenstolk/hotfix/mixins/scale
Make both .scale(X) and .scale(X, Y) both work
Mark Otto [Sat, 22 Feb 2014 01:34:27 +0000 (17:34 -0800)]
Merge pull request #12742 from ZDroid/table-responsive-mixin
Make .table-responsive usable as mixin
Mark Otto [Sat, 22 Feb 2014 01:23:01 +0000 (17:23 -0800)]
Merge pull request #12803 from PHLAK/master
Removed unnecessary top margin from .modal-footer
Mark Otto [Sat, 22 Feb 2014 01:18:50 +0000 (17:18 -0800)]
Merge pull request #12809 from Borkason/patch-1
Clarify the use of .has-feedback
Mark Otto [Fri, 21 Feb 2014 23:14:22 +0000 (15:14 -0800)]
Merge pull request #12761 from hnrch02/no-event-aliases
Remove event aliases from JavaScript
Mark Otto [Fri, 21 Feb 2014 23:06:21 +0000 (15:06 -0800)]
Fixes #12735: Fix sidebar hover state in Dashboard example
Mark Otto [Fri, 21 Feb 2014 23:03:16 +0000 (15:03 -0800)]
Fixes #12810: Document .container-fluid in the CSS overview docs
Mark Otto [Fri, 21 Feb 2014 22:52:15 +0000 (14:52 -0800)]
Fixes #12744: Document ability to remove animation on modals
Daniel Niccoli [Fri, 21 Feb 2014 15:32:24 +0000 (16:32 +0100)]
Clarify the use of .has-feedback
Chris Kankiewicz [Thu, 20 Feb 2014 21:27:19 +0000 (14:27 -0700)]
Removed unnecessary top margin from .modal-footer
Chris Rebert [Wed, 19 Feb 2014 20:41:46 +0000 (12:41 -0800)]
Merge pull request #12792 from twbs/translation-docs
change translation docs in light of #11342 & its many dupes
Chris Rebert [Wed, 19 Feb 2014 19:19:41 +0000 (11:19 -0800)]
change translation docs in light of #11342 & its many dupes
XhmikosR [Tue, 18 Feb 2014 11:21:05 +0000 (13:21 +0200)]
Merge pull request #12058 from ZDroid/uti
Remove semicolons from JS tests
Chris Rebert [Tue, 18 Feb 2014 09:53:17 +0000 (01:53 -0800)]
Merge pull request #12772 from ZDroid/tests-index
Improve `js/tests/index.html`
Zlatan Vasović [Tue, 18 Feb 2014 09:43:24 +0000 (10:43 +0100)]
Improve `js/tests/index.html`
- Improve comments.
- Remove `transition.js` script load as `transition.js` unit test doesn't exist.
Chris Rebert [Tue, 18 Feb 2014 08:57:45 +0000 (00:57 -0800)]
Merge pull request #12760 from ZDroid/grunt-jshintrc
Improve grunt/.jshintrc
XhmikosR [Tue, 18 Feb 2014 05:28:27 +0000 (07:28 +0200)]
Update grunt-contrib-cssmin.
Zlatan Vasović [Mon, 17 Feb 2014 19:56:46 +0000 (20:56 +0100)]
Remove semicolons from JS tests
Mark Otto [Mon, 17 Feb 2014 04:37:50 +0000 (20:37 -0800)]
Merge pull request #12749 from twbs/pointer-events-note
Document caveats of `pointer-events: none` usage in btn.disabled
Chris Rebert [Sun, 16 Feb 2014 20:26:09 +0000 (12:26 -0800)]
Safari rounding problem still present as of v7.0.1 for OS X
Chris Rebert [Sun, 16 Feb 2014 20:13:04 +0000 (12:13 -0800)]
Merge pull request #12720 from twbs/reident-test-files
Reindent test files
Heinrich Fenkart [Sun, 16 Feb 2014 19:06:31 +0000 (20:06 +0100)]
Remove event aliases from JavaScript
Makes life for people with custom jQuery builds excluding event aliases much easier.
Zlatan Vasović [Sun, 16 Feb 2014 18:57:39 +0000 (19:57 +0100)]
Improve grunt/.jshintrc
XhmikosR [Sun, 16 Feb 2014 18:45:00 +0000 (20:45 +0200)]
Merge pull request #12513 from ZDroid/jshint
Remove `curly: false` from `.jshintrc`
Zlatan Vasović [Sun, 16 Feb 2014 18:28:43 +0000 (19:28 +0100)]
Remove `curly: false` from `.jshintrc`
Chris Rebert [Sat, 15 Feb 2014 01:05:59 +0000 (17:05 -0800)]
Document caveats of `pointer-events: none` usage in btn.disabled
Refs #10049
Source for compatibility info: http://caniuse.com/#feat=pointer-events