]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
12 years agoBackport v3's readme update on npm install to 2.3 6967/head
Mark Otto [Sun, 17 Feb 2013 23:36:24 +0000 (15:36 -0800)] 
Backport v3's readme update on npm install to 2.3

12 years agoMerge branch '2.3.0-wip' v2.3.0
fat [Fri, 8 Feb 2013 06:13:13 +0000 (22:13 -0800)] 
Merge branch '2.3.0-wip'

12 years agoMerge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 6346/head
Mark Otto [Fri, 8 Feb 2013 06:08:13 +0000 (22:08 -0800)] 
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip

12 years agoadd 2.3 changelog section
Mark Otto [Fri, 8 Feb 2013 06:08:04 +0000 (22:08 -0800)] 
add 2.3 changelog section

12 years agoremove prevent default on focus
fat [Fri, 8 Feb 2013 05:42:34 +0000 (21:42 -0800)] 
remove prevent default on focus

12 years agoonly fire hidden once backdrop has been removed
fat [Fri, 8 Feb 2013 04:13:40 +0000 (20:13 -0800)] 
only fire hidden once backdrop has been removed

12 years agoMerge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
fat [Fri, 8 Feb 2013 03:47:01 +0000 (19:47 -0800)] 
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip

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

12 years agoif no callback, don't try to call callback ya goof
fat [Fri, 8 Feb 2013 03:45:42 +0000 (19:45 -0800)] 
if no callback, don't try to call callback ya goof

12 years agoFixes #6823: add some docs notes about tooltips in input groups
Mark Otto [Thu, 7 Feb 2013 01:25:58 +0000 (17:25 -0800)] 
Fixes #6823: add some docs notes about tooltips in input groups

12 years agoMerge pull request #6813 from Yohn/patch-12
Mark Otto [Wed, 6 Feb 2013 21:19:50 +0000 (13:19 -0800)] 
Merge pull request #6813 from Yohn/patch-12

don't remove title attribute for tooltips for 2.3-wip

12 years agounit tests 6813/head
Yohn [Wed, 6 Feb 2013 11:20:05 +0000 (06:20 -0500)] 
unit tests

12 years agodont remove title attribute part 2
Yohn [Wed, 6 Feb 2013 11:17:48 +0000 (06:17 -0500)] 
dont remove title attribute part 2

12 years agoUpdate link to changelog
Mark Otto [Wed, 6 Feb 2013 06:46:45 +0000 (22:46 -0800)] 
Update link to changelog

12 years agoMerge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
fat [Wed, 6 Feb 2013 06:30:54 +0000 (22:30 -0800)] 
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip

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

12 years agoclean up styles
fat [Wed, 6 Feb 2013 06:29:59 +0000 (22:29 -0800)] 
clean up styles

12 years agoFixes #6808: mention IE lame-itude in docs for invalid inputs
Mark Otto [Wed, 6 Feb 2013 06:28:18 +0000 (22:28 -0800)] 
Fixes #6808: mention IE lame-itude in docs for invalid inputs

12 years agoFixes #6190: Add print utility classes
Mark Otto [Wed, 6 Feb 2013 06:17:28 +0000 (22:17 -0800)] 
Fixes #6190: Add print utility classes

12 years agoMerge branch '2.3.0-wip' of git://github.com/ghusse/bootstrap into ghusse-2.3.0-wip
fat [Wed, 6 Feb 2013 06:10:41 +0000 (22:10 -0800)] 
Merge branch '2.3.0-wip' of git://github.com/ghusse/bootstrap into ghusse-2.3.0-wip

12 years agoMerge pull request #6783 from joprice/popoverOptionsOverride
fat-kun [Wed, 6 Feb 2013 05:48:34 +0000 (21:48 -0800)] 
Merge pull request #6783 from joprice/popoverOptionsOverride

reordered access of options in tooltip and popover

12 years agoMerge pull request #6780 from agatronic/2.3.0-wip
fat-kun [Wed, 6 Feb 2013 05:29:59 +0000 (21:29 -0800)] 
Merge pull request #6780 from agatronic/2.3.0-wip

less: Move to new selector interpolation, supported from 1.3.1

12 years agoscrewed up a merge and an old version number crept in
Mark Otto [Wed, 6 Feb 2013 05:20:29 +0000 (21:20 -0800)] 
screwed up a merge and an old version number crept in

12 years agodon't hide if already hidden ya n00b
fat [Wed, 6 Feb 2013 05:08:56 +0000 (21:08 -0800)] 
don't hide if already hidden ya n00b

