]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
13 years agoAdded unit test to check that tooltips is not showed when leave event is triggered... 3550/head 3654/head
Jørgen Borgesen [Sun, 20 May 2012 17:59:53 +0000 (19:59 +0200)] 
Added unit test to check that tooltips is not showed when leave event is triggered before show delay has expired AND the hide delay is set to 0

13 years agoCancel running timer for tooltips with delayed show, but instant hide. This prevents... 3478/head
Jørgen Borgesen [Mon, 14 May 2012 12:03:36 +0000 (14:03 +0200)] 
Cancel running timer for tooltips with delayed show, but instant hide. This prevents delayed tooltips from appearing if the mouse leaves the elements before tooltip is showed and the hiding delay is 0.

13 years agoMerge pull request #3226 from aziz/patch-6
Jacob Thornton [Thu, 26 Apr 2012 05:19:49 +0000 (22:19 -0700)] 
Merge pull request #3226 from aziz/patch-6

No need to specify units when a value is 0, thanks to RECESS

13 years agorebuild with typeahead change
Jacob Thornton [Thu, 26 Apr 2012 05:15:39 +0000 (22:15 -0700)] 
rebuild with typeahead change

13 years agorevert position -> offset for typeahead position
Jacob Thornton [Thu, 26 Apr 2012 05:14:39 +0000 (22:14 -0700)] 
revert position -> offset for typeahead position

13 years agofix #3234
Jacob Thornton [Thu, 26 Apr 2012 04:52:05 +0000 (21:52 -0700)] 
fix #3234

13 years agoNo need to specify units when a value is 0, thanks to RECESS 3226/head
Allen Bargi [Wed, 25 Apr 2012 15:16:59 +0000 (18:16 +0300)] 
No need to specify units when a value is 0, thanks to RECESS

13 years agofix regression in resetting collapse to auto on collapse open. (+ add spec and rebuild) v2.0.3
Jacob Thornton [Wed, 25 Apr 2012 01:06:41 +0000 (18:06 -0700)] 
fix regression in resetting collapse to auto on collapse open. (+ add spec and rebuild)

13 years agoheading
Mark Otto [Tue, 24 Apr 2012 13:53:48 +0000 (06:53 -0700)] 
heading

13 years agoofficially drop support for offset on thumbnails since it breaks BC
Mark Otto [Tue, 24 Apr 2012 13:52:57 +0000 (06:52 -0700)] 
officially drop support for offset on thumbnails since it breaks BC

13 years agorestore margins on thumbnails, add comments about it's changes and how responsive...
Mark Otto [Tue, 24 Apr 2012 13:45:21 +0000 (06:45 -0700)] 
restore margins on thumbnails, add comments about it's changes and how responsive affects it

13 years agomake component animations work cross browsers with opacity mixin, restore float on...
Mark Otto [Tue, 24 Apr 2012 13:39:14 +0000 (06:39 -0700)] 
make component animations work cross browsers with opacity mixin, restore float on thumbnails > li

13 years agoMerge branch '2.0.3-wip'
Jacob Thornton [Tue, 24 Apr 2012 09:21:45 +0000 (02:21 -0700)] 
Merge branch '2.0.3-wip'

Conflicts:
Makefile
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js

13 years ago2.0.2 -> 2.0.3
Jacob Thornton [Tue, 24 Apr 2012 09:19:02 +0000 (02:19 -0700)] 
2.0.2 -> 2.0.3

13 years agoMerge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Mark Otto [Tue, 24 Apr 2012 09:12:09 +0000 (02:12 -0700)] 
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip

13 years agoimplement ie7 fluid tests and semantic.gs IE7 hack for rounding in ie7; not perfect...
Mark Otto [Tue, 24 Apr 2012 09:11:59 +0000 (02:11 -0700)] 
implement ie7 fluid tests and semantic.gs IE7 hack for rounding in ie7; not perfect, but mostly solid

13 years agoMerge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Jacob Thornton [Tue, 24 Apr 2012 09:02:28 +0000 (02:02 -0700)] 
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip

13 years agochanges for build in preperation for 2.0.3 release
Jacob Thornton [Tue, 24 Apr 2012 09:02:06 +0000 (02:02 -0700)] 
changes for build in preperation for 2.0.3 release

