]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
11 years agomake CSSLint happier; refs #12094 12116/head
Chris Rebert [Mon, 6 Jan 2014 05:28:52 +0000 (21:28 -0800)] 
make CSSLint happier; refs #12094

11 years agoadd /docs/assets JS to JSCS Grunt task config
Chris Rebert [Mon, 6 Jan 2014 04:52:37 +0000 (20:52 -0800)] 
add /docs/assets JS to JSCS Grunt task config

11 years agoMerge pull request #12115 from Quy/master
Mark Otto [Mon, 6 Jan 2014 04:16:17 +0000 (20:16 -0800)] 
Merge pull request #12115 from Quy/master

Delete reference to a non-existent class

11 years agoDelete reference to a non-existent class 12115/head
Quy Ton [Mon, 6 Jan 2014 04:08:37 +0000 (20:08 -0800)] 
Delete reference to a non-existent class

11 years agoMerge pull request #12082 from kevinsawicki/use-dollar-instead-of-jquery
Chris Rebert [Mon, 6 Jan 2014 02:06:55 +0000 (18:06 -0800)] 
Merge pull request #12082 from kevinsawicki/use-dollar-instead-of-jquery

Use $ instead of jQuery

11 years agoMerge pull request #12110 from twbs/one-control-per-input-group
Mark Otto [Sun, 5 Jan 2014 23:57:33 +0000 (15:57 -0800)] 
Merge pull request #12110 from twbs/one-control-per-input-group

document single .form-control per .input-group limitation

11 years agodocument single .form-control per .input-group limitation; fixes #12109 12110/head
Chris Rebert [Sun, 5 Jan 2014 22:44:48 +0000 (14:44 -0800)] 
document single .form-control per .input-group limitation; fixes #12109

11 years agoUse mix of medium and small grid clases on dashboard example
Mark Otto [Sun, 5 Jan 2014 21:26:15 +0000 (13:26 -0800)] 
Use mix of medium and small grid clases on dashboard example

11 years agoMerge pull request #12105 from twbs/navbar-containers
Mark Otto [Sun, 5 Jan 2014 21:19:49 +0000 (13:19 -0800)] 
Merge pull request #12105 from twbs/navbar-containers

add .container(-fluid) to remaining navbar examples

11 years agoadd .container(-fluid) to remaining navbar examples for consistency/accuracy 12105/head
Chris Rebert [Sun, 5 Jan 2014 20:55:03 +0000 (12:55 -0800)] 
add .container(-fluid) to remaining navbar examples for consistency/accuracy

follow-up to 93a4d6cc5ecdc1cbc09c4b8af2e587f4480b36cf

11 years agoMerge pull request #12104 from ghoullier/master
Chris Rebert [Sun, 5 Jan 2014 19:47:00 +0000 (11:47 -0800)] 
Merge pull request #12104 from ghoullier/master

Replace getElementsByTag with querySelector in IE10 Mobile viewport JS snippet

11 years agoReplace getElementsByTag by querySelector for IE10 Mobile plateform. 12104/head
Gregory HOULLIER [Sun, 5 Jan 2014 19:15:48 +0000 (20:15 +0100)] 
Replace getElementsByTag by querySelector for IE10 Mobile plateform.

11 years agoMerge pull request #12099 from Quy/master
Chris Rebert [Sun, 5 Jan 2014 16:52:16 +0000 (08:52 -0800)] 
Merge pull request #12099 from Quy/master

Fix typos

11 years agoFix typos 12099/head
Quy Ton [Sun, 5 Jan 2014 16:38:32 +0000 (08:38 -0800)] 
Fix typos

11 years agoMerge pull request #12098 from ZDroid/reorg
Chris Rebert [Sun, 5 Jan 2014 16:05:40 +0000 (08:05 -0800)] 
Merge pull request #12098 from ZDroid/reorg

Group repo vars together in Jekyll config

11 years agoMerge pull request #12097 from ZDroid/deprecated
Chris Rebert [Sun, 5 Jan 2014 16:01:55 +0000 (08:01 -0800)] 
Merge pull request #12097 from ZDroid/deprecated

Replace @screen-sm with @screen-sm-min

11 years agoReorganize vars 12098/head
Zlatan Vasović [Sun, 5 Jan 2014 10:51:49 +0000 (11:51 +0100)] 
Reorganize vars

11 years agoReplace @screen-sm with @screen-sm-min 12097/head
Zlatan Vasović [Sun, 5 Jan 2014 10:38:26 +0000 (11:38 +0100)] 
Replace @screen-sm with @screen-sm-min