12 years agoclear interval in cycle + rebuild
fat [Wed, 6 Feb 2013 04:34:39 +0000 (20:34 -0800)] 
clear interval in cycle + rebuild

12 years agoMerge pull request #6481 from pseidemann/patch-1
fat-kun [Wed, 6 Feb 2013 04:13:57 +0000 (20:13 -0800)] 
Merge pull request #6481 from pseidemann/patch-1

don't remove title attribute for tooltips

12 years agoMerge pull request #6488 from nanek/dropdowns-remove-touchstart
fat-kun [Wed, 6 Feb 2013 04:08:42 +0000 (20:08 -0800)] 
Merge pull request #6488 from nanek/dropdowns-remove-touchstart

Remove touchstart from bootstrap-dropdown.js.

12 years agoMerge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
fat [Wed, 6 Feb 2013 04:01:25 +0000 (20:01 -0800)] 
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip

12 years agoupdate jquery to 1.9
fat [Wed, 6 Feb 2013 04:00:50 +0000 (20:00 -0800)] 
update jquery to 1.9

12 years agoMerge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Mark Otto [Wed, 6 Feb 2013 03:59:25 +0000 (19:59 -0800)] 
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip

12 years agoderp, fix broke css and recompile
Mark Otto [Wed, 6 Feb 2013 03:43:49 +0000 (19:43 -0800)] 
derp, fix broke css and recompile

12 years agorestore comma between selectors
Mark Otto [Wed, 6 Feb 2013 03:40:32 +0000 (19:40 -0800)] 
restore comma between selectors

12 years agoMerge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into patrickhl...
Mark Otto [Wed, 6 Feb 2013 03:39:49 +0000 (19:39 -0800)] 
Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into patrickhlauke-2.3.0-wip

Conflicts:
docs/assets/css/bootstrap.css
less/navbar.less

12 years agoMerge pull request #6737 from openwide-java/fix-tooltip-positioning-for-ie8
fat-kun [Wed, 6 Feb 2013 03:22:34 +0000 (19:22 -0800)] 
Merge pull request #6737 from openwide-java/fix-tooltip-positioning-for-ie8

Fix tooltip positioning for IE8 broken in 2.3.0

12 years agoMerge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Mark Otto [Mon, 4 Feb 2013 19:25:46 +0000 (11:25 -0800)] 
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip

12 years agoFixes #6794: incorrect docs mention of th element
Mark Otto [Mon, 4 Feb 2013 19:11:04 +0000 (11:11 -0800)] 
Fixes #6794: incorrect docs mention of th element

12 years agofix typo 6783/head
Joseph Price [Mon, 4 Feb 2013 14:10:48 +0000 (09:10 -0500)] 
fix typo

12 years agoMerge pull request #6638 from GeoffYoung/2.3.0-wip
Mark Otto [Sun, 3 Feb 2013 03:53:22 +0000 (19:53 -0800)] 
Merge pull request #6638 from GeoffYoung/2.3.0-wip

Update package.json to current Recess version

12 years agoMerge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Mark Otto [Sun, 3 Feb 2013 02:58:08 +0000 (18:58 -0800)] 
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip

12 years agoAdd changelog file to repo instead of relying on the wiki
Mark Otto [Sun, 3 Feb 2013 02:57:24 +0000 (18:57 -0800)] 
Add changelog file to repo instead of relying on the wiki

12 years agoreordered access of options in tooltip and popover to allow overriding data attrs...
Joseph Price [Sat, 2 Feb 2013 23:55:18 +0000 (18:55 -0500)] 
reordered access of options in tooltip and popover to allow overriding data attrs from js

12 years agoMerge pull request #6763 from rjregenold/2.3.0-wip
Mark Otto [Sat, 2 Feb 2013 20:35:39 +0000 (12:35 -0800)] 
Merge pull request #6763 from rjregenold/2.3.0-wip

fixes jankiness with anchor tags in carousel.

12 years agoMove to new selector interpolation, supported from 1.3.1 6780/head
Luke Page [Sat, 2 Feb 2013 07:49:55 +0000 (07:49 +0000)] 
Move to new selector interpolation, supported from 1.3.1

12 years agoMerge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Mark Otto [Sat, 2 Feb 2013 05:44:35 +0000 (21:44 -0800)] 
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip

12 years agoMerge branch 'dospuntocero-master' into 2.3.0-wip
Mark Otto [Sat, 2 Feb 2013 05:41:13 +0000 (21:41 -0800)] 
Merge branch 'dospuntocero-master' into 2.3.0-wip

12 years agoadd horizontal-three-color gradient test
Mark Otto [Sat, 2 Feb 2013 05:41:02 +0000 (21:41 -0800)] 
add horizontal-three-color gradient test

12 years agoMerge pull request #6776 from ndabas/fix-inline-lists-ie7
Mark Otto [Fri, 1 Feb 2013 21:04:17 +0000 (13:04 -0800)] 
Merge pull request #6776 from ndabas/fix-inline-lists-ie7

Fix inline lists for IE7

12 years agoFixing inline lists for IE7 6776/head
Nikhil Dabas [Fri, 1 Feb 2013 20:34:30 +0000 (02:04 +0530)] 
Fixing inline lists for IE7

12 years agoUse button element instead of a for responsive navbar buttons
Mark Otto [Fri, 1 Feb 2013 18:33:36 +0000 (10:33 -0800)] 
Use button element instead of a for responsive navbar buttons

12 years agoremoves anchor tag definition. 6763/head
RJ Regenold [Thu, 31 Jan 2013 18:49:53 +0000 (12:49 -0600)] 
removes anchor tag definition.

12 years agolets see how much i can mess this pull request up. :|
RJ Regenold [Thu, 31 Jan 2013 17:10:41 +0000 (11:10 -0600)] 
lets see how much i can mess this pull request up. :|

12 years agoits not dyslexic being easy.
RJ Regenold [Thu, 31 Jan 2013 17:04:12 +0000 (11:04 -0600)] 
its not dyslexic being easy.

12 years agofixes jankiness with anchor tags in carousel.
RJ Regenold [Thu, 31 Jan 2013 15:06:37 +0000 (09:06 -0600)] 
fixes jankiness with anchor tags in carousel.

12 years agomake on prev commit
Mark Otto [Thu, 31 Jan 2013 02:22:20 +0000 (18:22 -0800)] 
make on prev commit

12 years agoMerge branch 'baslr-master' into 2.3.0-wip
Mark Otto [Thu, 31 Jan 2013 02:22:11 +0000 (18:22 -0800)] 
Merge branch 'baslr-master' into 2.3.0-wip

12 years agoclear up show-grid stuff
Mark Otto [Thu, 31 Jan 2013 02:16:14 +0000 (18:16 -0800)] 
clear up show-grid stuff

12 years agoadd meta tag to second example
Mark Otto [Thu, 31 Jan 2013 01:46:18 +0000 (17:46 -0800)] 
add meta tag to second example

12 years agomake on prev commit
Mark Otto [Thu, 31 Jan 2013 01:45:02 +0000 (17:45 -0800)] 
make on prev commit

12 years agoMerge branch 'greg-raven-patch-2' into 2.3.0-wip
Mark Otto [Thu, 31 Jan 2013 01:44:45 +0000 (17:44 -0800)] 
Merge branch 'greg-raven-patch-2' into 2.3.0-wip

12 years agoUpdate pagination example HTML to match examples
Mark Otto [Thu, 31 Jan 2013 01:42:03 +0000 (17:42 -0800)] 
Update pagination example HTML to match examples

12 years agodon't remove title attribute for tooltips 6481/head
pseidemann [Tue, 29 Jan 2013 21:54:00 +0000 (22:54 +0100)] 
don't remove title attribute for tooltips
fixes #6445

12 years agoFix tooltip positioning for IE8 6737/head
Guillaume Smet [Tue, 29 Jan 2013 18:50:13 +0000 (19:50 +0100)] 
Fix tooltip positioning for IE8
IE8 defines a placeholder object getBoundingClientRect which breaks the new getPosition() method

12 years agoMerge pull request #6728 from fredsa/2.3.0-wip
Mark Otto [Mon, 28 Jan 2013 18:35:16 +0000 (10:35 -0800)] 
Merge pull request #6728 from fredsa/2.3.0-wip

Fix `form-actions` documentation

12 years agoFix form-actions documentation 6728/head
Fred Sauer [Mon, 28 Jan 2013 18:01:59 +0000 (10:01 -0800)] 
Fix form-actions documentation

12 years agoNo semicolumns 6713/head
Guillaume Gautreau [Sun, 27 Jan 2013 09:56:01 +0000 (10:56 +0100)] 
No semicolumns