13 years agofix ie7 button group toggles and button borders
Mark Otto [Tue, 24 Apr 2012 08:46:20 +0000 (01:46 -0700)] 
fix ie7 button group toggles and button borders

13 years agofix #3179: cut off radios and checkboxes
Mark Otto [Tue, 24 Apr 2012 08:33:00 +0000 (01:33 -0700)] 
fix #3179: cut off radios and checkboxes

13 years agofix #3202: add cursor to .accordion-toggle
Mark Otto [Tue, 24 Apr 2012 08:23:24 +0000 (01:23 -0700)] 
fix #3202: add cursor to .accordion-toggle

13 years agoMerge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Mark Otto [Mon, 23 Apr 2012 17:06:45 +0000 (10:06 -0700)] 
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip

13 years agofix up buttons after recess property order
Mark Otto [Mon, 23 Apr 2012 17:06:35 +0000 (10:06 -0700)] 
fix up buttons after recess property order

13 years agohr to var in makefil
Jacob Thornton [Mon, 23 Apr 2012 11:16:27 +0000 (04:16 -0700)] 
hr to var in makefil

13 years agorewrite server.js, fix travis
Jacob Thornton [Mon, 23 Apr 2012 10:44:32 +0000 (03:44 -0700)] 
rewrite server.js, fix travis

13 years agoincrease length of waitfor timeout for phantom
Jacob Thornton [Mon, 23 Apr 2012 10:18:13 +0000 (03:18 -0700)] 
increase length of waitfor timeout for phantom

13 years agowhite bg on docs again
Mark Otto [Mon, 23 Apr 2012 10:06:30 +0000 (03:06 -0700)] 
white bg on docs again

13 years agoMerge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Mark Otto [Mon, 23 Apr 2012 10:05:22 +0000 (03:05 -0700)] 
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip

13 years agoremove background color from radios and checkboxes for IEs
Mark Otto [Mon, 23 Apr 2012 10:05:10 +0000 (03:05 -0700)] 
remove background color from radios and checkboxes for IEs

13 years agofix typo
Mark Otto [Mon, 23 Apr 2012 06:56:36 +0000 (23:56 -0700)] 
fix typo

13 years agostyle changes to phantom integration
Jacob Thornton [Fri, 20 Apr 2012 00:40:58 +0000 (17:40 -0700)] 
style changes to phantom integration

13 years agorun qunit tests in phantomjs for travis-ci
Jacob Thornton [Fri, 20 Apr 2012 00:34:07 +0000 (17:34 -0700)] 
run qunit tests in phantomjs for travis-ci

13 years agomake a few changes to package.json (add make test to makefile)
Jacob Thornton [Thu, 19 Apr 2012 23:38:43 +0000 (16:38 -0700)] 
make a few changes to package.json (add make test to makefile)

13 years agoMerge pull request #3157 from caniszczyk/2.0.3-wip
Jacob Thornton [Thu, 19 Apr 2012 23:35:27 +0000 (16:35 -0700)] 
Merge pull request #3157 from caniszczyk/2.0.3-wip

Add TravisCI support and update README

13 years agoAdd Travis CI Support 3157/head
Chris Aniszczyk [Thu, 19 Apr 2012 22:32:41 +0000 (15:32 -0700)] 
Add Travis CI Support

Continous integration is nice, fixes #3155

Signed-off-by: Chris Aniszczyk <zx@twitter.com>
13 years agomention responsive css in navbar responsive section
Mark Otto [Thu, 19 Apr 2012 16:28:40 +0000 (09:28 -0700)] 
mention responsive css in navbar responsive section

13 years agomake build prettier - hopefully this works, maybe some makefile bro's can improve
Jacob Thornton [Thu, 19 Apr 2012 05:49:31 +0000 (22:49 -0700)] 
make build prettier - hopefully this works, maybe some makefile bro's can improve

13 years agomake bootstrap compile with Recess instead of Less
Jacob Thornton [Wed, 18 Apr 2012 23:16:42 +0000 (16:16 -0700)] 
make bootstrap compile with Recess instead of Less

