]>
git.ipfire.org Git - thirdparty/bootstrap.git/log
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
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
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
Mark Otto [Sun, 9 Feb 2014 00:59:59 +0000 (16:59 -0800)]
Merge pull request #12433 from tagliala/list-inline-first-element-fix
Fix first element padding of list-inline
Mark Otto [Sun, 9 Feb 2014 00:56:59 +0000 (16:56 -0800)]
brace position
Mark Otto [Sun, 9 Feb 2014 00:52:22 +0000 (16:52 -0800)]
Merge branch 'master' into fix-12154
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 [Sun, 9 Feb 2014 00:46:12 +0000 (16:46 -0800)]
grunt
Mark Otto [Sun, 9 Feb 2014 00:43:58 +0000 (16:43 -0800)]
grunt
Mark Otto [Sun, 9 Feb 2014 00:31:42 +0000 (16:31 -0800)]
grunt with new mixins
Mark Otto [Sun, 9 Feb 2014 00:13:30 +0000 (16:13 -0800)]
grunt
Mark Otto [Sun, 9 Feb 2014 00:03:25 +0000 (16:03 -0800)]
Merge pull request #12552 from stoudenmire/carousel-icon-classname-fix
Fixes two typos in carousel.less
Mark Otto [Sun, 9 Feb 2014 00:01:56 +0000 (16:01 -0800)]
Merge branch 'master' into pr/12462
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, 8 Feb 2014 23:53:18 +0000 (15:53 -0800)]
Merge branch 'pr/12579'
Mark Otto [Sat, 8 Feb 2014 23:51:38 +0000 (15:51 -0800)]
grunt
XhmikosR [Sat, 8 Feb 2014 23:48:13 +0000 (01:48 +0200)]
Merge pull request #12655 from twbs/holder.js
Update holder.js to v2.3.1.
Mark Otto [Sat, 8 Feb 2014 23:46:51 +0000 (15:46 -0800)]
Merge pull request #12645 from ZDroid/docs-js-semicolons
Omit semicolons consistently in docs
Mark Otto [Sat, 8 Feb 2014 23:44:13 +0000 (15:44 -0800)]
grunt
Mark Otto [Sat, 8 Feb 2014 23:37:35 +0000 (15:37 -0800)]
Merge branch 'master' into pr/12639
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, 8 Feb 2014 23:24:43 +0000 (15:24 -0800)]
Merge pull request #12659 from ZDroid/blockquote-font-size
Fix #12656: add @blockquote-font-size
Chris Rebert [Sat, 8 Feb 2014 21:34:36 +0000 (13:34 -0800)]
Merge pull request #12632 from ZDroid/exclude-jade
Exclude jade files from docs
Zlatan Vasović [Sat, 8 Feb 2014 19:34:26 +0000 (20:34 +0100)]
Move jade files to docs/jade/
Zlatan Vasović [Sat, 8 Feb 2014 21:11:49 +0000 (22:11 +0100)]
Fix #12656: add @blockquote-font-size
XhmikosR [Sat, 8 Feb 2014 06:20:17 +0000 (08:20 +0200)]
Update holder.js to v2.3.1.
Fix #12653.
Chris Rebert [Sat, 8 Feb 2014 02:51:32 +0000 (18:51 -0800)]
disable BrowserStack tests due to flakiness
Running "browserstack_runner" task
Using config: /home/travis/build/twbs/bootstrap/browserstack.json
Launching server on port: 8888
Downloading tunnel jar to `/home/travis/build/twbs/bootstrap/node_modules/browserstack-runner/lib/BrowserStackTunnel.jar`
Launching tunnel
Error: Invalid or corrupt jarfile /home/travis/build/twbs/bootstrap/node_modules/browserstack-runner/lib/BrowserStackTunnel.jar
[Runner alert] Tunnel launch timeout
Exiting
Non existent tunnel
Mark Otto [Sat, 8 Feb 2014 02:50:41 +0000 (18:50 -0800)]
Merge pull request #12633 from twbs/panels_and_tables
Properly reset borders on table cells in panels
Mark Otto [Sat, 8 Feb 2014 02:36:27 +0000 (18:36 -0800)]
Merge branch 'master' into panels_and_tables
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 [Fri, 7 Feb 2014 23:44:50 +0000 (15:44 -0800)]
Nuke shit I added in
4d7b2ddba92e47f923d22d9d7b23cb7b0a3e0bc2 that shouldn't come until v4
Julian Thilo [Fri, 7 Feb 2014 22:21:32 +0000 (23:21 +0100)]
Fix wrong id
Chris Rebert [Fri, 7 Feb 2014 20:44:51 +0000 (12:44 -0800)]
Merge pull request #12648 from ZDroid/index.html-only
Replace wildcard with file name
Zlatan Vasović [Fri, 7 Feb 2014 19:48:12 +0000 (20:48 +0100)]
Replace wildcard with file name
Zlatan Vasović [Fri, 7 Feb 2014 18:31:08 +0000 (19:31 +0100)]
Omit semicolons consistently in docs
Chris Rebert [Fri, 7 Feb 2014 17:36:39 +0000 (09:36 -0800)]
Merge pull request #12636 from ZDroid/grunt-jshintrc
Avoid setting `jshint node: true` in every Grunt JS file
Chris Rebert [Fri, 7 Feb 2014 17:28:08 +0000 (09:28 -0800)]
Merge pull request #12637 from ZDroid/text-truncate-typo
Fix .text-truncate() typo
Bas Bosman [Fri, 7 Feb 2014 13:14:32 +0000 (14:14 +0100)]
Drop -o-user-select
Zlatan Vasović [Fri, 7 Feb 2014 12:40:32 +0000 (13:40 +0100)]
Fix .text-truncate() typo
Zlatan Vasović [Fri, 7 Feb 2014 12:34:17 +0000 (13:34 +0100)]
Avoid setting `jshint node: true` in every Grunt JS file
Mark Otto [Fri, 7 Feb 2014 10:58:10 +0000 (02:58 -0800)]
Fixes #12486: Restore full width inputs for input groups in inline forms and navbars
Mark Otto [Fri, 7 Feb 2014 10:44:04 +0000 (02:44 -0800)]
Follow up to
1bdd59b18c2d1b2409d0422a60e8c007053202df , to better position the sidebar so the potential scrollbar doesn't get hidden by the navbar
Mark Otto [Fri, 7 Feb 2014 10:38:01 +0000 (02:38 -0800)]
Fixes #12447: Properly reset borders on table cells in panels
Mark Otto [Fri, 7 Feb 2014 10:24:37 +0000 (02:24 -0800)]
grunt for days
Mark Otto [Fri, 7 Feb 2014 10:13:39 +0000 (02:13 -0800)]
Merge pull request #12629 from twbs/search_inputs_ios
Override iOS search input's extra round corners
Mark Otto [Fri, 7 Feb 2014 10:08:32 +0000 (02:08 -0800)]
Override iOS search input's extra round corners
Mark Otto [Fri, 7 Feb 2014 09:49:12 +0000 (01:49 -0800)]
Fixes #12477: Clarify IE support in docs
Mark Otto [Fri, 7 Feb 2014 09:41:46 +0000 (01:41 -0800)]
Merge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Fri, 7 Feb 2014 09:41:04 +0000 (01:41 -0800)]
Fixes #12590: Add Korean translation link
Mark Otto [Fri, 7 Feb 2014 09:39:00 +0000 (01:39 -0800)]
Merge pull request #12319 from twbs/address-12007
Clarify target of dropdown events