12 years agoArrow replacement
Guillaume Gautreau [Sat, 26 Jan 2013 20:45:21 +0000 (21:45 +0100)] 
Arrow replacement

12 years agoworks with fixed test
Guillaume Gautreau [Sat, 26 Jan 2013 20:39:49 +0000 (21:39 +0100)] 
works with fixed test

12 years agoTest for replacing tooltip when resized
Guillaume Gautreau [Sat, 26 Jan 2013 20:39:05 +0000 (21:39 +0100)] 
Test for replacing tooltip when resized

12 years agolint + wrong comparison
Guillaume Gautreau [Sat, 26 Jan 2013 13:31:33 +0000 (14:31 +0100)] 
lint + wrong comparison

12 years agoUnit test for replacing tooltip inside window
Guillaume Gautreau [Sat, 26 Jan 2013 13:06:58 +0000 (14:06 +0100)] 
Unit test for replacing tooltip inside window

12 years agoTooltip positionning on special cases
Guillaume Gautreau [Sat, 26 Jan 2013 12:50:26 +0000 (13:50 +0100)] 
Tooltip positionning on special cases

12 years ago.icon-folder-close same width as icon-folder-open 6710/head
baslr [Sat, 26 Jan 2013 00:01:10 +0000 (01:01 +0100)] 
.icon-folder-close same width as icon-folder-open

.icon-folder-close same width as icon-folder-open. this prevents
buttons from wobbling if the icon changes from closed folder
to open folderĀ 

12 years agoUpdate less/mixins.less 6685/head
Francisco arenas [Thu, 24 Jan 2013 05:37:52 +0000 (03:37 -0200)] 
Update less/mixins.less

horizontal three color gradient added

12 years agoUpdate docs/templates/pages/getting-started.mustache 6667/head
Greg Raven [Tue, 22 Jan 2013 14:46:53 +0000 (06:46 -0800)] 
Update docs/templates/pages/getting-started.mustache

Add meta tag for viewport in the <head>; revise the URL for the latest version of jQuery.

12 years agoUpdate Recess version 6638/head
Geoff Young [Sat, 19 Jan 2013 21:27:10 +0000 (16:27 -0500)] 
Update Recess version

12 years agooverhaul alerts section of tests
Mark Otto [Thu, 17 Jan 2013 20:24:16 +0000 (12:24 -0800)] 
overhaul alerts section of tests

12 years agoMerge branch 'ravage84-patch-2' into 2.3.0-wip
Mark Otto [Thu, 17 Jan 2013 20:21:34 +0000 (12:21 -0800)] 
Merge branch 'ravage84-patch-2' into 2.3.0-wip

12 years agoUpdate less/tests/css-tests.html 6614/head
ravage84 [Thu, 17 Jan 2013 10:34:00 +0000 (11:34 +0100)] 
Update less/tests/css-tests.html

Extended css-tests with alerts (alerts and alert-blocks)

12 years agoMerge pull request #6600 from Yohn/patch-12
Mark Otto [Wed, 16 Jan 2013 18:28:02 +0000 (10:28 -0800)] 
Merge pull request #6600 from Yohn/patch-12

added missing class to doc example

12 years agoMerge pull request #6591 from Quy/2.3.0-wip
Mark Otto [Wed, 16 Jan 2013 18:24:13 +0000 (10:24 -0800)] 
Merge pull request #6591 from Quy/2.3.0-wip

Add text alignment classes info to docs

12 years agoUpdate docs/templates/pages/components.mustache 6600/head
Yohn [Wed, 16 Jan 2013 12:46:42 +0000 (07:46 -0500)] 
Update docs/templates/pages/components.mustache

12 years agoadding class to example code
Yohn [Wed, 16 Jan 2013 12:45:31 +0000 (07:45 -0500)] 
adding class to example code

12 years agoAdd text alignment classes info to docs 6591/head
Quy Ton [Wed, 16 Jan 2013 02:16:44 +0000 (18:16 -0800)] 
Add text alignment classes info to docs

12 years agoFixes #6586: remove top 5px margin from navbar input group button groups
Mark Otto [Tue, 15 Jan 2013 18:27:30 +0000 (10:27 -0800)] 
Fixes #6586: remove top 5px margin from navbar input group button groups

12 years agoadd text alignment classes from 3.0
Mark Otto [Tue, 15 Jan 2013 18:15:02 +0000 (10:15 -0800)] 
add text alignment classes from 3.0