13 years agoallow for pushstate in scrollspy
Jacob Thornton [Wed, 18 Apr 2012 20:35:14 +0000 (13:35 -0700)] 
allow for pushstate in scrollspy

13 years agoMerge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip
Jacob Thornton [Wed, 18 Apr 2012 20:15:58 +0000 (13:15 -0700)] 
Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip

13 years agooffset -> position #3088
Jacob Thornton [Wed, 18 Apr 2012 20:15:13 +0000 (13:15 -0700)] 
offset -> position #3088

13 years agofix #3111, badge and label alignment with surrounding text
Mark Otto [Wed, 18 Apr 2012 16:47:30 +0000 (09:47 -0700)] 
fix #3111, badge and label alignment with surrounding text

13 years agoMerge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Mark Otto [Wed, 18 Apr 2012 16:37:12 +0000 (09:37 -0700)] 
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip

13 years agofix some text around media queries in the docs
Mark Otto [Wed, 18 Apr 2012 16:37:07 +0000 (09:37 -0700)] 
fix some text around media queries in the docs

13 years agoMerge pull request #3128 from codler/patch-2
Mark Otto [Wed, 18 Apr 2012 16:22:38 +0000 (09:22 -0700)] 
Merge pull request #3128 from codler/patch-2

Add -ms-user-select

13 years agoadd -ms-user-select 3128/head
Han Lin Yap [Wed, 18 Apr 2012 08:38:14 +0000 (11:38 +0300)] 
add -ms-user-select

13 years agorebuild
Jacob Thornton [Tue, 17 Apr 2012 00:36:03 +0000 (17:36 -0700)] 
rebuild

13 years agoMerge pull request #3104 from iamnirav/2.0.3-wip
Jacob Thornton [Tue, 17 Apr 2012 00:35:32 +0000 (17:35 -0700)] 
Merge pull request #3104 from iamnirav/2.0.3-wip

Allow updater function in bootstrap-typeahead.js (updates the value of the input field) to be overridden

13 years agoUpdate new typeahead method docs to be a bit clearer. 3104/head
Nirav Sanghani [Tue, 17 Apr 2012 00:27:34 +0000 (17:27 -0700)] 
Update new typeahead method docs to be a bit clearer.

13 years agoUpdate typeahead docs to reflect new option.
Nirav Sanghani [Tue, 17 Apr 2012 00:24:51 +0000 (17:24 -0700)] 
Update typeahead docs to reflect new option.

13 years agoAllow updater function (updates the value of the input field) to be overridden.
Nirav Sanghani [Tue, 17 Apr 2012 00:05:35 +0000 (17:05 -0700)] 
Allow updater function (updates the value of the input field) to be overridden.

13 years agolots of property ordering
Jacob Thornton [Mon, 16 Apr 2012 23:34:08 +0000 (16:34 -0700)] 
lots of property ordering

13 years agofew more property orders
Jacob Thornton [Mon, 16 Apr 2012 22:37:17 +0000 (15:37 -0700)] 
few more property orders

13 years agoMerge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip
Jacob Thornton [Mon, 16 Apr 2012 22:09:26 +0000 (15:09 -0700)] 
Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip

13 years agoa few property reordering things
Jacob Thornton [Mon, 16 Apr 2012 22:09:05 +0000 (15:09 -0700)] 
a few property reordering things

13 years agofix modal per #3086
Mark Otto [Mon, 16 Apr 2012 21:38:22 +0000 (14:38 -0700)] 
fix modal per #3086

13 years agoMerge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Mark Otto [Mon, 16 Apr 2012 00:25:38 +0000 (17:25 -0700)] 
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip

13 years agonuke line
Mark Otto [Mon, 16 Apr 2012 00:25:32 +0000 (17:25 -0700)] 
nuke line

13 years agobuild bootstrap.js and bootstrap.min.js into docs
Jacob Thornton [Mon, 16 Apr 2012 00:03:33 +0000 (17:03 -0700)] 
build bootstrap.js and bootstrap.min.js into docs

13 years agoremove @gridRowWidth var since we don't use it anywhere
Mark Otto [Sun, 15 Apr 2012 23:57:11 +0000 (16:57 -0700)] 
remove @gridRowWidth var since we don't use it anywhere

