]>
git.ipfire.org Git - thirdparty/bootstrap.git/log
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
Zlatan Vasović [Fri, 14 Feb 2014 18:48:17 +0000 (19:48 +0100)]
Make .table-responsive usable as mixin
XhmikosR [Thu, 13 Feb 2014 08:05:04 +0000 (10:05 +0200)]
Fix customizer.js indentation warnings.
XhmikosR [Thu, 13 Feb 2014 07:55:12 +0000 (09:55 +0200)]
Re-indent test files.
Chris Rebert [Fri, 14 Feb 2014 01:57:24 +0000 (17:57 -0800)]
regenerate npm-shrinkwrap.canonical.json
Chris Rebert [Thu, 13 Feb 2014 21:54:02 +0000 (13:54 -0800)]
bump grunt-exec to v0.4.5 & add missing tilde to version spec
Zlatan Vasović [Thu, 13 Feb 2014 07:37:37 +0000 (08:37 +0100)]
Add build-raw-files log; fixes #12603
Fixes #12672
Chris Rebert [Thu, 13 Feb 2014 19:15:14 +0000 (11:15 -0800)]
Merge pull request #12719 from twbs/update-less
Update less.js to v1.6.3.
Chris Rebert [Thu, 13 Feb 2014 19:13:31 +0000 (11:13 -0800)]
Merge pull request #12718 from twbs/dependencies
Update dependencies.
XhmikosR [Wed, 12 Feb 2014 19:32:52 +0000 (21:32 +0200)]
Update dependencies.
XhmikosR [Thu, 13 Feb 2014 07:35:51 +0000 (09:35 +0200)]
Update less.js to v1.6.3.
Mark Otto [Thu, 13 Feb 2014 17:24:59 +0000 (09:24 -0800)]
grunt
Mark Otto [Thu, 13 Feb 2014 16:59:03 +0000 (08:59 -0800)]
grunt
Mark Otto [Thu, 13 Feb 2014 09:21:35 +0000 (01:21 -0800)]
update homepage showcase with three new posts
Mark Otto [Thu, 13 Feb 2014 09:12:26 +0000 (01:12 -0800)]
v3.1.1 bump
XhmikosR [Thu, 13 Feb 2014 06:53:47 +0000 (08:53 +0200)]
Merge pull request #12710 from ZDroid/customize-multistr
Fix multistr errors in customizer.js
Chris Rebert [Wed, 12 Feb 2014 20:04:42 +0000 (12:04 -0800)]
Merge pull request #12711 from ZDroid/scrollspy-typo
Fix scrollspy typo in docs.css
Zlatan Vasović [Wed, 12 Feb 2014 20:01:37 +0000 (21:01 +0100)]
Fix scrollspy typo in docs.css
Zlatan Vasović [Wed, 12 Feb 2014 19:54:43 +0000 (20:54 +0100)]
Fix multistr errors in customizer.js
Chris Rebert [Wed, 12 Feb 2014 19:29:42 +0000 (11:29 -0800)]
Merge pull request #12709 from twbs/bs-to-example-prefix
Use .bs-example-* instead of .bs-* in examples in docs
XhmikosR [Wed, 12 Feb 2014 19:27:31 +0000 (21:27 +0200)]
Remove trailing space.
Chris Rebert [Wed, 12 Feb 2014 19:10:55 +0000 (11:10 -0800)]
Use .bs-example-* instead of .bs-* in examples in docs
Refs #12610
Chris Rebert [Wed, 12 Feb 2014 19:07:04 +0000 (11:07 -0800)]
avoid using .bs-* in example, & improve style
Chris Rebert [Wed, 12 Feb 2014 19:02:37 +0000 (11:02 -0800)]
fix #12708 by updating class names in the docs JS
XhmikosR [Wed, 12 Feb 2014 16:47:08 +0000 (18:47 +0200)]
Switch to the minified JSZip.
Mark Otto [Tue, 11 Feb 2014 22:20:01 +0000 (14:20 -0800)]
Fixes #11659, #12698, and #12349: Always apply position and z-index form controls in input groups for proper borders
Chris Rebert [Tue, 11 Feb 2014 18:38:39 +0000 (10:38 -0800)]
Merge pull request #12696 from twbs/rm-browserstack
rm BrowserStack testing from build
Chris Rebert [Mon, 10 Feb 2014 19:20:50 +0000 (11:20 -0800)]
rm BrowserStack testing from build
Mark Otto [Tue, 11 Feb 2014 17:57:15 +0000 (09:57 -0800)]
Merge pull request #12695 from martikaljuve/offcanvas-transition
Fixed transitions on offcanvas example by adding initial left and right properties
Mark Otto [Tue, 11 Feb 2014 17:50:40 +0000 (09:50 -0800)]
Merge branch 'master' into pr/12412
Conflicts:
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
test-infra/npm-shrinkwrap.canonical.json
Marti Kaljuve [Tue, 11 Feb 2014 16:18:21 +0000 (18:18 +0200)]
Add initial right and left properties to offcanvas example for transitions.
Mark Otto [Tue, 11 Feb 2014 08:05:34 +0000 (00:05 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
Chris Rebert [Tue, 11 Feb 2014 07:04:21 +0000 (23:04 -0800)]
Merge pull request #12689 from ZDroid/fonts-x
Remove execute permission on font files
Zlatan Vasović [Tue, 11 Feb 2014 06:57:31 +0000 (07:57 +0100)]
Remove execute permission on font files
Mark Otto [Tue, 11 Feb 2014 06:12:28 +0000 (22:12 -0800)]
add version to getting started page
Mark Otto [Tue, 11 Feb 2014 05:41:14 +0000 (21:41 -0800)]
grunt
Mark Otto [Tue, 11 Feb 2014 05:28:05 +0000 (21:28 -0800)]
Update Glyphicons
Mark Otto [Tue, 11 Feb 2014 04:52:43 +0000 (20:52 -0800)]
Merge pull request #12673 from tlindig/tl_popover_arrow_size
use @popover-arrow-width for offset the popover
Mark Otto [Tue, 11 Feb 2014 04:52:20 +0000 (20:52 -0800)]
http://www.youtube.com/watch?v=YQwYNca4iog
Mark Otto [Tue, 11 Feb 2014 04:49:17 +0000 (20:49 -0800)]
Fixes #12674
* The problem with #12674 is that it reassigns the same variable, but the color values were purposely different.
* This uses Less's color functions to generate the proper darker colors.
* Why darker colors? Because those CSS carets render lighter than their solid border counterparts. Consider it a design hack.
Mark Otto [Tue, 11 Feb 2014 04:23:29 +0000 (20:23 -0800)]
Fixes #12685: Display current version under download button on homepage
Mark Otto [Tue, 11 Feb 2014 03:19:52 +0000 (19:19 -0800)]
Merge pull request #12665 from twbs/docs_teams
Update teams
Chris Rebert [Mon, 10 Feb 2014 20:40:51 +0000 (12:40 -0800)]
Merge pull request #12680 from twbs/googlechrome
chrome => googlechrome in Sauce
Chris Rebert [Mon, 10 Feb 2014 19:22:08 +0000 (11:22 -0800)]
chrome => googlechrome in Sauce; fixes #12647
Zlatan Vasović [Sat, 8 Feb 2014 20:59:17 +0000 (21:59 +0100)]
Use different coding style for Gruntfile
Fixes #12657
Chris Rebert [Mon, 10 Feb 2014 19:09:59 +0000 (11:09 -0800)]
fix indentation in Gruntfile
Chris Rebert [Mon, 10 Feb 2014 18:12:28 +0000 (10:12 -0800)]
tweak phrasing for hopefully greater clarity
Chris Rebert [Mon, 10 Feb 2014 18:06:33 +0000 (10:06 -0800)]
add copyright header to shrinkwrap.js; fixes #12643
Tobias Lindig [Mon, 10 Feb 2014 09:57:11 +0000 (10:57 +0100)]
use @popover-arrow-width for offset the popover to account for the popover arrow
Ruben Stolk [Mon, 10 Feb 2014 04:42:38 +0000 (10:12 +0530)]
Make both .scale(X) and .scale(X, Y) both work
Julian Thilo [Sun, 9 Feb 2014 21:04:01 +0000 (22:04 +0100)]
Merge pull request #12671 from Quy/master
Update docs prefixing
Quy Ton [Sun, 9 Feb 2014 20:41:47 +0000 (12:41 -0800)]
Update docs prefixing
Julian Thilo [Sun, 9 Feb 2014 18:50:54 +0000 (19:50 +0100)]
Merge pull request #12668 from Quy/master
Reorder links
Quy Ton [Sun, 9 Feb 2014 17:18:11 +0000 (09:18 -0800)]
Reorder links
Mark Otto [Sun, 9 Feb 2014 07:24:16 +0000 (23:24 -0800)]
Fixes #12610: Better and more consistent prefixing of docs CSS with .bs-docs-
Mark Otto [Sun, 9 Feb 2014 06:46:25 +0000 (22:46 -0800)]
i'm an idiot
Mark Otto [Sun, 9 Feb 2014 06:13:29 +0000 (22:13 -0800)]
Update teams to remove two Sass folks and add new Core member
Mark Otto [Sun, 9 Feb 2014 01:30:40 +0000 (17:30 -0800)]
grunt dist
Mark Otto [Sun, 9 Feb 2014 01:29:25 +0000 (17:29 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sun, 9 Feb 2014 01:29:10 +0000 (17:29 -0800)]
Fixes #12625: Only remove first list group item's top and last list group item's bottom borders when the list group is first or last
Mark Otto [Sun, 9 Feb 2014 01:19:45 +0000 (17:19 -0800)]
Mention limitation of form validation feedback icons with input groups