11 years agoMerge pull request #12095 from Quy/master
Chris Rebert [Sun, 5 Jan 2014 05:43:25 +0000 (21:43 -0800)] 
Merge pull request #12095 from Quy/master

Fix typo

11 years agoFix typo 12095/head
Quy Ton [Sun, 5 Jan 2014 05:35:06 +0000 (21:35 -0800)] 
Fix typo

11 years agoMerge pull request #12092 from Quy/master
Mark Otto [Sun, 5 Jan 2014 03:31:52 +0000 (19:31 -0800)] 
Merge pull request #12092 from Quy/master

Use relative URLs and fix anchor links

11 years agoMerge pull request #12090 from nschonni/patch-2
Chris Rebert [Sat, 4 Jan 2014 20:20:38 +0000 (12:20 -0800)] 
Merge pull request #12090 from nschonni/patch-2

Quote Node 0.10 so correct version is printed

11 years agoFix anchor links 12092/head
Quy Ton [Sat, 4 Jan 2014 17:28:56 +0000 (09:28 -0800)] 
Fix anchor links

11 years agoUse relative URLs
Quy Ton [Sat, 4 Jan 2014 17:10:02 +0000 (09:10 -0800)] 
Use relative URLs

11 years agoQuote Node 0.10 so correct version is printed 12090/head
Nick Schonning [Sat, 4 Jan 2014 15:46:05 +0000 (10:46 -0500)] 
Quote Node 0.10 so correct version is printed

11 years agoReplace lingering page.url instance with site.baseurl
Chris Rebert [Sat, 4 Jan 2014 00:19:20 +0000 (16:19 -0800)] 
Replace lingering page.url instance with site.baseurl

Refs #12083 & #12037

11 years agoUse $ instead of jQuery 12082/head
Kevin Sawicki [Fri, 3 Jan 2014 22:37:03 +0000 (14:37 -0800)] 
Use $ instead of jQuery

11 years agoflip order so sentence reads better
Chris Rebert [Fri, 3 Jan 2014 20:29:45 +0000 (12:29 -0800)] 
flip order so sentence reads better

11 years agode-emphasize /docs/assets and docs HTML now that they're outside of the root dir
Chris Rebert [Fri, 3 Jan 2014 20:21:38 +0000 (12:21 -0800)] 
de-emphasize /docs/assets and docs HTML now that they're outside of the root dir

11 years agoMerge pull request #12081 from Quy/master
Chris Rebert [Fri, 3 Jan 2014 20:14:20 +0000 (12:14 -0800)] 
Merge pull request #12081 from Quy/master

Update source code download structure

11 years agoUpdate source code download structure 12081/head
Quy Ton [Fri, 3 Jan 2014 19:42:27 +0000 (11:42 -0800)] 
Update source code download structure

11 years agoMerge pull request #12080 from Quy/master
Julian Thilo [Fri, 3 Jan 2014 19:04:14 +0000 (11:04 -0800)] 
Merge pull request #12080 from Quy/master

Refer to popovers instead of tooltips.

11 years agoRefer to popovers instead of tooltips. 12080/head
Quy Ton [Fri, 3 Jan 2014 18:55:06 +0000 (10:55 -0800)] 
Refer to popovers instead of tooltips.

11 years agoMerge pull request #12063 from ZDroid/tc
Mark Otto [Thu, 2 Jan 2014 18:52:43 +0000 (10:52 -0800)] 
Merge pull request #12063 from ZDroid/tc

Drop trailling comma

11 years agoDrop trailling comma 12063/head
Zlatan Vasović [Thu, 2 Jan 2014 14:46:13 +0000 (15:46 +0100)] 
Drop trailling comma

No need for it.

11 years agoMerge pull request #12055 from wangsai/fix-assets-links-of-examples
Mark Otto [Wed, 1 Jan 2014 20:02:28 +0000 (12:02 -0800)] 
Merge pull request #12055 from wangsai/fix-assets-links-of-examples

fix assets links in all examples

11 years agoMerge pull request #12056 from ZDroid/ny
Julian Thilo [Wed, 1 Jan 2014 17:45:50 +0000 (09:45 -0800)] 
Merge pull request #12056 from ZDroid/ny

New Year

11 years agoNew Year 12056/head
Zlatan Vasović [Wed, 1 Jan 2014 14:37:08 +0000 (15:37 +0100)] 
New Year

11 years agofix assets links in all examples 12055/head
wangsai [Wed, 1 Jan 2014 14:29:13 +0000 (22:29 +0800)] 
fix assets links in all examples