13 years agoMerge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Mark Otto [Sun, 15 Apr 2012 23:48:26 +0000 (16:48 -0700)] 
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip

13 years agosimplify the left margin for offset grid columns
Mark Otto [Sun, 15 Apr 2012 23:48:17 +0000 (16:48 -0700)] 
simplify the left margin for offset grid columns

13 years agoadd bootstrap + bootstrap.min.js to gh-pages for @remy
Jacob Thornton [Sun, 15 Apr 2012 23:45:13 +0000 (16:45 -0700)] 
add bootstrap + bootstrap.min.js to gh-pages for @remy

13 years agofixes #2941 + whitespace in collapse
Jacob Thornton [Sun, 15 Apr 2012 23:15:32 +0000 (16:15 -0700)] 
fixes #2941 + whitespace in collapse

13 years agofix #2990: text wrapping in .uneditable-input
Mark Otto [Sun, 15 Apr 2012 07:35:30 +0000 (00:35 -0700)] 
fix #2990: text wrapping in .uneditable-input

13 years agoMerge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip
Jacob Thornton [Sun, 15 Apr 2012 07:20:50 +0000 (00:20 -0700)] 
Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip

Conflicts:
docs/assets/bootstrap.zip

13 years agoadd zip to git ignore, and fix gh-pages make
Jacob Thornton [Sun, 15 Apr 2012 07:19:25 +0000 (00:19 -0700)] 
add zip to git ignore, and fix gh-pages make

13 years agosimplify make - move zipping to gh-pages only
Jacob Thornton [Sun, 15 Apr 2012 07:16:09 +0000 (00:16 -0700)] 
simplify make - move zipping to gh-pages only

13 years agoMerge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Mark Otto [Sun, 15 Apr 2012 07:06:35 +0000 (00:06 -0700)] 
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip

Conflicts:
docs/assets/bootstrap.zip

13 years agomove js tooltip link
Mark Otto [Sun, 15 Apr 2012 07:06:11 +0000 (00:06 -0700)] 
move js tooltip link

13 years agochange comments to preserve for yui
Jacob Thornton [Sun, 15 Apr 2012 06:51:08 +0000 (23:51 -0700)] 
change comments to preserve for yui

13 years agowhitespace
Jacob Thornton [Sun, 15 Apr 2012 06:38:11 +0000 (23:38 -0700)] 
whitespace

13 years agofix opera bug \o/ !!!! #1776
Jacob Thornton [Sun, 15 Apr 2012 06:24:19 +0000 (23:24 -0700)] 
fix opera bug \o/ !!!! #1776

13 years agofix #2989: clear .checkbox/.radio floats
Mark Otto [Sun, 15 Apr 2012 06:19:42 +0000 (23:19 -0700)] 
fix #2989: clear .checkbox/.radio floats

13 years agorebuild with tooltip formatting change
Jacob Thornton [Sun, 15 Apr 2012 06:11:19 +0000 (23:11 -0700)] 
rebuild with tooltip formatting change

13 years agoMerge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip
Jacob Thornton [Sun, 15 Apr 2012 06:10:41 +0000 (23:10 -0700)] 
Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip

13 years agoadd tests for mouseout delay in tooltip
Jacob Thornton [Sun, 15 Apr 2012 06:10:03 +0000 (23:10 -0700)] 
add tests for mouseout delay in tooltip

13 years agoMerge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Mark Otto [Sun, 15 Apr 2012 06:07:51 +0000 (23:07 -0700)] 
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip

Conflicts:
docs/assets/bootstrap.zip

13 years agoditch the .navbar in the selectors since it's the same specificity level, and thus...
Mark Otto [Sun, 15 Apr 2012 06:06:00 +0000 (23:06 -0700)] 
ditch the .navbar in the selectors since it's the same specificity level, and thus superfluous

13 years agochange position of var in dropdown + cleanup makefile vars
Jacob Thornton [Sun, 15 Apr 2012 05:43:36 +0000 (22:43 -0700)] 
change position of var in dropdown + cleanup makefile vars

13 years agoMerge branch '2.0.3-wip-nav-collapse' of https://github.com/tierra/bootstrap into...
Mark Otto [Sun, 15 Apr 2012 05:43:26 +0000 (22:43 -0700)] 
Merge branch '2.0.3-wip-nav-collapse' of https://github.com/tierra/bootstrap into tierra-2.0.3-wip-nav-collapse