12 years agoRevert "Leave tabindex=-1 alone" 6441/head
Patrick H. Lauke [Tue, 15 Jan 2013 07:22:02 +0000 (07:22 +0000)] 
Revert "Leave tabindex=-1 alone"

This reverts commit 370fa45fbe4ee879a626a67bb4df0ec9495102be.

12 years agoLeave tabindex=-1 alone
Patrick H. Lauke [Tue, 15 Jan 2013 07:16:33 +0000 (07:16 +0000)] 
Leave tabindex=-1 alone

It seems that, as misguided as I personally think it is, ARIA does
indeed want dropdown menus not to behave as regular keyboard users
expect them, killing TAB/SHIFT+TAB in favor of cursor keys. Fair
enough, the issue I have is then with ARIA, not with bootstrap. I would
sugges thought that if you really do want to follow ARIA consistently,
*any* navigation bar should also become an ARIA menu, further making it
impossible for keyboard users to use TAB/SHIFT+TAB to navigate through
it, and that these changes should be reflected in the bootstrap
examples as well...

12 years agoRevert "Keyboard accessibility in documentation"
Patrick H. Lauke [Tue, 15 Jan 2013 07:13:19 +0000 (07:13 +0000)] 
Revert "Keyboard accessibility in documentation"

This reverts commit a809daf2841f65ffac5030b2c6ce6aea60dd6233.

12 years agoMerge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Mark Otto [Mon, 14 Jan 2013 08:33:16 +0000 (00:33 -0800)] 
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip

12 years agoUpgrade to newest HTML5 shiv, and make it a local dependency rather than CDNing
Mark Otto [Mon, 14 Jan 2013 08:11:55 +0000 (00:11 -0800)] 
Upgrade to newest HTML5 shiv, and make it a local dependency rather than CDNing

12 years agoMerge pull request #6568 from Yohn/patch-12
Mark Otto [Mon, 14 Jan 2013 08:03:55 +0000 (00:03 -0800)] 
Merge pull request #6568 from Yohn/patch-12

Updating docs -> popover to show container option

12 years agofix typo 6568/head
Yohn [Sun, 13 Jan 2013 20:32:51 +0000 (15:32 -0500)] 
fix typo

12 years agofix typo
Yohn [Sun, 13 Jan 2013 20:32:03 +0000 (15:32 -0500)] 
fix typo

12 years agoadded container options to docs for popover
Yohn [Sun, 13 Jan 2013 20:23:22 +0000 (15:23 -0500)] 
added container options to docs for popover

12 years agoadded container options to docs for popover
Yohn [Sun, 13 Jan 2013 20:21:31 +0000 (15:21 -0500)] 
added container options to docs for popover

12 years agoUpdate Holder.js 1.6 to 1.9
Mark Otto [Sun, 13 Jan 2013 03:49:15 +0000 (19:49 -0800)] 
Update Holder.js 1.6 to 1.9

12 years agoUpdate extend page to point to readme for compiling.
Mark Otto [Sat, 12 Jan 2013 20:41:01 +0000 (12:41 -0800)] 
Update extend page to point to readme for compiling.

Note that we'll be dropping this page entirely as it's out of date and other compiling options are not recommended for contributing back to the project.

12 years agoKeyboard accessibility in documentation
Patrick H. Lauke [Sat, 12 Jan 2013 17:04:51 +0000 (17:04 +0000)] 
Keyboard accessibility in documentation

Removed unnecessary (?) and harmful (from a keyboard access point of
view) tabindex=-1 in the documentation examples.

12 years agoCleaned up dirty CSS
Patrick H. Lauke [Sat, 12 Jan 2013 11:02:13 +0000 (11:02 +0000)] 
Cleaned up dirty CSS

Used recess rather than less

12 years agoAddress #6459 and add mention of disabled links in dropdowns to le docs
Mark Otto [Sat, 12 Jan 2013 08:33:12 +0000 (00:33 -0800)] 
Address #6459 and add mention of disabled links in dropdowns to le docs

12 years agoMerge pull request #6462 from cvrebert/input-required-docs-fix-2.3.0
Mark Otto [Sat, 12 Jan 2013 08:29:34 +0000 (00:29 -0800)] 
Merge pull request #6462 from cvrebert/input-required-docs-fix-2.3.0

update 2.3.0 docs to reflect #5786

12 years agoMerge pull request #6472 from RWOverdijk/patch-1
Mark Otto [Sat, 12 Jan 2013 08:21:08 +0000 (00:21 -0800)] 
Merge pull request #6472 from RWOverdijk/patch-1

Update composer.json