11 years agoUpdate Gruntfile.js to copy 'dist/' files to 'docs/dist/' with 'grunt dist' task...
Mark Otto [Wed, 1 Jan 2014 02:21:41 +0000 (18:21 -0800)] 
Update Gruntfile.js to copy 'dist/' files to 'docs/dist/' with 'grunt dist' task; Fixes #12030: navbar toggle focus state

11 years agoFix broken JS
Mark Otto [Wed, 1 Jan 2014 01:47:16 +0000 (17:47 -0800)] 
Fix broken JS

11 years agoderp
Mark Otto [Tue, 31 Dec 2013 21:57:35 +0000 (13:57 -0800)] 
derp

11 years agoMerge pull request #12037 from twbs/docs_dir
Mark Otto [Tue, 31 Dec 2013 21:43:32 +0000 (13:43 -0800)] 
Merge pull request #12037 from twbs/docs_dir

Bring back the `/docs` directory

11 years agoMerge branch 'master' into docs_dir 12037/head
Mark Otto [Tue, 31 Dec 2013 21:43:11 +0000 (13:43 -0800)] 
Merge branch 'master' into docs_dir

11 years agoFixes #12046: move .csscomb.json and .csslintrc to less/ folder
Mark Otto [Tue, 31 Dec 2013 21:16:28 +0000 (13:16 -0800)] 
Fixes #12046: move .csscomb.json and .csslintrc to less/ folder

11 years agoMerge pull request #12049 from ZDroid/update-de
Mark Otto [Tue, 31 Dec 2013 20:57:55 +0000 (12:57 -0800)] 
Merge pull request #12049 from ZDroid/update-de

Update dependencies (again)

11 years agotypo
Mark Otto [Tue, 31 Dec 2013 19:57:44 +0000 (11:57 -0800)] 
typo

11 years ago@nschonni's feedback <3
Mark Otto [Tue, 31 Dec 2013 19:38:32 +0000 (11:38 -0800)] 
@nschonni's feedback <3

11 years ago@cvrebert's feedback
Mark Otto [Tue, 31 Dec 2013 18:51:39 +0000 (10:51 -0800)] 
@cvrebert's feedback

11 years agoMerge branch 'master' into docs_dir
Mark Otto [Tue, 31 Dec 2013 18:38:31 +0000 (10:38 -0800)] 
Merge branch 'master' into docs_dir

11 years agoUpdate dependencies (again) 12049/head
Zlatan Vasović [Tue, 31 Dec 2013 18:20:57 +0000 (19:20 +0100)] 
Update dependencies (again)

11 years agoMerge pull request #12043 from supergibbs/fixed_typo_in_customize.html
Chris Rebert [Mon, 30 Dec 2013 07:26:57 +0000 (23:26 -0800)] 
Merge pull request #12043 from supergibbs/fixed_typo_in_customize.html

Fixed typo

11 years agoFixed typo 12043/head
Supergibbs [Mon, 30 Dec 2013 07:16:41 +0000 (23:16 -0800)] 
Fixed typo

11 years agoSauce now supports latest Firefox on OS X Mavericks
Chris Rebert [Mon, 30 Dec 2013 05:15:29 +0000 (21:15 -0800)] 
Sauce now supports latest Firefox on OS X Mavericks

11 years agodefault to latest Firefox version on OS X
Chris Rebert [Mon, 30 Dec 2013 05:13:56 +0000 (21:13 -0800)] 
default to latest Firefox version on OS X

11 years agofix capitalization of iOS
Chris Rebert [Mon, 30 Dec 2013 04:45:36 +0000 (20:45 -0800)] 
fix capitalization of iOS

11 years agoMerge pull request #12041 from twbs/mv-sauce-into-infra
Chris Rebert [Mon, 30 Dec 2013 04:29:44 +0000 (20:29 -0800)] 
Merge pull request #12041 from twbs/mv-sauce-into-infra

mv sauce_browsers.yml out of the project root

11 years agomv sauce_browsers.yml out of the project root 12041/head
Chris Rebert [Mon, 30 Dec 2013 04:25:40 +0000 (20:25 -0800)] 
mv sauce_browsers.yml out of the project root