Conflicts:
docs/assets/bootstrap.zip

13 years agoMerge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip
Jacob Thornton [Sun, 15 Apr 2012 04:45:23 +0000 (21:45 -0700)] 
Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip

13 years agodon't open dropdown if target is disabled
Jacob Thornton [Sun, 15 Apr 2012 04:44:57 +0000 (21:44 -0700)] 
don't open dropdown if target is disabled

13 years agofix #3068: compile after changing comment
Mark Otto [Sun, 15 Apr 2012 03:56:50 +0000 (20:56 -0700)] 
fix #3068: compile after changing comment

13 years agoMerge branch 'au-phiware-patch-1' into 2.0.3-wip
Mark Otto [Sun, 15 Apr 2012 03:56:13 +0000 (20:56 -0700)] 
Merge branch 'au-phiware-patch-1' into 2.0.3-wip

13 years agoSilence comment (just like the others) 3068/head
au-phiware [Sun, 15 Apr 2012 02:31:07 +0000 (12:31 +1000)] 
Silence comment (just like the others)

13 years agofix #1823: styles of tabs within other tabs resolved
Mark Otto [Sun, 15 Apr 2012 01:47:27 +0000 (18:47 -0700)] 
fix #1823: styles of tabs within other tabs resolved

13 years agobump version on docs homepage to 2.0.3
Mark Otto [Sun, 15 Apr 2012 01:30:43 +0000 (18:30 -0700)] 
bump version on docs homepage to 2.0.3

13 years agomerge in #2684, offset on the .makeColumn mixin
Mark Otto [Sun, 15 Apr 2012 01:18:11 +0000 (18:18 -0700)] 
merge in #2684, offset on the .makeColumn mixin

13 years agoMerge branch 'gruvii-patch-2' into 2.0.3-wip
Mark Otto [Sun, 15 Apr 2012 01:11:40 +0000 (18:11 -0700)] 
Merge branch 'gruvii-patch-2' into 2.0.3-wip

13 years agoMerge branch 'patch-2' of https://github.com/gruvii/bootstrap into gruvii-patch-2
Mark Otto [Sun, 15 Apr 2012 01:11:31 +0000 (18:11 -0700)] 
Merge branch 'patch-2' of https://github.com/gruvii/bootstrap into gruvii-patch-2

13 years agocalling pause on a slide should actually pause it - even when hovering
Jacob Thornton [Sun, 15 Apr 2012 00:49:51 +0000 (17:49 -0700)] 
calling pause on a slide should actually pause it - even when hovering

13 years agorebuild
Jacob Thornton [Sun, 15 Apr 2012 00:19:00 +0000 (17:19 -0700)] 
rebuild

13 years agoMerge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Mark Otto [Sun, 15 Apr 2012 00:16:37 +0000 (17:16 -0700)] 
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip

Conflicts:
docs/assets/bootstrap.zip

13 years agoadding icon classes to finish off glyphicons 1.6 update
Mark Otto [Sun, 15 Apr 2012 00:15:16 +0000 (17:15 -0700)] 
adding icon classes to finish off glyphicons 1.6 update

13 years agohack for subnav
Jacob Thornton [Sun, 15 Apr 2012 00:15:03 +0000 (17:15 -0700)] 
hack for subnav

13 years agofix #3032: update glyphicons sprite to 1.6 release
Mark Otto [Sat, 14 Apr 2012 23:59:49 +0000 (16:59 -0700)] 
fix #3032: update glyphicons sprite to 1.6 release

13 years agowhitespace
Jacob Thornton [Sat, 14 Apr 2012 23:38:44 +0000 (16:38 -0700)] 
whitespace

13 years agofix typeahead test
Jacob Thornton [Sat, 14 Apr 2012 23:32:20 +0000 (16:32 -0700)] 
fix typeahead test

13 years agoadd jshint support + a few minor stylistic changes
Jacob Thornton [Sat, 14 Apr 2012 23:29:53 +0000 (16:29 -0700)] 
add jshint support + a few minor stylistic changes