11 years agoadd note about ios dropdown compat
fat [Mon, 30 Dec 2013 03:40:31 +0000 (19:40 -0800)] 
add note about ios dropdown compat

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
fat [Mon, 30 Dec 2013 03:25:24 +0000 (19:25 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoMerge pull request #12036 from ZDroid/grunt-fs-minify
Chris Rebert [Mon, 30 Dec 2013 03:23:57 +0000 (19:23 -0800)] 
Merge pull request #12036 from ZDroid/grunt-fs-minify

Merge two fs variable declarations into one

11 years agoMerge branch 'dropdown-aria-roles' of git://github.com/plumlee/bootstrap into plumlee...
fat [Mon, 30 Dec 2013 03:23:15 +0000 (19:23 -0800)] 
Merge branch 'dropdown-aria-roles' of git://github.com/plumlee/bootstrap into plumlee-dropdown-aria-roles

Conflicts:
js/dropdown.js

11 years agofixes #11379 - Fix carousel this.sliding not getting reset if $next.hasClass('active')
fat [Mon, 30 Dec 2013 03:01:32 +0000 (19:01 -0800)] 
fixes #11379 - Fix carousel this.sliding not getting reset if $next.hasClass('active')

11 years agofixes #11373 - adds related target to dropdown events
fat [Mon, 30 Dec 2013 02:57:22 +0000 (18:57 -0800)] 
fixes #11373 - adds related target to dropdown events

11 years agoMerge branch 'scrollspy-speedy-scroll-top' of git://github.com/ziogaschr/bootstrap...
fat [Mon, 30 Dec 2013 02:04:43 +0000 (18:04 -0800)] 
Merge branch 'scrollspy-speedy-scroll-top' of git://github.com/ziogaschr/bootstrap into ziogaschr-scrollspy-speedy-scroll-top

Conflicts:
dist/js/bootstrap.min.js

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
fat [Mon, 30 Dec 2013 01:54:40 +0000 (17:54 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agofixes #11288 - Vertical scroll position of modal saves between openings
fat [Mon, 30 Dec 2013 01:53:59 +0000 (17:53 -0800)] 
fixes #11288 - Vertical scroll position of modal saves between openings

11 years agono more page.base_url
Mark Otto [Sun, 29 Dec 2013 07:08:46 +0000 (23:08 -0800)] 
no more page.base_url

11 years agoStreamline copy process by not bringing over full files into docs/dist/, only take...
Mark Otto [Sun, 29 Dec 2013 07:05:02 +0000 (23:05 -0800)] 
Streamline copy process by not bringing over full files into docs/dist/, only take minified ones

11 years agoRearrange repository contents because muahahahahahaha
Mark Otto [Sun, 29 Dec 2013 06:47:03 +0000 (22:47 -0800)] 
Rearrange repository contents because muahahahahahaha

11 years agoMerge pull request #11203 from jasny/patch-1
Jacob [Sun, 29 Dec 2013 06:06:26 +0000 (22:06 -0800)] 
Merge pull request #11203 from jasny/patch-1

Scrollspy acting up when targets are hidden

11 years agofixes #10658 jQuery Popover content loses bound events on second setContent call.
fat [Sun, 29 Dec 2013 04:59:45 +0000 (20:59 -0800)] 
fixes #10658 jQuery Popover content loses bound events on second setContent call.

11 years agodrop the title
Mark Otto [Sun, 29 Dec 2013 02:47:32 +0000 (18:47 -0800)] 
drop the title

11 years agoMerge pull request #12035 from tomByrer/master
Mark Otto [Sun, 29 Dec 2013 02:46:36 +0000 (18:46 -0800)] 
Merge pull request #12035 from tomByrer/master

fixed .clearfix example, + doc link

11 years agoMerge two fs variable declarations into one 12036/head
Zlatan Vasović [Sat, 28 Dec 2013 22:33:32 +0000 (23:33 +0100)] 
Merge two fs variable declarations into one

One is enough.

11 years agofixed .clearfix example, + doc link 12035/head
tomByrer [Sat, 28 Dec 2013 19:01:32 +0000 (12:01 -0700)] 
fixed .clearfix example, + doc link

11 years agogrunt on last merge
Mark Otto [Sat, 28 Dec 2013 00:41:25 +0000 (16:41 -0800)] 
grunt on last merge

11 years agoMerge pull request #12028 from moshevds/deprecated-screen-md
Mark Otto [Fri, 27 Dec 2013 20:40:02 +0000 (12:40 -0800)] 
Merge pull request #12028 from moshevds/deprecated-screen-md

Small fix: I noticed the use of a deprecated variable.

11 years agoSmall fix: I noticed the use of a deprecated variable. This seems to be the only... 12028/head
Môshe van der Sterre [Fri, 27 Dec 2013 20:27:51 +0000 (21:27 +0100)] 
Small fix: I noticed the use of a deprecated variable. This seems to be the only occurrence.

11 years agoupdate accordion-group to panel
fat [Fri, 27 Dec 2013 04:33:44 +0000 (20:33 -0800)] 
update accordion-group to panel

11 years agofixes #10911 - add loading event for use with remote option :|
fat [Fri, 27 Dec 2013 04:26:27 +0000 (20:26 -0800)] 
fixes #10911 - add loading event for use with remote option :|

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
fat [Fri, 27 Dec 2013 03:40:41 +0000 (19:40 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agofixes #10890
fat [Fri, 27 Dec 2013 03:40:18 +0000 (19:40 -0800)] 
fixes #10890

11 years agoless fun to address #12008
Mark Otto [Fri, 27 Dec 2013 03:37:19 +0000 (19:37 -0800)] 
less fun to address #12008

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Fri, 27 Dec 2013 03:08:34 +0000 (19:08 -0800)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoFixes #12012: Use correct banner in docs js
Mark Otto [Fri, 27 Dec 2013 03:08:19 +0000 (19:08 -0800)] 
Fixes #12012: Use correct banner in docs js

11 years agorebuild
fat [Fri, 27 Dec 2013 02:30:16 +0000 (18:30 -0800)] 
rebuild

11 years agoupdate tool/pop destroy placement
fat [Fri, 27 Dec 2013 02:27:43 +0000 (18:27 -0800)] 
update tool/pop destroy placement

11 years agoMerge pull request #10761 from jochenberger/dont-create-tooltip-for-destroy
Jacob [Fri, 27 Dec 2013 02:25:29 +0000 (18:25 -0800)] 
Merge pull request #10761 from jochenberger/dont-create-tooltip-for-destroy

don't create new Tooltip/Popover objects just to destroy them immediately

11 years agonope
fat [Fri, 27 Dec 2013 02:18:53 +0000 (18:18 -0800)] 
nope

11 years agoMerge pull request #11496 from satazor/patch-1
Jacob [Fri, 27 Dec 2013 02:18:09 +0000 (18:18 -0800)] 
Merge pull request #11496 from satazor/patch-1

Clear timeout on destroy.

11 years agofixes #10798
fat [Fri, 27 Dec 2013 01:53:31 +0000 (17:53 -0800)] 
fixes #10798

11 years agoMerge pull request #10801 from Travesty3/master
Jacob [Fri, 27 Dec 2013 01:50:41 +0000 (17:50 -0800)] 
Merge pull request #10801 from Travesty3/master

Add 'collapse' class back after expanding

11 years agoMerge pull request #10834 from Prinzhorn/master
Jacob [Fri, 27 Dec 2013 01:46:59 +0000 (17:46 -0800)] 
Merge pull request #10834 from Prinzhorn/master

Only preventDefault on click on [data-toggle="modal"] when the element is a link

11 years agoadd Python indentation style to editorconfig; refs #12023
Chris Rebert [Thu, 26 Dec 2013 21:44:27 +0000 (13:44 -0800)] 
add Python indentation style to editorconfig; refs #12023

11 years agoMerge pull request #12009 from ZDroid/no-utf8-py
Chris Rebert [Thu, 26 Dec 2013 21:28:22 +0000 (13:28 -0800)] 
Merge pull request #12009 from ZDroid/no-utf8-py

Replace UTF-8 characters in s3_cache.py with ASCII characters

11 years agoMerge pull request #12022 from ZDroid/update-deps
Chris Rebert [Thu, 26 Dec 2013 21:16:13 +0000 (13:16 -0800)] 
Merge pull request #12022 from ZDroid/update-deps

Update dependencies

11 years agoUpdate dependencies 12022/head
Zlatan Vasović [Thu, 26 Dec 2013 20:55:55 +0000 (21:55 +0100)] 
Update dependencies

Updates grunt-html-validation and grunt-jekyll dependencies.

11 years agoMerge pull request #12010 from ZDroid/wrong-indent
Mark Otto [Thu, 26 Dec 2013 20:54:23 +0000 (12:54 -0800)] 
Merge pull request #12010 from ZDroid/wrong-indent

Fix wrong indent in .jscs.json

11 years agoMerge pull request #12021 from XhmikosR/master
Chris Rebert [Thu, 26 Dec 2013 20:32:34 +0000 (12:32 -0800)] 
Merge pull request #12021 from XhmikosR/master

Add docs-assets/css/docs.css to csslint too.