Comparar commits

...

1562 Commits

Autor SHA1 Mensagem Data
Mark Otto b4c4072679 Merge pull request #8637 from twitter/2.3.2-wip
Bump 2.3.2 dependencies and docs links for v3 RC1
2013-07-26 23:36:38 -07:00
Mark Otto 04b00365da finish bumping copyright 2013-07-26 23:16:25 -07:00
Mark Otto 92fd785e97 revert to 2.3.2 tag instead 2013-07-26 23:12:54 -07:00
Mark Otto aadc76694d Point docs downloads to tag in twbs org 2013-07-25 23:10:22 -07:00
Mark Otto 4be4e8ec35 Point changelog in docs to releases on GitHub 2013-07-25 23:07:23 -07:00
Mark Otto 14c1e926a6 More date changes 2013-07-25 23:04:01 -07:00
Mark Otto 87e2f0bbc5 Add changelog entry 2013-07-25 22:56:34 -07:00
Mark Otto 573b3f4415 Version bump 2013-07-25 22:56:28 -07:00
Mark Otto 7d59745955 Update URLs to account for v3 rc1 soft launch 2013-07-25 22:53:57 -07:00
Mark Otto b8238b6efb Merge branch 'master' of https://github.com/cvrebert/bootstrap into 2.3.3-wip 2013-07-25 22:17:42 -07:00
Chris Rebert 0822cc5458 twitter/bootstrap => twbs/bootstrap in links etc. 2013-07-25 22:12:22 -07:00
Mark Otto f0de5ad2ac Bump Recess to 1.1.9 2013-07-25 21:29:09 -07:00
Chris Rebert 790cb187f1 component.json -> bower.json; adjust jquery to >=1.8.0 <2.1.0 2013-07-18 22:57:59 -07:00
Mark Otto d991ef2ab1 Merge pull request #8242 from cvrebert/patch-1
Apply #8166 to master so folks can build a non-empty v2.3.2
2013-06-20 12:11:39 -07:00
Chris Rebert 514ea6ea76 Bump Recess to v1.1.8 to fix further less.js version problems
Apparently Recess v1.1.7 had another problem:
https://github.com/twitter/recess/pull/100
2013-06-20 12:14:46 -06:00
Chris Rebert beca8a6b74 Apply #8166 to master so folks can build v2.3.2 2013-06-20 12:04:20 -06:00
Mark Otto de683e9003 Update README.md 2013-06-13 22:57:05 -07:00
Mark Otto 60b202de32 Fix link to Bower in readme 2013-06-06 09:14:52 -07:00
fat d9b502dfb8 missed a few 2.3.1's 2013-05-17 10:26:09 -07:00
fat c9789f7515 update versioning to 2.3.2 2013-05-17 10:20:13 -07:00
fat b9bd82b496 patch dropdowns for #7118 2013-05-17 10:13:22 -07:00
Mark Otto 37d0a30589 Merge pull request #7287 from waynn/patch-1
fix pluralization since "a" is in front for issue #6342
2013-03-14 22:21:06 -07:00
Waynn Lue 1c7fe5d887 fix pluralization since "a" is in front 2013-03-06 22:01:21 -08:00
fat-kun eb24718add Merge pull request #7111 from twitter/2.3.1-wip
2.3.1 wip
2013-02-28 21:24:27 -08:00
fat 6b2a010357 update changelog 2013-02-28 21:16:08 -08:00
fat 839b0c893f shiiiit 2013-02-28 21:15:33 -08:00
fat 0992a85932 woops that should stay 2.3.0 2013-02-28 21:00:21 -08:00
fat 3469339068 2.3.1 2013-02-28 20:55:14 -08:00
fat cec434a4c3 rebuild 2013-02-28 20:48:48 -08:00
fat 2f27d9851c whitespace 2013-02-28 20:48:02 -08:00
fat a61322c2fb WHOOPS ( >_>) 2013-02-28 20:46:51 -08:00
fat 01e0f8c653 only pass unique options through to child nodes in tooltips 2013-02-28 20:39:07 -08:00
fat cf998040ec rebuild 2013-02-28 19:49:08 -08:00
fat ef80765726 pass true to cycle 2013-02-28 19:47:01 -08:00
fat 40b7a909a6 le sigh 2013-02-28 19:37:30 -08:00
Mark Otto 16111a5e45 Merge pull request #6967 from twitter/readme_npm_fix
Update readme npm instructions
2013-02-21 13:10:21 -08:00
Mark Otto e6a6fd2585 Backport v3's readme update on npm install to 2.3 2013-02-17 15:36:24 -08:00
fat 8c7f9c66a7 Merge branch '2.3.0-wip' 2013-02-07 22:13:13 -08:00
Mark Otto c4d47fb1ea Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2013-02-07 22:08:13 -08:00
Mark Otto 30fd4be093 add 2.3 changelog section 2013-02-07 22:08:04 -08:00
fat 501aabf572 remove prevent default on focus 2013-02-07 21:42:34 -08:00
fat 366e1e0a6d only fire hidden once backdrop has been removed 2013-02-07 20:13:40 -08:00
fat 1bf070b4ce Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Conflicts:
	docs/assets/js/bootstrap.min.js
2013-02-07 19:47:01 -08:00
fat d8a7a380bc if no callback, don't try to call callback ya goof 2013-02-07 19:45:42 -08:00
Mark Otto e3f3542d0b Fixes #6823: add some docs notes about tooltips in input groups 2013-02-06 17:25:58 -08:00
Mark Otto c8874ff285 Merge pull request #6813 from Yohn/patch-12
don't remove title attribute for tooltips for 2.3-wip
2013-02-06 13:19:50 -08:00
Yohn 60c9ff4364 unit tests 2013-02-06 06:20:05 -05:00
Yohn beb60309d1 dont remove title attribute part 2 2013-02-06 06:17:48 -05:00
Mark Otto 2fa77bf197 Update link to changelog 2013-02-05 22:46:45 -08:00
fat 3b56227553 Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Conflicts:
	docs/assets/js/bootstrap.min.js
2013-02-05 22:30:54 -08:00
fat 4814281540 clean up styles 2013-02-05 22:29:59 -08:00
Mark Otto accfdaafdb Fixes #6808: mention IE lame-itude in docs for invalid inputs 2013-02-05 22:28:18 -08:00
Mark Otto 0fe9148b91 Fixes #6190: Add print utility classes 2013-02-05 22:17:28 -08:00
fat 5e4db94c24 Merge branch '2.3.0-wip' of git://github.com/ghusse/bootstrap into ghusse-2.3.0-wip 2013-02-05 22:10:41 -08:00
fat-kun 6a9cd513c0 Merge pull request #6783 from joprice/popoverOptionsOverride
reordered access of options in tooltip and popover
2013-02-05 21:48:34 -08:00
fat-kun 042bb9b515 Merge pull request #6780 from agatronic/2.3.0-wip
less: Move to new selector interpolation, supported from 1.3.1
2013-02-05 21:29:59 -08:00
Mark Otto 1629df8008 screwed up a merge and an old version number crept in 2013-02-05 21:20:29 -08:00
fat a4b31d39a2 don't hide if already hidden ya n00b 2013-02-05 21:08:56 -08:00
fat a866a51a2e clear interval in cycle + rebuild 2013-02-05 20:34:39 -08:00
fat-kun ee91afba63 Merge pull request #6481 from pseidemann/patch-1
don't remove title attribute for tooltips
2013-02-05 20:13:57 -08:00
fat-kun 566380b257 Merge pull request #6488 from nanek/dropdowns-remove-touchstart
Remove touchstart from bootstrap-dropdown.js.
2013-02-05 20:08:42 -08:00
fat c25e8182ba Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2013-02-05 20:01:25 -08:00
fat 45656fc7fc update jquery to 1.9 2013-02-05 20:00:50 -08:00
Mark Otto 31fdb2e25e Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2013-02-05 19:59:25 -08:00
Mark Otto c97d304c0c derp, fix broke css and recompile 2013-02-05 19:43:49 -08:00
Mark Otto 9443eb6e21 restore comma between selectors 2013-02-05 19:40:32 -08:00
Mark Otto 15c7e73abd 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
2013-02-05 19:39:49 -08:00
fat-kun 31b9240dd0 Merge pull request #6737 from openwide-java/fix-tooltip-positioning-for-ie8
Fix tooltip positioning for IE8 broken in 2.3.0
2013-02-05 19:22:34 -08:00
Mark Otto cb0fed6693 Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2013-02-04 11:25:46 -08:00
Mark Otto db8a78fae6 Fixes #6794: incorrect docs mention of th element 2013-02-04 11:11:04 -08:00
Joseph Price 4b86a91e53 fix typo 2013-02-04 09:10:48 -05:00
Mark Otto 7ec817ea46 Merge pull request #6638 from GeoffYoung/2.3.0-wip
Update package.json to current Recess version
2013-02-02 19:53:22 -08:00
Mark Otto d6048031ed Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2013-02-02 18:58:08 -08:00
Mark Otto b1f1d7871f Add changelog file to repo instead of relying on the wiki 2013-02-02 18:57:24 -08:00
Joseph Price 1fe4ed8823 reordered access of options in tooltip and popover to allow overriding data attrs from js 2013-02-02 18:58:56 -05:00
Mark Otto dbe8aed76e Merge pull request #6763 from rjregenold/2.3.0-wip
fixes jankiness with anchor tags in carousel.
2013-02-02 12:35:39 -08:00
Luke Page 6b9bb547bf Move to new selector interpolation, supported from 1.3.1 2013-02-02 07:58:27 +00:00
Mark Otto 0bfbf1446d Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2013-02-01 21:44:35 -08:00
Mark Otto 8f0bc9e79b Merge branch 'dospuntocero-master' into 2.3.0-wip 2013-02-01 21:41:13 -08:00
Mark Otto d2ea2cdedd add horizontal-three-color gradient test 2013-02-01 21:41:02 -08:00
Mark Otto f328ebbc73 Merge pull request #6776 from ndabas/fix-inline-lists-ie7
Fix inline lists for IE7
2013-02-01 13:04:17 -08:00
Nikhil Dabas b7b2e4f8a1 Fixing inline lists for IE7 2013-02-02 02:04:30 +05:30
Mark Otto 7d655c3549 Use button element instead of a for responsive navbar buttons 2013-02-01 10:33:36 -08:00
RJ Regenold 2f44d8d2da removes anchor tag definition. 2013-01-31 12:49:53 -06:00
RJ Regenold 6014e63054 lets see how much i can mess this pull request up. :| 2013-01-31 11:10:41 -06:00
RJ Regenold ed2cf5b3e3 its not dyslexic being easy. 2013-01-31 11:04:12 -06:00
RJ Regenold e38d08d4c0 fixes jankiness with anchor tags in carousel. 2013-01-31 10:03:53 -06:00
Mark Otto baadc33c88 make on prev commit 2013-01-30 18:22:20 -08:00
Mark Otto 135e834bf4 Merge branch 'baslr-master' into 2.3.0-wip 2013-01-30 18:22:11 -08:00
Mark Otto 3cc65cb86c clear up show-grid stuff 2013-01-30 18:16:14 -08:00
Mark Otto dd4ce35ddc add meta tag to second example 2013-01-30 17:46:18 -08:00
Mark Otto a5fc3e0667 make on prev commit 2013-01-30 17:45:02 -08:00
Mark Otto 3b6b8e9f41 Merge branch 'greg-raven-patch-2' into 2.3.0-wip 2013-01-30 17:44:45 -08:00
Mark Otto f20c3368e4 Update pagination example HTML to match examples 2013-01-30 17:42:03 -08:00
pseidemann c4eea3abde don't remove title attribute for tooltips
fixes #6445
2013-01-29 22:54:00 +01:00
Guillaume Smet b7764d8a33 Fix tooltip positioning for IE8
IE8 defines a placeholder object getBoundingClientRect which breaks the new getPosition() method
2013-01-29 19:50:13 +01:00
Mark Otto ab0c055bc6 Merge pull request #6728 from fredsa/2.3.0-wip
Fix `form-actions` documentation
2013-01-28 10:35:16 -08:00
Fred Sauer d6e3b6b5a4 Fix form-actions documentation 2013-01-28 10:01:59 -08:00
Guillaume Gautreau ee71fb492f No semicolumns 2013-01-27 10:56:01 +01:00
Guillaume Gautreau 5b0f956a60 Arrow replacement 2013-01-26 21:45:21 +01:00
Guillaume Gautreau d9a0abaa06 works with fixed test 2013-01-26 21:39:49 +01:00
Guillaume Gautreau db9ec13ce4 Test for replacing tooltip when resized 2013-01-26 21:39:05 +01:00
Guillaume Gautreau e5be883bb9 lint + wrong comparison 2013-01-26 14:31:33 +01:00
Guillaume Gautreau 929598784f Unit test for replacing tooltip inside window 2013-01-26 14:06:58 +01:00
Guillaume Gautreau 6803ff70f9 Tooltip positionning on special cases 2013-01-26 13:50:26 +01:00
baslr 6afb1055e3 .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
2013-01-26 01:01:10 +01:00
Francisco arenas 2428904b4b Update less/mixins.less
horizontal three color gradient added
2013-01-24 03:37:52 -02:00
Greg Raven 22f1cc44ca Update docs/templates/pages/getting-started.mustache
Add meta tag for viewport in the <head>; revise the URL for the latest version of jQuery.
2013-01-22 06:46:53 -08:00
Geoff Young f3268db4b4 Update Recess version 2013-01-19 16:27:10 -05:00
Mark Otto 01b465928e overhaul alerts section of tests 2013-01-17 12:24:16 -08:00
Mark Otto bbb3c0a0e6 Merge branch 'ravage84-patch-2' into 2.3.0-wip 2013-01-17 12:21:34 -08:00
ravage84 650c77ddb9 Update less/tests/css-tests.html
Extended css-tests with alerts (alerts and alert-blocks)
2013-01-17 11:34:00 +01:00
Mark Otto b80bf2c138 Merge pull request #6600 from Yohn/patch-12
added missing class to doc example
2013-01-16 10:28:02 -08:00
Mark Otto 38c5c13d38 Merge pull request #6591 from Quy/2.3.0-wip
Add text alignment classes info to docs
2013-01-16 10:24:13 -08:00
Yohn 598e9e6f13 Update docs/templates/pages/components.mustache 2013-01-16 07:46:42 -05:00
Yohn 60bb95e611 adding class to example code 2013-01-16 07:45:31 -05:00
Quy Ton 1da1994ba4 Add text alignment classes info to docs 2013-01-15 18:16:44 -08:00
Mark Otto a67c86e40f Fixes #6586: remove top 5px margin from navbar input group button groups 2013-01-15 10:27:30 -08:00
Mark Otto c34ef69100 add text alignment classes from 3.0 2013-01-15 10:15:02 -08:00
Patrick H. Lauke c55329085e Revert "Leave tabindex=-1 alone"
This reverts commit 370fa45fbe.
2013-01-15 07:22:02 +00:00
Patrick H. Lauke 370fa45fbe 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...
2013-01-15 07:16:33 +00:00
Patrick H. Lauke 4503ad7808 Revert "Keyboard accessibility in documentation"
This reverts commit a809daf284.
2013-01-15 07:13:19 +00:00
Mark Otto 337741fc9a Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2013-01-14 00:33:16 -08:00
Mark Otto f9ee99cf6f Upgrade to newest HTML5 shiv, and make it a local dependency rather than CDNing 2013-01-14 00:11:55 -08:00
Mark Otto 5ae1df617f Merge pull request #6568 from Yohn/patch-12
Updating docs -> popover to show container option
2013-01-14 00:03:55 -08:00
Yohn a23eb06536 fix typo 2013-01-13 15:32:51 -05:00
Yohn ecc24953a5 fix typo 2013-01-13 15:32:03 -05:00
Yohn 98aeb0acf1 added container options to docs for popover 2013-01-13 15:23:22 -05:00
Yohn fdd1daeae1 added container options to docs for popover 2013-01-13 15:21:31 -05:00
Mark Otto 4b34f4947a Update Holder.js 1.6 to 1.9 2013-01-12 19:49:15 -08:00
Mark Otto 6f275c6148 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.
2013-01-12 12:41:01 -08:00
Patrick H. Lauke a809daf284 Keyboard accessibility in documentation
Removed unnecessary (?) and harmful (from a keyboard access point of
view) tabindex=-1 in the documentation examples.
2013-01-12 17:04:51 +00:00
Patrick H. Lauke 77c68e4bc2 Cleaned up dirty CSS
Used recess rather than less
2013-01-12 11:02:13 +00:00
Mark Otto a7231854c9 Address #6459 and add mention of disabled links in dropdowns to le docs 2013-01-12 00:33:12 -08:00
Mark Otto 8a16746542 Merge pull request #6462 from cvrebert/input-required-docs-fix-2.3.0
update 2.3.0 docs to reflect #5786
2013-01-12 00:29:34 -08:00
Mark Otto e195457728 Merge pull request #6472 from RWOverdijk/patch-1
Update composer.json
2013-01-12 00:21:08 -08:00
Mark Otto aaf80d410a fix username navbar text in fluid example for responsive variations 2013-01-12 00:20:13 -08:00
Mark Otto 19e2ad0eb6 Fixes #6538: Add th support to all the .table-rounded selectors 2013-01-11 23:38:53 -08:00
Mark Otto 6f894c62a5 Fixes #6528: Make .navbar a:hover .caret use @navbarlinkcolorhover and not -active 2013-01-11 23:35:22 -08:00
Mark Otto 42efd9f730 Address #6545: clarify initialization of tooltips in docs 2013-01-11 20:58:24 -08:00
Mark Otto 4de3a77a64 Fixes #6547: Make blockquotes use multiple of @baseFontSize 2013-01-11 20:55:09 -08:00
Mark Otto 88e816956a Fixes #6552: example fix for button group 2013-01-11 20:52:39 -08:00
Mark Otto b242ff7851 Fixes #6553: example fix for validation states 2013-01-11 20:51:11 -08:00
Mark Otto 767a293b4d Increase input group margin on bottom and vertically center to match inputs 2013-01-11 20:46:21 -08:00
Mark Otto 56a24027c3 Fixes #6473: Make .input-prepend and .input-append inline-block to match other form states 2013-01-11 20:42:44 -08:00
Mark Otto d3b3b4c48f Fixes #6474: remove duplicate .btn border colors to make @btn-border work 2013-01-11 20:40:17 -08:00
Mark Otto d7c93fc647 Fixes #6478: scope table backgrounds to immediate td/th elements 2013-01-11 20:38:14 -08:00
Mark Otto 53f9e25150 Comment fix 2013-01-11 20:30:56 -08:00
Mark Otto 649d8c985e Remove navbar links from sticky footer navbar example 2013-01-11 11:00:45 -08:00
Mark Otto 839f83c610 Merge branch 'wilfra-patch-2' into 2.3.0-wip 2013-01-11 10:58:17 -08:00
Mark Otto 6e5a2fedaa Nuke .popover-inner from the JS since we nuked it from the CSS/HTML long ago 2013-01-10 18:51:04 -08:00
William Franceschine cf852c1f62 Update docs/examples/marketing-narrow.html
Updated copyright to 2013
2013-01-10 02:14:14 -08:00
William Franceschine 9fdc9887cf Update docs/examples/marketing-alternate.html
Updated copyright to 2013
2013-01-10 02:13:57 -08:00
William Franceschine edfc0bf8b3 Update docs/examples/hero.html
Updated copyright to 2013
2013-01-10 02:13:43 -08:00
William Franceschine 1eb6a1d8c8 Update docs/examples/carousel.html
Updated copyright to 2013
2013-01-10 02:13:26 -08:00
William Franceschine 5eff3cdd5d Update docs/examples/fluid.html
Updated copyright to 2013
2013-01-10 02:10:52 -08:00
Mark Otto 1d87bcc9f5 Merge branch 'aronwoost-patch-1' into 2.3.0-wip 2013-01-09 21:37:11 -08:00
Mark Otto 976b4ea263 Merge branch 'Justin-John-master' into 2.3.0-wip 2013-01-09 21:35:50 -08:00
Mark Otto ccf4c2fbe3 add sticky footer with navbar 2013-01-09 19:53:42 -08:00
Justin John Mathews 2c2a847e75 Corrected carousel arrows to active.#6494, #6489
Corrected the carousel arrows to active on resizing the browser window.
2013-01-09 15:53:17 +05:30
Aron Woost aeb0e85151 replaced tabs with spaces 2013-01-09 10:15:15 +01:00
Kenan Shifflett b5ad50686c Removed touchstart from bootstrap-dropdown.js. 2013-01-07 20:13:28 -05:00
Wesley Overdijk bf3dea668f Update composer.json
target-dir is not needed. All it does, is nest everything another level deeper. It should only be used for completing psr-0 paths.
2013-01-06 16:43:41 +01:00
Chris Rebert 684c9d8d05 update docs to reflect #5786 2013-01-05 17:14:22 -08:00
Patrick H. Lauke 848ca6e315 Basic keyboard accessibility CSS tweaks
Mostly doubling-up :hover styles to also cover :focus, as a first step
to making the framework more keyboard-friendly.
Additionally, fixed two small markup issues in the docs/examples to
make the "Learn more" large primary button-styled links
keyboard-focusable (as without href they're treated as non-tabable
anchors).
2013-01-02 22:39:21 +00:00
Mark Otto 1c0e4fc7bb Popovers are now flexible width:
* Instead of a fixed width, we use max-width
* Width has been increased from 240px to 280px
* Added ability to hide the title via CSS :empty selector if no title is provided
2012-12-28 14:18:59 -06:00
Mark Otto f69d12af3d Merge pull request #6407 from aurnik/master
Fix link to File structure anchor
2012-12-28 11:10:46 -08:00
Mark Otto 6f8e315b1d Merge branch 'sparanoid-transition-duration' into 2.3.0-wip
Conflicts:
	docs/assets/img/bootstrap-docs-readme.png
2012-12-28 13:08:49 -06:00
Tunghsiao Liu 3096a377a2 Add transition-duration mixin 2012-12-28 16:19:12 +08:00
Aurnik Islam aa997e274e Fix link to File structure anchor 2012-12-27 01:49:09 -08:00
Mark Otto 330b143b40 Add longer tooltip example to docs, tighten up line-height on tooltip; run make 2012-12-26 09:36:07 -06:00
Mark Otto 9749d6afc2 Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2012-12-26 09:21:34 -06:00
fat-kun b9c7f29134 Merge pull request #6378 from Yohn/patch-7
fixes tooltip insert problems
2012-12-24 16:17:25 -08:00
Yohn 340d90138c Update docs/templates/pages/javascript.mustache 2012-12-24 19:03:13 -05:00
Yohn 2a5fde272c Update docs/javascript.html 2012-12-24 19:01:56 -05:00
Yohn 9835549faf made container option be false 2012-12-24 18:59:37 -05:00
Yohn e867ae7b60 removed the length check
updated it to @fat's suggestion
2012-12-24 18:07:41 -05:00
fat-kun 90cdef8dfe Merge pull request #6380 from Yohn/patch-10
promote using data-toggle instead of rel for tooltip and popover
2012-12-23 19:22:51 -08:00
fat-kun 0a7c840173 Merge pull request #6375 from tkawachi/tooltip-events-2.3.0
Tooltips fires show, shown, hide, hidden events
2012-12-23 19:19:58 -08:00
Yohn dfbac13ad1 data-toggle instead of rel for tooltip and popover 2012-12-23 07:04:24 -05:00
Yohn 5da8b315c0 data-toggle instead of rel for tooltip and popover 2012-12-23 07:00:03 -05:00
Yohn da0217405f data-toggle instead of rel for tooltip and popover 2012-12-23 06:51:46 -05:00
Yohn f152dead92 Update docs/javascript.html 2012-12-23 04:25:27 -05:00
Yohn 68ff08cc91 Update docs/templates/pages/javascript.mustache 2012-12-23 04:23:18 -05:00
Yohn b6960d8cf9 Update js/tests/unit/bootstrap-tooltip.js 2012-12-23 04:21:02 -05:00
Yohn d594d6377a adding container option to tooltips 2012-12-23 04:18:16 -05:00
KAWACHI Takashi defe85bb51 Assign event variables at declarations 2012-12-23 15:17:41 +09:00
KAWACHI Takashi 7a3a88acc6 Tooltips fires show, shown, hide, hidden events
It is re-worked from #3691.
2012-12-23 14:42:13 +09:00
fat-kun 48211ad9f5 Merge pull request #6374 from whyisjake/2.3.0-wip
Update docs/templates/pages/javascript.mustache
2012-12-22 21:18:36 -08:00
Jake Spurlock 0834bd51ec Update docs/templates/pages/javascript.mustache
Adding spaces around the pipes. Makes it consistent with the rest of the docs.
2012-12-22 21:03:58 -08:00
Mark Otto f74990d898 Version bump 2012-12-22 16:10:06 -08:00
fat-kun d09b46fe37 Merge pull request #6349 from Yohn/patch-6
Fixes #5753 with tooltip('toogle')
2012-12-22 14:53:24 -08:00
fat effba9e55c add data-api namespace to dropdown 2012-12-22 14:22:45 -08:00
fat 2c0ed072b0 shifting focus to parent and adding aria menuitem for dropdown 2012-12-22 13:57:57 -08:00
fat 4d195222d4 remake js 2012-12-22 13:48:28 -08:00
fat a9e661a2b5 read data options in constructor for collapse 2012-12-22 13:48:16 -08:00
fat fad0fb683b allow multiple trigger types in tooltip and popover + default tooltip to hover & focus 2012-12-22 13:24:37 -08:00
fat e2434fefbd chnage for #6248 2012-12-21 20:27:53 -08:00
fat f59bf47081 Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2012-12-21 20:20:04 -08:00
fat ddd59f22c7 update mustace to reflect changes to data-slide-to 2012-12-21 20:19:33 -08:00
fat 24a36df9f6 add support for [data-slide-to] attr on carousel 2012-12-21 19:45:19 -08:00
Mark Otto 7f7039321d Fixes #6189: Add holder.js to carousel example 2012-12-21 19:10:05 -08:00
Mark Otto a55605ca57 add readme image 2012-12-21 19:04:59 -08:00
Mark Otto 442012f0f5 Smaller image update to readme 2012-12-21 19:02:33 -08:00
Mark Otto 5a2966a2c2 Downsize image 2012-12-21 18:59:51 -08:00
Mark Otto d23006a6bd Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2012-12-21 18:59:14 -08:00
Mark Otto ccafc8a010 Explore adding icon to readme 2012-12-21 18:58:59 -08:00
Mark Otto 558bc52432 Add docs readme icon 2012-12-21 18:54:36 -08:00
fat 818c56f078 rewrite makefile to make a bit more "efficient" + rebuild 2012-12-21 17:42:24 -08:00
fat 82a758344d add direction prop to carousel slide event 2012-12-21 17:31:54 -08:00
fat e194c3e4f4 rebuild 2012-12-21 17:25:31 -08:00
fat 5da30ee5fb Merge branch 'marcelkorpel-master' into 2.3.0-wip 2012-12-21 17:24:45 -08:00
fat d5345f806c Merge branch 'master' of git://github.com/marcelkorpel/bootstrap into marcelkorpel-master 2012-12-21 17:19:36 -08:00
Mark Otto dc32555f5b Fixes #6370: Add comment to docs on typeahead and autocomplete 2012-12-21 15:46:10 -08:00
Mark Otto 704dfb2f1d Merge pull request #6360 from Quy/2.3.0-wip
Miscellaneous changes to docs
2012-12-21 00:28:07 -08:00
Quy Ton a27bf30f0d Miscellaneous changes to docs 2012-12-20 21:38:53 -08:00
Mark Otto c1e82732cf Update new example name and links 2012-12-20 20:27:07 -08:00
Mark Otto a24e47b5b8 Update the examples index:
* Retina ready screenshots
* Added screenshot and link to justified nav example (previously unlinked marketing-alternate.html)
2012-12-20 15:08:05 -08:00
Mark Otto 43d130762b Fixes #6352: marketing-alternate broken nav in FF17 2012-12-20 14:40:39 -08:00
Mark Otto 5e4f663e69 Undo important on hide/show utilties; punt to 3.0 2012-12-20 13:46:07 -08:00
Mark Otto b6575cc72e fix up code snippet 2012-12-20 13:41:08 -08:00
Yohn a6705246d0 Update js/tests/unit/bootstrap-tooltip.js 2012-12-20 04:36:57 -05:00
Yohn e21b6459ad fixes tooltip('toggle') 2012-12-20 04:34:28 -05:00
Mark Otto 30d8eb3ed5 Merge branch 'blakeembrey-dropdown-selectors' into 2.3.0-wip 2012-12-20 01:34:19 -08:00
Mark Otto 0a1434b23b Merge branch 'dropdown-selectors' of https://github.com/blakeembrey/bootstrap into blakeembrey-dropdown-selectors 2012-12-20 01:34:10 -08:00
Mark Otto 3f493f0d0d Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2012-12-20 01:30:43 -08:00
Mark Otto f706acb11c Fixes #6339: Use important flag on .hide and .show utility classes 2012-12-20 01:30:32 -08:00
fat 5abe33f5d8 reset carousel in the case that it is reinstantiated twice 2012-12-20 01:13:03 -08:00
fat 6b67a83631 Merge branch '2.2.3' into 2.3.0-wip 2012-12-20 01:05:55 -08:00
fat 2c9f43f685 if carousel element already open, don't reopen it duh bruh bruh 2012-12-20 01:05:07 -08:00
Mark Otto c00f29e4d4 Fixes #6236: Fix popover font-size in input groups 2012-12-20 00:54:58 -08:00
Mark Otto 9726fded1c Get on that carousel indicator lifestyle with some new hawtness 2012-12-19 23:52:38 -08:00
Mark Otto 5d776bcfd2 Merge branch '2.2.3' of github.com:twitter/bootstrap into 2.2.3 2012-12-19 23:39:40 -08:00
fat bbe4625672 lol we dont' have affix(refresh) 2012-12-19 23:39:26 -08:00
fat 7f9ff0ba5b add js support for carousel indicators 2012-12-19 23:25:25 -08:00
fat e9eff0cbff wait 100ms before engaging affix (allows for initial browser scroll) 2012-12-19 22:37:41 -08:00
fat 96e5fa6143 whitespace in tooltip + don't pass empty selector to $() in dropdown.js 2012-12-19 22:26:36 -08:00
fat 7c456c8554 fix tooltip doc dumbness 2012-12-19 22:05:33 -08:00
fat 219d275ae6 can't extend bounding box thingy 2012-12-19 22:03:57 -08:00
fat dc4e80a655 fix ghetto ass timeout shit 2012-12-19 21:55:23 -08:00
fat 5bd8cdca91 remove inside support from tooltip + fix tooltip svg support + change makefile to rely on local npm install 2012-12-19 21:36:50 -08:00
Mark Otto dc6142751f Fixes #6337: scope '.media .pull-left' and '.media .pull-right' to immediate children only 2012-12-19 18:47:34 -08:00
Mark Otto 529ecc5a77 Version bump 2012-12-10 18:31:04 -08:00
Mark Otto cddca18f12 Fixes #6174: Caret alignment in small and mini buttons 2012-12-10 10:59:57 -08:00
Mark Otto 9d985978a3 Escape HTML of section element 2012-12-10 10:55:42 -08:00
Mark Otto 847b632577 IE10 fix in responsive utilities, not regular utilities 2012-12-10 10:29:16 -08:00
Mark Otto e324a1beb0 Simplify syntax of nesting with inline lists 2012-12-10 10:28:18 -08:00
Mark Otto 83a6a55d2c Move IE10 responsive fix to responsive utilities so Customizer gets it 2012-12-10 10:25:18 -08:00
Mark Otto 165729254b squash new line 2012-12-10 10:13:04 -08:00
Mark Otto ab5d7f863c move reset after vars and mixins 2012-12-10 09:57:23 -08:00
Mark Otto 9f29785783 Merge pull request #6195 from nathanb/example-carousel-nav-fix
lowered carousel beneath the nav (in carousel example)
2012-12-10 00:21:35 -08:00
Blake Embrey c105906780 Update .dropdown-menu selectors to avoid conflicts with other elements. Fixes #6197 2012-12-10 16:42:58 +10:00
Nathan Bridgewater 18adc44171 lowered carousel beneath the nav 2012-12-09 22:10:38 -06:00
Mark Otto 070c125cec Restore print styles 2012-12-08 21:05:05 -08:00
Mark Otto 68d1d7fc83 Test removal of print styles for customized builds 2012-12-08 21:02:37 -08:00
Mark Otto b5ceca14db Fix docs typos 2012-12-08 18:46:34 -08:00
Mark Otto 9376a7c221 Fixes #5729: Nested striped tables
* Scopes striping to immediate children of the tbody and tr
* For nested tables, sets a background color of @bodyBackground, to override the default transparent bg
2012-12-08 12:57:21 -08:00
Mark Otto cacc213762 Nesting tables
* Add simple test to css-tests.html
* Scope .table-bordered to immediate children th/td elements only
2012-12-08 12:52:19 -08:00
Mark Otto b9292ff90c Merge pull request #6165 from Quy/2.2.2-wip
Apply code tag to data attribute on javascript page
2012-12-08 12:17:46 -08:00
Quy Ton 3bd9a26c01 Apply code tag to data attribute on javascript page 2012-12-08 12:06:46 -08:00
fat 820a3b27b6 get tests passing for typeahead :P 2012-12-07 19:16:48 -05:00
fat 1747caf19d insert menu of typeahead after input which it suggests on #3529
note: this will likely break things for people in the same way that doing
this to tooltip did… however we think this is a better insertion model for
z-index,scrolling,modal,etc. applications
2012-12-07 18:59:13 -05:00
fat 437654030a focus on escape in typeahead 2012-12-07 18:37:32 -05:00
fat 10e72e158d Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip 2012-12-07 17:50:34 -05:00
fat 91fbadad5b remove slide from carousel constructor #5579 2012-12-07 17:49:05 -05:00
billy gates c362e72660 Merge pull request #5862 from pmclanahan/issue-5806-typeahead-keyboard-nav
Fix issue with double move event firing in typeahead.
2012-12-07 14:16:51 -08:00
fat 66b70016d0 rebuild and only select visible dropdown items 2012-12-07 17:14:49 -05:00
billy gates 2526c3fdbe Merge pull request #6118 from godric7/master
scrollSpy - add parent scrollTop to offset calculation
2012-12-07 14:11:18 -08:00
fat a7eb9c294a add noConflict functionality to all bootstrap plugins 2012-12-07 17:06:01 -05:00
Mark Otto 1c5b8e967e Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip 2012-12-07 09:51:57 -08:00
Mark Otto be45a821bb Fixes #6148: Icons in mini buttons properly aligned 2012-12-07 09:51:01 -08:00
Mark Otto 1413f976ae Merge pull request #6151 from tierra/pre-code-white-space-fix
Fix code block white-space breaks within pre tags.
2012-12-07 09:48:14 -08:00
Mark Otto cc6fda2262 Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip 2012-12-07 09:43:32 -08:00
Mark Otto 2c7ab23d7a Fixes #6136: Proper scoping of breadcrumbs divider 2012-12-07 09:43:09 -08:00
Mark Otto 2877f84579 Merge pull request #6143 from Quy/2.2.2-wip
Escape &times;
2012-12-07 09:41:17 -08:00
Bryan Petty f4466dd9c7 Fix code block white-space breaks within pre tags. 2012-12-06 11:33:00 -07:00
Quy Ton 81679981c5 Escape &times; 2012-12-05 15:28:14 -08:00
Mark Otto 306c1b4914 Remove commented out old popover CSS 2012-12-05 11:06:16 -08:00
Mark Otto ed74992853 Fixes #4550: Temporary fix for dropdown taps on mobile
* Fix as documented here: https://github.com/twitter/bootstrap/issues/4756#issuecomment-9952781
* Stops propagation for touchstart for dropdowns
2012-12-04 18:36:18 -08:00
Mark Otto 12916b06aa Fix up display of dropdown submenu examples on responsive views 2012-12-04 18:25:16 -08:00
Mark Otto e31c7fb8a5 correct link on index page to grid system 2012-12-04 09:49:18 -08:00
Godric 8b959cacbc Update js/bootstrap-scrollspy.js
Fix for Bootstrap issue #6013 "scrollSpy - offset calculation"
https://github.com/twitter/bootstrap/issues/6013
2012-12-04 01:21:07 +01:00
Mark Otto 0f2a423b8d Once more, update all the favicons to retina 2012-12-03 13:25:56 -08:00
Mark Otto 15a4399015 Align the touch icons attributes 2012-12-03 13:22:10 -08:00
Mark Otto 869b69c66c Fixes #6115: scope breadcrumb styles to immediate children only 2012-12-03 13:09:38 -08:00
Mark Otto 06582edb2a Improve rendering of carousel example for IE10 2012-12-03 13:01:27 -08:00
Mark Otto d470fb72da nuke comments 2012-12-03 09:23:02 -08:00
Andreas Cederström 68cbba347b Fixing header color for success, error and info alerts 2012-12-03 14:20:14 +01:00
Mark Otto eca23e9b0f add source attribution for IE10 fix 2012-12-02 21:01:53 -08:00
Mark Otto f514c87d6b Enable responsive features in IE10 when snapped 2012-12-02 20:57:34 -08:00
Mark Otto 30d6a71ccd Revert vertical gradient spec to 'to bottom' as 'top' doesn't work in IE10 2012-12-02 20:40:24 -08:00
Mark Otto 439ff09701 herpderp 2012-12-02 18:15:40 -08:00
Mark Otto c8862d91bc Readme reorg
* Consolidate quick start options into easier to read list
* Consolidate social and community options into a list
* Add link to Code Guide for contributions section
2012-12-02 13:14:49 -08:00
Marcel Korpel 0dece7a71f Set focus back to input field after clicking an item
Test 'focus is still set' added

Fixes issue #5933
2012-12-02 12:35:33 +01:00
Mark Otto 139f1be49d reset text align in popovers given inline insertion 2012-12-02 02:30:00 -08:00
Mark Otto ea61cdb740 remove overrides on inner html of popover-content 2012-12-02 01:34:58 -08:00
Mark Otto 32d425967a run make on js changes to popover 2012-12-02 01:32:23 -08:00
Mark Otto 85c57c6ba8 Merge branch 'Moveo-master' into 2.2.2-wip 2012-12-02 01:32:13 -08:00
Mark Otto e8b3c36068 run make on modal popover fix 2012-12-02 00:09:45 -08:00
Mark Otto dbb244cb97 Merge pull request #6097 from blakeembrey/modal-body-relative
Add relative positioning to .modal-body
2012-12-01 17:45:33 -08:00
Blake Embrey fbec803b55 Add relative positioning to .modal-body - Fixes #5991 2012-12-02 09:53:05 +10:00
Mark Otto bca3ff4ed6 Fixes #5853: Maintain 10px margin above help block when following input groups 2012-11-29 23:39:33 -08:00
Mark Otto f087b3428c remove element from selector 2012-11-29 23:33:09 -08:00
Mark Otto fe7b6decb1 Merge pull request #6039 from desheikh/2.2.2-wip
help-block margin-top should also apply after a span.uneditable-input
2012-11-29 23:32:38 -08:00
Mark Otto 322a56354f run make with nav img fix 2012-11-29 23:27:20 -08:00
Mark Otto 721b568303 update comment 2012-11-29 23:27:09 -08:00
Mark Otto c5173cdb92 Merge branch 'idavemm-patch-1' into 2.2.2-wip 2012-11-29 23:26:22 -08:00
Mark Otto 52e669d619 Merge branch '2.2.2-wip-holder' into 2.2.2-wip 2012-11-29 21:35:57 -08:00
Mark Otto 38c546c785 upgrade to holder 1.6 2012-11-29 21:35:45 -08:00
Mark Otto 12aa060efd Merge branch 'jblotus-patch-1' into 2.2.2-wip 2012-11-29 21:06:20 -08:00
Mark Otto e9c32fdf6d Merge branch 'patch-1' of https://github.com/jblotus/bootstrap into jblotus-patch-1 2012-11-29 21:06:11 -08:00
Mark Otto acc037de15 add holder and replace placehold.it 2012-11-29 20:59:14 -08:00
Zulfiqar Ali ddd154481b added compiled css file 2012-11-29 17:40:23 +08:00
Mark Otto fa6a6dbb92 Merge pull request #6057 from ph-One/patch-3
Update Makefile's UglifyJS commands
2012-11-28 18:41:36 -08:00
Mark Otto 78390d12af Fix the carousel after we scoped selectors 2012-11-28 15:40:51 -08:00
Mark Otto cb69aa976f Merge branch 'trsteel88-master' into 2.2.2-wip 2012-11-28 15:35:16 -08:00
Kyle A. Matheny fe8df5022b Update Makefile
Fixed both instances of uglifyjs usage.
2012-11-28 23:33:05 +00:00
Mark Otto f1349a2450 Fixes #5533: Remove filter gradient from disabled links on dropdowns 2012-11-28 02:22:37 -08:00
Mark Otto 8fb36cb3dd Fixes #5594: Vertical button groups show use max-width, not width, and be scoped to immediate children buttons only 2012-11-28 02:21:34 -08:00
Mark Otto 296b838405 Fixes #5616: scope carousel state classes to immediate children only 2012-11-28 02:17:50 -08:00
Mark Otto bf3a5df371 Fixes #5930: redeclare font-size for popoves in btn-groups 2012-11-28 02:10:23 -08:00
Mark Otto 783120dffa Fixes #5927: Scope button group 5px button left margin to immediate children 2012-11-28 01:51:04 -08:00
Mark Otto 014d3cedf5 Fixes #5940: Prevent @headingsColor from changing alert colors 2012-11-28 01:48:34 -08:00
Mark Otto bfc97fdaf6 Fixes #4852: IE8 popover carets fixed
* IE8 refused a negative z-index to place the previous :after behind the .arrow, so I had to flip the styles.
* .arrow is the gray border/background, .arrow:after is now the white inner arrow
* Added a hex IE8 fallback to ensure the arrow shows for <IE9 as rgba() isn't supported
* Simplified some of the CSS for the popover carets
2012-11-28 01:38:21 -08:00
Zulfiqar Ali 693fd0db2a help-block margin-top should also apply after a span.uneditable-input 2012-11-28 16:47:59 +08:00
Mark Otto fda5bb135e Fixes #5963: Add large button example to icons, fix vertical alignment in large buttons 2012-11-28 00:46:09 -08:00
Mark Otto 74f51105e9 Fixes #6010: Navbar dropdown caret should match link hover color 2012-11-28 00:42:17 -08:00
Mark Otto 942f9c5df4 Fixes #6012: Updated docs sidenav media queries and reset width for exactly 980px 2012-11-28 00:37:55 -08:00
Mark Otto 02097700e8 Fixes #6035: use font-size vars in button groups 2012-11-28 00:31:52 -08:00
Mark Otto dc10e6bbf8 Fixes #5935: Updated vertical gradient mixin 2012-11-28 00:19:35 -08:00
Swaagie e6e4d93d5e leave it to the developer to decide how to use the content of the popover 2012-11-27 15:07:31 +01:00
Zulfiqar Ali 701f871e7d help-block margin-top should also apply after a span.input 2012-11-27 07:30:54 +08:00
Mark Otto e0d0190803 fix image sizes on homepage 2012-11-22 12:26:54 -08:00
Mark Otto 5d1b4206b1 Fixes #5986: single toggle button html examples 2012-11-22 12:06:36 -08:00
Mark Otto 8df2811d49 Simpler footer for docs
* Remove back to top link (ya'll are lazy :P)
* Center text
* Decrease vertical padding
2012-11-21 23:29:20 -08:00
Mark Otto 8b417c39e7 Merge pull request #5954 from tony/patch-2
Fix typo in reset.less
2012-11-19 15:31:14 -08:00
Tony Narlock ace6dc0c25 Fix typo in reset.less 2012-11-19 16:49:47 -05:00
Mark Otto a10d68f291 Fixes #5937: Border radius vars in button groups 2012-11-18 12:30:35 -08:00
Mark Otto a367fd4938 Fixes #5925: Adjust top margin of input group in navbar 2012-11-16 01:19:15 -08:00
Mark Otto 88c2497368 Fixes #5912: User correct selector for form field states.
Previously, we were using a generic label selector, but as this was changed in the main forms awhile back, we need to change it here.
2012-11-16 01:16:27 -08:00
Mark Otto 5702e1be6e widths on github buttons 2012-11-16 01:13:52 -08:00
Trent Steel 4d593618e0 add composer.json 2012-11-16 17:01:21 +10:00
Mark Otto 05655ff4ff fixes #5922: clicking only button should download custom build 2012-11-15 09:14:54 -08:00
Mark Otto 1700e48e7f Fixes #5879: Manual update of Normalize credit 2012-11-14 15:20:38 -08:00
Mark Otto 0df0b5f1f5 run make after latest merges 2012-11-14 15:19:16 -08:00
Mark Otto cd1f72f484 Merge pull request #5894 from amid2887/patch-3
Update less/tables.less ( typing, use variable, add border-radius reset )
2012-11-14 01:20:20 -08:00
Mark Otto 303767350c Merge pull request #5874 from tacomanator/2.2.2-wip
fixes #5873: @navbarInverseBrandColor not used
2012-11-14 01:18:11 -08:00
Paul McLanahan 6ec7c72e5b Fix issue with double move event firing in typeahead.
Fix test to catch issue.
Fix #5806.
2012-11-13 11:00:34 -05:00
amid2887 41889f74d0 Update less/tables.less
Possible typing.

Add @baseBorderRadius as value for some rules.

Add border-radius clearing for first and last td in the last tbody for table with tfoot.
2012-11-13 17:49:33 +07:00
Drew Goodwin c8856eeff3 fixes #5873: @navbarInverseBrandColor not used 2012-11-10 17:58:00 -08:00
Mark Otto 54486de88c run make again 2012-11-09 09:21:14 -08:00
Mark Otto f2bbee2075 remove * line-height 2012-11-08 23:56:29 -08:00
Mark Otto ddf5ceccce typo fix 2012-11-08 23:49:04 -08:00
Mark Otto cf7d7a7b5d remove ; from customizer 2012-11-08 23:46:40 -08:00
Mark Otto 02c0b788cd Merge pull request #5795 from globocom/missing-i18n-customize-and-download
insert missing i18n tag at customize and download string
2012-11-05 17:47:45 -08:00
Alexandre Magno 0a1d296e19 insert missing i18n tag at customize and download string 2012-11-05 18:38:59 -02:00
Mark Otto 79b7017227 version bump 2012-11-05 09:32:48 -08:00
Mark Otto d38bda1480 Fixes #5471: Remove color from .navbar and .navbar-inverse and reassign to .navbar-text to prevent unintended cascading 2012-11-04 22:50:07 -08:00
Mark Otto 62c78e46f8 more required input tweaks 2012-11-04 19:53:13 -08:00
Mark Otto 91bcccd9a8 simplify invalid input css 2012-11-04 19:43:09 -08:00
Mark Otto ebed09ec01 Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip 2012-11-04 19:42:13 -08:00
Mark Otto f3b3814606 Merge pull request #5786 from cvrebert/2.2.2-wip
fixes #5494: style invalid fields as invalid regardless of required-ness
2012-11-04 19:41:59 -08:00
Mark Otto 823b5accd3 start documenting html5 invalid form fields 2012-11-04 19:41:41 -08:00
Mark Otto 7e6cc0bf7e Fixes #5785: allow for segmented button groups in input groups 2012-11-04 19:08:02 -08:00
Chris Rebert 76f9c9128e fixes #5494: style invalid fields as invalid regardless of required-ness 2012-11-04 18:26:25 -08:00
Mark Otto 51f293ba4c Fixes #5662: white-space: nowrap; on code element 2012-11-04 13:30:36 -08:00
Mark Otto 075e320a83 remove unnecessary bg declarations in buttons per #5684 2012-11-04 13:26:03 -08:00
Mark Otto 21957a3d9e set background size for docs jumbotron for retina 2012-11-04 13:24:06 -08:00
Mark Otto 953dc3a6f2 higher res docs illustrations 2012-11-04 13:23:08 -08:00
Mark Otto fb51efcbd4 Fixes #5113: increase .typeahead z-index for proper use with modals 2012-11-04 13:01:31 -08:00
Mark Otto 2320a09898 fix modals display in docs on tablet view 2012-11-04 12:58:57 -08:00
Mark Otto 22d1506d23 remove margin on .inline lists 2012-11-04 12:39:27 -08:00
Mark Otto 28da31218f Refine new inline list option 2012-11-04 12:36:37 -08:00
Mark Otto 68f26d959f Merge branch '2.1.2-list-inline' of https://github.com/andriijas/bootstrap into andriijas-2.1.2-list-inline 2012-11-04 12:27:30 -08:00
Mark Otto e4866c4b3c clarify unstyled lists docs 2012-11-04 12:27:18 -08:00
Mark Otto 5d6cf2ee19 Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip 2012-11-03 13:43:23 -07:00
Mark Otto 2c93190283 Fixes #5776: Reside white-space for popovers 2012-11-03 13:42:08 -07:00
Mark Otto a8b9342aea Fixes #5739: Port in HTML5 BP print styles 2012-11-03 13:37:34 -07:00
Mark Otto c9dbd2d601 Fixes #5458: Clarify fluid nesting 2012-11-03 13:28:48 -07:00
Mark Otto 72e2d4bb77 Merge pull request #5766 from bradly/spelling-fixes-in-docs
Fixing various spelling typos in the docs.
2012-11-03 13:20:06 -07:00
Mark Otto 7ea343d570 Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip 2012-11-03 13:19:53 -07:00
Mark Otto ead5dbeba5 Fixes #5775: Collapse labels/badges
* When :empty, display: none;
* Add documentation for change in behavior
2012-11-03 13:18:23 -07:00
Mark Otto 2f39f86bd7 Merge pull request #5777 from bradly/change-example-emails-in-docs
Change example email addresses to use RFC 2606 reserved example domain.
2012-11-03 13:12:02 -07:00
Bradly Feeley 381d967ec8 Change example email addresses to use RFC 2606 reserved example domain. 2012-11-03 12:15:01 -06:00
Bradly Feeley 46b5e0cbc6 Fixing various spelling typos in the docs. 2012-11-02 16:34:21 -06:00
Mark Otto fc42ac6a56 fixes #5756: duplicate media CSS in compiled builds 2012-11-02 09:47:42 -07:00
David 46d38b10b8 Prevent IE8 from misplacing imgs
Fixed imgs in a nav that were misplaced on IE8.
2012-11-02 15:04:34 +01:00
Mark Otto d0c75bbc83 fixes #5742: add cursor: pointer; to labels and selects 2012-11-01 09:44:51 -07:00
Mark Otto d350f577e9 fixes #3222: simpler positioning of modals 2012-10-31 21:43:32 -07:00
Mark Otto 46347fff01 fixes #5692: add version # to readme 2012-10-31 11:17:01 -07:00
Ninir be03a53086 Replaced hardcoded CSS rules with mixins 2012-10-31 11:09:44 -07:00
Mark Otto 14b941744c fixes #5700: restore white text on active dropdown/typeahead text 2012-10-31 10:51:27 -07:00
Mark Otto bf48c31406 Merge branch 'bradly-affix-docs-fix' into 2.2.2-wip 2012-10-31 10:48:44 -07:00
Mark Otto 64326322b4 fixes #5725: hover state for a.muted; also reformatted CSS 2012-10-31 10:46:04 -07:00
Mark Otto d5697fcf6b fixes #5717: add retina favicon, recompile docs 2012-10-31 10:41:41 -07:00
fat 3b3dd3ac3c 2.2.1 - hotfix for carousel 2012-10-30 21:59:56 -07:00
fat 404e4d9e9a fix carousel and rebuild js 2012-10-30 21:32:15 -07:00
Bradly Feeley cbf1dace2f Fixing typos in affix options area in the docs. 2012-10-30 11:46:18 -07:00
Mark Otto b5af762ef5 Merge branch '2.1.2-wip'
Conflicts:
	js/bootstrap-dropdown.js
2012-10-29 22:01:58 -07:00
fat 68cfedb34a Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip 2012-10-29 21:55:07 -07:00
fat f1136228a7 add note about js style 2012-10-29 21:54:51 -07:00
Mark Otto bf10a43ed9 derp, add that in the right spot 2012-10-29 21:34:10 -07:00
Mark Otto 5bb6c42405 fixes #4511: remove focus on opened modal window 2012-10-29 21:33:20 -07:00
Mark Otto a6968c4934 Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip 2012-10-29 21:30:45 -07:00
Mark Otto 9352fe1750 add a ton of the new vars to the customizer 2012-10-29 21:30:39 -07:00
fat f595e146d6 http link 2012-10-29 21:29:05 -07:00
fat 31c1eba51b Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
Conflicts:
	bootstrap/css/bootstrap.css
	bootstrap/css/bootstrap.min.css
2012-10-29 21:28:17 -07:00
fat 92e7f166e7 remove haunt, remove bootstrap dir, add bower support 2012-10-29 21:27:34 -07:00
Mark Otto 81c3c1c68c add media.less to customizer page 2012-10-29 21:02:05 -07:00
Mark Otto 41ad16fe40 v2.2.0 instead of v2.1.2 2012-10-29 21:00:53 -07:00
Andreas Cederström 233e050adf Adding .inline for ul and ol 2012-10-26 09:47:55 +02:00
Mark Otto c33169a6ba fixes #5572: document .input-block-level 2012-10-18 11:19:16 -07:00
Jacob Thornton ba2a99e7c4 don't lookup typeahead when shift alt or ctrl are pushed 2012-10-17 23:39:41 -07:00
Jacob Thornton 45046544a6 when static, refocus on click 2012-10-17 23:36:22 -07:00
Jacob Thornton 0b9d4e78ad Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip 2012-10-17 23:06:58 -07:00
Jacob Thornton 7f3b94c453 Merge branch 'delegate-api-to-document' of git://github.com/badcarl/bootstrap into badcarl-delegate-api-to-document
Conflicts:
	js/bootstrap-carousel.js
2012-10-17 23:05:16 -07:00
billy gates d6ac499ca8 Merge pull request #5309 from erlendfh/dropdown-bugfix
Fixed bug in dropdown toggle where menu would only clear on the first dropdown
2012-10-17 23:00:41 -07:00
Jacob Thornton 280d4aeb30 rebuild 2012-10-17 22:51:39 -07:00
billy gates 7426ced0fb Merge pull request #5323 from artiz/master
Please check my fix for #4550
2012-10-17 22:50:52 -07:00
billy gates 24b5e6cb14 Merge pull request #5366 from Sinetheta/2.1.2-wip
Fix for #5362
2012-10-17 22:30:40 -07:00
Jacob Thornton a2fc01444e Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip 2012-10-17 22:27:00 -07:00
Jacob Thornton edc3eee5ea fix carousel event 2012-10-17 22:26:44 -07:00
billy gates 21f29a7682 Merge pull request #5389 from frntz/2.1.2-wip
Update js/bootstrap-tooltip.js
2012-10-17 22:15:48 -07:00
Jacob Thornton 8e6697f2b2 Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip 2012-10-17 21:38:01 -07:00
Jacob Thornton ac6625de5f add updater function and rebuild 2012-10-17 21:37:34 -07:00
billy gates 0a3e034891 Merge pull request #5524 from martinstein/fix-tooltip-delegate-click
Fix tooltip not working in delegate events on click-trigger
2012-10-17 21:34:01 -07:00
billy gates 97bf02d787 Merge pull request #5531 from dmitriybudnik/carousel-js-typo-fix
Fixed copy/paste caused typo
2012-10-17 21:25:21 -07:00
billy gates 3074737d90 Merge pull request #5549 from mfansler/2.1.2-wip
fixes #5336: reorder focus() call to avoid scrolling
2012-10-17 21:21:31 -07:00
Mark Otto e0a007b929 Merge pull request #5507 from bradly/2.1.2-wip
Fixing typo in docs.
2012-10-16 20:36:26 -07:00
Mark Otto b06724a1a4 Merge pull request #5508 from bradly/fix-readme-link
Updating README link about Less compilation.
2012-10-16 20:36:12 -07:00
Mark Otto 709870aa3e fixes #5496: use correct var for dropdown active link text 2012-10-16 20:34:42 -07:00
Mark Otto 57eb2a8018 more hellip on modals 2012-10-16 20:28:07 -07:00
Mark Otto 0ac50d28b5 fixes #5519: hellip in modal code 2012-10-16 20:18:50 -07:00
Mark Otto 78f7ad95f4 fixes #5542: move '.hero-unit p' font-styles to '.hero-unit' so they apply to all elements, including ul and ol, within the component. 2012-10-16 19:56:34 -07:00
Mark Otto bf78333531 add in latest carousel example, reorg examples on getting started 2012-10-16 12:50:10 -05:00
Mark Otto 463eae25b0 clarify js docs individual or compiled section 2012-10-16 12:37:36 -05:00
mfansler e24b46b7f3 fixes #5336: reorder focus() call to avoid scrolling 2012-10-16 12:27:43 -04:00
Dmitriy Budnik ae0ba0686e set spesific assertions count for test 2012-10-16 11:16:38 +03:00
Dmitriy Budnik cd55963930 fixed test 2012-10-16 09:49:26 +03:00
dmitriybudnik 432eaff29c Fixed copy/paste caused typo 2012-10-15 22:35:32 +03:00
Mark Otto 0048446db9 improve spacing in carousel example 2012-10-15 13:57:09 -05:00
Martin Stein 6b017b9bea fixed reference to this.tip() so it works in delegate events 2012-10-15 15:17:59 +02:00
Bradly Feeley fda641fb6c Updating README link about Less compilation. 2012-10-13 18:38:34 -07:00
Bradly Feeley ed5c5994a7 Fixing typo in docs. 2012-10-13 18:31:41 -07:00
James Fuller d19ca23f8f Update package.json
when building using Makefile, dependency for hogan.js needs to be installed
2012-10-11 21:30:04 -03:00
Mark Otto fa778792c5 compress images and add new carousel example for .net magazine article 2012-10-10 17:58:22 -07:00
Mark Otto df9a1c29f4 Merge branch '2.1.2-wip' of https://github.com/twitter/bootstrap into 2.1.2-wip 2012-10-10 10:29:55 -07:00
Mark Otto 31007c01d8 fixes #5478: remove double background color on dropdown links 2012-10-10 10:29:22 -07:00
Mark Otto 5af5c2ed36 fixes #: remove double background color on dropdown links 2012-10-10 09:51:13 -07:00
Mark Otto b18c009051 fixes #5473: use baselineheight var for input bottom margin 2012-10-10 09:47:08 -07:00
Kevin Attfield 48a8dd2a23 Added test to fix for #5362 2012-10-08 22:29:44 -07:00
Mark Otto 4702e75410 comments in template 2012-10-08 18:59:44 -07:00
Mark Otto ec8394cb6e adding another template for same-width nav links using 'display: table-cell;' 2012-10-08 18:58:35 -07:00
Mark Otto 7e534ce98a fixes #5443: reset background gradient on disabled dropdown links 2012-10-07 21:45:16 -07:00
Mark Otto e4f522990e fixes #5416: use correct variable for inverse navbar responsive links 2012-10-07 21:43:37 -07:00
Mark Otto 6203535d2f Changing title of docs pages to simply say 'Bootstrap' like the docs home page 2012-10-07 21:38:28 -07:00
Mark Otto d76c305cbb remove 'at twitter' part of readme 2012-10-06 14:42:07 -07:00
Mark Otto 7d649c9d4a fixes #5430: scope link styles in .dropdown-menu to .dropdown-menu li > a 2012-10-05 11:13:21 -07:00
Mark Otto 3726ce24bb finish off scoping of grid sizing to table elements 2012-10-03 09:43:14 -07:00
Mark Otto 11ee1633b4 fixes #5257: add data-original-title attribute selector to abbr element 2012-10-03 09:36:45 -07:00
Mark Otto dd8b745b88 use border-radius vars where possible 2012-10-03 09:26:52 -07:00
Mark Otto e73cd15fc8 copy and style changes to improve docs rendering on mobile devices 2012-10-02 17:01:18 -07:00
Mark Otto 630a88d3ce Merge pull request #5281 from GotenXiao/pagination-active-background
Use paginationActiveBackground var to finish fixing #4295
2012-10-02 15:23:59 -07:00
Mark Otto a2369021ce fixes #5352: update docs messaging for disable nav links 2012-10-02 15:10:22 -07:00
Mark Otto 1bd4723038 fixes #5392: hover on submenu should maintain white icons for active parent a tag 2012-10-02 13:19:11 -07:00
frntz b892a37320 Update js/bootstrap-tooltip.js
Avoid loosing events attached on Jquery object if added via function in popover content
2012-10-02 18:26:55 +03:00
Mark Otto 7c9597f4e7 remove double border effect: instead of inset shadow and border on fixed navbars, only border 2012-10-01 23:34:03 -07:00
Mark Otto 1b814458c9 improve dropdown submenu docs; add docs for left submenu; remove all dupe css for left submenu 2012-10-01 16:41:13 -07:00
Mark Otto 7763cab608 Merge branch '2.1.2-wip' of https://github.com/advancedrei/bootstrap into advancedrei-2.1.2-wip 2012-10-01 16:15:26 -07:00
Mark Otto 5cf7c803e2 Merge branch '2.1.2-wip-modal-responsivefix' of https://github.com/andriijas/bootstrap into andriijas-2.1.2-wip-modal-responsivefix 2012-10-01 15:29:21 -07:00
Mark Otto d36e37214b fixes #5319: add backface-visibility for webkit skewing 2012-10-01 15:26:17 -07:00
Mark Otto 86d5ed6f4f fixes #5377: change selectors for navbar collapse to be unique so only one open/closes at a time 2012-10-01 13:52:50 -07:00
Mark Otto fd1e9b1498 fix copy on modal popover button doodad 2012-10-01 13:28:54 -07:00
Mark Otto f8ac403d8b fixes #5123: scope table grid classes to td and th elements only, plus drop columns 13-24 2012-10-01 13:08:21 -07:00
Mark Otto bc4f5d565e fixes #5275: inline-block badges and labels, then fix padding accordingly 2012-10-01 12:04:10 -07:00
Mark Otto 5035592988 fixes #5193 manually: checkbox and radio padding in .controls-row 2012-10-01 11:53:52 -07:00
Mark Otto c6c1ada600 clarify tables support of responsive utility classes, of which there is none 2012-10-01 11:18:49 -07:00
Mark Otto a90334eebb fix docs sidenav width for ie8-9 2012-10-01 11:11:33 -07:00
Mark Otto 239ce24f92 fixes #5188: add .google-maps class to reset responsive images on case-by-case basis 2012-10-01 10:49:19 -07:00
Mark Otto 085d6d185d fixes #5055: wrap legend and form elements in fieldset so IE8 styles the legend properly 2012-10-01 10:42:45 -07:00
Mark Otto 32181816f7 run make on previous merge 2012-10-01 10:27:42 -07:00
Mark Otto c77d4266c0 Merge pull request #5369 from amid2887/2.1.2-wip
Add missing icon class definition for navs.less
2012-10-01 10:27:13 -07:00
amid2887 46764a7165 Add missing icon class definition for navs.less
add missing icon class definition for navs:
'[class*=" icon-"]'

P.S. Sorry for 2 pull requests with the same problem..
2012-10-01 14:32:51 +07:00
Mark Otto da43c7c27c run make after merge 2012-09-30 22:41:26 -07:00
Mark Otto 40a8a93b22 Merge branch 'amid2887-master' into 2.1.2-wip 2012-09-30 22:41:11 -07:00
amid2887 d49dd766c8 Add missing icon class definition for buttons.less
add missing icon class definition for buttons:
'[class*=" icon-"]'
2012-10-01 12:27:37 +07:00
Mark Otto a4a6244eb7 add sticky footer example per martin bean's suggestion, using the implementation by ryan fait 2012-09-30 22:09:51 -07:00
Kevin Attfield 82715ae96d Fix for #5362
Fix for issue [5362](https://github.com/twitter/bootstrap/issues/5362):
tab events fired on wrong dropdown anchor.
2012-09-30 21:41:37 -07:00
Mark Otto a2690c6d86 add link to examples on index page; add back narrow marketing page and signin page examples 2012-09-30 21:28:20 -07:00
Mark Otto 57f8dbe25c fixes #5360: typo in tables docs 2012-09-30 21:26:43 -07:00
Mark Otto f8374a754d clean up emphasis docs text 2012-09-28 15:01:12 -07:00
Mark Otto 8ecffcb32f fixes #5334: html snippet comments 2012-09-28 10:39:15 -07:00
Carl Porth e1f6458e36 don't wait for ready when binding events to document 2012-09-27 15:00:02 -07:00
Artem Kustikov 0944e036ae Fix for #4550
Also fixes dropdowns hiding behavior for case when two or more dropdowns
with [data-toggle=dropdown] exist on the page
2012-09-27 21:45:37 +03:00
Andreas Cederström ecbb0ed4df Making modal work with max width 767px - fixes #4860 2012-09-27 11:46:54 +02:00
Erlend Halvorsen e9a648cd39 Fixed bug in dropdown toggle where menu would only clear on the first drop down 2012-09-27 10:31:40 +02:00
Carl Porth 474471b831 bind data-api events to document instead of body to allow body replacement 2012-09-26 23:11:03 -07:00
Mark Otto 24e277b85a Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip 2012-09-26 16:01:59 -07:00
Mark Otto 498a28b4cd dat new kippt hotness 2012-09-26 16:01:45 -07:00
Robin Lewis b29d947477 Use paginationActiveBackground var to finish fixing #4295 2012-09-25 21:12:01 +01:00
Jacob Thornton 0540b63ab0 check affix pos on clicks - use timeout for clicks which scroll 2012-09-24 23:59:02 -07:00
Jacob Thornton aec8b08930 update docs for tooltip html + the dropdown methods api 2012-09-24 23:32:55 -07:00
Jacob Thornton 88b1e44dd6 change tooltip/popover insert strategy
remove modal-open class
hopefully resolve z-index headaches
2012-09-24 23:28:38 -07:00
Jacob Thornton 4a2443901f reverting d797a5fbd7 2012-09-24 23:19:33 -07:00
Jacob Thornton bda3d57a00 Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip 2012-09-24 23:16:09 -07:00
Jacob Thornton 003fcccceb change tooltip/popover html default to false for xss safety net 2012-09-24 23:15:36 -07:00
Mark Otto f4d3d7da2e ensure 100% width for .uneditable-inputs in <767px viewports 2012-09-23 16:06:28 -07:00
Mark Otto a4bf6ef0a0 match decimal placements in type.less 2012-09-23 15:16:13 -07:00
Mark Otto af871d57c9 fixes #5216: calculate heading sizes via math rather than fixed pixel amounts 2012-09-22 22:16:12 -07:00
Mark Otto c3ea955661 Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip 2012-09-22 21:37:08 -07:00
Mark Otto a419e70a42 add specific line items to contributing doc for issues, update branch list 2012-09-21 10:24:16 -07:00
Jacob Thornton ebf94c53a5 change transition.js, rebuild… travis maybe will be happy? 2012-09-20 16:50:36 -07:00
Jacob Thornton 1716b0fdb5 remove src's 2012-09-20 16:31:10 -07:00
Jacob Thornton fe38d12f12 rebuild - fix missing ( 2012-09-20 16:26:00 -07:00
Jacob Thornton 667179f406 added support for jquery 1.8.* 2012-09-20 16:23:54 -07:00
Mark Otto c92a75999f fixes #5127: add @inputHeight to replace static instances of '30px' throughout forms 2012-09-20 11:45:59 -07:00
Mark Otto 532ee08213 fixes #5150: add btn-group support to input groups 2012-09-20 11:37:34 -07:00
Mark Otto 443c43f6c4 fixes #5102, #5166, #5194, #5205: add overflow: visible; to .nav-collapse.collapse so that dropdowns overflow correctly in the navbar in IE7-8 2012-09-20 10:28:27 -07:00
Mark Otto 67585bd34e fixes #5211 manually: spacing in mixins to match others 2012-09-20 09:07:48 -07:00
Mark Otto 6c3cd6fd9d fixes #5212: text emphasis classes only get hover with links 2012-09-20 09:06:43 -07:00
Mark Otto a6206c98d5 increase padding on homepage button 2012-09-19 15:18:14 -07:00
Mark Otto 2d90c816ac add new vars for common border-radius, upping border-radius of inputs to 4px; add border-radius changes to -large, -small, -mini for buttons and paginations 2012-09-18 21:16:08 -07:00
Mark Otto 2769241aeb add new vars for common font-sizes and paddings with large, small, and mini components; resize pagination and buttons to better match each other 2012-09-18 20:56:20 -07:00
Mark Otto 37460e58d3 Merge branch '2.1.2-wip' of https://github.com/uberspeck/bootstrap into uberspeck-2.1.2-wip 2012-09-18 14:58:39 -07:00
Mark Otto cc3de8bd6e fixes #5177: remove color on .btn-large .caret, but keep sizing change; also start to add CSS tests for buttons 2012-09-18 12:00:57 -07:00
Mark Otto 13be8b2031 contributing edits 2012-09-18 11:50:11 -07:00
Mark Otto c15877445c Merge pull request #5187 from caniszczyk/2.1.2-wip
Add CONTRIBUTING.md
2012-09-18 11:44:43 -07:00
Mark Otto 78992bbf42 fixes #5178: update normalize to avoid resetting audio and video elements in android 2012-09-18 11:23:16 -07:00
Chris Aniszczyk 2a20761f07 Add CONTRIBUTING.md
Signed-off-by: Chris Aniszczyk <zx@twitter.com>
2012-09-18 10:50:04 -07:00
Mark Otto 3b3def4898 fixes #5087: add hover states to text emphasis classes for links 2012-09-17 23:19:52 -07:00
Mark Otto 239e6a7d21 fixes #5082 manually: reset font-size for .dropdown-menu within .input-prepend/-append 2012-09-17 23:11:49 -07:00
Mark Otto cedb3c7c56 fixes #5173: proper popover offsets; added docs examples to enable tests in the future 2012-09-17 23:03:32 -07:00
Mark Otto 783f4885ab add the media css to customizer 2012-09-17 18:17:22 -07:00
Mark Otto 26ca131a95 Merge branch 'wpbrains-media-component' into 2.1.2-wip 2012-09-17 18:15:44 -07:00
Mark Otto 143fef9f95 overhaul the docs and css to merge into 2.1.2 since this was against master 2012-09-17 18:15:39 -07:00
Mark Otto 917b46a343 resolve conflicts and remake 2012-09-17 16:43:18 -07:00
Mark Otto caa79ed594 fixes #5001: proper ids on form examples 2012-09-17 16:26:51 -07:00
Mark Otto 6881c193ca fixes #5039: properly set .row-fluid margins for .controls-row 2012-09-17 16:09:36 -07:00
Mark Otto 03a406d920 fixes #5041: add new navbar css tests for each variation, remove width: 100%; from .navbar-static-top 2012-09-17 15:49:22 -07:00
Mark Otto f69e244a60 Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip 2012-09-17 15:28:41 -07:00
Mark Otto cd876fb659 Merge pull request #5125 from tapcanvas/tab-body-bg
Use @bodyBackground on .nav-tabs active state instead of static color
2012-09-17 15:28:31 -07:00
Mark Otto 6f3bef195a nuke new examples for now 2012-09-17 08:53:13 -07:00
Mark Otto 1ea09b751e fixes #5163: add new var for navbar collapse's default view, use that in responsive navbar css 2012-09-17 08:52:19 -07:00
Mark Otto 6e25aacc91 more carouself example work 2012-09-16 21:54:06 -07:00
Robert McLaws 6aa15eb01f Support for left-opening dropdown submenus
Adds a new class called .dropdown-submenu-left. It is useful when you
have a .pull-right DropDown that has submenus. Without this, the menu
opens left past the page boundary, which can trigger the scrollbars and
cause other nastiness.
2012-09-16 03:02:31 -04:00
Mark Otto 6c4b276cd4 way cooler carousel example, along with updated screenshots for examples 2012-09-14 15:55:46 -07:00
Mark Otto 7857089065 tweak copy on each template, add sign in template 2012-09-14 15:21:44 -07:00
Mark Otto 0bcbcf69ec adding new examples 2012-09-14 15:17:46 -07:00
Mark Otto e4e2e37c5c add in some more examples (will work em in later), removed fleetio per their request, and added gather content to replace it 2012-09-14 14:48:03 -07:00
Mark Otto 5aa1018496 i18n homepage 2012-09-14 14:31:14 -07:00
Mark Otto faa760f563 revert docs change 2012-09-14 10:30:55 -07:00
Martin Bean 2ead9a5bc3 Standardized spelling of 'JavaScript'; added icons to file trees 2012-09-14 14:06:15 +01:00
Adrien Cahen 5331fe39df fix active tab bg on non-white body 2012-09-13 12:16:18 -07:00
Mark Otto 595e1a189c fixes #5119: javascript in navbar typo 2012-09-13 10:07:57 -07:00
Brian Campbell a40ab1cd66 mistakenly committed ALL assets. since only bootstrap.css and bootstrap.min.css are changed i removed all others 2012-09-12 18:11:42 -06:00
Mark Otto 15bb78ce80 fixes #5107: make all .btn-group inline-block by default instead of just within a .btn-toolbar 2012-09-12 16:37:41 -07:00
Mark Otto e1deba30aa fixes #5097: js docs typos 2012-09-12 16:22:52 -07:00
Mark Otto 537c5cc33d use local var for a few other .box-shadow mixins to fix CSS not compiling 2012-09-12 16:18:52 -07:00
Mark Otto 65d322958c add space 2012-09-12 16:11:03 -07:00
Mark Otto 38303dd997 revert the js evaluation in .box-shadow mixin, fix last mixin usages to escape if using >1 shadows 2012-09-12 15:53:29 -07:00
Mark Otto bbadd429a8 change up box-shadow mixin usage everywhere to use escaping again, or local var if necessary for further var evaluation 2012-09-12 15:48:56 -07:00
Brian Campbell 2c8eff0eec Updated pagination to support .pagination-large, .pagination-small, .pagination-mini matching button sizes. Updated related docs. 2012-09-12 14:10:03 -06:00
Mark Otto 0489c708c7 fixes #5040 manually: remove overflow: auto; from .modal to resolve sporadic modal right padding issues with scrollbars 2012-09-10 22:51:16 -07:00
Mark Otto 39791a8ea8 fixes #5059 manually: include media type in css getting started block 2012-09-10 22:44:08 -07:00
Mark Otto cd2b12f788 fixes #5064 manually: remove fancy quote mark 2012-09-10 22:41:14 -07:00
Mark Otto 10faf28aef Merge pull request #5051 from GeoffYoung/2.1.2-wip
Update modal example code to match example
2012-09-10 10:04:34 -07:00
Geoff Young 76e42edb29 Updated sample markup to reflect live demo. 2012-09-09 18:58:23 -04:00
Mark Otto f29f98501c run make after merging #5028, which removes the left margin of responsive fluid grid offsets 2012-09-07 11:42:21 -07:00
Mark Otto 1f8e2d2617 Merge branch 'dionysiosarvanitis-master' into 2.1.2-wip 2012-09-07 11:41:35 -07:00
Mark Otto 61332d727e fixes #5020: submenu support in dropup 2012-09-07 11:34:05 -07:00
Mark Otto f2bd7d9f27 fixes #5018: .btn-block in .modal-footer no longer has left margin 2012-09-07 11:10:00 -07:00
Mark Otto 6c5c3c81ec Merge branch 'tiny-typos' of https://github.com/ramiro/bootstrap into ramiro-tiny-typos 2012-09-07 11:06:08 -07:00
Mark Otto 7a0f5c6c00 fixes #5010: .pager span selector should be scoped to immediate children only 2012-09-07 11:04:51 -07:00
Dionysios G. Arvanitis cc4f8b9f6c remove offset margin in row-fluid mobile layout 2012-09-07 17:54:15 +03:00
Giuliano Velli 501a2d69e1 Merge branch 'media-component' of github.com:wpbrains/bootstrap into media-component 2012-09-07 10:13:26 +02:00
Giuliano Velli 7762a77c21 Modified the file to conform to bootstrap standards and fix an IE7 css selector issue
Signed-off-by: Giuliano Velli <giuliano@giusi.org>
2012-09-07 09:59:52 +02:00
Ramiro Morales 138b5a8c05 Fix small documentatio typos. 2012-09-05 23:07:52 -03:00
Mark Otto d4a16d35eb fixes #4996: incorrect border radius on a table 2012-09-05 10:05:54 -07:00
Mark Otto 3fa4ca2d87 Merge branch 'spantaleev-patch-1' into 2.1.2-wip 2012-09-05 10:04:38 -07:00
Mark Otto dfb3175d4b rebuild after merge 2012-09-05 10:04:28 -07:00
Mark Otto 08b8571cb8 version bump to get this started 2012-09-05 10:00:57 -07:00
Slavi Pantaleev 5ff5d351bf Do not force white icons in active tab links
Active `.nav-tabs` elements are not blue (like pills),
so forcing a white icon there is not appropriate.
2012-09-05 19:07:53 +03:00
Jacob Thornton c52368d3c5 last rebuild before 2.1.1 release 2012-09-04 20:44:11 -07:00
Mark Otto df8e3c6ee3 Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip 2012-09-04 20:13:36 -07:00
Mark Otto bc4ecd9984 regrettably remove the animated button for download on homepage to improve page performance in some browsers 2012-09-04 20:13:27 -07:00
♒∆✝ 9341bb756b Merge pull request #4784 from rossj/2.1.1-wip
Fix Typeahead key navigation with Chrome + jQuery 1.8.0
2012-09-04 20:03:04 -07:00
♒∆✝ 9d890a8412 Merge pull request #4810 from mainerror/2.1.1-wip
Makefile misses a 'clean' directive
2012-09-04 19:54:16 -07:00
Mark Otto 7e4629fbbe fixes #4968 manually: typo in scaffolding docs about offset classes 2012-09-04 14:27:48 -07:00
Mark Otto 73ef263d5f improve comments in image styles 2012-09-04 11:31:48 -07:00
Mark Otto bf590d8c81 fixes #4958: add version to minified js 2012-09-04 11:13:08 -07:00
Mark Otto a1d2ee6542 fixes #4885: correct use of skew in .skew() mixin for FF 2012-09-04 11:08:08 -07:00
Mark Otto de36456f5d fixes #4957: use input border var for select element instead of #ddd 2012-09-04 11:00:25 -07:00
Mark Otto 1f0043a7f5 fixes #4959: docs example 2012-09-04 09:13:09 -07:00
Mark Otto acf2a64016 fixes #4935: properly comment responsive image techniques and add CSS tests to support 2012-09-03 17:35:35 -07:00
Mark Otto 8cda830eaf fixes #4146: IE7-8 responsive image helper 2012-09-03 01:13:42 -07:00
Mark Otto f25129361b add comment to go with updated box-shadow mixin 2012-09-03 01:04:53 -07:00
Mark Otto f46813a8c8 Merge pull request #4763 from Luis-TP/2.1.1-wip
Improve .box-shadow mixin by utilizing regex function to no longer require escaping
2012-09-03 01:03:37 -07:00
Mark Otto 9d5f9eca85 fixes #4909: add color utility classes .text-warning, etc and document them 2012-09-03 00:47:48 -07:00
Mark Otto 69d4c3f9a1 fixes #4925: ensure docs examples don't use fixed font-size and line-height for .lead 2012-09-02 20:54:41 -07:00
Mark Otto 3737904859 fixes #4922: use basefontsize for realz on .lead 2012-09-02 13:25:03 -07:00
Mark Otto 209852c805 fixes #4902: proper accordion html example 2012-09-01 12:03:55 -07:00
Mark Otto 02f6bd65f5 fixes #4910: use @baseLineHeight * 1.5 for .lead font-size 2012-09-01 12:00:13 -07:00
Mark Otto e8c5b3c9a5 fixes #4869: typo in getting started 2012-08-31 23:51:48 -07:00
Mark Otto b1bdca0fdb fixes #4901: attribute typo and reran make 2012-08-31 23:25:58 -07:00
Mark Otto 00d6f26270 fixes #4896: reflect media query order in docs 2012-08-31 23:12:02 -07:00
Mark Otto 0f85e8b7f8 fixes #4824: scope table grid sizes to .table instead of table 2012-08-31 22:37:46 -07:00
Mark Otto beb0b64096 fixes #4889: btn-link disabled styles 2012-08-31 14:02:18 -07:00
Mark Otto afd931262c Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip 2012-08-29 13:14:11 -07:00
Mark Otto 2da2169a56 fixes #4828: make fluid grid inputs size the same as fixed grid inputs 2012-08-29 13:06:47 -07:00
Mark Otto 2137cd65fb fixes #4819: manual fix of missing .control-label in responsive767 file, coupled with a remake 2012-08-29 13:05:43 -07:00
Mark Otto 010a5dd84d Merge pull request #4816 from desimone/master
Fixed a typo in docs/assets/css/docs.css
2012-08-29 10:48:04 -07:00
Bobby DeSimone 8878facc67 Fixed a typo in docs/assets/css/docs.css 2012-08-29 11:13:55 -03:00
Octavian Damiean a976a1583c Added 'clean' directive to the make file. 2012-08-29 13:24:00 +02:00
Mark Otto e27b1355b5 fixes #4771: widen .form-horizontal labels and .dl-horizontal terms given larger font-size of 2.1.0 2012-08-28 10:12:04 -07:00
Ross Johnson b5373d8561 Merge remote-tracking branch 'origin/2.1.0-wip' into 2.1.1-wip 2012-08-28 11:14:34 -05:00
Ross Johnson 66ad3d62c6 Fix key events with Chrome + jQuery 1.8.0 2012-08-28 00:55:56 -05:00
Mark Otto 545edf5459 Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip 2012-08-27 22:43:05 -07:00
Mark Otto 609142eee2 fixes #4729: only use margin-top on .help-block when it follows an input, select, textarea 2012-08-27 22:42:12 -07:00
Jacob Thornton 3568146b28 only stop prop on form – as people seem to be relying on dropdown hiding when clicking internal elements 2012-08-27 21:44:09 -07:00
Jacob Thornton 215d92bacd Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip 2012-08-27 21:27:31 -07:00
Jacob Thornton 4751a0a274 crude check to make sure element has a # for an id 2012-08-27 21:27:01 -07:00
Mark Otto 7d412b1e14 fixes #4741: undo previous version's attempt at firefox gradient changes and add gradient tests 2012-08-27 21:18:55 -07:00
Mark Otto 55982664d0 Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip 2012-08-27 21:06:29 -07:00
Mark Otto 1eaf1cf418 fixes #4653: add hover states to stateful table rows 2012-08-27 21:06:21 -07:00
Jacob Thornton 601e252074 fix for #4761 2012-08-27 20:58:51 -07:00
Jacob Thornton d797a5fbd7 fix for open elements under modal when .modal-open 2012-08-27 20:43:12 -07:00
Mark Otto 17d8c78e52 fix docs horizontal scroll on tablet viewports 2012-08-27 20:32:42 -07:00
Mark Otto 438f745ea2 Merge pull request #4765 from globocom/missing-i18n-tag-getting-started-download-page
i18n tags missing in some strings at getting started download page
2012-08-27 20:06:42 -07:00
Alexandre Magno b5a8c0a45e i18n tags missing in some strings at getting started download page 2012-08-27 23:54:07 -03:00
Luis Aleman 2719ac3e9b Unescaped box-shadows to take advantage of new box-shadow mixin 2012-08-27 19:14:00 -04:00
Luis Aleman 67eae2a503 Do not need to write box-shadow in full 2012-08-27 19:13:37 -04:00
Luis Aleman 96a1797af1 No longer need to write box-shadows in full when using lighten or other functions 2012-08-27 19:13:11 -04:00
Luis Aleman 1b7a3ca416 Changed box-shadow mixin to accept infinite, comma separated, shadows 2012-08-27 19:10:20 -04:00
Mark Otto 303a33f15c fixes #4664: spelling mistake in alerts docs 2012-08-27 15:48:54 -07:00
Mark Otto 3b67ece2d1 fixes #4666: overrides for input types with .btn-block 2012-08-27 15:39:55 -07:00
Mark Otto 4674945fa8 fixes #4556: add mention of disable state and required js to buttons docs 2012-08-27 15:27:58 -07:00
Mark Otto b444582ccd fixes #4671: mention collapsing parents in docs for affix plugin 2012-08-27 15:20:50 -07:00
Mark Otto 8610fd9b2b remove min-height from .span3 in docs since we no longer need it 2012-08-27 15:12:55 -07:00
Mark Otto 85dcbd0b34 add min-height: 1px; to .span* classes to prevent grid columns from collapsing 2012-08-27 15:12:22 -07:00
Mark Otto cf9334bd7d fixes #4725: width of .uneditable-input should match standard text input width 2012-08-27 12:07:28 -07:00
Mark Otto 22c4f3d058 fixes #4718: add vertical-align: middle; to .btn-group to ensure proper alignment next to standard .btn 2012-08-27 12:05:15 -07:00
Mark Otto 15317419f4 fixes #4577: no margin on .control-row .span* in responsive 2012-08-27 11:46:47 -07:00
Mark Otto 8a5dde556b fixes #4644: ensure new static navbar negative indents on responsive layouts like fixed navbars 2012-08-27 11:05:01 -07:00
Mark Otto 1c9d5c43b0 fixes #4640: pagination span issues resolved by scoping selectors to appropriate children, not all children; clarify docs on use of spans for disabled and active links 2012-08-27 10:56:46 -07:00
Mark Otto a2b9a5e1fe fixes #4680: proper margin on buttons in navbar forms 2012-08-27 10:52:11 -07:00
Mark Otto fcd08fce8f fixes #4578: add clearfix to .navbar-inner to clear floats 2012-08-27 10:32:07 -07:00
Mark Otto 54e3a26dda fixes #4562: correct select and input widths at 220px (changed with 2.1.0 when we changed padding) 2012-08-27 10:08:16 -07:00
Mark Otto 96542f14ab fixes #4540: adjust vertical alignment of .btn-group in .navbar 2012-08-27 10:04:58 -07:00
Mark Otto 12d5c88c20 fixes #4742: add default value to striped gradient 2012-08-27 09:53:23 -07:00
Mark Otto bdc3ff99f3 fixes #4749: correct initialism example 2012-08-27 09:18:32 -07:00
Mark Otto 72f176d1f5 fixes #4748: document jquery dependency better 2012-08-27 09:17:20 -07:00
Mark Otto 1b8f4f5bc5 fixes #4512: improved borders on navbars 2012-08-26 23:23:47 -07:00
Mark Otto f15eb7b499 fixes #4506: clearfix added to .dl-horizontal to account for empty dd elements 2012-08-26 23:06:56 -07:00
Mark Otto cfa039d2e0 Merge branch 'sparanoid-master' into 2.1.1-wip 2012-08-26 22:30:49 -07:00
Mark Otto eb8aad85b8 fixes #4734 manually: doctype in getting started in examples 2012-08-26 22:29:40 -07:00
Mark Otto f744ad57fc fixes #4676 manually: example html updated 2012-08-25 22:31:10 -07:00
Tunghsiao Liu ec6b320003 Add .transition-delay mixin 2012-08-26 13:09:10 +08:00
Mark Otto bb9d1af1ca fixes #4672 manually: placeholder comment 2012-08-25 21:51:07 -07:00
Mark Otto aa07523e69 Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip 2012-08-25 19:41:25 -07:00
Mark Otto d9593e217d avoid top margin on input-append/prepend in .navbar-form 2012-08-24 14:45:02 -07:00
Mark Otto 0682780cd8 fixes #4657: proper border radius property in tables 2012-08-23 15:04:41 -07:00
Mark Otto d9fe9af966 Merge pull request #4643 from rpavlik/codespell
Spelling mistake in tooltip test
2012-08-23 09:51:20 -07:00
Mark Otto 5cbb826961 Merge pull request #4560 from andriijas/2.1.1-wip-table-row-warning
.warning for table tr  and .info for .control-group
2012-08-23 09:47:44 -07:00
Ryan Pavlik 019d9bf0f3 Fix typo found with codespell. 2012-08-23 11:41:55 -05:00
Mark Otto be64955e25 nuke 10px right margin on .navbar .nav 2012-08-23 09:38:56 -07:00
Mark Otto 3424df22ee delete components folder 2012-08-23 08:30:27 -07:00
Mark Otto ac4420237c fixes #4591 properly: remove -1px left margin on .input-append .add-on 2012-08-22 20:32:47 -07:00
Mark Otto 4775bc910c fixes #4604: add span support to .pager component 2012-08-22 20:28:08 -07:00
Mark Otto 5da217b96e fixed #4598, typo, manually 2012-08-22 20:23:58 -07:00
Mark Otto 582b178723 fixes #4542 manually: typo in phantomjs and space between url in markdown 2012-08-22 10:44:41 -07:00
Mark Otto 535dfc2153 fixes #4561: typo 2012-08-22 09:51:41 -07:00
Mark Otto 6160667b19 fixes #4564 manually: typo in getting started jumbotron 2012-08-22 09:48:57 -07:00
Mark Otto 5f97e04aa3 fixes #4567: link in scaffolding page 2012-08-22 09:47:56 -07:00
Mark Otto 115c7b82c4 fixes #4586: typo in docs 2012-08-22 09:45:57 -07:00
Andreas Cederström a9764c34a7 Add info state to form validation 2012-08-22 11:24:02 +02:00
Andreas Cederström 361889def9 Add .warning to table rows 2012-08-22 11:20:31 +02:00
Mark Otto 5d41742f17 fixes #4505: lighten navbar text and link color so hover looks darker 2012-08-21 14:53:34 -07:00
Mark Otto 8d00fe4c03 running make on previous merge 2012-08-21 14:43:13 -07:00
Mark Otto 1973c64342 Merge branch 'PavelDemyanenko-patch-1' into 2.1.1-wip 2012-08-21 14:42:25 -07:00
Mark Otto 46c10c8b58 alternate fix to #4522: increase line-height on btn-mini 2012-08-21 14:38:47 -07:00
Mark Otto 190d3c9c3e fixes #4526: box-shadow on .radio and .checkbox if .control-group has a form field state 2012-08-21 14:22:26 -07:00
Mark Otto e2ecd2df6c Merge branch 'incbee-master' into 2.1.1-wip 2012-08-21 14:16:09 -07:00
Mark Otto 45978b6674 run make 2012-08-21 14:16:01 -07:00
Mark Otto b1c93c2700 fixes #4523: more specific selectors on white icon inversion 2012-08-21 14:15:01 -07:00
philippm 6e7ba4e24a Fix all submenus expanded recursively in dropdown
The problem was that the CSS selector made *all* of a submenu's nested
menus visible. Fixed by applying the selector to the immediate nested
menu only.
2012-08-21 22:10:36 +01:00
Mark Otto 311c00a29b fixes #4532: navbar responsive carets for dropdown-menus now hidden, also fixes borders on navbar form 2012-08-21 14:07:20 -07:00
Mark Otto 13199c0020 fixes #4530: fix docs nesting cols comments 2012-08-21 13:59:13 -07:00
Mark Otto 6dc13573bf add css tests and stuff for #4528 2012-08-21 13:42:00 -07:00
Mark Otto 1c134d9a7f update version numbers to 2.1.1 2012-08-21 13:11:25 -07:00
Mark Otto b52d29095a fixes #4520: manually fix example html for icon 2012-08-21 13:09:01 -07:00
Mark Otto 4f918ce52c fixes #4517 manually in mustache file as well, typo in docs 2012-08-21 13:08:09 -07:00
Mark Otto 94f9f9de73 Merge branch 'UTGuy-master' into 2.1.1-wip 2012-08-21 13:07:11 -07:00
Mark Otto e5060b8d92 clean up spacing and run make 2012-08-21 13:07:06 -07:00
Mark Otto 8a2b9f4a5f remove entity in content property on dropup carets--not necessary at all 2012-08-21 13:02:02 -07:00
Mark Otto 099cec1ca7 fixes #4493: typo in dimiss alerts docs 2012-08-21 13:00:40 -07:00
Mark Otto 06c718b1d3 fixes #4480: typo in scaffolding page 2012-08-21 12:59:26 -07:00
Mark Otto 55facf1f2e fixes #4473: docs example typo for js affix plugin 2012-08-21 12:58:48 -07:00
Mark Otto 6477ad1acf fixes #4472: manually change mustache file as well for typo 2012-08-21 12:57:41 -07:00
UTGuy 5fc5d26917 Update less/variables.less
https://github.com/twitter/bootstrap/issues/4508

should fix this issue
2012-08-21 11:21:28 -03:00
Pavel Demyanenko fe3ed433e4 Fix bug Collapse broken in IE 2012-08-21 14:33:15 +04:00
Jacob Thornton 320b75de63 add affix to zip 2012-08-20 23:13:43 -07:00
Jacob Thornton 9e0d87a4dd fix afffix 2012-08-20 16:43:49 -07:00
Mark Otto 471d913ab6 add bottom margin back to sidenav for narrow tablets 2012-08-20 16:37:46 -07:00
Mark Otto cbc7873bb4 fix jittering of sidenav 2012-08-20 16:33:41 -07:00
Jacob Thornton 2b5e09038a small nits 2012-08-20 16:21:57 -07:00
Jacob Thornton 5d63e8e2a8 fMerge branch '2.1.0-wip'
Conflicts:
	docs/index.html
2012-08-20 16:13:46 -07:00
Mark Otto aa2cec6f2f fixes #4178: translate3d instead of translate 2012-08-20 14:26:38 -07:00
Mark Otto 01572f00bb ie7 button group and button toggle padding changes 2012-08-20 12:27:45 -07:00
Mark Otto 58dd1f20ae fix vertical button-groups in ie7 2012-08-20 12:20:22 -07:00
Mark Otto 6cf3752b9b fix ie7 dropdowns examples in docs 2012-08-20 12:16:15 -07:00
Mark Otto 78cb09b440 run make and add comment 2012-08-20 11:31:24 -07:00
Mark Otto ed13ec50f8 Merge branch 'patch-1' of https://github.com/krnlde/bootstrap into krnlde-patch-1 2012-08-20 11:28:43 -07:00
Mark Otto e59642838f remove relative and top positioning from docs sidenav at narrow layout 2012-08-20 11:28:30 -07:00
Mark Otto 2fda6a45aa bump up height of progress bars, give some extra depth with stacking bars, and then make the stacked bars actually work 2012-08-20 11:22:37 -07:00
Mark Otto 47697c5f35 Merge branch 'progress-multi-2.1.0-wip' of https://github.com/jpommerening/bootstrap into jpommerening-progress-multi-2.1.0-wip 2012-08-20 11:13:07 -07:00
Mark Otto afaee0ca13 reorder jumbotron links 2012-08-20 11:09:16 -07:00
Mark Otto 73cf9c4db8 fixes #4469 manually: reset width on file inputs 2012-08-20 10:28:41 -07:00
Jonas Pommerening a1951ed7c0 stack mutliple progress bars 2012-08-20 10:12:03 +02:00
Mark Otto e510306196 bump versions to 2.1.0 2012-08-19 23:07:18 -07:00
Mark Otto a12c19b3c8 updated package and readme 2012-08-19 23:05:16 -07:00
Mark Otto a667fd93ab pre font-size increase; revert static top navbar, undo contents section for now 2012-08-19 23:01:24 -07:00
Mark Otto 4e979f084d fix static navbar container issues, clean up docs presentation by unfixing the top navbar in favor of static one, start adding table of contents for longer sections of docs 2012-08-19 21:12:52 -07:00
Mark Otto e4d4ef43b0 copy change for previous commit 2012-08-19 20:38:27 -07:00
Mark Otto e71e2b4be2 fixes #4460 and #4461: copy change for opera animations support 2012-08-19 20:38:16 -07:00
Mark Otto 94ba211c40 fixes #4462: mixins instead of vanilla css 2012-08-19 20:32:29 -07:00
Mark Otto b745b7768a fixes #4458: improve support for .btn + .btn in .btn-groups and .btn-toolbars 2012-08-19 17:07:41 -07:00
Mark Otto 887f11d47f fixes #4455: improve small styles and add to docs 2012-08-19 13:12:43 -07:00
Mark Otto 47cf3cc62f copy edits to base css page 2012-08-19 12:07:23 -07:00
Mark Otto bb85bbc657 compy edits to docs 2012-08-19 12:04:41 -07:00
Mark Otto 7ed82c1223 font-size change on examples in getting started 2012-08-19 11:59:28 -07:00
Mark Otto 8e271d664b Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-08-19 11:54:05 -07:00
Mark Otto c531a75ff0 fixes #4451 manually: add .fade to modal example in both mustache and html 2012-08-19 11:53:55 -07:00
Kai Dorschner 1e190d8036 Fix for thumbnails in responsive design 2012-08-19 17:32:40 +03:00
Jacob Thornton c9cef741f6 listen to touchstart for dropdowns on mobile 2012-08-18 20:18:15 -07:00
Jacob Thornton 45dddc59a1 add click option for tooltip, popover - make click default for popover 2012-08-18 19:54:30 -07:00
Jacob Thornton 44e35e9dfa fix component 2012-08-18 19:33:46 -07:00
Jacob Thornton 937cfa6a88 add note about .nav 2012-08-18 19:32:50 -07:00
Jacob Thornton 1166b39630 removed some old stuff from application.js 2012-08-18 19:24:29 -07:00
Mark Otto e79eb75e09 fixes #4044: make z-index of tooltips same as fixed navbar so they overlay it if generated from within 2012-08-18 17:05:37 -07:00
Mark Otto e6e0e2ac9b fixes #4442: allow for .btn within a .btn-toolbar without .btn-group 2012-08-18 16:50:26 -07:00
Mark Otto 4d2f584fdd fixes #4444: clarify docs copy that new icon white style is intentional on active and hover links in .nav and .dropdown-menu 2012-08-18 16:47:04 -07:00
Mark Otto 9ae137aede modifications to new content 2012-08-18 16:42:50 -07:00
Mark Otto 80ced60778 Merge branch '2.1.0-wip' of https://github.com/smerik/bootstrap into smerik-2.1.0-wip 2012-08-18 16:31:13 -07:00
Mark Otto 50638530e6 fixes #4445: .btn-link shouldn't have a pressed button-like state at all, so nuking everything on :active as well 2012-08-18 16:30:47 -07:00
Erik van der Kolk dda951d1e1 Remove inexisting end tag </hr> 2012-08-18 21:52:43 +02:00
Erik van der Kolk ae275dccb8 Fix empty for attribute on labels in Horizontal form 2012-08-18 21:44:57 +02:00
Erik van der Kolk b7233a49dd Move code within code snippet as close to the left for Basic block 2012-08-18 19:51:57 +02:00
Erik van der Kolk 3f12c746e5 Replace Note: by Heads up! 2012-08-18 19:49:27 +02:00
Erik van der Kolk 2327d30ef5 Add code snippet to Icon examples => Form fields section 2012-08-18 19:40:42 +02:00
Erik van der Kolk 8b763286df Add code snippet to Icon examples => Navigation section 2012-08-18 19:31:29 +02:00
Erik van der Kolk d71efb855b Separate Buttons examples in Icon examples section and add code snippets 2012-08-18 19:21:01 +02:00
Erik van der Kolk 97247a157c Improve description for Images section 2012-08-18 18:24:18 +02:00
Erik van der Kolk d8eb75d6e8 Fix Heads up! part for Images section 2012-08-18 18:14:20 +02:00
Erik van der Kolk f1854a3cec Move code within <pre> tags as close to the left for Images section 2012-08-18 16:53:43 +02:00
Erik van der Kolk 2ab0c8de1a Fix typo in One class, multiple tags section 2012-08-18 16:50:08 +02:00
Erik van der Kolk 04a20fb402 Use one line per tag in code snippet for One class, multiple tags 2012-08-18 16:47:15 +02:00
Erik van der Kolk 7b7a02542b Improve doc for block level buttons 2012-08-18 16:41:40 +02:00
Erik van der Kolk 41253fb073 Improve doc for Button sizes 2012-08-18 16:36:40 +02:00
Erik van der Kolk a3c474c404 Move code within <pre> tags as close to the left for Input focus 2012-08-18 16:07:48 +02:00
Erik van der Kolk f4f6783cc0 Add <input> into Help text code snippet as shown in example 2012-08-18 16:03:47 +02:00
Erik van der Kolk 263ed4e239 Add span5 from example into multiple grid inputs code snippet 2012-08-18 15:48:18 +02:00
Erik van der Kolk f37d4b0918 Add missing placeholders and <select> in Grid sizing code snippet 2012-08-18 15:43:00 +02:00
Erik van der Kolk 01dadc05f4 Make Relative sizing code snippet the same as example 2012-08-18 15:31:11 +02:00
Erik van der Kolk 663fd4ff62 Make Extending form ... => Search form code snippet the same as example 2012-08-18 15:29:55 +02:00
Erik van der Kolk a8b18b6f54 Fix typo 2012-08-18 14:54:32 +02:00
Erik van der Kolk 25f8ef3260 Add multiple="multiple" to Forms => Selects as described in explanation 2012-08-18 14:36:30 +02:00
Erik van der Kolk c8b8d914b8 Make Forms => Textarea code snippet the same as example 2012-08-18 14:22:41 +02:00
Erik van der Kolk 7f5aa177f5 Make Forms => Default styles code snippet the same as example 2012-08-18 14:00:33 +02:00
Erik van der Kolk 0c24f51d2a Change .help-block tag for "Forms => Default styles" example into <span> 2012-08-18 13:56:02 +02:00
Erik van der Kolk 05571db109 Add <caption> to Supported table markup example 2012-08-18 13:40:37 +02:00
Mark Otto 1ae194597c nuke subnav styles from responsive navbar 2012-08-17 16:32:34 -07:00
Mark Otto 256a25f25c fixes #4260 and #4322: set vertical-align to top on input-prepend components to solve modal rounding issues 2012-08-17 16:28:45 -07:00
Mark Otto 5b947b8a2f fix up padding on small buttons, add button examples 2012-08-17 16:11:52 -07:00
Mark Otto f9deb8017a Merge branch '2.1.0-wip' of https://github.com/tobz/bootstrap into tobz-2.1.0-wip 2012-08-17 16:04:35 -07:00
Mark Otto 2b22c0c56e fixes #4438: button groups in inline forms now render inline 2012-08-17 16:00:36 -07:00
Mark Otto 9e6322dbab fixes #4428: specifity on .search-query increased 2012-08-17 12:59:32 -07:00
Mark Otto 077577c7f3 fixes #4421: add static top navbar class 2012-08-17 11:46:23 -07:00
Mark Otto b86e1fb62a additional navbar contrast: add inset shadow since we nuked the border 2012-08-17 11:31:21 -07:00
Mark Otto b8715ddfd0 fixes #4417: proper height on thumbnail placeholder image 2012-08-17 11:27:11 -07:00
Mark Otto 79e05d0c0e change css version # 2012-08-17 11:24:48 -07:00
Mark Otto 51b43acf20 run make on previous commit's merge 2012-08-17 11:23:39 -07:00
Mark Otto 39f779b5d3 Merge pull request #4419 from natansh/2.1.0-wip
Fix typo to make dropdown active link show icon-white
2012-08-17 11:23:22 -07:00
Mark Otto ded21ebc91 fixes #4416 in a different way: scope active state of navbar links to just the immediate navbar link, not dropdown elements 2012-08-17 11:22:45 -07:00
Natansh Verma bb61175eba Fixes typo for issue #4413. 2012-08-16 17:09:55 +05:30
Mark Otto 54c645e33d tweak transition 2012-08-15 14:49:55 -07:00
Mark Otto fd509cb370 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-08-15 14:45:41 -07:00
Mark Otto ada5589184 add transition to thumbnails 2012-08-15 14:45:35 -07:00
Mark Otto 74bda55d4c Merge pull request #4406 from mikaelkael/fix/add-affix-to-compilation
Add affix.js to javascript compilation
2012-08-15 09:36:35 -07:00
tobz 48f5626499 Fixed spelling error in forms documentation. 2012-08-15 11:07:43 -03:00
tobz 27e9214e05 Removed pixel designation from a zeroed-out property. 2012-08-15 10:38:59 -03:00
tobz ddefdbf31f Added default top margin of 1px for icons. 2012-08-15 10:38:21 -03:00
tobz 6bfa58ea4d Updated margin adjustments of button-based icon overrides. 2012-08-15 10:37:49 -03:00
Mickael Perraud 6a1521327b Add affix.js to javascript compilation 2012-08-15 10:56:52 +02:00
Mark Otto b0437bef76 Merge pull request #4274 from Marmelatze/three-color-gradient
Force percentage value on .vertical-three-colors() gradient mixin.
2012-08-14 22:07:17 -07:00
Jacob Thornton ff38c14948 stray ; 2012-08-14 21:23:29 -07:00
Jacob Thornton ae9a2bd93a Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip 2012-08-14 21:06:39 -07:00
Jacob Thornton dee57462e2 get affix actually working and update docs 2012-08-14 21:06:08 -07:00
Mark Otto e1659b2c4e add affix plugin to downloads page 2012-08-14 18:57:27 -07:00
Mark Otto 2ee035403d running make on prev merge 2012-08-14 16:28:17 -07:00
Mark Otto 61a8ef2feb Merge branch 'fix/center-text-navbar' of https://github.com/mikaelkael/bootstrap into mikaelkael-fix/center-text-navbar 2012-08-14 16:27:01 -07:00
Mark Otto 9c72246d49 navbar and dropdown fixes, for alignments and for ie7/8 dropdown hidden bugs from #3946 2012-08-14 16:24:58 -07:00
Mark Otto f3479a3953 compensate for ie7 button padding with no borders, fix indentation 2012-08-14 15:44:25 -07:00
Mark Otto f933a41c7b remove bottom margin on radios and checkboxes 2012-08-14 15:34:10 -07:00
Mark Otto 780636d955 fixes #3674: checkbox vertical alignment in IE9 2012-08-14 15:29:47 -07:00
Mark Otto b14d946afb add animation to docs download btn for firefox 2012-08-14 15:12:22 -07:00
Mickael Perraud 41093a328e Center text in navbar with change to @baseLineHeight (18 -> 20px) 2012-08-15 00:11:57 +02:00
Mark Otto a80dafbb18 fix width of star github btn in docs 2012-08-14 15:00:22 -07:00
Mark Otto 5144c77b27 fixes #4358: make select elements 30px tall to match inputs 2012-08-14 14:57:49 -07:00
Mark Otto 50df524ba1 remove borders entirely from fixed navbars 2012-08-14 14:53:45 -07:00
Mark Otto dbcd87331d fixes #4371: scope hovers on table rows to tbody 2012-08-14 14:51:33 -07:00
Mark Otto 662fface3b Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-08-14 14:32:10 -07:00
Mark Otto 0b0d7f104c fixes #4396: pull right dropdown menus no longer overlaid by submenus 2012-08-14 14:32:03 -07:00
Mark Otto 2a6deb92b1 fixes #4395: scope dropdown menu caret in navbar to first level dropdown only 2012-08-14 14:29:31 -07:00
Mark Otto 75e5279e01 Merge pull request #4393 from Nivl/2.1.0-wip
Fix .thumbnail line-height
2012-08-14 14:25:31 -07:00
Melvin f6ac297903 Fix .thumbnail line-height 2012-08-14 21:06:35 +03:00
Mark Otto e9b04acb92 Merge pull request #4384 from andriijas/2.1.0-wip-js-typo-fix
now with 13 custom jquery plugins
2012-08-14 09:54:04 -07:00
Mark Otto 57ea6fea76 Merge pull request #4376 from kylase/2.1.0-wip
Changed placeholders values
2012-08-14 09:30:27 -07:00
Andreas Cederström 2df0a0fdeb now with 13 custom jquery plugins 2012-08-14 13:58:12 +02:00
Mark Otto 4bf93a2d76 fixes #4265: restore chromium select fix 2012-08-13 23:03:35 -07:00
Mark Otto 97a23ef2e6 fixes #4342: navbar vars not in use, render navbar dividers 2012-08-13 22:57:40 -07:00
kylase d684607976 Amend placeholders values 2012-08-14 13:51:50 +08:00
Mark Otto 0040a78058 merge 2012-08-13 21:35:31 -07:00
Mark Otto 41f4c60a91 fixes #4373: broken examples link on homepage 2012-08-13 21:34:40 -07:00
Mark Otto cf33664b0c Merge pull request #4372 from hho/patch-2
Fixed a typo in inverse navbar code sample
2012-08-13 21:32:24 -07:00
kylase d96047f45f Changed placeholders value of @baseFontSize and @baseLineHeight to the values specified in variables.less 2012-08-14 11:57:13 +08:00
Henning Hoefer a74457a203 Fixed a typo in inverse navbar code sample 2012-08-14 02:10:07 +02:00
Mark Otto cf4fd1abbe Merge pull request #4367 from benjaminoakes/2.1.0-wip
Fix wording of "Button dropdowns" docs
2012-08-13 16:13:01 -07:00
Ben Oakes e31f06b857 Fix wording (presumed typo) 2012-08-13 13:22:08 -05:00
Mark Otto 9f8ce77751 running make on previous changes 2012-08-13 10:05:19 -07:00
Mark Otto 5df1e2c00a hotfix: github buttons urls 2012-08-09 14:00:24 -07:00
Mark Otto e06c257e6b fix gh buttons 2012-08-09 11:25:34 -07:00
Mark Otto f6c7ac51f2 add some simple styles for showing white icons on hover where appropriate 2012-08-08 11:26:22 -07:00
Mark Otto 08e4475f00 reorg vars fields on customize page to ensure they are all in three columns for time being 2012-08-07 23:11:23 -07:00
Mark Otto 3c89f7bb5f fix chevron on js docs and run make after table changes 2012-08-07 23:07:53 -07:00
Mark Otto 85f1f2257b make twitter bird white in illustration on homepage to abide by brand guidelines 2012-08-07 23:05:39 -07:00
Mark Otto 03eee23952 speed up animation and brightness on docs download 2012-08-07 23:02:01 -07:00
Mark Otto 4eee78e051 fixes #4304: more specific selectors on table border classes to override .table-striped 2012-08-07 22:50:49 -07:00
Mark Otto a525a6fe33 Merge pull request #4300 from rilian/2.1.0-wip
optimizing images on 2.1.0-wip branch; saving couple of KBs from package
2012-08-07 22:45:53 -07:00
Mark Otto 8ed77c41f0 fixes #4295: add vars for pagination 2012-08-07 22:37:38 -07:00
Mark Otto 0cb3ba6b23 run make after merging #4289 2012-08-07 22:34:39 -07:00
Mark Otto aeed751a7f Merge pull request #4289 from coliff/patch-4
Update docs/templates/pages/javascript.mustache
2012-08-07 22:34:09 -07:00
rilian 80a645b52a optimizing images on 2.1.0-wip branch; saving couple of KBs from package 2012-08-06 13:23:12 +03:00
Mark Otto 3823d29c04 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-08-05 00:15:21 -07:00
Mark Otto f61dd7239b fixes #4277: typo 2012-08-05 00:15:09 -07:00
Christian 25c6175311 Update docs/templates/pages/javascript.mustache
Amended all mentions of 'Javascript' and 'javascript' in the body text to the correct 'JavaScript'.
2012-08-05 12:39:17 +09:00
Florian Pfitzer fa38ab573b Fixes vertical-three-colors in Firefox 2012-08-03 16:56:59 +02:00
Jacob Thornton 88deb08ff2 Merge branch '2.1.0-wip' of http://github.com/twitter/bootstrap into 2.1.0-wip 2012-08-02 16:58:51 -07:00
Jacob Thornton 2b2b3303e1 fix indexof on array for ie8 2012-08-02 16:58:25 -07:00
Mark Otto 33c6ab9b20 decrease docs nav padding 2012-08-01 23:21:06 -07:00
Mark Otto d27dcf3b07 cut down on selectors on .formFieldState() mixin to origin input catchall 2012-08-01 23:16:49 -07:00
Mark Otto 1482030679 fixes #4207: redeclare box-shadow on .formFieldState() mixin so transitions work in WebKit 2012-08-01 23:15:51 -07:00
Mark Otto 1e2edaef48 add test for #4236: button group, one button with text and one with icon, now line up properly 2012-08-01 22:52:53 -07:00
Mark Otto fc7ecd78c8 add select element responsive CSS test 2012-08-01 20:58:33 -07:00
Mark Otto 4a84145c43 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-08-01 20:34:29 -07:00
Mark Otto 86a577d76b decrease box-shadow 2012-08-01 20:34:19 -07:00
Jacob Thornton 48546c2735 aria-labelledby="myModalLabel" aria-hidden="true" 2012-08-01 20:26:44 -07:00
♒∆✝ 7ec1778103 Merge pull request #4257 from ginader/modal-accessibility
close #3531 added focus handling and removed the badly announced "times"...
2012-08-01 20:23:50 -07:00
Dirk Ginader 6977d35eed close #3531 added focus handling and removed the badly announced "times" close button from screenreaders 2012-08-01 20:11:16 -07:00
Mark Otto 225d0e0af3 label new css test 2012-08-01 19:36:28 -07:00
Mark Otto 1bb7c0e669 fixes #4254: make .span12 expand full width of a parent when responsive 2012-08-01 19:33:37 -07:00
Mark Otto 3c742fc08b add test for textarea at .span12, really fix docs footer 2012-08-01 19:25:50 -07:00
Mark Otto 72323051c3 increase padding on navbar responsive nav links, fix footer margins 2012-08-01 19:18:42 -07:00
Mark Otto c2e899f2a0 remove the canvas slider doodad 2012-08-01 19:00:25 -07:00
Mark Otto fe93b926b4 add popover and tooltip components 2012-08-01 18:08:31 -07:00
Mark Otto fbc053692d add components section to docs for isolated examples 2012-08-01 18:06:02 -07:00
Mark Otto b979cd9e67 darken default button borders 2012-08-01 17:01:29 -07:00
Mark Otto 7aaf141371 add compability note to image styles 2012-08-01 16:57:27 -07:00
Mark Otto e8fd7e6c96 fix jank button on docs homepage 2012-08-01 16:15:21 -07:00
Mark Otto 735001cb26 increase horizontal padding on inputs given new font-size 2012-08-01 11:53:00 -07:00
Mark Otto 5637c6fb70 pulsing download button on homepage 2012-08-01 11:52:48 -07:00
Mark Otto fab1a80dcb increase margin on checkboxes and radios to center properly 2012-08-01 11:35:31 -07:00
Mark Otto 060e216712 fixes #4253: hover on responsive navbar 2012-08-01 09:18:00 -07:00
♒∆✝ 6905dbe98d Merge pull request #4241 from shama/issue-guidelines
Use ref instead of label when checking branches in issue-guidelines
2012-08-01 00:52:52 -07:00
Kyle Robinson Young 1f70dd71c8 Use ref instead of label when checking branches in issue-guidelines 2012-07-31 15:16:40 -07:00
Mark Otto 31b30ab88e copy edits to docs 2012-07-31 00:06:37 -07:00
Mark Otto e191964ff8 reorder docs css 2012-07-31 00:01:04 -07:00
Mark Otto 9795e9bbe6 place chevrons first in sidenav in docs, fix ie7 bugs for said sidenav 2012-07-30 23:48:26 -07:00
Mark Otto 196fb1d86a fixes #3615: remove last-child hack for IE7 since IE7 doesn't support :last-child 2012-07-30 22:26:54 -07:00
Mark Otto 59eba9afbc remove position from labels/badges in mini btns 2012-07-30 15:54:03 -07:00
Mark Otto 0e62011da0 fix download page links 2012-07-30 15:52:38 -07:00
Mark Otto 364dbb7931 fixes #3665: ensure inputs in a fluid row maintain grid sizing 2012-07-30 15:38:36 -07:00
Mark Otto be8d5243f4 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-07-30 13:25:49 -07:00
Mark Otto a9bf1e6e35 fixes #3900: nudge badges in buttons up 1px 2012-07-30 13:25:27 -07:00
Mark Otto 1f30faac73 Merge pull request #4229 from conzett/master
Add 'dist' directory to .gitignore
2012-07-30 13:08:29 -07:00
Mark Otto b2ebd5c46c update button styles to use updated 14px base font size, align carets to others with no opacity changes 2012-07-30 12:52:44 -07:00
Mark Otto 7fa99fb1fe fix navbar form alignment, and update examples to show these cases 2012-07-30 12:15:08 -07:00
Graham Conzett 178397ae5e Add 'dist' directory to .gitignore
Allows you to keep a 'dist' directory in the repository as a target build location.
This can be useful if you have bootstrap as a submodule in a project and want to build it,
but still keep it self-contained. Similar to how jQuery does their default builds:
https://github.com/jquery/jquery/#how-to-build-your-own-jquery
2012-07-30 14:10:01 -04:00
Mark Otto 6bf661aceb new fav and touch icons to match new masthead 2012-07-30 10:33:48 -07:00
Mark Otto 04164e4367 fixes #3858: add var for responsive navbar. also add additional examples to navbar docs 2012-07-30 10:25:04 -07:00
Mark Otto b63543181a fix examples collapse classes, rename navbar-redux to navbar and delete the old one 2012-07-30 10:08:27 -07:00
Mark Otto cfac4bb59d fixes #4221: correct border-collapse property for IE7 hack 2012-07-29 23:51:40 -07:00
Mark Otto 84a9c74efd fix footer in responsive 2012-07-29 23:51:18 -07:00
Mark Otto 22a9a83656 fixes #3694: provide override classes for .hide and .pull-right for grid columns 2012-07-29 16:51:24 -07:00
Mark Otto d63ebe3f3c more breadcrumb tweaks for contrast 2012-07-29 16:37:37 -07:00
Mark Otto 87ce3489d3 remove gradient, border, and box-shadow from .breadcrumb to differentiate from nav and buttons 2012-07-29 16:25:20 -07:00
Mark Otto 761429d88a Merge branch '2.1.0-wip-navbar' into 2.1.0-wip 2012-07-29 16:24:05 -07:00
Mark Otto 134d11b528 use shorthand on form field transitions for box-shadow mixin 2012-07-29 12:10:29 -07:00
Mark Otto e56a700849 fixes #4210: indenting on hero example 2012-07-29 12:07:18 -07:00
Mark Otto 5184da39f4 clear out docs assets, update and png crush features image 2012-07-29 00:44:55 -07:00
Mark Otto a30045daef reverse navbar styles to save code 2012-07-29 00:30:15 -07:00
Mark Otto fe6a4b0b54 add .btn-block for a full-width button option 2012-07-27 15:42:58 -07:00
Mark Otto 16b4ac0d8f add docs for sub menu support on dropdowns, add caret via :after to submenu toggles 2012-07-27 10:35:15 -07:00
Mark Otto 9d5c431223 add basic support for sub menus in dropdown menus 2012-07-27 10:06:54 -07:00
Mark Otto 1e9b450619 add image styles, for now to scaffolding (soon to own file) 2012-07-27 00:06:43 -07:00
Mark Otto 6474190746 increase height of homepage jumbotron, update vars and styles of popovers 2012-07-26 23:42:36 -07:00
Mark Otto 79067721b1 fix js docs formatting 2012-07-26 23:21:06 -07:00
Mark Otto 4bb2a13776 rerun make 2012-07-26 21:45:30 -07:00
Mark Otto f75277e62d indenting and such 2012-07-26 21:45:19 -07:00
Mark Otto 880bdbc4dd simplify styles for bs docs nav 2012-07-24 16:07:25 -07:00
Jacob Thornton c10a357bb3 don't bite so hard 2012-07-24 12:57:00 -07:00
Mark Otto fa6a131eb6 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-07-24 01:53:45 -07:00
Mark Otto b7b4fd5c82 wrap footer in bs docs canvas for scrolling doodad 2012-07-24 01:53:32 -07:00
Mark Otto 7590e65f6f fix search form, mostly in navbar 2012-07-24 01:44:12 -07:00
Jacob Thornton e2fc202df2 Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip 2012-07-24 00:49:19 -07:00
Jacob Thornton c98b75c979 added fade out on scroll - we can pull this if you prefer it 2012-07-24 00:48:45 -07:00
Mark Otto 394922a1bf Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-07-24 00:44:20 -07:00
Mark Otto 87aa61001e fixes #4118: responsive modal gets width auto and improved positioning for narrower widths 2012-07-24 00:44:11 -07:00
Mark Otto c37aa99e28 modal heading line-height 2012-07-24 00:37:19 -07:00
Mark Otto 4912dd441d fix h3 in modal and make modal unhidden by removing important from earlier issue 2012-07-24 00:35:54 -07:00
Jacob Thornton e38fa4b1f4 fix scroll thinggg 2012-07-24 00:30:58 -07:00
Jacob Thornton 5b2f2ed821 Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip
Conflicts:
	docs/assets/css/docs.css
	docs/javascript.html
	docs/templates/pages/javascript.mustache
2012-07-24 00:24:25 -07:00
Jacob Thornton 4ea7c47235 slightly fix side bar 2012-07-24 00:21:40 -07:00
Mark Otto 7ce048bccd Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-07-23 23:57:13 -07:00
Mark Otto cd441e082f fixes #4156: don't override border radius if stacked nav has one child 2012-07-23 23:56:13 -07:00
Mark Otto 6245886b26 tweak docs shadows 2012-07-23 23:54:26 -07:00
♒∆✝ 802ced9ca5 Merge pull request #4166 from jonathansampson/2.1.0-wip
IE10 uses 'transition' and 'transitionend'
2012-07-23 23:15:46 -07:00
Mark Otto f085dbadd1 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
Conflicts:
	docs/assets/css/docs.css
	docs/base-css.html
	docs/components.html
	docs/customize.html
	docs/getting-started.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/customize.mustache
	docs/templates/pages/getting-started.mustache
	docs/templates/pages/javascript.mustache
	docs/templates/pages/scaffolding.mustache
2012-07-23 23:01:38 -07:00
Jonathan Sampson 2a0cf0f131 IE10 uses 'transition' and 'transitionend'
msTransition, while supported in IE, should be ignored in favor of the
unprefixed property. Additionally, MSTransitionEnd should also be
ignored in favor of the unprefixed event transitionend.

Current unit test requires no attention in light of this change.

MSDN:
http://msdn.microsoft.com/en-us/library/ie/hh673535(v=vs.85).aspx#transitions_dom_events
2012-07-24 01:50:38 -04:00
Mark Otto 0dda2c4659 make docs scroll over jumbotrons, but only for 980px up 2012-07-23 22:36:08 -07:00
Jacob Thornton 614d52bd7f delete this test for now - as affix is still heavily underdevelopment 2012-07-23 18:17:43 -07:00
Jacob Thornton 5247b15411 following #4148 2012-07-23 18:12:23 -07:00
♒∆✝ 685785d2c2 Merge pull request #4159 from ixti/opera11-transitions-fix
Fix transition end name for opera 11+12
2012-07-23 17:58:38 -07:00
Mark Otto 5b8838aeac more alignment fixes for customize page 2012-07-23 12:51:48 -07:00
Mark Otto b05fc00d59 fixes #4148, readme typo 2012-07-23 12:51:36 -07:00
Aleksey V Zapparov 76cfe17002 Fix transition end name for opera 11+12
Fix transition end name for Opera 11 and Opera 12.
Should fix issues: #3896, #3897, #4157, #4158
2012-07-23 20:56:18 +02:00
Jacob Thornton e25bcb93fc Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip 2012-07-22 18:29:01 -07:00
Jacob Thornton dcf75697ec some progress on affix plugin 2012-07-22 18:28:39 -07:00
♒∆✝ cf70fb629f Merge pull request #3842 from alienlebarge/2.1.0-wip
<img /> tag with `height` attr are not responsive
2012-07-22 14:59:08 -07:00
Jacob Thornton fa1e1e34df Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip 2012-07-22 14:52:13 -07:00
Jacob Thornton fae6c36874 adds minLength #3960 2012-07-22 14:50:52 -07:00
♒∆✝ 48fc0ad569 Merge pull request #4104 from lookfirst/2.1.0-wip-fix-destroy
namespace the events for popover/tooltip
2012-07-22 14:40:09 -07:00
Jon Stevens d76c899142 remove the ns option 2012-07-22 14:36:23 -07:00
Mark Otto e9f374f041 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-07-22 14:31:58 -07:00
Mark Otto 5b8ff7061b fixes #4136: use @dropdownBorder var, but keep IE7-8 fallback 2012-07-22 14:31:39 -07:00
Jon Stevens 393f4a7b42 simplify things to one line. pull #4104 2012-07-22 14:19:11 -07:00
Jacob Thornton 8281a9023a *face palm* 2012-07-22 13:21:44 -07:00
Jacob Thornton 77dea2c5eb change haunt to write 2012-07-22 13:00:17 -07:00
Jacob Thornton 6c2fa9430c add haunt w/ issue guideline spec 2012-07-22 12:57:39 -07:00
Mark Otto b9105b98f9 move from downloads.html to customize.html to better match purpose of page, fix up customize page layout to match other docs, link style refinement to jumbotrons 2012-07-20 22:06:47 -07:00
Mark Otto ee750bbce1 tweak docs masthead links hover 2012-07-20 21:38:28 -07:00
Jon Stevens 117f65d431 on destroy, also hide. issue #3880, pull #4104 2012-07-20 09:47:12 -07:00
Mark Otto 1d4660beea nuke commented out code from last fix 2012-07-19 21:25:42 -07:00
Mark Otto 3c1a0fbda4 fixes #4103: simpler fix for tfoot in .table-border 2012-07-19 21:25:24 -07:00
Mark Otto 89d7ec5290 fixes #4102: properly round top left corners of .table-border with caption/colgroup; also fix css tests page layout and footer 2012-07-19 21:06:42 -07:00
Mark Otto 6c23fff4d6 misc docs content changes 2012-07-18 01:06:52 -07:00
Mark Otto c8fa2600f2 copy change 2012-07-17 23:38:29 -07:00
Mark Otto aac3736eea fixes #3845: add .btn-link for transparent buttons styled as links 2012-07-17 23:32:52 -07:00
Mark Otto cb1a59caa0 Merge branch '2.1.0-wip' of https://github.com/gcoop/bootstrap into gcoop-2.1.0-wip
Conflicts:
	docs/base-css.html
	docs/templates/pages/base-css.mustache
2012-07-17 23:14:58 -07:00
Mark Otto ba90d0fc5e Merge pull request #4110 from purwandi/develop
Moved JS to bottom on extends page
2012-07-17 22:44:26 -07:00
Mark Otto 326b665065 de-scope nav-header from .nav 2012-07-17 22:40:38 -07:00
Purwandi a8316c780d Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into develop 2012-07-18 12:33:16 +07:00
Mark Otto 39f8996d6a fix dropdown vars and make hover state be link color again, add gradient to dropdown link hovers, fix caret positions and active states on nav tabs, tweak nav link padding 2012-07-17 22:26:53 -07:00
Purwandi 51c9fa1697 Moved JS to bottom on extends page 2012-07-18 12:19:02 +07:00
Mark Otto 6a663081a7 remove separate examples page, add to getting started page 2012-07-17 21:45:57 -07:00
Mark Otto a1ad6d124a Merge branch '2.1.0-wip' of https://github.com/benjaminoakes/bootstrap into benjaminoakes-2.1.0-wip
Conflicts:
	docs/extend.html
	docs/templates/pages/extend.mustache
2012-07-17 20:57:20 -07:00
Mark Otto 62f6368344 center masthead bg pattern 2012-07-17 20:22:55 -07:00
Mark Otto 25bc298aff pngcrush masthead pattern to save 10k 2012-07-17 19:55:02 -07:00
Mark Otto 4008d666a5 new pattern for masthead 2012-07-17 19:54:29 -07:00
Mark Otto 16fa610ea4 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-07-17 19:11:51 -07:00
Mark Otto 478396fd4e remove list-type declarations from ul and ol elements since those should just use browser defaults 2012-07-17 19:11:41 -07:00
Jon Stevens 2ee9b2717b namespace the events for popover/tooltip so that they can be cleanly removed. issue #3880 2012-07-16 16:01:11 -07:00
Ben Oakes 426e7d9fbd Compiled; ignoring bootstrap.css change to avoid conflicts 2012-07-16 09:31:18 -04:00
Ben Oakes 9581cbfe32 Two of the three apps are for Linux/Windows; adjust accordingly 2012-07-16 09:29:49 -04:00
Mark Otto 40ab928315 Merge pull request #4083 from martinbean/2.1.0-wip
Moved JS to bottom as per best practices
2012-07-15 16:26:42 -07:00
Mark Otto e20d2dfe9d docs cleanup and blockquote cleanup for .pull-right option 2012-07-15 16:13:25 -07:00
Mark Otto 750badabf7 copy edits and tweaks to utility classes to ensure they always are specific enough 2012-07-13 14:43:51 -07:00
Martin Bean 74b167b86d Moved JS to bottom as per best practices 2012-07-13 22:25:47 +01:00
Mark Otto 463de252a9 update static assets section of extend page, copy changes elsewhere 2012-07-13 14:20:25 -07:00
Mark Otto 6e622ee763 more content edits to Extend 2012-07-13 11:18:35 -07:00
Mark Otto 93b1519017 content edits to Extend page 2012-07-13 11:17:22 -07:00
Mark Otto 5cb116beb8 cleanup subnav example 2012-07-13 10:58:20 -07:00
Mark Otto 2d4f5eb5a4 fix indenting on getting started page 2012-07-13 00:56:18 -07:00
Mark Otto fae691c3d9 some analytics tracking on getting started 2012-07-12 21:41:51 -07:00
Mark Otto f22b06097a add download links to getting started 2012-07-12 21:41:07 -07:00
Mark Otto f36060dab5 remove getting started link from home, add to navbar, overhaul getting started docs 2012-07-12 21:40:25 -07:00
Mark Otto 9343e1e933 remove getting started link from home, add to navbar, overhaul getting started docs 2012-07-12 21:38:18 -07:00
Mark Otto a12f0e551f overhaul docs on sub pages, clean up css and copy 2012-07-12 18:11:49 -07:00
Mark Otto 549d61fc28 updated footer 2012-07-12 17:02:55 -07:00
Mark Otto 7d324ee35b Merge branch 'respclasses' of https://github.com/digitaldisseny/bootstrap into digitaldisseny-respclasses 2012-07-12 16:24:37 -07:00
Mark Otto 3c775f2432 add chevrons to other docs navs 2012-07-12 16:23:21 -07:00
Mark Otto 280dfda6ed docs css cleanup for spacing and stuff 2012-07-12 16:16:06 -07:00
Mark Otto c884d6eaa6 clean up docs for subnav 2012-07-12 13:50:27 -07:00
Mark Otto 338c7ef2b6 tweak code snippet on pager and clean up type and font-sizes on docs Home 2012-07-12 13:45:07 -07:00
Mark Otto 5b5352c92d fix grid alignment on scaffolding 2012-07-11 11:15:04 -07:00
Roberto - phproberto f0ed383e51 Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into respclasses 2012-07-11 01:31:44 +02:00
Mark Otto 713105774f fixes #3706: add textColor and textShadow as options to .buttonBackground mixin 2012-07-10 00:45:44 -07:00
Mark Otto a750551fee add vars for tooltip customization via background and color 2012-07-10 00:36:21 -07:00
Mark Otto 5d8e78e0fa fixes #3605: add support for input-prepend/-append to .form-search 2012-07-10 00:32:30 -07:00
Roberto - phproberto 83846ba0d6 Fixes #4002 responsive utilities classes 2012-07-10 08:12:16 +02:00
Mark Otto 75d952ffd8 fix indenting and remove hidden subnav on Components 2012-07-09 22:40:58 -07:00
Mark Otto 0ca210395c fix indenting and remove hidden subnav on Scaffolding 2012-07-09 22:36:12 -07:00
Mark Otto 3ea309568f fix indenting and remove hidden subnav on Base CSS docs 2012-07-09 22:34:33 -07:00
Mark Otto c74dddd02e fix indenting on extend and js docs pages, remove hidden subnavs 2012-07-09 22:29:53 -07:00
Mark Otto 6f8226a393 update Extend docs page to include side nav and spec out next section for extending with static assets 2012-07-09 22:25:00 -07:00
Mark Otto 64e87a85f5 remove popoverarrows mixin, relegate code to tooltips and popvers since we only used them once each; this fixes the problem of broken tooltips in 2.1 2012-07-09 22:14:30 -07:00
Mark Otto f4877c2369 fix up docs popover examples and copy 2012-07-09 21:13:33 -07:00
Mark Otto 148e5a3d89 fixes #3291: remove float on responsive .thumbnails for 767px and down to ensure thumbnail images don't pop out of container in FF 2012-07-09 21:07:49 -07:00
Mark Otto f495a8d0cc fixes #3210: add .btn to .navbar-form to remove bottom margin, improve vertical align of contents of .navbar-form 2012-07-09 21:01:29 -07:00
Mark Otto 413c05a09d fixes #3381: update docs to show correct media query range on responsive utilities 2012-07-09 20:55:11 -07:00
Mark Otto 93be608bf0 fixes #3384: add support for multiple inputs per line when using grid sizing 2012-07-09 20:49:17 -07:00
Mark Otto dbea3e2784 update comments after merging gradient change 2012-07-09 00:53:56 -07:00
Mark Otto 646c87c151 Merge pull request #3937 from codler/patch-4
Update linear-gradient standard
2012-07-09 00:53:18 -07:00
Mark Otto 7800fee7e0 fixes #3973: same border on disabled inputs as default inputs: 2012-07-09 00:51:38 -07:00
Mark Otto 07f80e6fd8 fixes #4027: same margins on .pager and .pagination 2012-07-09 00:42:38 -07:00
Mark Otto 50a945e084 Merge branch '2.1.0-wip' of https://github.com/nextgenthemes/bootstrap into nextgenthemes-2.1.0-wip
Conflicts:
	less/buttons.less
2012-07-09 00:39:56 -07:00
Mark Otto 25d0b341a9 wasn't feeling the new buttons, downsizing again until we get a better balance 2012-07-09 00:31:54 -07:00
Mark Otto 9887d3cf4a updating docs examples to remove 13/18 resets, fix up buttons alignments and carets 2012-07-09 00:26:32 -07:00
Mark Otto 410decafad indenting 2012-07-09 00:17:52 -07:00
Mark Otto 16cf6b30cd docs changes for icons 2012-07-09 00:17:36 -07:00
Mark Otto 8b696ad0b5 fix text in docs about default font-size and line-height 2012-07-09 00:14:35 -07:00
Mark Otto db9925510b fix up carousel alignment and line-height 2012-07-08 21:47:16 -07:00
Mark Otto 20676ddd4d adding getting started page based on Bootstrap University from awhile back, testing out side nav on docs instead of subnav bar 2012-07-08 01:47:36 -07:00
Mark Otto 5f861ef517 fix up docs to use default container, fix responsive home changes 2012-07-07 23:16:07 -07:00
nextgenthemes 7d1c8c2a0c Wrapped btn:hover, btn.disabled inside .btn 2012-07-07 23:20:50 +03:00
Mark Otto 3f2f96b0d7 reoder forms a bit 2012-07-07 12:52:05 -07:00
Mark Otto e2b777d9a3 docs pre font-size and nowrap on prepend/append 2012-07-07 12:34:47 -07:00
Mark Otto 7cc916d137 Merge branch '21jumpst' into 2.1.0-wip 2012-07-07 00:48:15 -07:00
Mark Otto c7f6499235 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-07-07 00:30:55 -07:00
Mark Otto e2336ef02a remove specific values for the fluid grid system and instead use LESS's percentage() function 2012-07-07 00:30:43 -07:00
Mark Otto 6d447079a4 update buttons in docs to include type 2012-07-06 15:18:56 -07:00
Mark Otto 7ff1b074ea Merge pull request #3986 from desandro/full-height-progress-bar
Full height progress bar
2012-07-06 13:44:09 -07:00
Mark Otto dc6eaafb00 vertically align inline form content 2012-07-06 10:59:46 -07:00
Mark Otto 19ea4668e5 prevent small tags from increasing height of headings 2012-07-06 10:35:08 -07:00
Mark Otto 3d770ab7bd Merge branch 'philfreo-patch-1' into 2.1.0-wip 2012-07-06 10:22:53 -07:00
Mark Otto 095e052606 adding homepage social buttons 2012-07-06 10:10:56 -07:00
Mark Otto cd6915cdb4 tests cleanup on type, homepage content tweaks 2012-07-05 19:45:32 -07:00
Mark Otto 68146db004 buttons and pre updates for font-size 2012-07-05 15:15:57 -07:00
Mark Otto 3c07eaa251 updates to type scale 2012-07-05 15:11:54 -07:00
Mark Otto c6ee96c025 fix up subnav styles, add subnav search form styles, add some basic docs for subnav 2012-07-05 10:37:23 -07:00
Mark Otto a645664e50 update thumbnails to fix display issues and refine aesthetics 2012-07-05 10:12:15 -07:00
Mark Otto 62c386259b rewrite docs homepage, new graphics 2012-07-04 23:31:30 -07:00
Gavin Cooper (work) b4125748b0 added ability to give rows in tables status classes .success .error and .info. 2012-07-04 12:22:34 +01:00
Phil Freo 4d6434a2c7 Adding 'connect' npm requirement as it is required to run make test (in order for it to run node js/tests/server.js) 2012-07-03 23:34:11 -07:00
Dave DeSandro 26dad5f56d .progress .bar { height: 100% } 2012-07-02 17:21:26 -04:00
Mark Otto 3ad52ca632 fast responsive tweaks 2012-07-01 22:49:01 -07:00
Mark Otto 70e81e6f55 new jumbotron 2012-07-01 08:42:09 -07:00
Mark Otto fb29075926 Merge pull request #3976 from benvinegar/master
Fix Opera .clearfix bug when using contenteditable
2012-06-30 22:05:03 -07:00
Mark Otto cd2d82150c standardize top level file comments 2012-06-28 21:46:45 -07:00
Mark Otto 98ebd54800 address issues with fixed subnav like borders, corners, etc 2012-06-28 21:20:40 -07:00
Mark Otto 6f4360c47b cleanup docs css more 2012-06-28 21:06:54 -07:00
Mark Otto c31a4e5131 remove responsive subnav from docs and place in navbar-responsive.less 2012-06-28 20:59:16 -07:00
Mark Otto c09e8473e2 use variablef or wells background-color, update docs for glyphicons license mention, update popovers to remove that thick border and make them look mo betta 2012-06-28 10:03:46 -07:00
Mark Otto a683497dbc renamed less.html to extend.html, removing all the vars and mixins 2012-06-27 23:56:00 -07:00
Han Lin Yap 2e3306d5dd Update linear-gradient standard 2012-06-26 12:30:43 +03:00
Mark Otto b77ed4a3a3 fix dropdowns in button groups after font-size hack 2012-06-25 20:57:04 -07:00
Mark Otto 244a9ab79d reverse the gradient on striped progress bars so it matches the active state when animated 2012-06-25 20:20:32 -07:00
Ben Vinegar 3761d50c5a Fix Opera .clearfix bug when using contenteditable 2012-06-25 17:35:42 -07:00
Mark Otto a85499749a Merge pull request #3856 from Calvein/patch-1
Remove useless ms prefixes
2012-06-25 17:10:02 -07:00
Mark Otto e7e183e55d Merge branch 'tekezo-patch-1' into 2.1.0-wip 2012-06-25 16:49:13 -07:00
Mark Otto d65e815a48 use @textColor to change help-block/help-inline font color 2012-06-25 16:47:29 -07:00
Mark Otto 94a3d4eb14 reorder media queries 2012-06-25 16:25:50 -07:00
Mark Otto 8c2db7d7d6 prevent button group buttons from wrapping in tight spaces by removing floats and replacing with font-size: 0; inline-block hack 2012-06-25 15:47:07 -07:00
Mark Otto 78849cf52e remove jank fix for dt bold text 2012-06-25 15:09:39 -07:00
Mark Otto cd466f1d0b add tests for table grid sizing, solve bugs in fluid table grid sizing 2012-06-25 14:37:35 -07:00
Mark Otto 27845e4492 #3223: make table row hover optional class 2012-06-25 14:11:37 -07:00
Mark Otto 508a93d9e3 make fixing of subnav work again 2012-06-24 21:07:20 -07:00
Mark Otto 6662f62236 remove subnav file, instead add an optional class for .navbar 2012-06-24 21:03:39 -07:00
Mark Otto 87af5d3bbe more subnav optimizations 2012-06-24 20:42:31 -07:00
Mark Otto 71669dda63 tons of docs cleanup in css, adding subnav to official components 2012-06-24 20:26:48 -07:00
Takayama Fumihiko e80f37b600 ".linenums .tag" should be ".prettyprint .tag". 2012-06-24 15:26:39 +09:00
Mark Otto 160fe7ca59 create vars for responsive grid values, fixed and fluid, and document them in the customizer 2012-06-20 23:46:51 -07:00
Mark Otto 59153205b3 run make on js files 2012-06-20 23:46:29 -07:00
Mark Otto 3875a9f31b Merge branch 'marcusds-2.1.0-wip' into 2.1.0-wip 2012-06-20 20:26:59 -07:00
Mark Otto b353565d4e add docs for fluid offsetting 2012-06-20 20:26:50 -07:00
Mark Otto f2dadecbf3 Merge branch '2.1.0-wip' of https://github.com/marcusds/bootstrap into marcusds-2.1.0-wip 2012-06-20 20:22:22 -07:00
Mark Otto 7301931a6d Merge branch '2.1.0-wip' of https://github.com/marcusds/bootstrap into 2.1.0-wip 2012-06-20 20:20:22 -07:00
Mark Otto f5a2d82a3a Merge branch 'EngineerGio-patch-1' into 2.1.0-wip 2012-06-20 19:36:16 -07:00
Mark Otto 83e46b8df9 reorder for t-r-b-l 2012-06-20 19:36:06 -07:00
EngineerGio 5bd9217f9b Added border-radius mixins to set single corner radius and single side border radius 2012-06-21 01:50:28 +03:00
Jacob Thornton 1e717991e8 Merge pull request #3880 from lookfirst/popover-destroy
Add popover / tooltip destroy method
2012-06-20 12:02:05 -07:00
Jacob Thornton eb62c977cd Merge pull request #3770 from Barryvdh/2.1.0-wip
Scope carousel .active to .item
2012-06-20 10:58:20 -07:00
Jon Stevens 3a5b4cc7df simplify code into a single line 2012-06-20 10:42:25 -07:00
Jacob Thornton b2b000b750 change transition end name for opera 2012-06-20 10:40:56 -07:00
Mark Otto 089f42a07f fix html typos 2012-06-20 00:06:05 -07:00
Mark Otto d704d6f0ed #3861: add span to pagination selectors for full support of non-link pagination items 2012-06-19 23:37:47 -07:00
Mark Otto ce140662a0 remove unused container reset 2012-06-19 20:01:03 -07:00
Mark Otto 9df832b4bb add separate vars for dropdown link hover and active states 2012-06-19 19:17:42 -07:00
Mark Otto 40298ddbf1 add note to components about nav list nesting 2012-06-19 15:25:35 -07:00
Mark Otto ff92344f0d remove icons example of nav list--doesn't really add anything useful 2012-06-19 14:46:14 -07:00
Mark Otto b54264cde0 add basic vertical button group support 2012-06-19 14:42:46 -07:00
Mark Otto 64ba423b6d #2764: add disabled styles to navs and dropdowns 2012-06-19 13:52:07 -07:00
Mark Otto d14f06fc4e round select list corners 2012-06-19 13:25:35 -07:00
Mark Otto 143b6ae2de fix less docs typos 2012-06-19 13:23:30 -07:00
Mark Otto 9aa5a6db12 updated tests and homepage marketing copy 2012-06-19 13:21:35 -07:00
Jon Stevens af88f54e5d small typo fix to docs 2012-06-18 19:56:52 -07:00
Jon Stevens 47e0647086 add unit tests for destroy behavior of popover and tooltip 2012-06-18 19:51:49 -07:00
Jon Stevens 6a974f9ff7 enable the ability to destroy tooltips and popovers from elements. related to issue #3453 2012-06-18 19:25:54 -07:00
Mark Otto bae3cfd183 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-06-17 12:40:43 -07:00
Mark Otto 3add79c071 #3864: use @baseLineHeight in alerts.less 2012-06-17 12:40:36 -07:00
Mark Otto 36e78bd7ac Merge pull request #3863 from rosslaird/spelling
Corrected spelling error
2012-06-17 12:34:29 -07:00
Ross Laird 626b45d691 Corrected spelling error 2012-06-15 13:07:44 -07:00
François Robichet fb31cdba9c Remove useless ms prefixes 2012-06-15 15:23:40 +03:00
Mark Otto b1cb556503 improve inline-block of append/prepend inputs with font-size: 0; 2012-06-14 11:56:46 -07:00
alienlebarge 7b726f974f fix responsive height of image 2012-06-14 14:53:04 +02:00
Mark Otto cda48d41ba fix #gradientBar to .gradientBar in LESS docs 2012-06-13 22:04:02 -07:00
Mark Otto 3ead14a1e0 clarify support of select items (which is none) for input-prepend/append 2012-06-13 22:00:10 -07:00
Mark Otto 2cbff258b9 fix examples page 2012-06-11 22:33:16 -07:00
Mark Otto 1db72f8d77 Merge pull request #3810 from purwandi/develop
Add space between attrs in docs on navbar button
2012-06-11 22:31:58 -07:00
Mark Otto 2e6d4e9439 more rearrangement and removal of about sections in js docs 2012-06-11 22:28:10 -07:00
Mark Otto bf875d9e36 cleanup options display in all sections, rearrange typeahead section 2012-06-11 22:19:25 -07:00
Purwandi c7ffe6edc8 Add space on navbar button 2012-06-12 12:17:10 +07:00
Mark Otto f453909f39 add a dropdowns section to Components (still needs work) and reformat much of the js docs 2012-06-11 21:48:41 -07:00
Mark Otto 5dd47f1196 keep tables at 13px in docs for now, clean up some modals js docs stuff 2012-06-11 20:33:00 -07:00
Mark Otto 7ed02b461b fix blockquote alignment 2012-06-11 20:20:51 -07:00
Marcus Schwab 97cbefa72f Merge remote-tracking branch 'upstream/2.1.0-wip' into 2.1.0-wip 2012-06-11 02:04:14 -07:00
Marcus Schwab bd19b42c15 Proper spacing between offsets
row-fluids don't have the same negative margin-left as rows. This was
throwing everything off.
So added a different rule for first-child and subsequent "spans".
2012-06-11 01:51:19 -07:00
Mark Otto 681b601561 Merge branch '2.1.0-wip' of https://github.com/marcusds/bootstrap into marcusds-2.1.0-wip 2012-06-10 23:02:30 -07:00
Mark Otto a0cd886c56 rewrite the rest of the nav section 2012-06-10 21:24:13 -07:00
Mark Otto c90c66e61f rewrite the split button dropdowns section 2012-06-10 21:00:20 -07:00
Mark Otto 081a07c168 updated button groups section 2012-06-10 20:50:49 -07:00
Mark Otto 017b7cb804 rewrite the navbar section 2012-06-10 20:39:00 -07:00
Mark Otto 0c817bf5e2 redo pagination and breadcrumbs 2012-06-10 16:46:46 -07:00
Mark Otto 3985379cca rearrange hero unit section 2012-06-10 15:14:21 -07:00
Mark Otto f2e39233f5 rewrite alerts and progress bars sections 2012-06-10 15:12:02 -07:00
Mark Otto 4a907709ba redo icons section 2012-06-09 23:26:46 -07:00
Mark Otto 5ef2b6561a realign icons to five cols, fix buttons 2012-06-09 22:47:45 -07:00
Mark Otto fc2481b8e5 fix form display issue in docs 2012-06-09 19:26:06 -07:00
Mark Otto c65006601e overhaul forms docs to simplify presentation of everything, reduce text, and increase visibility of examples 2012-06-09 19:15:46 -07:00
Mark Otto ca63ea2f26 overhaul tables docs for more streamlined content 2012-06-09 13:15:28 -07:00
Mark Otto aff3694f28 remove mention of prettify from docs, fix docs subnav width when fixed 2012-06-09 12:58:55 -07:00
Mark Otto 550e375af0 restore scrollspy to body 2012-06-08 16:35:04 -07:00
Barryvdh c028e33358 Scope finding the .active to .item 2012-06-08 16:19:08 +03:00
Mark Otto 269ce715f1 overhaul js docs top sections, update subhead 2012-06-07 22:24:47 -07:00
Mark Otto 97c7a83a8f remove individual js file download buttons 2012-06-07 22:12:15 -07:00
Mark Otto bba0b34c36 restore top navs entirely 2012-06-07 22:10:36 -07:00
Mark Otto c1c7528dd9 drop the side nav, restore topbar 2012-06-07 21:48:03 -07:00
Mark Otto df869f1eb0 fix grids 2012-06-07 21:45:37 -07:00
Marcus Schwab c3f5d7c62d ajgon's fluid offsets working with first-child 2012-06-07 17:23:22 -07:00
Igor Rzegocki f8d68002dc Added offsets for .row-fluid 2012-06-07 17:23:22 -07:00
Mark Otto ff6dd0cf56 nav and content tweaks 2012-06-07 14:01:03 -07:00
Mark Otto 860a96939a fix grid tooltips, tweaks 2012-06-07 10:58:15 -07:00
Mark Otto f109be4e8a update readme to match master 2012-06-07 10:31:52 -07:00
Mark Otto 857b8fb8be Update master 2012-06-07 10:31:26 -07:00
Mark Otto a1aa2b188a more content changes to docs 2012-06-07 10:20:52 -07:00
Mark Otto 2ecbd36cbf add back left rail nav, tweak colors 2012-06-06 00:48:31 -07:00
Mark Otto 10d68406fe examples-wrap tables 2012-06-05 23:59:50 -07:00
Mark Otto 2c5ac562d2 updated type section of base css 2012-06-05 20:47:40 -07:00
Mark Otto 5a614fb86d remove sidenav 2012-06-05 19:53:54 -07:00
Mark Otto 09ec0b843e updated less page to single col 2012-06-05 18:29:26 -07:00
Mark Otto 8ee0679522 updated javascripts for first pass at single column 2012-06-05 18:25:46 -07:00
Mark Otto 53cec198c0 update layout for side nav 2012-06-05 17:17:20 -07:00
Mark Otto 22918f8f92 more tweaks to layouts and some docs styles 2012-06-05 17:16:17 -07:00
Mark Otto dd127611e1 two col scaffolding rev 2012-06-05 00:46:16 -07:00
Mark Otto 094e65eb9d adding 20px grid, setting that on docs 2012-06-04 23:58:51 -07:00
Mark Otto de53f62a04 more changes to js and components, playing with new docs subnav 2012-06-04 23:57:48 -07:00
Mark Otto 47e2c43401 navs tabs pills to single column 2012-06-04 23:37:18 -07:00
Mark Otto b8d8704f90 button groups and dropdowns to single column 2012-06-04 23:34:02 -07:00
Mark Otto 446f9199c6 updated index page and footer 2012-06-04 23:31:26 -07:00
Mark Otto f0ff20ec40 updating scaffolding page to single column 2012-06-04 23:10:30 -07:00
Mark Otto 257890f839 finish off rest of base-css page 2012-06-04 23:03:21 -07:00
Mark Otto 060100cf3a update table section to single column 2012-06-04 21:13:35 -07:00
Mark Otto 094e12f68d convert code section to new layout 2012-06-04 21:10:08 -07:00
Mark Otto c44bd1edf4 revamp docs to have new width, start realigning the base css page to match 2012-06-04 21:08:31 -07:00
Mark Otto 632c6d22a2 add bs-docs-examples styles from other branch 2012-06-04 20:57:58 -07:00
Mark Otto eef87c96af #3684: reset width to auto for input type='image' 2012-06-04 20:27:42 -07:00
Mark Otto 348668ec13 add misc helper classes to components css docs 2012-06-04 20:25:57 -07:00
Mark Otto 589242604f document large and small well classes 2012-06-04 18:56:50 -07:00
Mark Otto b79c100967 add placeholder to input-prepend to confirm FF placeholder looks good 2012-06-04 18:44:50 -07:00
Mark Otto c56eb0962a fix double @@ on less pages 2012-06-04 18:39:02 -07:00
Mark Otto 8df906e641 Merge branch 'wachunga-2.0.4-wip' into 2.1.0-wip 2012-06-04 08:47:48 -07:00
Mark Otto 9cceb0bba7 Merge branch '2.0.4-wip' of https://github.com/wachunga/bootstrap into wachunga-2.0.4-wip 2012-06-04 08:47:41 -07:00
Mark Otto 5563b8448e fix #3693: rounded corners on search form 2012-06-04 08:45:51 -07:00
Mark Otto 8eb1488861 wrap download page in form 2012-06-04 08:44:50 -07:00
Mark Otto 37ba0eba02 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-06-04 08:33:48 -07:00
Mark Otto eb3a4b8f75 fix placeholder for FF by attaching input and textarea when we call the mixin 2012-06-04 08:33:42 -07:00
Jacob Thornton 82ea5847a7 adds remote source to modal. Remote source can be specified in href or by providing a remote option #936 2012-06-03 21:26:54 -07:00
Jacob Thornton 041b8bdfd3 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-06-03 11:24:51 -07:00
Jacob Thornton 31e8a358c3 check length so that pause, actually pauses 2012-06-03 11:24:19 -07:00
Mark Otto ad9bfeef7a fix cut off icons 2012-06-02 22:34:20 -07:00
Mark Otto 9a4ee790e1 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
Conflicts:
	docs/assets/js/bootstrap.min.js
2012-06-02 22:14:12 -07:00
Mark Otto 9a3a297a47 update version # on homepage, crush assets 2012-06-02 22:12:45 -07:00
Jacob Thornton 2d3a0babd2 make active selector more specific #2043 and rebuild 2012-06-02 22:10:35 -07:00
Jacob Thornton 4a276b1620 Merge pull request #3682 from mlmorg/2.1.0-wip
Alter typeahead to accept synchronous/asynchronous data source
2012-06-02 21:57:18 -07:00
Matt Morgan af14f6db5d Merge branch 'async' into 2.1.0-wip 2012-06-03 00:33:06 -04:00
Jacob Thornton 91a7274a43 only set height explicitly for collapse when animation is supported #2131 2012-06-02 21:26:34 -07:00
Jacob Thornton a38bc90b48 change note to point out that boostrap.js bundles all plugins #3174 2012-06-02 21:19:56 -07:00
Jacob Thornton ebc1fe907d only trigger $.support.transition.end when it exists 2012-06-02 21:09:13 -07:00
Jacob Thornton 3a751a63d4 fix multi carousel bug #3194 2012-06-02 21:01:45 -07:00
Jacob Thornton 555a3b0478 fix carousel when hiding a reshowing - make sure it always triggers transition end #3248 2012-06-02 20:28:08 -07:00
Jacob Thornton 0b827965d3 fix regression in typeahead #3313 2012-06-02 19:31:30 -07:00
Jacob Thornton 354f99f0bd add length to parent dropdown check #3316 2012-06-02 19:02:30 -07:00
Jacob Thornton b8a8927b0c add link to phantomjs in docs #3347 2012-06-02 18:36:45 -07:00
Jacob Thornton 4ca1cba3f8 upgrade jquery to 1.7.2 #3379 2012-06-02 18:25:07 -07:00
Jacob Thornton b07b869b26 rebuild assets 2012-06-02 18:15:23 -07:00
Jacob Thornton 806a82ef83 add relatedTarget to carousel slide event 2012-06-02 18:06:00 -07:00
Jacob Thornton 037107480d remove isHTML support 2012-06-02 17:57:36 -07:00
Jacob Thornton f836473129 add html option back to tooltip and popover to explicitly prevent XSS #3421 2012-06-02 17:55:10 -07:00
Jacob Thornton fc96bc8bba rebuild doi 2012-06-02 17:30:00 -07:00
Jacob Thornton 5b401a8c16 add collapsed class to collapse invoker when it's target is collapsed #3525 2012-06-02 17:28:38 -07:00
Jacob Thornton 5e5965ca6f Merge branch 'accessibility' into 2.1.0-wip
Conflicts:
	docs/assets/js/bootstrap.min.js
	docs/javascript.html
	docs/templates/pages/javascript.mustache
2012-06-02 16:11:35 -07:00
Jacob Thornton ebc6935663 2.0.3 -> 2.0.4 2012-06-01 11:04:27 -07:00
Jacob Thornton 5657ab46c5 Merge branch '2.0.4-wip' 2012-06-01 10:53:47 -07:00
Jacob Thornton 4eaeea81fd rebuild and fix test 2012-05-31 10:24:23 -07:00
Jacob Thornton bcd5097c02 Merge pull request #3655 from jorgenfb/8dda83906d72ade81ecf9b21d55b5a2922589d30
Updated unit test for tooltips. Now using is() instead of hasClass()
2012-05-31 09:03:53 -07:00
Mark Otto 7875e4833c fix broken css tests, add fluid input-prepend/-append to tests, fix input-prepend/append for responsive for both fluid and fixed sizing 2012-05-28 17:32:24 -07:00
Mark Otto f53a038088 remake after merging IE7/8 bugfix for animations 2012-05-28 17:17:55 -07:00
Mark Otto 6fc5674466 Merge branch 'raymccoy-no-filters' into 2.0.4-wip 2012-05-28 17:17:36 -07:00
Mark Otto 9699e1d707 scope float right dropdown menus to immediate children 2012-05-28 01:13:24 -07:00
Mark Otto 241cbd478d Merge pull request #3619 from coreyti/2.0.4-wip-fix-placeholder
2.0.4 wip fix placeholder
2012-05-28 01:00:23 -07:00
Jacob Thornton a85c8fe74e add note about contributing 2012-05-27 20:07:58 -07:00
Corey Innis 8a06339501 fixes .placeholder to work as a "grouped selector"
adding the `&` combinator to `.placeholder` makes it work for the global case (in forms.less) as well as within `.navbar-search .search-query`

the result can be seen in the generated bootstrap.css, which include the -ms vendor extension.
2012-05-27 18:12:08 -07:00
Mark Otto 287086758b add tracking but for production only 2012-05-26 23:17:23 -07:00
Mark Otto cc8b260ed8 adding google analytics tracking to docs 2012-05-26 16:35:28 -07:00
Mark Otto a7529e158b remove color from labels 2012-05-25 09:19:10 -07:00
Mark Otto 7dbcd0be9a fix navbar button for mobile tapping (turn to button instead of adding href=#), streamline less docs page 2012-05-24 21:30:43 -07:00
Mark Otto aaf1825b49 fix example code for carousel 2012-05-24 20:26:08 -07:00
Mark Otto fe30bd6055 make bootstrap like google maps a bit more 2012-05-24 20:18:52 -07:00
Mark Otto 76ee212343 make nested cols code match given example 2012-05-24 20:16:25 -07:00
Mark Otto c1c679b644 #3592: clarify grid sizing in grid docs 2012-05-24 20:13:59 -07:00
Mark Otto 7fa9f605d6 recompile after adding ms-placeholder 2012-05-24 19:18:06 -07:00
Mark Otto 72e3b3beb3 Merge branch 'ademaro-patch-1' into 2.0.4-wip 2012-05-24 19:17:49 -07:00
Ademaro 34e5bc5f1d ie support placeholder color (http://msdn.microsoft.com/en-us/library/ie/hh772745(v=vs.85).aspx) 2012-05-24 13:57:02 +04:00
Mark Otto 19489496c1 remove redeclared font styles from <p> and rebuild 2012-05-23 00:05:30 -07:00
Mark Otto 5d27fbb32d Merge branch 'pvorb-patch-1' into 2.0.4-wip 2012-05-23 00:05:13 -07:00
Mark Otto 3b6b6eb242 fix field state mixin 2012-05-23 00:04:54 -07:00
Tomás Arribas 642f75141d Do not use filters in fade animations 2012-05-21 02:56:57 +02:00
Jørgen Borgesen 8dda83906d Swapped out .hasClass() with .is() when checking for multiple classes 2012-05-20 20:10:21 +02:00
Jørgen Borgesen e388a5e475 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 2012-05-20 19:59:53 +02:00
Paul Vorbach faf2866f96 Remove re-declaration of font-fam, font-size, and line-height in p 2012-05-20 11:54:21 +03:00
Mark Otto 78790da03c fix resizing issues from incorrectly changing <767px grid classes to inline-block, fix height issue on textareas 2012-05-17 22:00:49 -07:00
Mark Otto e5187e12c4 fix modal example per #3510 2012-05-17 21:48:13 -07:00
Mark Otto 1dbf4c92ce manually resolve #3516: type in less docs 2012-05-17 21:45:45 -07:00
Jacob Thornton b1d7c34086 remove log 2012-05-17 00:45:28 -07:00
Jacob Thornton 9889948f58 abandon activedescendant because it was awful 2012-05-17 00:39:14 -07:00
Jacob Thornton a7b49a7d92 nearly everything working with activedescendant... then decide it's wrong. 2012-05-17 00:23:11 -07:00
Jacob Thornton 10c6db4b14 add proper role to dialog markup and cleanup modal logging 2012-05-16 19:43:22 -07:00
Jacob Thornton 4b53778150 Merge branch 'master' into 2.0.4-wip 2012-05-16 19:10:49 -07:00
Jacob Thornton a404ac33bb modal accessibility tab control 2012-05-16 19:09:57 -07:00
Mark Otto 5ecab6112c version bump on docs home 2012-05-15 10:59:06 -07:00
Mark Otto e009ed23fc move navbar and update paths so it sits in tests 2012-05-15 09:45:53 -07:00
Mark Otto 67f81a2ed5 clarify button type on dismiss icons 2012-05-15 09:41:06 -07:00
Mark Otto 0679f24606 example incorrect for modal dismiss button 2012-05-15 09:37:28 -07:00
Mark Otto 3a27b4e6f6 remake again after pull 2012-05-15 09:07:55 -07:00
Mark Otto 6be09df1bf Merge branch '2.0.4-wip-forms' of github.com:twitter/bootstrap into 2.0.4-wip-forms 2012-05-15 09:07:31 -07:00
Mark Otto a9d4b667ff finish fixing uneditable-input and remake 2012-05-15 09:07:19 -07:00
Mark Otto 532569fe59 updated forms to rearrange focus state, reinstate uneditable-input, and a few other cleanup tidbits 2012-05-15 09:04:44 -07:00
Mark Otto ecf84bdac5 correct regressions against 2.0.3 2012-05-15 00:17:02 -07:00
Mark Otto 87f6e426b3 three columns 2012-05-14 23:50:34 -07:00
Mark Otto c8cafa5d5a move forms test to less/tests 2012-05-14 23:45:25 -07:00
Mark Otto e28efd7da0 consolidate and relabel new form selectors 2012-05-14 23:42:32 -07:00
Mark Otto a0809ceebe add forms test page for all html5 input types and refactor selectors 2012-05-14 23:40:06 -07:00
Mark Otto 33061a8e0b document .lead per #3213 2012-05-14 22:02:51 -07:00
Mark Otto 1b537c6f9c adding navbar example, for fixed and static navbars 2012-05-14 08:57:24 -07:00
Jørgen Borgesen e9a7d26d06 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. 2012-05-14 14:03:36 +02:00
Mark Otto 826a8714e2 #3257: share .navbar-fixed-top styles with .navbar-fixed-bottom 2012-05-13 22:11:35 -07:00
Mark Otto ea15660973 #3420: properly scope dropdown open state to immediate children only 2012-05-13 21:52:18 -07:00
Mark Otto 332d2a7384 #3438: fix typo on i18n tag 2012-05-13 17:43:56 -07:00
Mark Otto a2fb9ed42f #3449: make legend and form-actions the same border color 2012-05-13 17:43:04 -07:00
Mark Otto c02c3c60c9 Merge branch 'aziz-patch-7' into 2.0.4-wip 2012-05-13 14:42:12 -07:00
Mark Otto 8f44245850 document .hyphens() mixin 2012-05-13 14:31:31 -07:00
Mark Otto 23401e811f Merge branch 'Synchro-hyphenation' into 2.0.4-wip 2012-05-13 14:29:08 -07:00
Mark Otto 1a8561d084 Merge branch 'hyphenation' of https://github.com/Synchro/bootstrap into Synchro-hyphenation 2012-05-13 14:28:32 -07:00
Mark Otto 7de65e0a62 #3465 part 2: add mention to docs of type button issue 2012-05-13 14:03:32 -07:00
Mark Otto d09db29039 #3465 part 1: add type="button" to all dismiss buttons in docs 2012-05-13 14:01:57 -07:00
Mark Otto 6f61c96f02 Merge branch '2.0.4-wip' of github.com:twitter/bootstrap into 2.0.4-wip 2012-05-13 13:59:26 -07:00
Mark Otto 6a89659727 #3468: 140 icons, not 120 2012-05-13 13:59:20 -07:00
Mark Otto 3a21891824 #3469: add variables for dropdown menu dividers 2012-05-13 13:58:42 -07:00
Mark Otto 526d77af61 remove wrapping <label> from all js docs 2012-05-13 11:10:08 -07:00
Mark Otto 839ec86ac7 Merge pull request #3428 from Gavrisimo/patch-1
Update .placeholder() mixin call
2012-05-12 11:37:53 -07:00
Milos Gavrilovic 20eae67147 Update .placeholder() mixin call
In less/mixins.less this mixin is being created with @placeholderText
color as default, which is actually set as @placeholderText: @grayLight
in less/variables.less so it's redundant to make call like this:

.placeholder(@grayLight);
2012-05-10 12:25:22 +03:00
David Hirtle 452d8c1df0 Gradient mixins blow up in IE7/8 if you happen to use rgba() colors as params 2012-05-04 13:50:16 -07:00
Synchro ca369c4b2a Add Opera prefix 2012-05-01 17:54:53 +02:00
Synchro dcc89e7400 Coding style 2012-05-01 17:06:19 +02:00
Synchro 5ffb6d6706 Add .hyphens mixin 2012-05-01 17:01:26 +02:00
Mark Otto ef368f0076 #3263: typo in forms docs 2012-04-30 15:43:47 -07:00
Mark Otto b6b354ceaa #3255: typo in components for tabbable tabs 2012-04-30 15:42:55 -07:00
Mark Otto 51153766f5 Merge branch 'anirvan-master' into 2.0.4-wip 2012-04-30 15:41:47 -07:00
Mark Otto 59ec4c7154 make responsive input fields not wrap for fluid input prepend/append by setting block back to inline-block (oversight of 2.0.3) 2012-04-30 15:40:49 -07:00
Mark Otto c204bc66d6 #3237: change to CSS comments in responsive docs 2012-04-30 15:33:35 -07:00
Mark Otto 6e9756ebb6 #3228: update docs to list dependencies from 2.0.3 for compiling via make 2012-04-30 15:30:56 -07:00
Mark Otto ad46b0980c expand input css tests to fixed width grid 2012-04-30 15:06:26 -07:00
Anirvan Chatterjee ec56940c51 several spelling corrections 2012-04-27 10:48:59 -07:00
Matt Morgan bf9d8fcc07 Alter typeahead to accept synchronous/asynchronous data source via function/callback 2012-04-26 14:09:20 -04:00
Allen Bargi ab178060be let's reuse color variables, instead of hardcoding colors. 2012-04-26 17:38:47 +03:00
Jacob Thornton b261f9781b Merge pull request #3226 from aziz/patch-6
No need to specify units when a value is 0, thanks to RECESS
2012-04-25 22:19:49 -07:00
Jacob Thornton ffb4d9025b rebuild with typeahead change 2012-04-25 22:15:39 -07:00
Jacob Thornton fc509e14b2 revert position -> offset for typeahead position 2012-04-25 22:14:39 -07:00
Jacob Thornton a29e5a9dd6 fix #3234 2012-04-25 21:52:05 -07:00
Allen Bargi 99c3b7810b No need to specify units when a value is 0, thanks to RECESS 2012-04-25 18:16:59 +03:00
Jacob Thornton aaabe2a46c fix regression in resetting collapse to auto on collapse open. (+ add spec and rebuild) 2012-04-24 18:06:41 -07:00
Giuliano Velli 3aa89ded21 Merge branch 'media-component' of github.com:wpbrains/bootstrap into media-component
Conflicts:
	docs/components.html

Signed-off-by: Giuliano Velli <wpbrains@giusi.org>
2012-04-24 17:23:14 +02:00
Giuliano Velli 4fbb400754 Added Medias code and documentation
Fix for Issue #1711

Added media.less and edited bootstrap.less and responsive.less to
manage media components.

Added a section to the documentation (Media, in components.html) outlining how Medias work. Edited bootstrap.css and bootstrap-responsive.css to add the code for the demos

Signed-off-by: Giuliano Velli <wpbrains@giusi.org>
2012-04-24 17:19:17 +02:00
Mark Otto 66ac6e14db heading 2012-04-24 06:53:48 -07:00
Mark Otto 7b282798a3 officially drop support for offset on thumbnails since it breaks BC 2012-04-24 06:52:57 -07:00
Mark Otto 5be84ad0b7 restore margins on thumbnails, add comments about it's changes and how responsive affects it 2012-04-24 06:45:21 -07:00
Mark Otto f9744ff522 make component animations work cross browsers with opacity mixin, restore float on thumbnails > li 2012-04-24 06:39:14 -07:00
Jacob Thornton e659dc7e1b Merge branch '2.0.3-wip'
Conflicts:
	Makefile
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
2012-04-24 02:21:45 -07:00
Jacob Thornton 839ef3a030 2.0.2 -> 2.0.3 2012-04-24 02:19:02 -07:00
Mark Otto 79d7092a39 Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip 2012-04-24 02:12:09 -07:00
Mark Otto d8aaf50798 implement ie7 fluid tests and semantic.gs IE7 hack for rounding in ie7; not perfect, but mostly solid 2012-04-24 02:11:59 -07:00
Jacob Thornton fc871a4821 Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip 2012-04-24 02:02:28 -07:00
Jacob Thornton 73453c7f79 changes for build in preperation for 2.0.3 release 2012-04-24 02:02:06 -07:00
Mark Otto 1c2db11d58 fix ie7 button group toggles and button borders 2012-04-24 01:46:20 -07:00
Mark Otto 805ca03457 fix #3179: cut off radios and checkboxes 2012-04-24 01:33:00 -07:00
Mark Otto 7f6f3ff462 fix #3202: add cursor to .accordion-toggle 2012-04-24 01:23:24 -07:00
Mark Otto f805a6080c Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip 2012-04-23 10:06:45 -07:00
Mark Otto 419e50e339 fix up buttons after recess property order 2012-04-23 10:06:35 -07:00
Jacob Thornton b8b1ffde05 hr to var in makefil 2012-04-23 04:16:27 -07:00
Jacob Thornton c408d8961b rewrite server.js, fix travis 2012-04-23 03:44:32 -07:00
Jacob Thornton c896a182e1 increase length of waitfor timeout for phantom 2012-04-23 03:18:13 -07:00
Mark Otto 091a97c01c white bg on docs again 2012-04-23 03:06:30 -07:00
Mark Otto 176e0b1169 Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip 2012-04-23 03:05:22 -07:00
Mark Otto 99a916d5eb remove background color from radios and checkboxes for IEs 2012-04-23 03:05:10 -07:00
Mark Otto 192cb575da fix typo 2012-04-22 23:56:36 -07:00
Giuliano Velli f5fd5e7523 Added Medias code and documentation
Added media.less and edited bootstrap.less and responsive.less to manage media components.

Added a section to the documentation (Media, in components.html) outlining how Medias work. Edited bootstrap.css and bootstrap-responsive.css to add the code for the demos

Signed-off-by: Giuliano Velli <wpbrains@giusi.org>
2012-04-20 17:55:22 +02:00
Jacob Thornton f84882122e style changes to phantom integration 2012-04-19 17:40:58 -07:00
Jacob Thornton 03f78f7a60 run qunit tests in phantomjs for travis-ci 2012-04-19 17:34:07 -07:00
Jacob Thornton 1160935446 make a few changes to package.json (add make test to makefile) 2012-04-19 16:38:43 -07:00
Jacob Thornton de9271bfd1 Merge pull request #3157 from caniszczyk/2.0.3-wip
Add TravisCI support and update README
2012-04-19 16:35:27 -07:00
Chris Aniszczyk c99dcd2e93 Add Travis CI Support
Continous integration is nice, fixes #3155

Signed-off-by: Chris Aniszczyk <zx@twitter.com>
2012-04-19 16:09:59 -07:00
Mark Otto fd009597b6 mention responsive css in navbar responsive section 2012-04-19 09:28:40 -07:00
Jacob Thornton f89394b8ef make build prettier - hopefully this works, maybe some makefile bro's can improve 2012-04-18 22:49:31 -07:00
Jacob Thornton edb52a82d8 make bootstrap compile with Recess instead of Less 2012-04-18 16:16:42 -07:00
Jacob Thornton bc07e2adae allow for pushstate in scrollspy 2012-04-18 13:35:14 -07:00
Jacob Thornton b627898919 Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip 2012-04-18 13:15:58 -07:00
Jacob Thornton 8f98c4fbf6 offset -> position #3088 2012-04-18 13:15:13 -07:00
Mark Otto 47b6e6bd80 fix #3111, badge and label alignment with surrounding text 2012-04-18 09:47:30 -07:00
Mark Otto 62a0f5fdcb Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip 2012-04-18 09:37:12 -07:00
Mark Otto 178a9f3b51 fix some text around media queries in the docs 2012-04-18 09:37:07 -07:00
Mark Otto 48e6d88889 Merge pull request #3128 from codler/patch-2
Add -ms-user-select
2012-04-18 09:22:38 -07:00
Han Lin Yap c09602d172 add -ms-user-select 2012-04-18 11:38:14 +03:00
Jacob Thornton f3cf4cbaae rebuild 2012-04-16 17:36:03 -07:00
Jacob Thornton ba202d77ba 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
2012-04-16 17:35:32 -07:00
Nirav Sanghani 031fa47f68 Update new typeahead method docs to be a bit clearer. 2012-04-16 17:27:34 -07:00
Nirav Sanghani d5a95315eb Update typeahead docs to reflect new option. 2012-04-16 17:24:51 -07:00
Nirav Sanghani 8e8b1ad03d Allow updater function (updates the value of the input field) to be overridden. 2012-04-16 17:05:35 -07:00
Jacob Thornton 2881269e16 lots of property ordering 2012-04-16 16:34:08 -07:00
Jacob Thornton a3ec868ac2 few more property orders 2012-04-16 15:37:17 -07:00
Jacob Thornton 457859feba Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip 2012-04-16 15:09:26 -07:00
Jacob Thornton 498b7d984a a few property reordering things 2012-04-16 15:09:05 -07:00
Mark Otto 5fa0fcc888 fix modal per #3086 2012-04-16 14:38:22 -07:00
Mark Otto 41b695b8cd Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip 2012-04-15 17:25:38 -07:00
Mark Otto a184806538 nuke line 2012-04-15 17:25:32 -07:00
Jacob Thornton 6cf9906a60 build bootstrap.js and bootstrap.min.js into docs 2012-04-15 17:03:33 -07:00
Mark Otto 5c5310dc87 remove @gridRowWidth var since we don't use it anywhere 2012-04-15 16:57:11 -07:00
Mark Otto b67a2d8a59 Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip 2012-04-15 16:48:26 -07:00
Mark Otto d374fe92e5 simplify the left margin for offset grid columns 2012-04-15 16:48:17 -07:00
Jacob Thornton 6506ede632 add bootstrap + bootstrap.min.js to gh-pages for @remy 2012-04-15 16:45:13 -07:00
Jacob Thornton 0b8042656f fixes #2941 + whitespace in collapse 2012-04-15 16:15:32 -07:00
Mark Otto 13e4d1d5ac fix #2990: text wrapping in .uneditable-input 2012-04-15 00:35:30 -07:00
Jacob Thornton cad8f2b43a Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-04-15 00:20:50 -07:00
Jacob Thornton e985681758 add zip to git ignore, and fix gh-pages make 2012-04-15 00:19:25 -07:00
Jacob Thornton 2a6894d834 simplify make - move zipping to gh-pages only 2012-04-15 00:16:09 -07:00
Mark Otto 6c221d65e3 Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-04-15 00:06:35 -07:00
Mark Otto a4c2332eb1 move js tooltip link 2012-04-15 00:06:11 -07:00
Jacob Thornton c262ead6ed change comments to preserve for yui 2012-04-14 23:51:08 -07:00
Jacob Thornton be0efcfcfc whitespace 2012-04-14 23:38:11 -07:00
Jacob Thornton 1ca1ef94ee fix opera bug \o/ !!!! #1776 2012-04-14 23:24:19 -07:00
Mark Otto 9e9be2dc0d fix #2989: clear .checkbox/.radio floats 2012-04-14 23:19:42 -07:00
Jacob Thornton cf4924764c rebuild with tooltip formatting change 2012-04-14 23:11:19 -07:00
Jacob Thornton 19469aa52c Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip 2012-04-14 23:10:41 -07:00
Jacob Thornton b14455b03a add tests for mouseout delay in tooltip 2012-04-14 23:10:03 -07:00
Mark Otto 2dbce887df Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-04-14 23:07:51 -07:00
Mark Otto a6f27ebed4 ditch the .navbar in the selectors since it's the same specificity level, and thus superfluous 2012-04-14 23:06:00 -07:00
Jacob Thornton c7dc4cc573 change position of var in dropdown + cleanup makefile vars 2012-04-14 22:43:36 -07:00
Mark Otto 8dc1a0eade 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
2012-04-14 22:43:26 -07:00
Jacob Thornton ce94442104 Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip 2012-04-14 21:45:23 -07:00
Jacob Thornton d65f7f204a don't open dropdown if target is disabled 2012-04-14 21:44:57 -07:00
Mark Otto 490eb1bd16 fix #3068: compile after changing comment 2012-04-14 20:56:50 -07:00
Mark Otto 3bc7553f66 Merge branch 'au-phiware-patch-1' into 2.0.3-wip 2012-04-14 20:56:13 -07:00
au-phiware 16855b920e Silence comment (just like the others) 2012-04-15 12:31:07 +10:00
Mark Otto fc7ae48c95 fix #1823: styles of tabs within other tabs resolved 2012-04-14 18:47:27 -07:00
Mark Otto def7ae7798 bump version on docs homepage to 2.0.3 2012-04-14 18:30:43 -07:00
Mark Otto 4bcb89946b merge in #2684, offset on the .makeColumn mixin 2012-04-14 18:18:11 -07:00
Mark Otto d8acc062c1 Merge branch 'gruvii-patch-2' into 2.0.3-wip 2012-04-14 18:11:40 -07:00
Mark Otto 2486033754 Merge branch 'patch-2' of https://github.com/gruvii/bootstrap into gruvii-patch-2 2012-04-14 18:11:31 -07:00
Jacob Thornton 82267d48ff calling pause on a slide should actually pause it - even when hovering 2012-04-14 17:49:51 -07:00
Jacob Thornton 34132f0e89 rebuild 2012-04-14 17:19:00 -07:00
Mark Otto ce30d19c15 Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-04-14 17:16:37 -07:00
Mark Otto dbde2dc9e4 adding icon classes to finish off glyphicons 1.6 update 2012-04-14 17:15:16 -07:00
Jacob Thornton 3408064d00 hack for subnav 2012-04-14 17:15:03 -07:00
Mark Otto d5063e5dc8 fix #3032: update glyphicons sprite to 1.6 release 2012-04-14 16:59:49 -07:00
Jacob Thornton 81a296d06a whitespace 2012-04-14 16:38:44 -07:00
Jacob Thornton c291e4d786 fix typeahead test 2012-04-14 16:32:20 -07:00
Jacob Thornton 575f18aaf4 add jshint support + a few minor stylistic changes 2012-04-14 16:29:53 -07:00
Mark Otto 8575a45294 alt fix to #3029: change to single border-radii properties 2012-04-14 13:31:48 -07:00
Mark Otto a7d8145a32 fix #3036: add bg color to inputs 2012-04-14 13:18:37 -07:00
Mark Otto c710f03995 Merge pull request #3042 from ctalkington/typo-fix-1
Doc Typo Fix
2012-04-13 17:14:11 -07:00
ctalkington 0e6f12af86 add 's' to 'classe' in components docs. thanks mishmosh. 2012-04-12 15:14:54 -05:00
Bryan Petty 5b85ed181a Fixed extra margin on Navbar buttons. 2012-04-10 15:22:17 -06:00
Mark Otto 48063afb3a Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-04-07 23:41:27 -07:00
Mark Otto 0b2d23d443 add larger .input-* to block reset for responsive <767 2012-04-07 23:41:09 -07:00
Mark Otto 28c4ed824e Merge branch 'alecrust-patch-3' into 2.0.3-wip 2012-04-07 23:38:16 -07:00
Mark Otto 5bc601d9a8 fix typo on js docs selector 2012-04-07 23:37:58 -07:00
Jacob Thornton 08fee005a8 https://github.com/twitter/bootstrap/issues/2954 2012-04-07 21:26:46 -07:00
Chris Aniszczyk 11064c4d34 Update the LICENSE to the actual APLv2 2012-04-07 17:17:39 -07:00
Mark Otto a20cd66ba4 clean up new input append examples 2012-04-07 16:49:06 -07:00
Mark Otto 3ecf109835 fix conflicts, add docs example for two buttons on an append 2012-04-07 16:44:03 -07:00
Mark Otto 1d30225e2c Merge branch 'jasny-patch-2' into 2.0.3-wip
Conflicts:
	less/forms.less
2012-04-07 16:43:48 -07:00
Mark Otto 0a71f171bc readd bootstrap.zip, add @inputBorderRadius var to close #2946 2012-04-07 16:17:15 -07:00
Mark Otto f563b1db43 update kippt screenshot 2012-04-07 15:59:14 -07:00
Mark Otto 5591a9b966 use yui-compress by default instead of regular compress 2012-04-07 14:56:37 -07:00
Mark Otto 798363eda7 fix left margin on .thumbnails for responsive <767 2012-04-07 14:31:55 -07:00
Mark Otto 10ff5f16a6 fix #2968 manually: add consolas to monospace font stack 2012-04-07 14:25:58 -07:00
Bryan Petty 4b81c0dff3 Changed .nav-collapse to clear both instead of left, and added compiled files. 2012-04-05 14:13:16 -06:00
Arnold Daniels fedce0cec7 Allow multiple buttons in .input-prepend and .input-append.
This has a look similar to button groups.
2012-04-05 23:08:32 +03:00
Jacob Thornton 4953629ccd Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-04-04 15:13:27 -07:00
Jacob Thornton 83febb3452 remake and add isHTML check to popover as well 2012-04-04 15:02:30 -07:00
Jacob Thornton 4bd611884a detect if title in tooltip is text or html. if text - use text method to prevent xss.
all add a few notes to js readme about updated event
2012-04-04 14:58:04 -07:00
Alec Rust ff57f59562 Corrected spacing 2012-04-03 12:15:36 +02:00
Mark Otto 2ea437f353 fix #2908: unfloat inputs using .span* in fluid row 2012-04-02 22:49:19 -07:00
Mark Otto 4462f24753 fix #2911: correct /lib/ path to /less/ 2012-04-02 22:40:06 -07:00
Mark Otto 2988de6377 fix #2913: get more specific with button group selectors 2012-04-02 22:38:12 -07:00
Bryan Petty 030265eaec Restrict collapsed items in Navbar to only those in .nav-collapse, and buttons in Navbar. 2012-04-02 02:52:06 -06:00
Mark Otto 7bf4c8e76e Merge branch 'alecrust-patch-1' into 2.0.3-wip 2012-04-01 11:10:20 -07:00
Alec Rust 574592cba5 Corrected "resises" to "resides" 2012-04-01 17:25:43 +02:00
Mark Otto 647f1c98ed fix #2296: allow fluid thumbnails 2012-04-01 01:05:00 -07:00
Mark Otto fe05f9aeb2 fix #2572: streamline thumbnails css to allow for offsets 2012-04-01 00:59:34 -07:00
Mark Otto 33fa705c7f fix #2811: left and right aligned tabbable tabs fixes so that .tab-content grows to match parent's width 2012-04-01 00:15:04 -07:00
Mark Otto d652af1097 fix #2860: truncate .dl-horizontal terms and reset to stacked for <767px layouts 2012-03-31 23:53:54 -07:00
Mark Otto 452ddc0f0d update less docs page to reflect changes in mixins (no more default values) and variable name fix 2012-03-31 21:36:45 -07:00
Mark Otto f37d9aeaef fix #2856: make inputs using .span* classes responsive at <767px layout 2012-03-31 21:31:01 -07:00
Mark Otto 2355fd224d remove @shadow instances and replace with escaped values, update mixins to not use a default value at all 2012-03-31 21:06:16 -07:00
Mark Otto 56ecc6ba96 clarify use of dropdowns, href, and data-target for js docs; add tests to css tests page for it's display and execution in html 2012-03-31 12:31:56 -07:00
Mark Otto 37745cd899 fix fluid grid selectors to remove > in selectors 2012-03-31 00:53:38 -07:00
Mark Otto 2f4810e72f Merge branch 'grantzau-patch-1' into 2.0.3-wip 2012-03-30 23:38:16 -07:00
Jacob Thornton 2dc979a202 MSTransitionEnd + move paren (thanks rick waldron) 2012-03-29 14:14:17 -07:00
Jacob Thornton 0665c3ebf7 move over paren just because. 2012-03-29 13:55:56 -07:00
Jacob Thornton 422d04cb2b simplify transition plugin a little 2012-03-29 13:51:23 -07:00
Jacob Thornton 30b3f47e31 remove "technique" 2012-03-29 12:48:37 -07:00
Jacob Thornton 8ea8c312ea replace UA sniffing 2012-03-29 12:35:06 -07:00
Julius Graakjær Grantzau 6564afbe73 Renaming @gridColumnGutter to @gridGutterWidth 2012-03-29 14:56:53 +03:00
Mark Otto 2bbc9a1cb2 fix js links in css tests 2012-03-28 20:03:57 -07:00
Mark Otto a9f9949b3e rearrange other parts of forms docs 2012-03-28 19:41:23 -07:00
Mark Otto 04baa07547 document .backface-visibility and update comments and initial value 2012-03-28 18:25:27 -07:00
Mark Otto feccc6e705 Merge branch 'backface-visibility' of https://github.com/dannykeane/bootstrap into dannykeane-backface-visibility 2012-03-28 18:21:04 -07:00
Mark Otto 3308d1968f fix #2846: Firefox required two clicks on selects to get to options dropdown 2012-03-28 18:18:41 -07:00
Mark Otto d6680a50b9 start rearranging form docs and clear up messaging about required classes and default styles 2012-03-28 18:00:05 -07:00
Mark Otto 369ca13c75 fix homepage link in css-tests and remove second help text from example form 2012-03-28 17:52:03 -07:00
Mark Otto 66743676ce moving css tests to less directory 2012-03-28 17:41:40 -07:00
Mark Otto 93d42ca80e fix #2832: clarify docs on use of .tabbable and add mention of .fade 2012-03-28 17:35:06 -07:00
Mark Otto e41584afb5 fix #2829: redeclare .pull-right for navs since they get more specific floats 2012-03-28 17:02:13 -07:00
Danny Keane 2165ab2620 Added the back-face visibility css property to mixins.less, this property prevents the browser flickered experienced especially in Chrome when using 3D transformations. 2012-03-28 15:05:49 +01:00
Mark Otto 0fe68de1a4 fix second booboo 2012-03-27 09:22:15 -07:00
Mark Otto 5b3268317c Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-03-27 09:21:35 -07:00
Mark Otto d27fc24aa0 fix spelling booboo 2012-03-27 09:21:13 -07:00
Mark Otto 155a7c1067 Merge pull request #2817 from andriijas/2.0.3-wip
Finish of a.close to button.close
2012-03-27 09:14:39 -07:00
Andreas Cederström 5d2062a3cc Finish of close conversion from a to button 2012-03-27 08:36:34 +02:00
Mark Otto 917f11e679 update LESS docs to note @baseFontSize and @baseLineHeight must be pixels 2012-03-26 09:30:42 -07:00
Mark Otto d4914f47c3 fix #2799, mention of text in the navbar 2012-03-26 09:25:31 -07:00
Mark Otto cffadd8c71 add position relative to .dropup 2012-03-25 22:28:43 -07:00
Mark Otto 4449c4e9e0 update docs messaging around alerts and buttons 2012-03-25 20:44:01 -07:00
Mark Otto 473e5714f7 change all anchor alert closes to buttons 2012-03-25 20:41:59 -07:00
Mark Otto ea437351ed add heads up note for required href on alert dismiss actions 2012-03-25 19:47:13 -07:00
Mark Otto 4893928310 add back href for alerts in components docs to make close work on iphone 2012-03-25 18:03:30 -07:00
Mark Otto 825227474b add refresh method documentation to js docs to close #2028 and #2795 2012-03-25 17:37:38 -07:00
Mark Otto 3e2e111b17 add css tests for fluid rows and inputs 2012-03-25 17:11:50 -07:00
Mark Otto 519384fae8 Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip 2012-03-25 16:41:57 -07:00
Mark Otto 95c2877ffc remove > in fluid grid selectors, fix double padding issue on fluid layout and example 2012-03-25 16:41:46 -07:00
Mark Otto 998c8a6e3d fix double padding issue on fluid layout and example 2012-03-25 16:40:51 -07:00
Mark Otto 8d52e6d458 change arrows in one pagination example because opera janks it up, per #2697 2012-03-25 14:51:54 -07:00
Mark Otto 4c3e7690ba jankify the IE7 horizontal forms a bit more to account for no labels before .controls, per #2728 2012-03-25 14:46:47 -07:00
Mark Otto cbd77d0aeb give IE7 inline-block behavior for input-prepend/append 2012-03-25 14:37:19 -07:00
Mark Otto d0526e31fa remove padding on .search-query for IE7-8 since it doesn't pick up large border-radius 2012-03-25 14:31:04 -07:00
Mark Otto c0f28d81b0 Remove black border on buttons in IE7:
1. Removed borders on .btn and increased line-height 2px to compensate
2. Set buttons to use the endColor of the gradient as the background-color by default for extra contrast between button and background
3. Set a 5% darker background-color on hover of buttons just for IE7
2012-03-25 14:28:24 -07:00
Jacob Thornton a62810918f fix responsive navbar 2012-03-25 13:33:36 -07:00
Mark Otto a5552a1d70 revert bart's mixin fix 2012-03-25 12:42:47 -07:00
Mark Otto b81a082cd1 add navbarheight support to .brand and .nav links in navbar 2012-03-25 12:32:29 -07:00
Mark Otto 6c5c29ada2 introduce .navbar-link to resolve issue with buttons in .navbar-text 2012-03-25 01:21:47 -07:00
Mark Otto a7b8e52f8e Overhaul the responsive utility classes:
1. Rename file from responsive-utility-classes.less to responsive-utilities.less
2. Add additional help text around the documentation for the classes in Scaffolding
3. Remove unnecessary display values on initial classes
4. Drop block values for inherit for better support on inline and table elements
5. Make use of \!important on every class to avoid classes with more specific selectors (e.g., .span* classes for the grid)
2012-03-25 01:12:51 -07:00
Mark Otto d1864b3608 adding 144x144 ipad touch icon 2012-03-25 00:46:03 -07:00
Mark Otto 1837b8ef2c remove height: auto on images since it interferes with inline dimensions 2012-03-25 00:20:30 -07:00
Mark Otto 223c8358ce Merge branch 'andreasbovens-master' into 2.0.3-wip 2012-03-25 00:07:09 -07:00
Jacob Thornton 3e7920820a add missing closing brace 2012-03-24 20:01:51 -07:00
Jacob Thornton 0dfff052cb add MSTransitionEnd event to js plugin 2012-03-24 19:02:55 -07:00
Jacob Thornton f02d017ffa return matcher value directly + cleanup first lines of files 2012-03-24 18:59:04 -07:00
Jacob Thornton 6dc59a9c3e add explict note that tooltip delay isn't applied to manual trigger type in popover/tooltip 2012-03-24 18:45:12 -07:00
Jacob Thornton bccc2cb719 add preventDefault support for all inital event types (show, close, hide, etc.) + fix small bug with scrollspy.last 2012-03-24 18:20:09 -07:00
Jacob Thornton ef5ac02b69 allow prevent default for show and hide event in modal 2012-03-24 17:50:21 -07:00
Andreas Bovens de0aaff433 Added -o- and -ms- prefixes to animations CSS
Added -o- and -ms- prefixes to make the animated progress bars to work
in the latest/upcoming versions of IE and Opera.
2012-03-24 18:53:27 +01:00
Mark Otto f9f03d8976 Merge branch 'bartt-master' into 2.0.3-wip
Conflicts:
	docs/assets/bootstrap.zip
	docs/assets/css/bootstrap.css
	less/button-groups.less
2012-03-23 20:56:48 -07:00
Mark Otto c7afe382a2 fix other instances of mixins, swap use of box-shadow everywhere, include border-radius and transition 2012-03-23 20:56:04 -07:00
Mark Otto f87e4c60e9 Merge branch '2.1.0-wip' into 2.0.3-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-03-23 18:29:21 -07:00
Bart Teeuwisse 035b85eeba The native box-shadow, background-clip and background-size instructions all take 1 or more arguments. In 1.3.0 LESS became arity aware, see https://gist.github.com/1933613. As a result the signatures of these mixins had to change a little. 2012-03-23 12:37:40 -07:00
Mark Otto a57554222f Merge branch '2.0.3-wip' of https://github.com/andriijas/bootstrap into andriijas-2.0.3-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-03-23 09:53:04 -07:00
Mark Otto 0b41984920 Fix #2758: Uneditable inputs in input-prepend/append
1. Added a missing comma to the input-append's form control stack () to fix border-radius
2. Add  to the .uneditable-input in forms to remove the float as we do with all other form controls
2012-03-23 09:47:57 -07:00
Andreas Cederström eb4f708b91 badge-error => badge-important 2012-03-23 13:35:46 +01:00
Mark Otto 5179df1928 css tests cleanup 2012-03-23 01:31:22 -07:00
Mark Otto de7aee2465 fix broken tables with double borders and such, add css tests page to start with table edge cases 2012-03-23 01:28:04 -07:00
Mark Otto 622b8fa3f0 adding blog link to docs homepage 2012-03-23 01:13:20 -07:00
Mark Otto e84161076b add mention of transitions plugin requirement on collapse 2012-03-23 00:58:41 -07:00
Mark Otto f330de0b5c add comment for append/prepend z-indexing 2012-03-23 00:51:31 -07:00
Mark Otto 281e058ef2 fix #2613: labels hang too low 2012-03-23 00:40:10 -07:00
Mark Otto ee3fc11add fix #2617: add negative margin to fixed-bottom navbar 2012-03-23 00:38:13 -07:00
Mark Otto 2729d15742 fix #2625 manually: account for dropup caret on large button 2012-03-23 00:37:15 -07:00
Mark Otto b8d8ab1aad run make on merge of progress bars change 2012-03-23 00:28:58 -07:00
Mark Otto 81f31d95c8 Merge branch 'patch-1' of https://github.com/sirlantis/bootstrap into sirlantis-patch-1 2012-03-23 00:28:25 -07:00
Mark Otto a28fa20018 remove redundant max-width img from docs css 2012-03-22 23:49:39 -07:00
Mark Otto c4fb703269 fix left and right tab-content alignment with width: auto; 2012-03-22 23:38:50 -07:00
TJ Rana 7ea34ae0ef Add "the" on lines 28 and 29 2012-03-22 23:31:52 -07:00
TJ Rana 7376eef378 Add s to bumps on line 30 2012-03-22 23:31:52 -07:00
TJ Rana 303ba1326b Make guidelines for release numbering more specific 2012-03-22 23:31:52 -07:00
Mark Otto ac64d9405b Dropdowns overhaul:
1. Removed broken and unused dropup examples from the navs/pills docs
2. New defaults for dropdown menus: all corners are rounded and always 1px offset from top unless otherwise specified
3. Refined active and open states for button dropdowns by adding a darker background color for each button variation when opened; also changed the opened dropdown-toggle's inset shadow to match that of an :active button
4. Generalized .dropdown.open to just .open, thus removing a few lines from button-groups.less.
5. Annnnnnnnnd I think that's it.
2012-03-22 23:09:31 -07:00
Mark Otto 50b2245be5 restore max-width 100% for images 2012-03-22 22:06:23 -07:00
Mark Otto 20da2c8ea0 add the broken out responsive files 2012-03-22 21:54:54 -07:00
Mark Otto ab068f6fda bump version numbers in css files to 2.0.3, break out responsive CSS into separate files for further customization 2012-03-22 21:33:06 -07:00
Mark Otto bdf8a6966b remove labels and badges from customizer and replace with single file 2012-03-22 21:17:55 -07:00
Mark Otto dbadac183d add new @formActionsBackground to customize page 2012-03-22 21:09:27 -07:00
Mark Otto 1852d077bf add shell of tests page, lighten form actions background and give it a variable 2012-03-22 21:08:41 -07:00
Mark Otto b011daf67f finish adding remaining component variables to less docs page 2012-03-22 19:36:55 -07:00
Mark Otto 254bb40f00 remove mentions of unused button variable per #2537 2012-03-22 17:49:13 -07:00
Mark Otto edca6f28f0 fix #2718, misaligned uneditable inputs in prepends/appends 2012-03-22 17:41:20 -07:00
Mark Otto b7b84c7a0d remove bug in docs for example icon in an input-prepend by removing margin on any input/select/etc in an input-prepend/append 2012-03-22 17:36:32 -07:00
Mark Otto ceab161324 fix unescaped reset filter per #2575 2012-03-22 17:31:09 -07:00
Mark Otto 1a6a1828bf remove mention of siteWidth, no longer used 2012-03-22 17:23:20 -07:00
Mark Otto 42f636032c fix #2716, incorrect required markup for navbar search form 2012-03-22 17:22:19 -07:00
Mark Otto e0c85fb69c use new font-stack mixins in base and alt font family mixins 2012-03-22 17:18:07 -07:00
Mark Otto 78e37e7d21 Merge branch 'font-variables' of https://github.com/ctalkington/bootstrap into ctalkington-font-variables 2012-03-22 17:13:58 -07:00
Mark Otto 89ea238c32 move navbarBrandColor closer to link color 2012-03-22 17:13:20 -07:00
Mark Otto b59cb505f8 Merge branch 'brand-link' of https://github.com/ctalkington/bootstrap into ctalkington-brand-link
Conflicts:
	docs/assets/bootstrap.zip
2012-03-22 17:12:22 -07:00
Mark Otto fa1b3bdda4 Merge branch 'Synchro-master' into 2.0.3-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-03-22 17:10:16 -07:00
Mark Otto 0e73a0e94b change spacing and fix code blocks 2012-03-22 17:09:54 -07:00
Mark Otto d839bf961b Merge branch 'master' of https://github.com/Synchro/bootstrap into Synchro-master 2012-03-22 16:04:32 -07:00
Mark Otto d7af2714c6 remove separate badges and labels, add single file instead, remove hover from non-link badges/labels 2012-03-22 16:02:00 -07:00
Marcus Bointon 239c178b68 Clarify docs on how tabs are activated from JS, see #1000 2012-03-22 21:24:57 +01:00
Marcus Bointon cfce34e300 Add more examples for activating tabs
Make naming of tab id consistent
2012-03-22 20:36:49 +01:00
Mark Otto 0f57bdab75 Merge branch 'doc-typos' of https://github.com/ZeroGravX/bootstrap into ZeroGravX-doc-typos 2012-03-22 09:06:59 -07:00
Mark Otto d335adf644 Updated readme to include blog mention 2012-03-22 00:33:18 -07:00
Jacob Thornton b3bf223617 filter out non matches in map 2012-03-21 23:59:27 -07:00
Jacob Thornton 20e085723b cache $(href) lookup 2012-03-21 23:51:32 -07:00
Jacob Thornton 706ee46b73 sort scrollspy to prevent flicker for unordered nav 2012-03-21 23:45:58 -07:00
Jacob Thornton 94b24aaa47 clear timeout to reset delays for tooltip/popover 2012-03-21 21:57:06 -07:00
Jacob Thornton 22963d7346 Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-03-21 21:37:17 -07:00
Jacob Thornton d5fb653914 top stripping leading and trailing whitespace + always use .html method 2012-03-21 21:35:02 -07:00
Marcus Bointon 2f06366399 Make changes in page templates, rebuild 2012-03-21 12:09:00 +01:00
Marcus Bointon 02a67ea59e Add note about styling tabs
Fix typo in popover docs
2012-03-21 11:28:23 +01:00
Marcus Bointon a0203bc8e0 Fix and improve docs on tab config 2012-03-21 11:20:56 +01:00
Jacob Thornton cb8dcfcebf if transitioning collapse, don't start new transition 2012-03-20 22:43:27 -07:00
Jacob Thornton 663e41d74f prevent dropdowns from closing when clicking inside form element inside dropdown 2012-03-19 23:13:55 -07:00
Jacob Thornton 63bd7cb478 fix slide logic for ie+ in carousel 2012-03-19 21:39:39 -07:00
Jacob Thornton bce33bbb09 if parent in collapse, only grab children 2012-03-19 21:10:55 -07:00
Jacob Thornton 630ff4ff7d fix collapse bug in ie7+ for initial collapse in 2012-03-19 20:51:20 -07:00
Jacob Thornton 07d23b927e add activate to scrollspy docs 2012-03-19 20:29:22 -07:00
Jacob Thornton 384a082e8d active - onActivate 2012-03-19 20:24:46 -07:00
Jacob Thornton 05e0d5f3d9 fire active event on active 2012-03-19 16:09:08 -07:00
Jacob Thornton 67f199678c if interval is false, do not autocycle the carousel 2012-03-19 15:48:57 -07:00
Jacob Thornton 83a7a69893 typeahead should escape regexp special chars 2012-03-19 15:33:28 -07:00
Jacob Thornton bf59220b87 ;) 2012-03-19 15:19:01 -07:00
Jacob Thornton 5a2c7eb50a select last item in scrollspy if you've reached the bottom of the document or element 2012-03-19 15:18:00 -07:00
Mark Figueredo d115d169b7 Added offset parameter to .makeColumn. 2012-03-19 14:58:55 -03:00
Mark cdd158c571 Could have sworn I added that 's'! 2012-03-18 12:49:18 -06:00
Mark 4c0905c5f2 Added URL fix from #2643 - Thanks ctalkington 2012-03-18 12:44:31 -06:00
Jacob Thornton 527fb87dad add /head 2012-03-17 21:29:56 -07:00
ctalkington 2c4230e2d3 update docs to match variable addition. 2012-03-15 14:46:27 -05:00
ctalkington 99e96f64f7 update docs to match variable addition. 2012-03-15 14:39:28 -05:00
ctalkington bf09c979ca make brand links follow navbarLinkColor but also be customizable in advanced cases. 2012-03-15 14:21:27 -05:00
ctalkington 51f37cbb81 make font family mixins customizable with variables. 2012-03-15 13:34:50 -05:00
Marcel Jackwerth 1a1cab2d06 Invert progress-bar-stripes direction 2012-03-15 18:11:17 +01:00
Mark d3873b0fc7 Typo Fixes for .mustache files
Added the doc typo fixes to the .mustache files as well.
2012-03-14 20:28:24 -06:00
Jacob Thornton 8e0afbeaa4 update hide text to h5bp technique #2586 2012-03-14 12:00:27 -07:00
Mark 6a61e81b7a Another Typo
Fixed another typo pointed out by panahi.
2012-03-13 13:36:58 -06:00
Mark ffa0d2f180 Some Doc Typos
Fixed doc typos in Components and Scaffolding.
2012-03-13 10:35:08 -06:00
219 arquivos alterados com 32459 adições e 35823 exclusões
+4 -1
Ver Arquivo
@@ -6,6 +6,7 @@
*.rej
*.swo
*.swp
*.zip
*.vi
*~
*.sass-cache
@@ -31,4 +32,6 @@ nbproject
.hg
.svn
.CVS
.idea
.idea
node_modules
dist
+3
Ver Arquivo
@@ -0,0 +1,3 @@
language: node_js
node_js:
- 0.6
+368
Ver Arquivo
@@ -0,0 +1,368 @@
## 2.3.2 re-release (July 26, 2013)
Patch to update jQuery in Bower and bump Recess to 1.1.9.
## 2.3.2 (May 17, 2013)
Fix dropdown for firefox (middleclick) and mobile.
## 2.3.1 (February 28, 2013)
Patch release for @fat's n00bery
- fix missing event type in dropdown
- fix delegated data-attrs for popover/tooltip
- make carousel actually pause when you click cycle
- fix jshint ref in makefile
- fix trying to remove backdrop when no backdrop
## 2.3.0 (February 7, 2013)
Minor release to add carousel indicators, improve tooltips, improve dev setup, and fix hella bugs.
- **Repository changes:**
- **Local instead of global dependencies** for our makefile and install process. Now getting started is way easier—just run `npm install`.
- Upgraded to jQuery 1.9. No changes were needed, but we did upgrade the included jQuery file to the latest release.
- Moved changelog to be within the repo instead of as a wiki page.
- **New and improved features:**
- **Added carousel indicators!** Add the HTML and it automagically works.
- **Added `container` option to tooltips.** The default option is still `insertAfter`, but now you may specify where to insert tooltips (and by extension, popovers) with the optional container parameter.
- Improved popovers now utilize `max-width` instead of `width`, have been widened from 240px to 280px, and will automatically hide the title if one has not been set via CSS `:empty` selector.
- Improved tooltip alignment on edges with [#6713](https://github.com/twbs/bootstrap/pull/6713).
- **Improved accessibility for links in all components.** After merging [#6441](https://github.com/twbs/bootstrap/pull/6441), link hover states now apply to the `:focus` state as well. This goes for basic `<a>` tags, as well as buttons, navs, dropdowns, and more.
- Added print utility classes to show and hide content between `screen` and `print` via CSS.
- Updated input groups to make them behave more like default form controls. Added `display: inline-block;`, increased `margin-bottom`, and added `vertical-align: middle;` to match `<input>` styles.
- Added `.horizontal-three-colors()` gradient mixin (with example in the CSS tests file).
- Added `.text-left`, `.text-center`, and `.text-right` utility classes for easy typographic alignment.
- Added `@ms-viewport` so IE10 can use responsive CSS when in split-screen mode.
- **Docs changes:**
- Added [new justified navigation example](https://f.cloud.github.com/assets/98681/25869/5e2f812c-4afa-11e2-9293-501cd689232d.png).
- Added sticky footer with fixed navbar example.
See more on the [2.3.0 pull request](https://github.com/twbs/bootstrap/pull/6346).
## 2.2.2 (December 8, 2012)
Bugfix release addressing docs, CSS, and some JavaScript issues. Key changes include:
- **Docs:**
- Assets (illustrations and examples) are now retina-ready.
- Replaced [Placehold.it](http://placehold.it) with [Holder.js](http://imsky.github.com/holder/), a client-side and retina-ready placeholder image tool.
- **Dropdowns:** Temporary fix added for dropdowns on mobile to prevent them from closing early.
- **Popovers:**
- No longer inherits `font-size: 0;` when placed in button groups.
- Arrows refactored to work in IE8, and use less code.
- Plugin no longer inserts popover content into a `<p>`, but rather directly into `.popover-content`.
- **Labels and badges:** Now [automatically collapse](https://github.com/twbs/bootstrap/commit/ead5dbeba5cd7acfa560bfb353f5e7c4f4a19256) if they have no content.
- **Tables:** Nesting support with `.table-bordered` and `.table-striped` greatly improved.
- **Typeahead:**
- Now [inserts dropdown menu after the input](https://github.com/twbs/bootstrap/commit/1747caf19d59cad7fdc90ae56a00e0e2849f95f4) instead of at the close of the document.
- Hitting escape will place focus back on the `<input>`.
- Print styles, from HTML5 Boilerplate, have been added.
See more on the [2.2.2 milestone](https://github.com/twbs/bootstrap/issues?milestone=17&state=closed).
## 2.2.1 (October 30, 2012)
Hotfix release to address the carousel bug reports.
## 2.2.0 (October 29, 2012)
### tl;dr
2.1.2 is now 2.2.0: four new example templates, added media component, new typographic scale, fixed that box-shadow mixin bug, fixed z-index issues, and [more](https://github.com/twbs/bootstrap/issues?milestone=15&page=1&state=closed).
### Highlights
- **Added four new example templates** to the docs, including a narrow marketing page, sign in form, sticky footer, and a fancy carousel (created for an upcoming .net magazine article).
- **Added the media component**, to create larger common components like comments, Tweets, etc.
- **New variable-driven typographic scale** based on `@baseFontSize` and `@baseLineHeight`.
- Revamped mini, small, and large padding via new variables for inputs and buttons so everything is the same size.
- Reverted 2.1.1's `.box-shadow();` mixin change that caused compiler errors.
- Improved dropdown submenus to support dropups and left-aligned submenus.
- Fixed z-index issues with tooltips and popovers in modals.
- Hero unit now sets basic type styles for the entire component, rather than on `.hero-unit p { ... }`.
- Updated JavaScript plugins and docs to jQuery 1.8.1.
- Added Contributing.md file.
- Added support for installing Bootstrap via [Bower](http://twitter.github.com/bower).
- Miscellaneous variable improvements across the board.
- Miscellaneous documentation typos fixed.
For the full list of issues included in this release, visit the [2.2.0 milestone on GitHub](https://github.com/twbs/bootstrap/issues?milestone=15&page=1&state=closed)
## 2.1.1 (September 4, 2012)
* New feature: alert text. We documented these new classes, like `.text-success`, at the bottom of the [Typography section](http://twbs.github.com/bootstrap/base-css.html#typography) along with the long undocumented `.muted`.
* Fixed a lot of typos in the docs. Spelling is hard.
* Made the `.box-shadow()` mixin more durable. It no longer requires escaping for multiple shadows, meaning you can easily use variables and functions in them once again.
* Widened `.dl-horizontal dt` and `.horizontal-form .control-group` to better handle the increased font-size.
* Dropdown submenus improved: now you only see the next level, not all levels, on hover of the submenu toggle.
* Clarified jQuery and Bootstrap template requirements in Getting Started section.
* `select` now utilizes `@inputBorder`.
* `.lead` now scales up from `@baseFontSize` instead of being a fixed font-size and line-height.
* Fixed the vertical three color gradient in latest Firefox.
* Reordered some variables that caused errors in certain Less compilers.
View all closed issues on the [2.1.1 milestone](https://github.com/twbs/bootstrap/issues?milestone=14&state=closed).
## 2.1.0 (August 20, 2012)
### Key changes
* Submenu support on dropdowns
* Affix JavaScript plugin
* Block level buttons
* State classes on table rows
* Improved disabled states on navs and dropdowns
* The navbar component is now white by default, with an optional class to darken it
* Improved prepended and appended inputs
* New base font-size and line-height
* Added variable for navbar collapse trigger point
* Fluid grid offsets
* Fluid grid system variables are no longer fixed percentages
* Removed LESS docs page
For full set of changes, see the completed milestone: https://github.com/twbs/bootstrap/issues?milestone=7&page=1&state=closed
## 2.0.4 (June 1, 2012)
### Docs
- Added `type="button"` to all dismiss buttons in alerts and modals to avoid a bug in which they prevent their parent's `form` from properly submitting.
- Added simple documentation to Base CSS for `.lead`.
- Added new CSS test to illustrate how the navbar, static and fixed, behaves.
- Clarified grid sizing copy to include mention of responsive variations.
- Reformatted the LESS docs page to prevent terrible table displays at smaller grid sizes.
- Miscellaneous typos and tweaks.
### CSS
- Refactored forms.less to make our selectors more specific for fewer overrides and less code. Instead of a generic `input` selector and various resets, we target each type of input like `input[type="text"]`, `input[type="password"]`, etc.
- Form field state (e.g., success or error) now applies to checkbox and radio labels.
- Removed redundant CSS on `<p>` for `font-family`, `font-size`, and `line-height`.
- Removed redundant `color` declaration from the `<label>` element.
- Added variables for dropdown dividers border colors.
- `legend` and `.form-actions` share the same `border-color`, `#e5e5e5`.
- Fixed some responsive issues with input-prepend and -append, notably with the fluid grid.
- Added special CSS to prevent `max-width: 100%;` on images from messing up Google Maps rendering.
- Scope opened dropdowns to only immediate children to avoid unintended cascade.
- Similarly, scope floated-right dropdowns to immediate children with `.pull-right > .dropdown-menu`.
- Updated `.placeholder()` mixin to use `&` operator in Less for proper output when compiling.
- Added `-ms-input-placeholder` to `.placeholder()` mixin.
- Added CSS3 hyphens mixin.
- Fixed a bug in IE7/8 where certain form controls would not show text if the parent had a filter opacity set.
## 2.0.3 (April 24, 2012)
Running makefile now require JSHint and Recess.
### HTML and CSS
- Overhauled the responsive utility classes to simplify required CSS, add `!important` to all declarations, and use `display: inherit` in place of `display: block` to account for different types of elements.
- Removed `>` from fluid grid column selectors, meaning every element with a `.span*` class within a `.row-fluid` will use percentage widths instead of fixed-pixels.
- Fixed regression in responsive images support as of 2.0.1. We've re-added `max-width: 100%;` to images by default. We removed it in our last release since we had folks complaining about Google Maps integration and other projects, but we're taking a different stance now on these things and will require developers to make these tweaks on their end.
- Added variable `@navbarBrandColor` for the brand element in navbars, which defaults to `@navbarLinkColor`.
- Font-family mixins now use variables for their stacks.
- Fixed an unescaped `filter` on the `.reset-filter()` mixin that was causing some errors depending on your compiler.
- Fixed regression in `.form-actions` background, which was too dark, by adding a new variable `@formActionsBackground` and changing the color to `#f5f5f5` instead of `#eee`.
- Fixed an issue on button group dropdowns where the background color was not using the button's darker color when the dropdown is open.
- Generalized and simplified the open dropdown classes while adding smarter defaults. Instead of `.dropdown.open`, we now use just `.open`. On the defaults side, all dropdown menus now have rounded corners to start.
- Improved active `.dropdown-toggle` styles (for dropdown buttons) by darkening the background and sharpening the inset shadow to match the active state of buttons.
- Direction of animation on progress bars reversed.
- Fixed input-prepend/append issue with uneditable inputs: `.uneditable-input` was being floated and a missing comma meant its `border-radius` for the append option wasn't being applied properly.
- Removed `height: auto;` from `img` since it was overriding dimensions set via HTML attributes.
- Fixed an issue of double borders on the top of tables with captions or colgroups.
- Fixed issue with anchor buttons in the `.navbar-text`. Instead of a general styling on all anchors within an element with that class, we now have a new class to specifically apply appropriate link color.
- Added support for `@navbarHeight` on the brand/project name and nav links for complete navbar height customization.
- Fixed the black borders on buttons problem in IE7 by removing the border, increasing the line-height, and providing darker background colors.
- Removed excess padding on `.search-query` inputs in IE7 since it doesn't have border-radius.
- Updated alert messages in Components to use `button` elements as close icons instead of `a`. Both can be used, but an `a` will require `href="#"` for dismissal on iOS devices.
- Fixed an issue with prepended/appended inputs in Firefox where `select` elements required two clicks to toggle the dropdown. Resolved by moving the `position: relative` to the `select` by default instead of on `:focus`.
- Added a new mixin, `.backface-visibility`, to help refine CSS 3D tranforms. Examples and explanation of usage can be found on [CSS Tricks](http://css-tricks.com/almanac/properties/b/backface-visibility/).
- Changed specificity of grid classes in responsive layouts under 767px to accurately target `input`, `select`, and `textarea` elements that use `.span*` classes.
- Horizontal description lists, `.dl-horizontal`, now truncate terms that are too long to fit in their fixed-width column. In the < 767px responsive layout, they change to their default stacked layout.
- Changed tabbable tabs to prevent issues in left and right aligned tabs. `.tab-content` would not growing to its parent's full width due to `display: table`. We removed that and the `width: 100%` and instead just set `overflow: auto` to clear the left and right aligned tabs.
- Updated thumbnails to support fluid grid column sizing.
- Added `>` to most of the button group selectors
- Added new variable, `@inputBorderRadius`, to all form controls that previously made use of the static `3px` value everywhere.
- Changed the way we do `border-radius` for tables. Instead of the regular mixin that zeros out all other corners, we specify one corner only so they can be combined for use on single column table headers.
- Updated Glyphicons Halflings from 1.5 to 1.6, introducing 20 new icons.
- Added an `offset` paramater to the `.makeColumn`.
- Increased the specificity of all tabbable nav selectors to include `.nav-collapse` to appropriately scope the responsive navbar behavior.
- Fixed uneditable inputs: text now cuts off and does not wrap, making it behave just like a default `input`.
- Labels and badges are now `vertical-align: baseline;` so they line up with surrounding text.
### Javascript
- Add jshint support
- Add travis-ci support w/ headless phantom integration
- Replace UA sniffing in bootstrap-transitions.js
- Add MSTransitionEnd event to transition plugin
- Fix pause method in carousel (shouldn't restart when hovering over controls)
- Fix crazy opera bug #1776
- Don't open dropdown if target element is disabled
- Always select last item in scrollspy if you've reached the bottom of the document or element
- Typeahead should escape regexp special chars
- If interval is false on carousel, do not auto-cycle
- Add preventDefault support for all initial event types (show, close, hide, etc.)
- Fix collapse bug in ie7+ for initial collapse in
- Fix nested collapse bug
- If transitioning collapse, don't start new transition
- Try to autodetect when to use html/text method in tooltip/popovers to help prevent xss
- Add bootstrap + bootstrap.min.js to gh-pages for @remy and jsbin support
### Documentation and repo
- Combined badges and labels into a single LESS file, labels-badges.less, to reduce repeated CSS.
- Separated responsive features into multiple files. We now have a file for each grouping of media queries (tablets and down, tablets to desktops, and large desktops). Additionally, the visible/hidden utility classes and the responsive navbar are in their own files. The output is the same in the compiled CSS, but this should give folks a bit more flexibility.
- Added a new CSS Tests page in the docs (not in the top nav) for better testing of edge cases and extending the use of standard components.
- Removed the bootstrap.zip file from the repo and the make process for faster building and a lighter repo. From now on, the zip will only be in the documentation branch.
- Fixed incorrect use of class instead of ID for tabs example and added documentation for multiple ways of toggling tabs.
- Fixed required markup listed for the specialized navbar search field.
- Removed all mention of `@siteWidth`, a variable no longer in use.
- Removed mentions of unused `@buttonPrimaryBackground` variable, which is no longer in use.
- Updated LESS docs page to include all the new variables we added in previous releases.
- Removed broken "dropup" menus from tabs and pills examples (shouldn't have been there in the first place).
- Replaced `.badge-error` with `.badge-important`. The error option is not a valid class and was a typo in the docs.
- Fixed mention of how to add plain text to the navbar. Previously the docs stated you only needed a `p` tag, but the required HTML is any element with class `.navbar-text`.
- Clarified the use of `.tabbable` for tabs. The wrapping class is only required for left and right tabs to clear their floats. Also added mention of `.fade` to fade in tabs.
- Updated forms documentation:
- Remove unnecessary duplicate help text in first example
- Added mention of required `input` class, `.search-query`, for the search form variation
- Removed incorrect mention of form fields being `display: block;` to start as fields are `inline-block` to start.
- Added mention of `data-target` attribute for the dropdowns javascript plugin to show how to keep custom URLs intact on links with `.dropdown-toggle` class.
- Updated the Kippt screenshot on the homepage to reflect their recent responsive redesign and upgrade to 2.0.2.
## 2.0.2 (March 12, 2012)
Overview of docs changes, bugfixes, and new features.
### Documentation updates
- All docs pages now have distinct titles, such as <em>Scaffolding &middot; Twitter Bootstrap</em>.
- Updated the Apple touch icons (now black on black instead of the blue grid) and fixed the links to them in the docs.
- Added new global styles docs section to the Scaffolding page.
- Required use of HTML5 doctype
- Overview of global typographic and links details
- Mention of our embedded CSS reset via [Normalize.css](http://necolas.github.com/normalize.css/)
- Added version number to the download button on the docs homepage.
- Updated progress bars section to simplify how the classes stack and more clearly indicate the available optional classes and styles.
- Added a new example, [SoundReady.fm](http://soundready.fm), to the homepage
- Added various sizes to the docs for button groups
### Resolved bugs
- Removed all IE7 hacks and floats from `.input-prepend` and `.input-append`, however, this requires you to **ensure there is no whitespace in your code** between `.add-on` and the `input`.
- In `.input-prepend` and `.input-append`, added ability to use add-ons on both sides when you chain the selectors.
- Updated lingering `.btn-dark` reference to `.btn-inverse`.
- Fixed issue with content being cut off in `.tab-content` for tabbable sections.
- Updated `.navbar .container` to use `width: auto;` to start and then reset the fixed widths via the `#gridSystem` mixin (it's a little dirty, but required to avoid adding another class).
- Modal footer buttons are now aligned by their parent via `text-align: right;` instead of `float: right` on the button level. This was changed to allow the use of `.pull-left` and `.pull-right` to align buttons easily. Double check your button order with this change!
- Fixed problem where default striped progress bar was green instead of blue.
- Fixed CSS selector used for `input` and `textarea` grid sizes to properly apply the CSS (was `input > .span*` and now is `input.span*`).
### New features
- Horizontal dividers support added to nav lists
- Added basic version of badges
- Added visible/hidden classes for devices
- Added support for buttons in input-prepend/append component
- Added .navbar-fixed-bottom support
- Added .dropup support for dropdown menus to pop them upward instead of downward (this is automatically done for the newly added fixed bottom navbar).
- Added mixin for [new image replacement technique](http://www.zeldman.com/2012/03/01/replacing-the-9999px-hack-new-image-replacement/)
- Added pause on hover for the carousel
- Added tons of new variables for typography, buttons, forms, dropdowns, navbar, and more for the LESS pros out there. These variables have also been reflected on the Customize page.
- Added new horizontal description list variation
- Added `.disabled` class support to the pager component (also added a mention of this to the docs)
- Added `.well-large` and `.well-small` classes for extending the well component
For a full issue-by-issue rundown of the release, check out the now closed [2.0.2 milestone on GitHub](https://github.com/twbs/bootstrap/issues?sort=created&direction=desc&state=closed&page=1&milestone=9)
## v2.0.1 (February 17, 2012)
Overview of changes:
- Previously the docs called for use of `.control-label` in the examples, but the CSS didn't make clear use of it. This class is required for horizontal forms and has been reflected in the CSS.
- We've tried our best to improve rendering of buttons and icons across all browsers. Some issues remain; Firefox throws an `!important`on `line-height` for inputs, so that's the big one.
- We refined the label component style to move away from uppercase.
- Added the black button option, `.btn-inverse`.
- Added a mini button class, `.btn-mini`.
- We had to re-add the protocol, `http:` to the HTML5 schim because IE7-8 wouldn't recognize it, dropping some HTML5 support for those browsers and introducing major performance issues.
- Resolved some issues with responsive layouts where media queries would overlap at 768px and 980px.
- Rearranged Scaffolding docs page to split fixed and fluid grid systems.
- Tons of docs updates for typos and language changes.
For full list of changes, see the now closed [v2.0.1 milestone](https://github.com/twbs/bootstrap/issues?milestone=8&state=closed).
## v2.0.0 (January 28, 2012)
Complete rewrite of the library. For full details, head to the upgrading doc at http://twbs.github.com/bootstrap/upgrading.html.
## v1.4.0
### Key bug fixes and changes
- **Updated tables** to make no border the default and add options for condensed and bordered versions
- **Updated form states** to expand on error styles and provide warning and success variations
- New javascript plugin for button states
- Switched to strict mode for Javascript plugins
- Added more data attribute controls to our plugins
- Full list of 25+ issues fixed: https://github.com/twbs/bootstrap/issues?milestone=6&state=closed
## v1.3.0
### New features
- **Javascript plugins** for modals, alerts, dropdowns, scrollspy, tabs, tooltips, and popovers that work with jQuery and Ender
- **Massively updated docs** for both the main page and for the new javascript plugins
- **Inline labels** for marking inline content with key visual flags
- Media thumbnails
- Breadcrumbs
### Updated docs
- Added complete javascript page with detailed documentation for how to use plugins
- Three complete example pages of using Bootstrap, linked from main docs page with thumbnails
- Added section for compiling Less, for guidelines on how to recompile Bootstrap with Less
- Added section for customizing grid variables in Less to roll your own grid system
- Added section for code for using pre and code tags
- Added section for form field sizes that match grid column sizes
### Key bug fixes and changes
- Updated table styles to be just a tad bit more refined
- Added new form input sizes based on the Bootstrap grid system (meaning now you can do `input.span5` for a 280px-wide input)
- Removed `:focus` states from `:active` links in Firefox
- Fixed unqualified `.clearfix` in forms.less that added bottom margin to all containers
- Updated `.container()` mixing to be `.fixed-container()` to prevent conflicts when compiling
- Added focus states (either `box-shadow` or `outline` on `:focus`) to all buttons, links, and inputs
- No longer require `h3` in topbar, but still support for backwards compatibility
## v1.2.0
- **Dropdowns refactored** to be extensible (now work in ul.tabs)
- **Added HTML5 form support** by generalizing the form selectors (e.g., input instead of input[type=text|password])
- **Gradients back in IE**, but removed rounded corners in IE9 to prevent background bleed on buttons and alert messages
- **Simplified the grid CSS** by removing the static .span1-16 classes in favor of CSS-style regex for column styles in the grid
- **Added .one-third and .two-thirds columns** to the grid system
- Fixed bug in disabled buttons where they received :active styles
- Bug fixes
## v1.1.1
- **Redesigned alerts** to be more readable
- **Refactored buttons and alerts CSS** to be simpler
- Updated grid system to be more specific and not require .column or columns
- Improved on specificity of CSS selectors by removing unnecessary tag and parent selectors
- Miscellaneous updates to docs
- Bug fixes
## v1.1.0
- **Added support for IE7 and IE8**
- Added examples directory with first example usage of Bootstrap for a simple website
- Syntax fixes for gradients and color-stops
- Miscellaneous updates to docs
- Bug fixes
## v1.0.0
- **Initial release**
+75
Ver Arquivo
@@ -0,0 +1,75 @@
# Contributing to Bootstrap
Looking to contribute something to Bootstrap? **Here's how you can help.**
## Reporting issues
We only accept issues that are bug reports or feature requests. Bugs must be isolated and reproducible problems that we can fix within the Bootstrap core. Please read the following guidelines before opening any issue.
1. **Search for existing issues.** We get a lot of duplicate issues, and you'd help us out a lot by first checking if someone else has reported the same issue. Moreover, the issue may have already been resolved with a fix available.
2. **Create an isolated and reproducible test case.** Be sure the problem exists in Bootstrap's code with a [reduced test case](http://css-tricks.com/reduced-test-cases/) that should be included in each bug report.
3. **Include a live example.** Make use of jsFiddle or jsBin to share your isolated test cases.
4. **Share as much information as possible.** Include operating system and version, browser and version, version of Bootstrap, customized or vanilla build, etc. where appropriate. Also include steps to reproduce the bug.
## Key branches
- `master` is the latest, deployed version.
- `gh-pages` is the hosted docs (not to be used for pull requests).
- `*-wip` is the official work in progress branch for the next release.
## Notes on the repo
As of v2.0.0, Bootstrap's documentation is powered by Mustache templates and built via `make` before each commit and release. This was done to enable internationalization (translation) in a future release by uploading our strings to the [Twitter Translation Center](http://translate.twttr.com/). Any edits to the docs should be first done in the Mustache files and then recompiled into the HTML.
## Pull requests
- Try to submit pull requests against the latest `*-wip` branch for easier merging
- Any changes to the docs must be made to the Mustache templates, not just the compiled HTML pages
- CSS changes must be done in .less files first, never just the compiled files
- If modifying the .less files, always recompile and commit the compiled files bootstrap.css and bootstrap.min.css
- Try not to pollute your pull request with unintended changes--keep them simple and small
- Try to share which browsers your code has been tested in before submitting a pull request
## Coding standards: HTML
- Two spaces for indentation, never tabs
- Double quotes only, never single quotes
- Always use proper indentation
- Use tags and elements appropriate for an HTML5 doctype (e.g., self-closing tags)
## Coding standards: CSS
- Adhere to the [Recess CSS property order](http://markdotto.com/2011/11/29/css-property-order/)
- Multiple-line approach (one property and value per line)
- Always a space after a property's colon (.e.g, `display: block;` and not `display:block;`)
- End all lines with a semi-colon
- For multiple, comma-separated selectors, place each selector on it's own line
- Attribute selectors, like `input[type="text"]` should always wrap the attribute's value in double quotes, for consistency and safety (see this [blog post on unquoted attribute values](http://mathiasbynens.be/notes/unquoted-attribute-values) that can lead to XSS attacks).
## Coding standards: JS
- No semicolons
- Comma first
- 2 spaces (no tabs)
- strict mode
- "Attractive"
## License
By contributing your code, you agree to license your contribution under the terms of the APLv2: https://github.com/twbs/bootstrap/blob/master/LICENSE
+173 -10
Ver Arquivo
@@ -1,13 +1,176 @@
Copyright 2012 Twitter, Inc.
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
http://www.apache.org/licenses/LICENSE-2.0
1. Definitions.
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
+90 -25
Ver Arquivo
@@ -2,49 +2,114 @@ BOOTSTRAP = ./docs/assets/css/bootstrap.css
BOOTSTRAP_LESS = ./less/bootstrap.less
BOOTSTRAP_RESPONSIVE = ./docs/assets/css/bootstrap-responsive.css
BOOTSTRAP_RESPONSIVE_LESS = ./less/responsive.less
LESS_COMPRESSOR ?= `which lessc`
WATCHR ?= `which watchr`
DATE=$(shell date +%I:%M%p)
CHECK=\033[32m✔\033[39m
HR=\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#\#
#
# BUILD DOCS
#
docs: bootstrap
rm docs/assets/bootstrap.zip
zip -r docs/assets/bootstrap.zip bootstrap
build:
@echo "\n${HR}"
@echo "Building Bootstrap..."
@echo "${HR}\n"
@./node_modules/.bin/jshint js/*.js --config js/.jshintrc
@./node_modules/.bin/jshint js/tests/unit/*.js --config js/.jshintrc
@echo "Running JSHint on javascript... ${CHECK} Done"
@./node_modules/.bin/recess --compile ${BOOTSTRAP_LESS} > ${BOOTSTRAP}
@./node_modules/.bin/recess --compile ${BOOTSTRAP_RESPONSIVE_LESS} > ${BOOTSTRAP_RESPONSIVE}
@echo "Compiling LESS with Recess... ${CHECK} Done"
@node docs/build
@cp img/* docs/assets/img/
@cp js/*.js docs/assets/js/
@cp js/tests/vendor/jquery.js docs/assets/js/
@echo "Compiling documentation... ${CHECK} Done"
@cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js js/bootstrap-affix.js > docs/assets/js/bootstrap.js
@./node_modules/.bin/uglifyjs -nc docs/assets/js/bootstrap.js > docs/assets/js/bootstrap.min.tmp.js
@echo "/**\n* Bootstrap.js v2.3.2 by @fat & @mdo\n* Copyright 2013 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > docs/assets/js/copyright.js
@cat docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js > docs/assets/js/bootstrap.min.js
@rm docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js
@echo "Compiling and minifying javascript... ${CHECK} Done"
@echo "\n${HR}"
@echo "Bootstrap successfully built at ${DATE}."
@echo "${HR}\n"
@echo "Thanks for using Bootstrap,"
@echo "<3 @mdo and @fat\n"
#
# RUN JSHINT & QUNIT TESTS IN PHANTOMJS
#
test:
./node_modules/.bin/jshint js/*.js --config js/.jshintrc
./node_modules/.bin/jshint js/tests/unit/*.js --config js/.jshintrc
node js/tests/server.js &
phantomjs js/tests/phantom.js "http://localhost:3000/js/tests"
kill -9 `cat js/tests/pid.txt`
rm js/tests/pid.txt
#
# CLEANS THE ROOT DIRECTORY OF PRIOR BUILDS
#
clean:
rm -r bootstrap
lessc ${BOOTSTRAP_LESS} > ${BOOTSTRAP}
lessc ${BOOTSTRAP_RESPONSIVE_LESS} > ${BOOTSTRAP_RESPONSIVE}
node docs/build
cp img/* docs/assets/img/
cp js/*.js docs/assets/js/
cp js/tests/vendor/jquery.js docs/assets/js/
#
# BUILD SIMPLE BOOTSTRAP DIRECTORY
# lessc & uglifyjs are required
# recess & uglifyjs are required
#
bootstrap:
mkdir -p bootstrap/img
mkdir -p bootstrap/css
bootstrap: bootstrap-img bootstrap-css bootstrap-js
#
# JS COMPILE
#
bootstrap-js: bootstrap/js/*.js
bootstrap/js/*.js: js/*.js
mkdir -p bootstrap/js
cp img/* bootstrap/img/
lessc ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.css
lessc --compress ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.min.css
lessc ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.css
lessc --compress ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.min.css
cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js > bootstrap/js/bootstrap.js
uglifyjs -nc bootstrap/js/bootstrap.js > bootstrap/js/bootstrap.min.tmp.js
echo "/**\n* Bootstrap.js by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > bootstrap/js/copyright.js
cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js js/bootstrap-affix.js > bootstrap/js/bootstrap.js
./node_modules/.bin/uglifyjs -nc bootstrap/js/bootstrap.js > bootstrap/js/bootstrap.min.tmp.js
echo "/*!\n* Bootstrap.js by @fat & @mdo\n* Copyright 2013 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > bootstrap/js/copyright.js
cat bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js > bootstrap/js/bootstrap.min.js
rm bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js
#
# CSS COMPLILE
#
bootstrap-css: bootstrap/css/*.css
bootstrap/css/*.css: less/*.less
mkdir -p bootstrap/css
./node_modules/.bin/recess --compile ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.css
./node_modules/.bin/recess --compress ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.min.css
./node_modules/.bin/recess --compile ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.css
./node_modules/.bin/recess --compress ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.min.css
#
# IMAGES
#
bootstrap-img: bootstrap/img/*
bootstrap/img/*: img/*
mkdir -p bootstrap/img
cp img/* bootstrap/img/
#
# MAKE FOR GH-PAGES 4 FAT & MDO ONLY (O_O )
#
gh-pages: docs
gh-pages: bootstrap docs
rm -f docs/assets/bootstrap.zip
zip -r docs/assets/bootstrap.zip bootstrap
rm -r bootstrap
rm -f ../bootstrap-gh-pages/assets/bootstrap.zip
node docs/build production
cp -r docs/* ../bootstrap-gh-pages
@@ -58,4 +123,4 @@ watch:
watchr -e "watch('less/.*\.less') { system 'make' }"
.PHONY: docs watch gh-pages
.PHONY: docs watch gh-pages bootstrap-img bootstrap-css bootstrap-js
+52 -54
Ver Arquivo
@@ -1,104 +1,102 @@
[Twitter Bootstrap](http://twitter.github.com/bootstrap)
=================
# [Bootstrap v2.3.2](http://twbs.github.com/bootstrap) [![Build Status](https://secure.travis-ci.org/twbs/bootstrap.png)](http://travis-ci.org/twbs/bootstrap)
Bootstrap provides simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions. In other words, it's a front-end toolkit for faster, more beautiful web development. It's created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat) at Twitter.
Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat).
To get started, checkout http://twitter.github.com/bootstrap!
To get started, checkout [http://getbootstrap.com](http://getbootstrap.com)!
Quick start
-----------
## Quick start
Clone the repo, `git clone git@github.com:twitter/bootstrap.git`, or [download the latest release](https://github.com/twitter/bootstrap/zipball/master).
Three quick start options are available:
* [Download the latest release](https://github.com/twbs/bootstrap/zipball/master).
* Clone the repo: `git clone git://github.com/twbs/bootstrap.git`.
* Install with Twitter's [Bower](http://bower.io): `bower install bootstrap`.
Versioning
----------
## Versioning
For transparency and insight into our release cycle, and for striving to maintain backward compatibility, Bootstrap will be maintained under the Semantic Versioning guidelines as much as possible.
Releases will be numbered with the follow format:
Releases will be numbered with the following format:
`<major>.<minor>.<patch>`
And constructed with the following guidelines:
* Breaking backward compatibility bumps the major
* New additions without breaking backward compatibility bumps the minor
* Bug fixes and misc changes bump the patch
* Breaking backward compatibility bumps the major (and resets the minor and patch)
* New additions without breaking backward compatibility bumps the minor (and resets the patch)
* Bug fixes and misc changes bumps the patch
For more information on SemVer, please visit http://semver.org/.
For more information on SemVer, please visit [http://semver.org/](http://semver.org/).
Bug tracker
-----------
## Bug tracker
Have a bug? Please create an issue here on GitHub!
https://github.com/twitter/bootstrap/issues
Have a bug or a feature request? [Please open a new issue](https://github.com/twbs/bootstrap/issues). Before opening any issue, please search for existing issues and read the [Issue Guidelines](https://github.com/necolas/issue-guidelines), written by [Nicolas Gallagher](https://github.com/necolas/).
Twitter account
---------------
## Community
Keep up to date on announcements and more by following Bootstrap on Twitter, [@TwBootstrap](http://twitter.com/TwBootstrap).
Keep track of development and community news.
* Follow [@twbootstrap on Twitter](http://twitter.com/twbootstrap).
* Read and subscribe to the [The Official Twitter Bootstrap Blog](http://blog.getbootstrap.com).
* Have a question that's not a feature request or bug report? [Ask on the mailing list.](http://groups.google.com/group/twitter-bootstrap)
* Chat with fellow Bootstrappers in IRC. On the `irc.freenode.net` server, in the `##twitter-bootstrap` channel.
Mailing list
------------
## Compiling CSS and JavaScript
Have a question? Ask on our mailing list!
Bootstrap includes a [makefile](Makefile) with convenient methods for working with the framework. Before getting started, be sure to install [the necessary local dependencies](package.json):
twitter-bootstrap@googlegroups.com
```
$ npm install
```
http://groups.google.com/group/twitter-bootstrap
When completed, you'll be able to run the various make commands provided:
#### build - `make`
Runs the recess compiler to rebuild the `/less` files and compiles the docs. Requires recess and uglify-js.
#### test - `make test`
Runs jshint and qunit tests headlessly in [phantomjs](http://code.google.com/p/phantomjs/) (used for ci). Depends on having phantomjs installed.
IRC
---
Server: irc.freenode.net
Channel: ##twitter-bootstrap (the double ## is not a typo)
Developers
----------
We have included a makefile with convenience methods for working with the Bootstrap library.
+ **build** - `make`
Runs the LESS compiler to rebuild the `/less` files and compiles the docs pages. Requires lessc and uglify-js. <a href="http://twitter.github.com/bootstrap/less.html#compiling">Read more in our docs &raquo;</a>
+ **watch** - `make watch`
#### watch - `make watch`
This is a convenience method for watching just Less files and automatically building them whenever you save. Requires the Watchr gem.
Should you encounter problems with installing dependencies or running the makefile commands, be sure to first uninstall any previous versions (global and local) you may have installed, and then rerun `npm install`.
Authors
-------
## Contributing
Please submit all pull requests against *-wip branches. If your pull request contains JavaScript patches or features, you must include relevant unit tests. All HTML and CSS should conform to the [Code Guide](http://github.com/mdo/code-guide), maintained by [Mark Otto](http://github.com/mdo).
Thanks!
## Authors
**Mark Otto**
+ http://twitter.com/mdo
+ http://github.com/markdotto
+ [http://twitter.com/mdo](http://twitter.com/mdo)
+ [http://github.com/mdo](http://github.com/mdo)
**Jacob Thornton**
+ http://twitter.com/fat
+ http://github.com/fat
+ [http://twitter.com/fat](http://twitter.com/fat)
+ [http://github.com/fat](http://github.com/fat)
Copyright and license
---------------------
## Copyright and license
Copyright 2012 Twitter, Inc.
@@ -106,7 +104,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
you may not use this work except in compliance with the License.
You may obtain a copy of the License in the LICENSE file, or at:
http://www.apache.org/licenses/LICENSE-2.0
[http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
+8
Ver Arquivo
@@ -0,0 +1,8 @@
{
"name": "bootstrap",
"version": "2.3.2",
"main": ["./docs/assets/js/bootstrap.js", "./docs/assets/css/bootstrap.css"],
"dependencies": {
"jquery": ">=1.8.0 <2.1.0"
}
}
+9
Ver Arquivo
@@ -0,0 +1,9 @@
{
"name": "twbs/bootstrap"
, "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development."
, "keywords": ["bootstrap", "css"]
, "homepage": "http://twbs.github.com/bootstrap/"
, "author": "Twitter Inc."
, "license": "Apache-2.0"
}
Arquivo binário não exibido.
Diferenças do arquivo suprimidas por serem muito extensas Carregar Diff
+3650 -1473
Ver Arquivo
Diferenças do arquivo suprimidas por serem muito extensas Carregar Diff
+647 -425
Ver Arquivo
Diferenças do arquivo suprimidas por serem muito extensas Carregar Diff
Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 5.9 KiB

Depois

Largura:  |  Altura:  |  Tamanho: 11 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 16 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 2.2 KiB

Depois

Largura:  |  Altura:  |  Tamanho: 3.9 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 3.1 KiB

Depois

Largura:  |  Altura:  |  Tamanho: 5.5 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 1.1 KiB

Depois

Largura:  |  Altura:  |  Tamanho: 1.1 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 2.6 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 3.0 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 30 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 128 KiB

Depois

Largura:  |  Altura:  |  Tamanho: 122 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 82 KiB

Depois

Largura:  |  Altura:  |  Tamanho: 79 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 50 KiB

Depois

Largura:  |  Altura:  |  Tamanho: 48 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 19 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 11 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 6.3 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 10 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 30 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 61 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 133 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 71 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 75 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 49 KiB

Depois

Largura:  |  Altura:  |  Tamanho: 47 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 53 KiB

Depois

Largura:  |  Altura:  |  Tamanho: 49 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 332 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 25 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 204 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 22 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 133 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 115 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 131 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 22 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 7.0 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 35 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 30 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 54 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 172 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 205 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 81 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 134 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 134 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 398 B

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 4.3 KiB

Depois

Largura:  |  Altura:  |  Tamanho: 8.6 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 4.3 KiB

Depois

Largura:  |  Altura:  |  Tamanho: 12 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 316 B

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 305 B

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 213 B

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 345 B

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 117 B

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 172 B

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 301 B

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 292 B

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 405 B

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 84 B

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 370 B

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 312 B

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 452 B

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 264 B

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 13 KiB

Depois

Largura:  |  Altura:  |  Tamanho: 12 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 1.2 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 1.1 KiB

Depois

Largura:  |  Altura:  |  Tamanho: 1008 B

+1 -1
Ver Arquivo
@@ -17,7 +17,7 @@ To target a specific plugin, just include the plugins name as a namespace along
---
### PROGRAMATIC API
### PROGRAMMATIC API
We also believe you should be able to use all plugins provided by Bootstrap purely through the JS API.
+21 -45
Ver Arquivo
@@ -6,11 +6,23 @@
$(function(){
var $window = $(window)
// Disable certain links in docs
$('section [href^=#]').click(function (e) {
e.preventDefault()
})
// side bar
setTimeout(function () {
$('.bs-docs-sidenav').affix({
offset: {
top: function () { return $window.width() <= 980 ? 290 : 210 }
, bottom: 270
}
})
}, 100)
// make code pretty
window.prettyPrint && prettyPrint()
@@ -21,59 +33,24 @@
$(this).parents('.add-on')[method]('active')
})
// position static twipsies for components page
if ($(".twipsies a").length) {
$(window).on('load resize', function () {
$(".twipsies a").each(function () {
$(this)
.tooltip({
placement: $(this).attr('title')
, trigger: 'manual'
})
.tooltip('show')
})
})
}
// add tipsies to grid for scaffolding
if ($('#grid-system').length) {
$('#grid-system').tooltip({
selector: '.show-grid > div'
if ($('#gridSystem').length) {
$('#gridSystem').tooltip({
selector: '.show-grid > [class*="span"]'
, title: function () { return $(this).width() + 'px' }
})
}
// fix sub nav on scroll
var $win = $(window)
, $nav = $('.subnav')
, navTop = $('.subnav').length && $('.subnav').offset().top - 40
, isFixed = 0
processScroll()
$win.on('scroll', processScroll)
function processScroll() {
var i, scrollTop = $win.scrollTop()
if (scrollTop >= navTop && !isFixed) {
isFixed = 1
$nav.addClass('subnav-fixed')
} else if (scrollTop <= navTop && isFixed) {
isFixed = 0
$nav.removeClass('subnav-fixed')
}
}
// tooltip demo
$('.tooltip-demo.well').tooltip({
selector: "a[rel=tooltip]"
$('.tooltip-demo').tooltip({
selector: "a[data-toggle=tooltip]"
})
$('.tooltip-test').tooltip()
$('.popover-test').popover()
// popover demo
$("a[rel=popover]")
$("a[data-toggle=popover]")
.popover()
.click(function(e) {
e.preventDefault()
@@ -114,7 +91,7 @@
})
// request built javascript
$('.download-btn').on('click', function () {
$('.download-btn .btn').on('click', function () {
var css = $("#components.download input:checked")
.map(function () { return this.value })
@@ -132,7 +109,7 @@
$.ajax({
type: 'POST'
, url: 'http://bootstrap.herokuapp.com'
, url: /\?dev/.test(window.location) ? 'http://localhost:3000' : 'http://bootstrap.herokuapp.com'
, dataType: 'jsonpi'
, params: {
js: js
@@ -142,7 +119,6 @@
}
})
})
})
// Modified from the original jsonpi https://github.com/benvinegar/jquery-jsonpi
@@ -177,4 +153,4 @@ $.ajaxTransport('jsonpi', function(opts, originalOptions, jqXHR) {
}
})
}(window.jQuery)
}(window.jQuery)
+117
Ver Arquivo
@@ -0,0 +1,117 @@
/* ==========================================================
* bootstrap-affix.js v2.3.2
* http://twbs.github.com/bootstrap/javascript.html#affix
* ==========================================================
* Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ========================================================== */
!function ($) {
"use strict"; // jshint ;_;
/* AFFIX CLASS DEFINITION
* ====================== */
var Affix = function (element, options) {
this.options = $.extend({}, $.fn.affix.defaults, options)
this.$window = $(window)
.on('scroll.affix.data-api', $.proxy(this.checkPosition, this))
.on('click.affix.data-api', $.proxy(function () { setTimeout($.proxy(this.checkPosition, this), 1) }, this))
this.$element = $(element)
this.checkPosition()
}
Affix.prototype.checkPosition = function () {
if (!this.$element.is(':visible')) return
var scrollHeight = $(document).height()
, scrollTop = this.$window.scrollTop()
, position = this.$element.offset()
, offset = this.options.offset
, offsetBottom = offset.bottom
, offsetTop = offset.top
, reset = 'affix affix-top affix-bottom'
, affix
if (typeof offset != 'object') offsetBottom = offsetTop = offset
if (typeof offsetTop == 'function') offsetTop = offset.top()
if (typeof offsetBottom == 'function') offsetBottom = offset.bottom()
affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ?
false : offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ?
'bottom' : offsetTop != null && scrollTop <= offsetTop ?
'top' : false
if (this.affixed === affix) return
this.affixed = affix
this.unpin = affix == 'bottom' ? position.top - scrollTop : null
this.$element.removeClass(reset).addClass('affix' + (affix ? '-' + affix : ''))
}
/* AFFIX PLUGIN DEFINITION
* ======================= */
var old = $.fn.affix
$.fn.affix = function (option) {
return this.each(function () {
var $this = $(this)
, data = $this.data('affix')
, options = typeof option == 'object' && option
if (!data) $this.data('affix', (data = new Affix(this, options)))
if (typeof option == 'string') data[option]()
})
}
$.fn.affix.Constructor = Affix
$.fn.affix.defaults = {
offset: 0
}
/* AFFIX NO CONFLICT
* ================= */
$.fn.affix.noConflict = function () {
$.fn.affix = old
return this
}
/* AFFIX DATA-API
* ============== */
$(window).on('load', function () {
$('[data-spy="affix"]').each(function () {
var $spy = $(this)
, data = $spy.data()
data.offset = data.offset || {}
data.offsetBottom && (data.offset.bottom = data.offsetBottom)
data.offsetTop && (data.offset.top = data.offsetTop)
$spy.affix(data)
})
})
}(window.jQuery);
+49 -44
Ver Arquivo
@@ -1,8 +1,8 @@
/* ==========================================================
* bootstrap-alert.js v2.0.2
* http://twitter.github.com/bootstrap/javascript.html#alerts
* bootstrap-alert.js v2.3.2
* http://twbs.github.com/bootstrap/javascript.html#alerts
* ==========================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,61 +18,59 @@
* ========================================================== */
!function( $ ){
!function ($) {
"use strict"; // jshint ;_;
"use strict"
/* ALERT CLASS DEFINITION
* ====================== */
var dismiss = '[data-dismiss="alert"]'
, Alert = function ( el ) {
, Alert = function (el) {
$(el).on('click', dismiss, this.close)
}
Alert.prototype = {
Alert.prototype.close = function (e) {
var $this = $(this)
, selector = $this.attr('data-target')
, $parent
constructor: Alert
, close: function ( e ) {
var $this = $(this)
, selector = $this.attr('data-target')
, $parent
if (!selector) {
selector = $this.attr('href')
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
}
$parent = $(selector)
$parent.trigger('close')
e && e.preventDefault()
$parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
$parent
.trigger('close')
.removeClass('in')
function removeElement() {
$parent
.trigger('closed')
.remove()
}
$.support.transition && $parent.hasClass('fade') ?
$parent.on($.support.transition.end, removeElement) :
removeElement()
if (!selector) {
selector = $this.attr('href')
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
}
$parent = $(selector)
e && e.preventDefault()
$parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
$parent.trigger(e = $.Event('close'))
if (e.isDefaultPrevented()) return
$parent.removeClass('in')
function removeElement() {
$parent
.trigger('closed')
.remove()
}
$.support.transition && $parent.hasClass('fade') ?
$parent.on($.support.transition.end, removeElement) :
removeElement()
}
/* ALERT PLUGIN DEFINITION
* ======================= */
$.fn.alert = function ( option ) {
var old = $.fn.alert
$.fn.alert = function (option) {
return this.each(function () {
var $this = $(this)
, data = $this.data('alert')
@@ -84,11 +82,18 @@
$.fn.alert.Constructor = Alert
/* ALERT NO CONFLICT
* ================= */
$.fn.alert.noConflict = function () {
$.fn.alert = old
return this
}
/* ALERT DATA-API
* ============== */
$(function () {
$('body').on('click.alert.data-api', dismiss, Alert.prototype.close)
})
$(document).on('click.alert.data-api', dismiss, Alert.prototype.close)
}( window.jQuery );
}(window.jQuery);
+46 -41
Ver Arquivo
@@ -1,8 +1,8 @@
/* ============================================================
* bootstrap-button.js v2.0.2
* http://twitter.github.com/bootstrap/javascript.html#buttons
* bootstrap-button.js v2.3.2
* http://twbs.github.com/bootstrap/javascript.html#buttons
* ============================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,58 +17,56 @@
* limitations under the License.
* ============================================================ */
!function( $ ){
"use strict"
!function ($) {
"use strict"; // jshint ;_;
/* BUTTON PUBLIC CLASS DEFINITION
* ============================== */
var Button = function ( element, options ) {
var Button = function (element, options) {
this.$element = $(element)
this.options = $.extend({}, $.fn.button.defaults, options)
}
Button.prototype = {
Button.prototype.setState = function (state) {
var d = 'disabled'
, $el = this.$element
, data = $el.data()
, val = $el.is('input') ? 'val' : 'html'
constructor: Button
state = state + 'Text'
data.resetText || $el.data('resetText', $el[val]())
, setState: function ( state ) {
var d = 'disabled'
, $el = this.$element
, data = $el.data()
, val = $el.is('input') ? 'val' : 'html'
$el[val](data[state] || this.options[state])
state = state + 'Text'
data.resetText || $el.data('resetText', $el[val]())
// push to event loop to allow forms to submit
setTimeout(function () {
state == 'loadingText' ?
$el.addClass(d).attr(d, d) :
$el.removeClass(d).removeAttr(d)
}, 0)
}
$el[val](data[state] || this.options[state])
Button.prototype.toggle = function () {
var $parent = this.$element.closest('[data-toggle="buttons-radio"]')
// push to event loop to allow forms to submit
setTimeout(function () {
state == 'loadingText' ?
$el.addClass(d).attr(d, d) :
$el.removeClass(d).removeAttr(d)
}, 0)
}
, toggle: function () {
var $parent = this.$element.parent('[data-toggle="buttons-radio"]')
$parent && $parent
.find('.active')
.removeClass('active')
this.$element.toggleClass('active')
}
$parent && $parent
.find('.active')
.removeClass('active')
this.$element.toggleClass('active')
}
/* BUTTON PLUGIN DEFINITION
* ======================== */
$.fn.button = function ( option ) {
var old = $.fn.button
$.fn.button = function (option) {
return this.each(function () {
var $this = $(this)
, data = $this.data('button')
@@ -86,15 +84,22 @@
$.fn.button.Constructor = Button
/* BUTTON NO CONFLICT
* ================== */
$.fn.button.noConflict = function () {
$.fn.button = old
return this
}
/* BUTTON DATA-API
* =============== */
$(function () {
$('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) {
var $btn = $(e.target)
if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
$btn.button('toggle')
})
$(document).on('click.button.data-api', '[data-toggle^=button]', function (e) {
var $btn = $(e.target)
if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
$btn.button('toggle')
})
}( window.jQuery );
}(window.jQuery);
+84 -38
Ver Arquivo
@@ -1,8 +1,8 @@
/* ==========================================================
* bootstrap-carousel.js v2.0.2
* http://twitter.github.com/bootstrap/javascript.html#carousel
* bootstrap-carousel.js v2.3.2
* http://twbs.github.com/bootstrap/javascript.html#carousel
* ==========================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,17 +18,18 @@
* ========================================================== */
!function( $ ){
!function ($) {
"use strict"; // jshint ;_;
"use strict"
/* CAROUSEL CLASS DEFINITION
* ========================= */
var Carousel = function (element, options) {
this.$element = $(element)
this.options = $.extend({}, $.fn.carousel.defaults, options)
this.options.slide && this.slide(this.options.slide)
this.$indicators = this.$element.find('.carousel-indicators')
this.options = options
this.options.pause == 'hover' && this.$element
.on('mouseenter', $.proxy(this.pause, this))
.on('mouseleave', $.proxy(this.cycle, this))
@@ -36,18 +37,26 @@
Carousel.prototype = {
cycle: function () {
this.interval = setInterval($.proxy(this.next, this), this.options.interval)
cycle: function (e) {
if (!e) this.paused = false
if (this.interval) clearInterval(this.interval);
this.options.interval
&& !this.paused
&& (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
return this
}
, getActiveIndex: function () {
this.$active = this.$element.find('.item.active')
this.$items = this.$active.parent().children()
return this.$items.index(this.$active)
}
, to: function (pos) {
var $active = this.$element.find('.active')
, children = $active.parent().children()
, activePos = children.index($active)
var activeIndex = this.getActiveIndex()
, that = this
if (pos > (children.length - 1) || pos < 0) return
if (pos > (this.$items.length - 1) || pos < 0) return
if (this.sliding) {
return this.$element.one('slid', function () {
@@ -55,14 +64,19 @@
})
}
if (activePos == pos) {
if (activeIndex == pos) {
return this.pause().cycle()
}
return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos]))
return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos]))
}
, pause: function () {
, pause: function (e) {
if (!e) this.paused = true
if (this.$element.find('.next, .prev').length && $.support.transition.end) {
this.$element.trigger($.support.transition.end)
this.cycle(true)
}
clearInterval(this.interval)
this.interval = null
return this
@@ -79,12 +93,13 @@
}
, slide: function (type, next) {
var $active = this.$element.find('.active')
var $active = this.$element.find('.item.active')
, $next = next || $active[type]()
, isCycling = this.interval
, direction = type == 'next' ? 'left' : 'right'
, fallback = type == 'next' ? 'first' : 'last'
, that = this
, e
this.sliding = true
@@ -92,26 +107,41 @@
$next = $next.length ? $next : this.$element.find('.item')[fallback]()
e = $.Event('slide', {
relatedTarget: $next[0]
, direction: direction
})
if ($next.hasClass('active')) return
if (!$.support.transition && this.$element.hasClass('slide')) {
this.$element.trigger('slide')
$active.removeClass('active')
$next.addClass('active')
this.sliding = false
this.$element.trigger('slid')
} else {
if (this.$indicators.length) {
this.$indicators.find('.active').removeClass('active')
this.$element.one('slid', function () {
var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()])
$nextIndicator && $nextIndicator.addClass('active')
})
}
if ($.support.transition && this.$element.hasClass('slide')) {
this.$element.trigger(e)
if (e.isDefaultPrevented()) return
$next.addClass(type)
$next[0].offsetWidth // force reflow
$active.addClass(direction)
$next.addClass(direction)
this.$element.trigger('slide')
this.$element.one($.support.transition.end, function () {
$next.removeClass([type, direction].join(' ')).addClass('active')
$active.removeClass(['active', direction].join(' '))
that.sliding = false
setTimeout(function () { that.$element.trigger('slid') }, 0)
})
} else {
this.$element.trigger(e)
if (e.isDefaultPrevented()) return
$active.removeClass('active')
$next.addClass('active')
this.sliding = false
this.$element.trigger('slid')
}
isCycling && this.cycle()
@@ -125,15 +155,18 @@
/* CAROUSEL PLUGIN DEFINITION
* ========================== */
$.fn.carousel = function ( option ) {
var old = $.fn.carousel
$.fn.carousel = function (option) {
return this.each(function () {
var $this = $(this)
, data = $this.data('carousel')
, options = typeof option == 'object' && option
, options = $.extend({}, $.fn.carousel.defaults, typeof option == 'object' && option)
, action = typeof option == 'string' ? option : options.slide
if (!data) $this.data('carousel', (data = new Carousel(this, options)))
if (typeof option == 'number') data.to(option)
else if (typeof option == 'string' || (option = options.slide)) data[option]()
else data.cycle()
else if (action) data[action]()
else if (options.interval) data.pause().cycle()
})
}
@@ -145,17 +178,30 @@
$.fn.carousel.Constructor = Carousel
/* CAROUSEL NO CONFLICT
* ==================== */
$.fn.carousel.noConflict = function () {
$.fn.carousel = old
return this
}
/* CAROUSEL DATA-API
* ================= */
$(function () {
$('body').on('click.carousel.data-api', '[data-slide]', function ( e ) {
var $this = $(this), href
, $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
, options = !$target.data('modal') && $.extend({}, $target.data(), $this.data())
$target.carousel(options)
e.preventDefault()
})
$(document).on('click.carousel.data-api', '[data-slide], [data-slide-to]', function (e) {
var $this = $(this), href
, $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
, options = $.extend({}, $target.data(), $this.data())
, slideIndex
$target.carousel(options)
if (slideIndex = $this.attr('data-slide-to')) {
$target.data('carousel').pause().to(slideIndex).cycle()
}
e.preventDefault()
})
}( window.jQuery );
}(window.jQuery);
+70 -41
Ver Arquivo
@@ -1,8 +1,8 @@
/* =============================================================
* bootstrap-collapse.js v2.0.2
* http://twitter.github.com/bootstrap/javascript.html#collapse
* bootstrap-collapse.js v2.3.2
* http://twbs.github.com/bootstrap/javascript.html#collapse
* =============================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,16 +17,21 @@
* limitations under the License.
* ============================================================ */
!function( $ ){
"use strict"
!function ($) {
var Collapse = function ( element, options ) {
this.$element = $(element)
"use strict"; // jshint ;_;
/* COLLAPSE PUBLIC CLASS DEFINITION
* ================================ */
var Collapse = function (element, options) {
this.$element = $(element)
this.options = $.extend({}, $.fn.collapse.defaults, options)
if (this.options["parent"]) {
this.$parent = $(this.options["parent"])
if (this.options.parent) {
this.$parent = $(this.options.parent)
}
this.options.toggle && this.toggle()
@@ -42,31 +47,39 @@
}
, show: function () {
var dimension = this.dimension()
, scroll = $.camelCase(['scroll', dimension].join('-'))
, actives = this.$parent && this.$parent.find('.in')
var dimension
, scroll
, actives
, hasData
if (this.transitioning || this.$element.hasClass('in')) return
dimension = this.dimension()
scroll = $.camelCase(['scroll', dimension].join('-'))
actives = this.$parent && this.$parent.find('> .accordion-group > .in')
if (actives && actives.length) {
hasData = actives.data('collapse')
if (hasData && hasData.transitioning) return
actives.collapse('hide')
hasData || actives.data('collapse', null)
}
this.$element[dimension](0)
this.transition('addClass', 'show', 'shown')
this.$element[dimension](this.$element[0][scroll])
this.transition('addClass', $.Event('show'), 'shown')
$.support.transition && this.$element[dimension](this.$element[0][scroll])
}
, hide: function () {
var dimension = this.dimension()
var dimension
if (this.transitioning || !this.$element.hasClass('in')) return
dimension = this.dimension()
this.reset(this.$element[dimension]())
this.transition('removeClass', 'hide', 'hidden')
this.transition('removeClass', $.Event('hide'), 'hidden')
this.$element[dimension](0)
}
, reset: function ( size ) {
, reset: function (size) {
var dimension = this.dimension()
this.$element
@@ -74,41 +87,49 @@
[dimension](size || 'auto')
[0].offsetWidth
this.$element[size ? 'addClass' : 'removeClass']('collapse')
this.$element[size !== null ? 'addClass' : 'removeClass']('collapse')
return this
}
, transition: function ( method, startEvent, completeEvent ) {
, transition: function (method, startEvent, completeEvent) {
var that = this
, complete = function () {
if (startEvent == 'show') that.reset()
if (startEvent.type == 'show') that.reset()
that.transitioning = 0
that.$element.trigger(completeEvent)
}
this.$element
.trigger(startEvent)
[method]('in')
this.$element.trigger(startEvent)
if (startEvent.isDefaultPrevented()) return
this.transitioning = 1
this.$element[method]('in')
$.support.transition && this.$element.hasClass('collapse') ?
this.$element.one($.support.transition.end, complete) :
complete()
}
}
, toggle: function () {
this[this.$element.hasClass('in') ? 'hide' : 'show']()
}
}
}
/* COLLAPSIBLE PLUGIN DEFINITION
* ============================== */
$.fn.collapse = function ( option ) {
/* COLLAPSE PLUGIN DEFINITION
* ========================== */
var old = $.fn.collapse
$.fn.collapse = function (option) {
return this.each(function () {
var $this = $(this)
, data = $this.data('collapse')
, options = typeof option == 'object' && option
, options = $.extend({}, $.fn.collapse.defaults, $this.data(), typeof option == 'object' && option)
if (!data) $this.data('collapse', (data = new Collapse(this, options)))
if (typeof option == 'string') data[option]()
})
@@ -121,18 +142,26 @@
$.fn.collapse.Constructor = Collapse
/* COLLAPSIBLE DATA-API
/* COLLAPSE NO CONFLICT
* ==================== */
$(function () {
$('body').on('click.collapse.data-api', '[data-toggle=collapse]', function ( e ) {
var $this = $(this), href
, target = $this.attr('data-target')
|| e.preventDefault()
|| (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
, option = $(target).data('collapse') ? 'toggle' : $this.data()
$(target).collapse(option)
})
$.fn.collapse.noConflict = function () {
$.fn.collapse = old
return this
}
/* COLLAPSE DATA-API
* ================= */
$(document).on('click.collapse.data-api', '[data-toggle=collapse]', function (e) {
var $this = $(this), href
, target = $this.attr('data-target')
|| e.preventDefault()
|| (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
, option = $(target).data('collapse') ? 'toggle' : $this.data()
$this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
$(target).collapse(option)
})
}( window.jQuery );
}(window.jQuery);
+100 -23
Ver Arquivo
@@ -1,8 +1,8 @@
/* ============================================================
* bootstrap-dropdown.js v2.0.2
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
* bootstrap-dropdown.js v2.3.2
* http://twbs.github.com/bootstrap/javascript.html#dropdowns
* ============================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,15 +18,16 @@
* ============================================================ */
!function( $ ){
!function ($) {
"use strict"; // jshint ;_;
"use strict"
/* DROPDOWN CLASS DEFINITION
* ========================= */
var toggle = '[data-toggle="dropdown"]'
, Dropdown = function ( element ) {
var toggle = '[data-toggle=dropdown]'
, Dropdown = function (element) {
var $el = $(element).on('click.dropdown.data-api', this.toggle)
$('html').on('click.dropdown.data-api', function () {
$el.parent().removeClass('open')
@@ -37,39 +38,105 @@
constructor: Dropdown
, toggle: function ( e ) {
, toggle: function (e) {
var $this = $(this)
, selector = $this.attr('data-target')
, $parent
, isActive
if (!selector) {
selector = $this.attr('href')
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
}
if ($this.is('.disabled, :disabled')) return
$parent = $(selector)
$parent.length || ($parent = $this.parent())
$parent = getParent($this)
isActive = $parent.hasClass('open')
clearMenus()
!isActive && $parent.toggleClass('open')
if (!isActive) {
if ('ontouchstart' in document.documentElement) {
// if mobile we we use a backdrop because click events don't delegate
$('<div class="dropdown-backdrop"/>').insertBefore($(this)).on('click', clearMenus)
}
$parent.toggleClass('open')
}
$this.focus()
return false
}
, keydown: function (e) {
var $this
, $items
, $active
, $parent
, isActive
, index
if (!/(38|40|27)/.test(e.keyCode)) return
$this = $(this)
e.preventDefault()
e.stopPropagation()
if ($this.is('.disabled, :disabled')) return
$parent = getParent($this)
isActive = $parent.hasClass('open')
if (!isActive || (isActive && e.keyCode == 27)) {
if (e.which == 27) $parent.find(toggle).focus()
return $this.click()
}
$items = $('[role=menu] li:not(.divider):visible a', $parent)
if (!$items.length) return
index = $items.index($items.filter(':focus'))
if (e.keyCode == 38 && index > 0) index-- // up
if (e.keyCode == 40 && index < $items.length - 1) index++ // down
if (!~index) index = 0
$items
.eq(index)
.focus()
}
}
function clearMenus() {
$(toggle).parent().removeClass('open')
$('.dropdown-backdrop').remove()
$(toggle).each(function () {
getParent($(this)).removeClass('open')
})
}
function getParent($this) {
var selector = $this.attr('data-target')
, $parent
if (!selector) {
selector = $this.attr('href')
selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
}
$parent = selector && $(selector)
if (!$parent || !$parent.length) $parent = $this.parent()
return $parent
}
/* DROPDOWN PLUGIN DEFINITION
* ========================== */
$.fn.dropdown = function ( option ) {
var old = $.fn.dropdown
$.fn.dropdown = function (option) {
return this.each(function () {
var $this = $(this)
, data = $this.data('dropdown')
@@ -81,12 +148,22 @@
$.fn.dropdown.Constructor = Dropdown
/* DROPDOWN NO CONFLICT
* ==================== */
$.fn.dropdown.noConflict = function () {
$.fn.dropdown = old
return this
}
/* APPLY TO STANDARD DROPDOWN ELEMENTS
* =================================== */
$(function () {
$('html').on('click.dropdown.data-api', clearMenus)
$('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
})
$(document)
.on('click.dropdown.data-api', clearMenus)
.on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
.on('click.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
.on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
}( window.jQuery );
}(window.jQuery);
+139 -102
Ver Arquivo
@@ -1,8 +1,8 @@
/* =========================================================
* bootstrap-modal.js v2.0.2
* http://twitter.github.com/bootstrap/javascript.html#modals
* bootstrap-modal.js v2.3.2
* http://twbs.github.com/bootstrap/javascript.html#modals
* =========================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,17 +18,19 @@
* ========================================================= */
!function( $ ){
!function ($) {
"use strict"; // jshint ;_;
"use strict"
/* MODAL CLASS DEFINITION
* ====================== */
var Modal = function ( content, options ) {
var Modal = function (element, options) {
this.options = options
this.$element = $(content)
this.$element = $(element)
.delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
this.options.remote && this.$element.find('.modal-body').load(this.options.remote)
}
Modal.prototype = {
@@ -41,139 +43,161 @@
, show: function () {
var that = this
, e = $.Event('show')
if (this.isShown) return
this.$element.trigger(e)
$('body').addClass('modal-open')
if (this.isShown || e.isDefaultPrevented()) return
this.isShown = true
this.$element.trigger('show')
escape.call(this)
backdrop.call(this, function () {
this.escape()
this.backdrop(function () {
var transition = $.support.transition && that.$element.hasClass('fade')
!that.$element.parent().length && that.$element.appendTo(document.body) //don't move modals dom position
if (!that.$element.parent().length) {
that.$element.appendTo(document.body) //don't move modals dom position
}
that.$element
.show()
that.$element.show()
if (transition) {
that.$element[0].offsetWidth // force reflow
}
that.$element.addClass('in')
that.$element
.addClass('in')
.attr('aria-hidden', false)
that.enforceFocus()
transition ?
that.$element.one($.support.transition.end, function () { that.$element.trigger('shown') }) :
that.$element.trigger('shown')
that.$element.one($.support.transition.end, function () { that.$element.focus().trigger('shown') }) :
that.$element.focus().trigger('shown')
})
}
, hide: function ( e ) {
, hide: function (e) {
e && e.preventDefault()
if (!this.isShown) return
var that = this
e = $.Event('hide')
this.$element.trigger(e)
if (!this.isShown || e.isDefaultPrevented()) return
this.isShown = false
$('body').removeClass('modal-open')
this.escape()
escape.call(this)
$(document).off('focusin.modal')
this.$element
.trigger('hide')
.removeClass('in')
.attr('aria-hidden', true)
$.support.transition && this.$element.hasClass('fade') ?
hideWithTransition.call(this) :
hideModal.call(this)
this.hideWithTransition() :
this.hideModal()
}
}
/* MODAL PRIVATE METHODS
* ===================== */
function hideWithTransition() {
var that = this
, timeout = setTimeout(function () {
that.$element.off($.support.transition.end)
hideModal.call(that)
}, 500)
this.$element.one($.support.transition.end, function () {
clearTimeout(timeout)
hideModal.call(that)
})
}
function hideModal( that ) {
this.$element
.hide()
.trigger('hidden')
backdrop.call(this)
}
function backdrop( callback ) {
var that = this
, animate = this.$element.hasClass('fade') ? 'fade' : ''
if (this.isShown && this.options.backdrop) {
var doAnimate = $.support.transition && animate
this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
.appendTo(document.body)
if (this.options.backdrop != 'static') {
this.$backdrop.click($.proxy(this.hide, this))
, enforceFocus: function () {
var that = this
$(document).on('focusin.modal', function (e) {
if (that.$element[0] !== e.target && !that.$element.has(e.target).length) {
that.$element.focus()
}
})
}
if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
, escape: function () {
var that = this
if (this.isShown && this.options.keyboard) {
this.$element.on('keyup.dismiss.modal', function ( e ) {
e.which == 27 && that.hide()
})
} else if (!this.isShown) {
this.$element.off('keyup.dismiss.modal')
}
}
this.$backdrop.addClass('in')
, hideWithTransition: function () {
var that = this
, timeout = setTimeout(function () {
that.$element.off($.support.transition.end)
that.hideModal()
}, 500)
doAnimate ?
this.$backdrop.one($.support.transition.end, callback) :
callback()
this.$element.one($.support.transition.end, function () {
clearTimeout(timeout)
that.hideModal()
})
}
} else if (!this.isShown && this.$backdrop) {
this.$backdrop.removeClass('in')
, hideModal: function () {
var that = this
this.$element.hide()
this.backdrop(function () {
that.removeBackdrop()
that.$element.trigger('hidden')
})
}
$.support.transition && this.$element.hasClass('fade')?
this.$backdrop.one($.support.transition.end, $.proxy(removeBackdrop, this)) :
removeBackdrop.call(this)
, removeBackdrop: function () {
this.$backdrop && this.$backdrop.remove()
this.$backdrop = null
}
} else if (callback) {
callback()
}
}
, backdrop: function (callback) {
var that = this
, animate = this.$element.hasClass('fade') ? 'fade' : ''
function removeBackdrop() {
this.$backdrop.remove()
this.$backdrop = null
}
if (this.isShown && this.options.backdrop) {
var doAnimate = $.support.transition && animate
function escape() {
var that = this
if (this.isShown && this.options.keyboard) {
$(document).on('keyup.dismiss.modal', function ( e ) {
e.which == 27 && that.hide()
})
} else if (!this.isShown) {
$(document).off('keyup.dismiss.modal')
}
this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
.appendTo(document.body)
this.$backdrop.click(
this.options.backdrop == 'static' ?
$.proxy(this.$element[0].focus, this.$element[0])
: $.proxy(this.hide, this)
)
if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
this.$backdrop.addClass('in')
if (!callback) return
doAnimate ?
this.$backdrop.one($.support.transition.end, callback) :
callback()
} else if (!this.isShown && this.$backdrop) {
this.$backdrop.removeClass('in')
$.support.transition && this.$element.hasClass('fade')?
this.$backdrop.one($.support.transition.end, callback) :
callback()
} else if (callback) {
callback()
}
}
}
/* MODAL PLUGIN DEFINITION
* ======================= */
$.fn.modal = function ( option ) {
var old = $.fn.modal
$.fn.modal = function (option) {
return this.each(function () {
var $this = $(this)
, data = $this.data('modal')
@@ -193,18 +217,31 @@
$.fn.modal.Constructor = Modal
/* MODAL NO CONFLICT
* ================= */
$.fn.modal.noConflict = function () {
$.fn.modal = old
return this
}
/* MODAL DATA-API
* ============== */
$(function () {
$('body').on('click.modal.data-api', '[data-toggle="modal"]', function ( e ) {
var $this = $(this), href
, $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
, option = $target.data('modal') ? 'toggle' : $.extend({}, $target.data(), $this.data())
$(document).on('click.modal.data-api', '[data-toggle="modal"]', function (e) {
var $this = $(this)
, href = $this.attr('href')
, $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7
, option = $target.data('modal') ? 'toggle' : $.extend({ remote:!/#/.test(href) && href }, $target.data(), $this.data())
e.preventDefault()
$target.modal(option)
})
e.preventDefault()
$target
.modal(option)
.one('hide', function () {
$this.focus()
})
})
}( window.jQuery );
}(window.jQuery);
+35 -16
Ver Arquivo
@@ -1,8 +1,8 @@
/* ===========================================================
* bootstrap-popover.js v2.0.2
* http://twitter.github.com/bootstrap/javascript.html#popovers
* bootstrap-popover.js v2.3.2
* http://twbs.github.com/bootstrap/javascript.html#popovers
* ===========================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,14 +18,19 @@
* =========================================================== */
!function( $ ) {
!function ($) {
"use strict"
"use strict"; // jshint ;_;
var Popover = function ( element, options ) {
/* POPOVER PUBLIC CLASS DEFINITION
* =============================== */
var Popover = function (element, options) {
this.init('popover', element, options)
}
/* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js
========================================== */
@@ -38,8 +43,8 @@
, title = this.getTitle()
, content = this.getContent()
$tip.find('.popover-title')[ $.type(title) == 'object' ? 'append' : 'html' ](title)
$tip.find('.popover-content > *')[ $.type(content) == 'object' ? 'append' : 'html' ](content)
$tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
$tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content)
$tip.removeClass('fade top bottom left right in')
}
@@ -53,28 +58,32 @@
, $e = this.$element
, o = this.options
content = $e.attr('data-content')
|| (typeof o.content == 'function' ? o.content.call($e[0]) : o.content)
content = content.toString().replace(/(^\s*|\s*$)/, "")
content = (typeof o.content == 'function' ? o.content.call($e[0]) : o.content)
|| $e.attr('data-content')
return content
}
, tip: function() {
, tip: function () {
if (!this.$tip) {
this.$tip = $(this.options.template)
}
return this.$tip
}
, destroy: function () {
this.hide().$element.off('.' + this.type).removeData(this.type)
}
})
/* POPOVER PLUGIN DEFINITION
* ======================= */
$.fn.popover = function ( option ) {
var old = $.fn.popover
$.fn.popover = function (option) {
return this.each(function () {
var $this = $(this)
, data = $this.data('popover')
@@ -88,8 +97,18 @@
$.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, {
placement: 'right'
, trigger: 'click'
, content: ''
, template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'
, template: '<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
})
}( window.jQuery );
/* POPOVER NO CONFLICT
* =================== */
$.fn.popover.noConflict = function () {
$.fn.popover = old
return this
}
}(window.jQuery);
+63 -26
Ver Arquivo
@@ -1,8 +1,8 @@
/* =============================================================
* bootstrap-scrollspy.js v2.0.2
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
* bootstrap-scrollspy.js v2.3.2
* http://twbs.github.com/bootstrap/javascript.html#scrollspy
* =============================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,23 +17,25 @@
* limitations under the License.
* ============================================================== */
!function ( $ ) {
"use strict"
!function ($) {
/* SCROLLSPY CLASS DEFINITION
* ========================== */
"use strict"; // jshint ;_;
function ScrollSpy( element, options) {
/* SCROLLSPY CLASS DEFINITION
* ========================== */
function ScrollSpy(element, options) {
var process = $.proxy(this.process, this)
, $element = $(element).is('body') ? $(window) : $(element)
, href
this.options = $.extend({}, $.fn.scrollspy.defaults, options)
this.$scrollElement = $element.on('scroll.scroll.data-api', process)
this.$scrollElement = $element.on('scroll.scroll-spy.data-api', process)
this.selector = (this.options.target
|| ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
|| '') + ' .nav li > a'
this.$body = $('body').on('click.scroll.data-api', this.selector, process)
this.$body = $('body')
this.refresh()
this.process()
}
@@ -43,25 +45,43 @@
constructor: ScrollSpy
, refresh: function () {
this.targets = this.$body
var self = this
, $targets
this.offsets = $([])
this.targets = $([])
$targets = this.$body
.find(this.selector)
.map(function () {
var href = $(this).attr('href')
return /^#\w/.test(href) && $(href).length ? href : null
var $el = $(this)
, href = $el.data('target') || $el.attr('href')
, $href = /^#\w/.test(href) && $(href)
return ( $href
&& $href.length
&& [[ $href.position().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]] ) || null
})
.sort(function (a, b) { return a[0] - b[0] })
.each(function () {
self.offsets.push(this[0])
self.targets.push(this[1])
})
this.offsets = $.map(this.targets, function (id) {
return $(id).position().top
})
}
, process: function () {
var scrollTop = this.$scrollElement.scrollTop() + this.options.offset
, scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight
, maxScroll = scrollHeight - this.$scrollElement.height()
, offsets = this.offsets
, targets = this.targets
, activeTarget = this.activeTarget
, i
if (scrollTop >= maxScroll) {
return activeTarget != (i = targets.last()[0])
&& this.activate ( i )
}
for (i = offsets.length; i--;) {
activeTarget != targets[i]
&& scrollTop >= offsets[i]
@@ -72,21 +92,27 @@
, activate: function (target) {
var active
, selector
this.activeTarget = target
this.$body
.find(this.selector).parent('.active')
$(this.selector)
.parent('.active')
.removeClass('active')
active = this.$body
.find(this.selector + '[href="' + target + '"]')
selector = this.selector
+ '[data-target="' + target + '"],'
+ this.selector + '[href="' + target + '"]'
active = $(selector)
.parent('li')
.addClass('active')
if ( active.parent('.dropdown-menu') ) {
active.closest('li.dropdown').addClass('active')
if (active.parent('.dropdown-menu').length) {
active = active.closest('li.dropdown').addClass('active')
}
active.trigger('activate')
}
}
@@ -95,7 +121,9 @@
/* SCROLLSPY PLUGIN DEFINITION
* =========================== */
$.fn.scrollspy = function ( option ) {
var old = $.fn.scrollspy
$.fn.scrollspy = function (option) {
return this.each(function () {
var $this = $(this)
, data = $this.data('scrollspy')
@@ -112,14 +140,23 @@
}
/* SCROLLSPY NO CONFLICT
* ===================== */
$.fn.scrollspy.noConflict = function () {
$.fn.scrollspy = old
return this
}
/* SCROLLSPY DATA-API
* ================== */
$(function () {
$(window).on('load', function () {
$('[data-spy="scroll"]').each(function () {
var $spy = $(this)
$spy.scrollspy($spy.data())
})
})
}( window.jQuery );
}(window.jQuery);
+30 -16
Ver Arquivo
@@ -1,8 +1,8 @@
/* ========================================================
* bootstrap-tab.js v2.0.2
* http://twitter.github.com/bootstrap/javascript.html#tabs
* bootstrap-tab.js v2.3.2
* http://twbs.github.com/bootstrap/javascript.html#tabs
* ========================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,14 +18,15 @@
* ======================================================== */
!function( $ ){
!function ($) {
"use strict"; // jshint ;_;
"use strict"
/* TAB CLASS DEFINITION
* ==================== */
var Tab = function ( element ) {
var Tab = function (element) {
this.element = $(element)
}
@@ -39,6 +40,7 @@
, selector = $this.attr('data-target')
, previous
, $target
, e
if (!selector) {
selector = $this.attr('href')
@@ -47,13 +49,16 @@
if ( $this.parent('li').hasClass('active') ) return
previous = $ul.find('.active a').last()[0]
previous = $ul.find('.active:last a')[0]
$this.trigger({
type: 'show'
, relatedTarget: previous
e = $.Event('show', {
relatedTarget: previous
})
$this.trigger(e)
if (e.isDefaultPrevented()) return
$target = $(selector)
this.activate($this.parent('li'), $ul)
@@ -105,6 +110,8 @@
/* TAB PLUGIN DEFINITION
* ===================== */
var old = $.fn.tab
$.fn.tab = function ( option ) {
return this.each(function () {
var $this = $(this)
@@ -117,14 +124,21 @@
$.fn.tab.Constructor = Tab
/* TAB NO CONFLICT
* =============== */
$.fn.tab.noConflict = function () {
$.fn.tab = old
return this
}
/* TAB DATA-API
* ============ */
$(function () {
$('body').on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
e.preventDefault()
$(this).tab('show')
})
$(document).on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
e.preventDefault()
$(this).tab('show')
})
}( window.jQuery );
}(window.jQuery);
+158 -67
Ver Arquivo
@@ -1,9 +1,9 @@
/* ===========================================================
* bootstrap-tooltip.js v2.0.2
* http://twitter.github.com/bootstrap/javascript.html#tooltips
* bootstrap-tooltip.js v2.3.2
* http://twbs.github.com/bootstrap/javascript.html#tooltips
* Inspired by the original jQuery.tipsy by Jason Frame
* ===========================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,14 +18,16 @@
* limitations under the License.
* ========================================================== */
!function( $ ) {
"use strict"
!function ($) {
"use strict"; // jshint ;_;
/* TOOLTIP PUBLIC CLASS DEFINITION
* =============================== */
var Tooltip = function ( element, options ) {
var Tooltip = function (element, options) {
this.init('tooltip', element, options)
}
@@ -33,20 +35,30 @@
constructor: Tooltip
, init: function ( type, element, options ) {
, init: function (type, element, options) {
var eventIn
, eventOut
, triggers
, trigger
, i
this.type = type
this.$element = $(element)
this.options = this.getOptions(options)
this.enabled = true
if (this.options.trigger != 'manual') {
eventIn = this.options.trigger == 'hover' ? 'mouseenter' : 'focus'
eventOut = this.options.trigger == 'hover' ? 'mouseleave' : 'blur'
this.$element.on(eventIn, this.options.selector, $.proxy(this.enter, this))
this.$element.on(eventOut, this.options.selector, $.proxy(this.leave, this))
triggers = this.options.trigger.split(' ')
for (i = triggers.length; i--;) {
trigger = triggers[i]
if (trigger == 'click') {
this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this))
} else if (trigger != 'manual') {
eventIn = trigger == 'hover' ? 'mouseenter' : 'focus'
eventOut = trigger == 'hover' ? 'mouseleave' : 'blur'
this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this))
}
}
this.options.selector ?
@@ -54,8 +66,8 @@
this.fixTitle()
}
, getOptions: function ( options ) {
options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data())
, getOptions: function (options) {
options = $.extend({}, $.fn[this.type].defaults, this.$element.data(), options)
if (options.delay && typeof options.delay == 'number') {
options.delay = {
@@ -67,46 +79,50 @@
return options
}
, enter: function ( e ) {
var self = $(e.currentTarget)[this.type](this._options).data(this.type)
, enter: function (e) {
var defaults = $.fn[this.type].defaults
, options = {}
, self
if (!self.options.delay || !self.options.delay.show) {
self.show()
} else {
self.hoverState = 'in'
setTimeout(function() {
if (self.hoverState == 'in') {
self.show()
}
}, self.options.delay.show)
}
this._options && $.each(this._options, function (key, value) {
if (defaults[key] != value) options[key] = value
}, this)
self = $(e.currentTarget)[this.type](options).data(this.type)
if (!self.options.delay || !self.options.delay.show) return self.show()
clearTimeout(this.timeout)
self.hoverState = 'in'
this.timeout = setTimeout(function() {
if (self.hoverState == 'in') self.show()
}, self.options.delay.show)
}
, leave: function ( e ) {
, leave: function (e) {
var self = $(e.currentTarget)[this.type](this._options).data(this.type)
if (!self.options.delay || !self.options.delay.hide) {
self.hide()
} else {
self.hoverState = 'out'
setTimeout(function() {
if (self.hoverState == 'out') {
self.hide()
}
}, self.options.delay.hide)
}
if (this.timeout) clearTimeout(this.timeout)
if (!self.options.delay || !self.options.delay.hide) return self.hide()
self.hoverState = 'out'
this.timeout = setTimeout(function() {
if (self.hoverState == 'out') self.hide()
}, self.options.delay.hide)
}
, show: function () {
var $tip
, inside
, pos
, actualWidth
, actualHeight
, placement
, tp
, e = $.Event('show')
if (this.hasContent() && this.enabled) {
this.$element.trigger(e)
if (e.isDefaultPrevented()) return
$tip = this.tip()
this.setContent()
@@ -118,19 +134,18 @@
this.options.placement.call(this, $tip[0], this.$element[0]) :
this.options.placement
inside = /in/.test(placement)
$tip
.remove()
.detach()
.css({ top: 0, left: 0, display: 'block' })
.appendTo(inside ? this.$element : document.body)
pos = this.getPosition(inside)
this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
pos = this.getPosition()
actualWidth = $tip[0].offsetWidth
actualHeight = $tip[0].offsetHeight
switch (inside ? placement.split(' ')[1] : placement) {
switch (placement) {
case 'bottom':
tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2}
break
@@ -145,45 +160,100 @@
break
}
$tip
.css(tp)
.addClass(placement)
.addClass('in')
this.applyPlacement(tp, placement)
this.$element.trigger('shown')
}
}
, applyPlacement: function(offset, placement){
var $tip = this.tip()
, width = $tip[0].offsetWidth
, height = $tip[0].offsetHeight
, actualWidth
, actualHeight
, delta
, replace
$tip
.offset(offset)
.addClass(placement)
.addClass('in')
actualWidth = $tip[0].offsetWidth
actualHeight = $tip[0].offsetHeight
if (placement == 'top' && actualHeight != height) {
offset.top = offset.top + height - actualHeight
replace = true
}
if (placement == 'bottom' || placement == 'top') {
delta = 0
if (offset.left < 0){
delta = offset.left * -2
offset.left = 0
$tip.offset(offset)
actualWidth = $tip[0].offsetWidth
actualHeight = $tip[0].offsetHeight
}
this.replaceArrow(delta - width + actualWidth, actualWidth, 'left')
} else {
this.replaceArrow(actualHeight - height, actualHeight, 'top')
}
if (replace) $tip.offset(offset)
}
, replaceArrow: function(delta, dimension, position){
this
.arrow()
.css(position, delta ? (50 * (1 - delta / dimension) + "%") : '')
}
, setContent: function () {
var $tip = this.tip()
$tip.find('.tooltip-inner').html(this.getTitle())
, title = this.getTitle()
$tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title)
$tip.removeClass('fade in top bottom left right')
}
, hide: function () {
var that = this
, $tip = this.tip()
, e = $.Event('hide')
this.$element.trigger(e)
if (e.isDefaultPrevented()) return
$tip.removeClass('in')
function removeWithAnimation() {
var timeout = setTimeout(function () {
$tip.off($.support.transition.end).remove()
$tip.off($.support.transition.end).detach()
}, 500)
$tip.one($.support.transition.end, function () {
clearTimeout(timeout)
$tip.remove()
$tip.detach()
})
}
$.support.transition && this.$tip.hasClass('fade') ?
removeWithAnimation() :
$tip.remove()
$tip.detach()
this.$element.trigger('hidden')
return this
}
, fixTitle: function () {
var $e = this.$element
if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') {
$e.attr('data-original-title', $e.attr('title') || '').removeAttr('title')
$e.attr('data-original-title', $e.attr('title') || '').attr('title', '')
}
}
@@ -191,11 +261,12 @@
return this.getTitle()
}
, getPosition: function (inside) {
return $.extend({}, (inside ? {top: 0, left: 0} : this.$element.offset()), {
width: this.$element[0].offsetWidth
, height: this.$element[0].offsetHeight
})
, getPosition: function () {
var el = this.$element[0]
return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : {
width: el.offsetWidth
, height: el.offsetHeight
}, this.$element.offset())
}
, getTitle: function () {
@@ -206,8 +277,6 @@
title = $e.attr('data-original-title')
|| (typeof o.title == 'function' ? o.title.call($e[0]) : o.title)
title = (title || '').toString().replace(/(^\s*|\s*$)/, "")
return title
}
@@ -215,6 +284,10 @@
return this.$tip = this.$tip || $(this.options.template)
}
, arrow: function(){
return this.$arrow = this.$arrow || this.tip().find(".tooltip-arrow")
}
, validate: function () {
if (!this.$element[0].parentNode) {
this.hide()
@@ -235,8 +308,13 @@
this.enabled = !this.enabled
}
, toggle: function () {
this[this.tip().hasClass('in') ? 'hide' : 'show']()
, toggle: function (e) {
var self = e ? $(e.currentTarget)[this.type](this._options).data(this.type) : this
self.tip().hasClass('in') ? self.hide() : self.show()
}
, destroy: function () {
this.hide().$element.off('.' + this.type).removeData(this.type)
}
}
@@ -245,6 +323,8 @@
/* TOOLTIP PLUGIN DEFINITION
* ========================= */
var old = $.fn.tooltip
$.fn.tooltip = function ( option ) {
return this.each(function () {
var $this = $(this)
@@ -259,12 +339,23 @@
$.fn.tooltip.defaults = {
animation: true
, delay: 0
, selector: false
, placement: 'top'
, trigger: 'hover'
, title: ''
, selector: false
, template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
, trigger: 'hover focus'
, title: ''
, delay: 0
, html: false
, container: false
}
}( window.jQuery );
/* TOOLTIP NO CONFLICT
* =================== */
$.fn.tooltip.noConflict = function () {
$.fn.tooltip = old
return this
}
}(window.jQuery);
+33 -24
Ver Arquivo
@@ -1,8 +1,8 @@
/* ===================================================
* bootstrap-transition.js v2.0.2
* http://twitter.github.com/bootstrap/javascript.html#transitions
* bootstrap-transition.js v2.3.2
* http://twbs.github.com/bootstrap/javascript.html#transitions
* ===================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,35 +17,44 @@
* limitations under the License.
* ========================================================== */
!function( $ ) {
!function ($) {
"use strict"; // jshint ;_;
/* CSS TRANSITION SUPPORT (http://www.modernizr.com/)
* ======================================================= */
$(function () {
"use strict"
/* CSS TRANSITION SUPPORT (https://gist.github.com/373874)
* ======================================================= */
$.support.transition = (function () {
var thisBody = document.body || document.documentElement
, thisStyle = thisBody.style
, support = thisStyle.transition !== undefined || thisStyle.WebkitTransition !== undefined || thisStyle.MozTransition !== undefined || thisStyle.MsTransition !== undefined || thisStyle.OTransition !== undefined
return support && {
end: (function () {
var transitionEnd = "TransitionEnd"
if ( $.browser.webkit ) {
transitionEnd = "webkitTransitionEnd"
} else if ( $.browser.mozilla ) {
transitionEnd = "transitionend"
} else if ( $.browser.opera ) {
transitionEnd = "oTransitionEnd"
var transitionEnd = (function () {
var el = document.createElement('bootstrap')
, transEndEventNames = {
'WebkitTransition' : 'webkitTransitionEnd'
, 'MozTransition' : 'transitionend'
, 'OTransition' : 'oTransitionEnd otransitionend'
, 'transition' : 'transitionend'
}
, name
for (name in transEndEventNames){
if (el.style[name] !== undefined) {
return transEndEventNames[name]
}
return transitionEnd
}())
}
}())
return transitionEnd && {
end: transitionEnd
}
})()
})
}( window.jQuery );
}(window.jQuery);
+123 -59
Ver Arquivo
@@ -1,8 +1,8 @@
/* =============================================================
* bootstrap-typeahead.js v2.0.2
* http://twitter.github.com/bootstrap/javascript.html#typeahead
* bootstrap-typeahead.js v2.3.2
* http://twbs.github.com/bootstrap/javascript.html#typeahead
* =============================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,18 +17,24 @@
* limitations under the License.
* ============================================================ */
!function( $ ){
"use strict"
!function($){
var Typeahead = function ( element, options ) {
"use strict"; // jshint ;_;
/* TYPEAHEAD PUBLIC CLASS DEFINITION
* ================================= */
var Typeahead = function (element, options) {
this.$element = $(element)
this.options = $.extend({}, $.fn.typeahead.defaults, options)
this.matcher = this.options.matcher || this.matcher
this.sorter = this.options.sorter || this.sorter
this.highlighter = this.options.highlighter || this.highlighter
this.$menu = $(this.options.menu).appendTo('body')
this.updater = this.options.updater || this.updater
this.source = this.options.source
this.$menu = $(this.options.menu)
this.shown = false
this.listen()
}
@@ -39,22 +45,29 @@
, select: function () {
var val = this.$menu.find('.active').attr('data-value')
this.$element.val(val)
this.$element.change();
this.$element
.val(this.updater(val))
.change()
return this.hide()
}
, updater: function (item) {
return item
}
, show: function () {
var pos = $.extend({}, this.$element.offset(), {
var pos = $.extend({}, this.$element.position(), {
height: this.$element[0].offsetHeight
})
this.$menu.css({
top: pos.top + pos.height
, left: pos.left
})
this.$menu
.insertAfter(this.$element)
.css({
top: pos.top + pos.height
, left: pos.left
})
.show()
this.$menu.show()
this.shown = true
return this
}
@@ -66,18 +79,24 @@
}
, lookup: function (event) {
var that = this
, items
, q
var items
this.query = this.$element.val()
if (!this.query) {
if (!this.query || this.query.length < this.options.minLength) {
return this.shown ? this.hide() : this
}
items = $.grep(this.source, function (item) {
if (that.matcher(item)) return item
items = $.isFunction(this.source) ? this.source(this.query, $.proxy(this.process, this)) : this.source
return items ? this.process(items) : this
}
, process: function (items) {
var that = this
items = $.grep(items, function (item) {
return that.matcher(item)
})
items = this.sorter(items)
@@ -109,7 +128,8 @@
}
, highlighter: function (item) {
return item.replace(new RegExp('(' + this.query + ')', 'ig'), function ($1, match) {
var query = this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, '\\$&')
return item.replace(new RegExp('(' + query + ')', 'ig'), function ($1, match) {
return '<strong>' + match + '</strong>'
})
}
@@ -152,45 +172,31 @@
, listen: function () {
this.$element
.on('focus', $.proxy(this.focus, this))
.on('blur', $.proxy(this.blur, this))
.on('keypress', $.proxy(this.keypress, this))
.on('keyup', $.proxy(this.keyup, this))
if ($.browser.webkit || $.browser.msie) {
this.$element.on('keydown', $.proxy(this.keypress, this))
if (this.eventSupported('keydown')) {
this.$element.on('keydown', $.proxy(this.keydown, this))
}
this.$menu
.on('click', $.proxy(this.click, this))
.on('mouseenter', 'li', $.proxy(this.mouseenter, this))
.on('mouseleave', 'li', $.proxy(this.mouseleave, this))
}
, keyup: function (e) {
switch(e.keyCode) {
case 40: // down arrow
case 38: // up arrow
break
case 9: // tab
case 13: // enter
if (!this.shown) return
this.select()
break
case 27: // escape
if (!this.shown) return
this.hide()
break
default:
this.lookup()
, eventSupported: function(eventName) {
var isSupported = eventName in this.$element
if (!isSupported) {
this.$element.setAttribute(eventName, 'return;')
isSupported = typeof this.$element[eventName] === 'function'
}
return isSupported
}
e.stopPropagation()
e.preventDefault()
}
, keypress: function (e) {
, move: function (e) {
if (!this.shown) return
switch(e.keyCode) {
@@ -214,29 +220,80 @@
e.stopPropagation()
}
, keydown: function (e) {
this.suppressKeyPressRepeat = ~$.inArray(e.keyCode, [40,38,9,13,27])
this.move(e)
}
, keypress: function (e) {
if (this.suppressKeyPressRepeat) return
this.move(e)
}
, keyup: function (e) {
switch(e.keyCode) {
case 40: // down arrow
case 38: // up arrow
case 16: // shift
case 17: // ctrl
case 18: // alt
break
case 9: // tab
case 13: // enter
if (!this.shown) return
this.select()
break
case 27: // escape
if (!this.shown) return
this.hide()
break
default:
this.lookup()
}
e.stopPropagation()
e.preventDefault()
}
, focus: function (e) {
this.focused = true
}
, blur: function (e) {
var that = this
setTimeout(function () { that.hide() }, 150)
this.focused = false
if (!this.mousedover && this.shown) this.hide()
}
, click: function (e) {
e.stopPropagation()
e.preventDefault()
this.select()
this.$element.focus()
}
, mouseenter: function (e) {
this.mousedover = true
this.$menu.find('.active').removeClass('active')
$(e.currentTarget).addClass('active')
}
, mouseleave: function (e) {
this.mousedover = false
if (!this.focused && this.shown) this.hide()
}
}
/* TYPEAHEAD PLUGIN DEFINITION
* =========================== */
$.fn.typeahead = function ( option ) {
var old = $.fn.typeahead
$.fn.typeahead = function (option) {
return this.each(function () {
var $this = $(this)
, data = $this.data('typeahead')
@@ -251,21 +308,28 @@
, items: 8
, menu: '<ul class="typeahead dropdown-menu"></ul>'
, item: '<li><a href="#"></a></li>'
, minLength: 1
}
$.fn.typeahead.Constructor = Typeahead
/* TYPEAHEAD NO CONFLICT
* =================== */
$.fn.typeahead.noConflict = function () {
$.fn.typeahead = old
return this
}
/* TYPEAHEAD DATA-API
* ================== */
$(function () {
$('body').on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) {
var $this = $(this)
if ($this.data('typeahead')) return
e.preventDefault()
$this.typeahead($this.data())
})
$(document).on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) {
var $this = $(this)
if ($this.data('typeahead')) return
$this.typeahead($this.data())
})
}( window.jQuery );
}(window.jQuery);
+2280
Ver Arquivo
Diferenças do arquivo suprimidas por serem muito extensas Carregar Diff
Diff do arquivo suprimido porque uma ou mais linhas são muito longas
@@ -3,7 +3,7 @@
.pun, .opn, .clo { color: #93a1a1; }
.fun { color: #dc322f; }
.str, .atv { color: #D14; }
.kwd, .linenums .tag { color: #1e347b; }
.kwd, .prettyprint .tag { color: #1e347b; }
.typ, .atn, .dec, .var { color: teal; }
.pln { color: #48484c; }
@@ -21,10 +21,10 @@
/* Specify class=linenums on a pre to get line numbering */
ol.linenums {
margin: 0 0 0 33px; /* IE indents via margin-left */
}
}
ol.linenums li {
padding-left: 12px;
color: #bebec5;
line-height: 18px;
line-height: 20px;
text-shadow: 0 1px 0 #fff;
}
+401
Ver Arquivo
@@ -0,0 +1,401 @@
/*
Holder - 1.9 - client side image placeholders
(c) 2012-2013 Ivan Malopinsky / http://imsky.co
Provided under the Apache 2.0 License: http://www.apache.org/licenses/LICENSE-2.0
Commercial use requires attribution.
*/
var Holder = Holder || {};
(function (app, win) {
var preempted = false,
fallback = false,
canvas = document.createElement('canvas');
//getElementsByClassName polyfill
document.getElementsByClassName||(document.getElementsByClassName=function(e){var t=document,n,r,i,s=[];if(t.querySelectorAll)return t.querySelectorAll("."+e);if(t.evaluate){r=".//*[contains(concat(' ', @class, ' '), ' "+e+" ')]",n=t.evaluate(r,t,null,0,null);while(i=n.iterateNext())s.push(i)}else{n=t.getElementsByTagName("*"),r=new RegExp("(^|\\s)"+e+"(\\s|$)");for(i=0;i<n.length;i++)r.test(n[i].className)&&s.push(n[i])}return s})
//getComputedStyle polyfill
window.getComputedStyle||(window.getComputedStyle=function(e,t){return this.el=e,this.getPropertyValue=function(t){var n=/(\-([a-z]){1})/g;return t=="float"&&(t="styleFloat"),n.test(t)&&(t=t.replace(n,function(){return arguments[2].toUpperCase()})),e.currentStyle[t]?e.currentStyle[t]:null},this})
//http://javascript.nwbox.com/ContentLoaded by Diego Perini with modifications
function contentLoaded(n,t){var l="complete",s="readystatechange",u=!1,h=u,c=!0,i=n.document,a=i.documentElement,e=i.addEventListener?"addEventListener":"attachEvent",v=i.addEventListener?"removeEventListener":"detachEvent",f=i.addEventListener?"":"on",r=function(e){(e.type!=s||i.readyState==l)&&((e.type=="load"?n:i)[v](f+e.type,r,u),!h&&(h=!0)&&t.call(n,null))},o=function(){try{a.doScroll("left")}catch(n){setTimeout(o,50);return}r("poll")};if(i.readyState==l)t.call(n,"lazy");else{if(i.createEventObject&&a.doScroll){try{c=!n.frameElement}catch(y){}c&&o()}i[e](f+"DOMContentLoaded",r,u),i[e](f+s,r,u),n[e](f+"load",r,u)}};
//https://gist.github.com/991057 by Jed Schmidt with modifications
function selector(a){
a=a.match(/^(\W)?(.*)/);var b=document["getElement"+(a[1]?a[1]=="#"?"ById":"sByClassName":"sByTagName")](a[2]);
var ret=[]; b!=null&&(b.length?ret=b:b.length==0?ret=b:ret=[b]); return ret;
}
//shallow object property extend
function extend(a,b){var c={};for(var d in a)c[d]=a[d];for(var e in b)c[e]=b[e];return c}
//hasOwnProperty polyfill
if (!Object.prototype.hasOwnProperty)
Object.prototype.hasOwnProperty = function(prop) {
var proto = this.__proto__ || this.constructor.prototype;
return (prop in this) && (!(prop in proto) || proto[prop] !== this[prop]);
}
function text_size(width, height, template) {
var dimension_arr = [height, width].sort();
var maxFactor = Math.round(dimension_arr[1] / 16),
minFactor = Math.round(dimension_arr[0] / 16);
var text_height = Math.max(template.size, maxFactor);
return {
height: text_height
}
}
function draw(ctx, dimensions, template, ratio) {
var ts = text_size(dimensions.width, dimensions.height, template);
var text_height = ts.height;
var width = dimensions.width * ratio, height = dimensions.height * ratio;
var font = template.font ? template.font : "sans-serif";
canvas.width = width;
canvas.height = height;
ctx.textAlign = "center";
ctx.textBaseline = "middle";
ctx.fillStyle = template.background;
ctx.fillRect(0, 0, width, height);
ctx.fillStyle = template.foreground;
ctx.font = "bold " + text_height + "px "+font;
var text = template.text ? template.text : (dimensions.width + "x" + dimensions.height);
if (ctx.measureText(text).width / width > 1) {
text_height = template.size / (ctx.measureText(text).width / width);
}
//Resetting font size if necessary
ctx.font = "bold " + (text_height * ratio) + "px "+font;
ctx.fillText(text, (width / 2), (height / 2), width);
return canvas.toDataURL("image/png");
}
function render(mode, el, holder, src) {
var dimensions = holder.dimensions,
theme = holder.theme,
text = holder.text ? decodeURIComponent(holder.text) : holder.text;
var dimensions_caption = dimensions.width + "x" + dimensions.height;
theme = (text ? extend(theme, { text: text }) : theme);
theme = (holder.font ? extend(theme, {font: holder.font}) : theme);
var ratio = 1;
if(window.devicePixelRatio && window.devicePixelRatio > 1){
ratio = window.devicePixelRatio;
}
if (mode == "image") {
el.setAttribute("data-src", src);
el.setAttribute("alt", text ? text : theme.text ? theme.text + " [" + dimensions_caption + "]" : dimensions_caption);
if(fallback || !holder.auto){
el.style.width = dimensions.width + "px";
el.style.height = dimensions.height + "px";
}
if (fallback) {
el.style.backgroundColor = theme.background;
}
else{
el.setAttribute("src", draw(ctx, dimensions, theme, ratio));
}
} else {
if (!fallback) {
el.style.backgroundImage = "url(" + draw(ctx, dimensions, theme, ratio) + ")";
el.style.backgroundSize = dimensions.width+"px "+dimensions.height+"px";
}
}
};
function fluid(el, holder, src) {
var dimensions = holder.dimensions,
theme = holder.theme,
text = holder.text;
var dimensions_caption = dimensions.width + "x" + dimensions.height;
theme = (text ? extend(theme, {
text: text
}) : theme);
var fluid = document.createElement("div");
fluid.style.backgroundColor = theme.background;
fluid.style.color = theme.foreground;
fluid.className = el.className + " holderjs-fluid";
fluid.style.width = holder.dimensions.width + (holder.dimensions.width.indexOf("%")>0?"":"px");
fluid.style.height = holder.dimensions.height + (holder.dimensions.height.indexOf("%")>0?"":"px");
fluid.id = el.id;
el.style.width=0;
el.style.height=0;
if (theme.text) {
fluid.appendChild(document.createTextNode(theme.text))
} else {
fluid.appendChild(document.createTextNode(dimensions_caption))
fluid_images.push(fluid);
setTimeout(fluid_update, 0);
}
el.parentNode.insertBefore(fluid, el.nextSibling)
if(window.jQuery){
jQuery(function($){
$(el).on("load", function(){
el.style.width = fluid.style.width;
el.style.height = fluid.style.height;
$(el).show();
$(fluid).remove();
});
})
}
}
function fluid_update() {
for (i in fluid_images) {
if(!fluid_images.hasOwnProperty(i)) continue;
var el = fluid_images[i],
label = el.firstChild;
el.style.lineHeight = el.offsetHeight+"px";
label.data = el.offsetWidth + "x" + el.offsetHeight;
}
}
function parse_flags(flags, options) {
var ret = {
theme: settings.themes.gray
}, render = false;
for (sl = flags.length, j = 0; j < sl; j++) {
var flag = flags[j];
if (app.flags.dimensions.match(flag)) {
render = true;
ret.dimensions = app.flags.dimensions.output(flag);
} else if (app.flags.fluid.match(flag)) {
render = true;
ret.dimensions = app.flags.fluid.output(flag);
ret.fluid = true;
} else if (app.flags.colors.match(flag)) {
ret.theme = app.flags.colors.output(flag);
} else if (options.themes[flag]) {
//If a theme is specified, it will override custom colors
ret.theme = options.themes[flag];
} else if (app.flags.text.match(flag)) {
ret.text = app.flags.text.output(flag);
} else if(app.flags.font.match(flag)){
ret.font = app.flags.font.output(flag);
}
else if(app.flags.auto.match(flag)){
ret.auto = true;
}
}
return render ? ret : false;
};
if (!canvas.getContext) {
fallback = true;
} else {
if (canvas.toDataURL("image/png")
.indexOf("data:image/png") < 0) {
//Android doesn't support data URI
fallback = true;
} else {
var ctx = canvas.getContext("2d");
}
}
var fluid_images = [];
var settings = {
domain: "holder.js",
images: "img",
bgnodes: ".holderjs",
themes: {
"gray": {
background: "#eee",
foreground: "#aaa",
size: 12
},
"social": {
background: "#3a5a97",
foreground: "#fff",
size: 12
},
"industrial": {
background: "#434A52",
foreground: "#C2F200",
size: 12
}
},
stylesheet: ".holderjs-fluid {font-size:16px;font-weight:bold;text-align:center;font-family:sans-serif;margin:0}"
};
app.flags = {
dimensions: {
regex: /^(\d+)x(\d+)$/,
output: function (val) {
var exec = this.regex.exec(val);
return {
width: +exec[1],
height: +exec[2]
}
}
},
fluid: {
regex: /^([0-9%]+)x([0-9%]+)$/,
output: function (val) {
var exec = this.regex.exec(val);
return {
width: exec[1],
height: exec[2]
}
}
},
colors: {
regex: /#([0-9a-f]{3,})\:#([0-9a-f]{3,})/i,
output: function (val) {
var exec = this.regex.exec(val);
return {
size: settings.themes.gray.size,
foreground: "#" + exec[2],
background: "#" + exec[1]
}
}
},
text: {
regex: /text\:(.*)/,
output: function (val) {
return this.regex.exec(val)[1];
}
},
font: {
regex: /font\:(.*)/,
output: function(val){
return this.regex.exec(val)[1];
}
},
auto: {
regex: /^auto$/
}
}
for (var flag in app.flags) {
if(!app.flags.hasOwnProperty(flag)) continue;
app.flags[flag].match = function (val) {
return val.match(this.regex)
}
}
app.add_theme = function (name, theme) {
name != null && theme != null && (settings.themes[name] = theme);
return app;
};
app.add_image = function (src, el) {
var node = selector(el);
if (node.length) {
for (var i = 0, l = node.length; i < l; i++) {
var img = document.createElement("img")
img.setAttribute("data-src", src);
node[i].appendChild(img);
}
}
return app;
};
app.run = function (o) {
var options = extend(settings, o), images = [];
if(options.images instanceof window.NodeList){
imageNodes = options.images;
}
else if(options.images instanceof window.Node){
imageNodes = [options.images];
}
else{
imageNodes = selector(options.images);
}
if(options.elements instanceof window.NodeList){
bgnodes = options.bgnodes;
}
else if(options.bgnodes instanceof window.Node){
bgnodes = [options.bgnodes];
}
else{
bgnodes = selector(options.bgnodes);
}
preempted = true;
for (i = 0, l = imageNodes.length; i < l; i++) images.push(imageNodes[i]);
var holdercss = document.getElementById("holderjs-style");
if(!holdercss){
holdercss = document.createElement("style");
holdercss.setAttribute("id", "holderjs-style");
holdercss.type = "text/css";
document.getElementsByTagName("head")[0].appendChild(holdercss);
}
if(holdercss.styleSheet){
holdercss.styleSheet += options.stylesheet;
}
else{
holdercss.textContent+= options.stylesheet;
}
var cssregex = new RegExp(options.domain + "\/(.*?)\"?\\)");
for (var l = bgnodes.length, i = 0; i < l; i++) {
var src = window.getComputedStyle(bgnodes[i], null)
.getPropertyValue("background-image");
var flags = src.match(cssregex);
if (flags) {
var holder = parse_flags(flags[1].split("/"), options);
if (holder) {
render("background", bgnodes[i], holder, src);
}
}
}
for (var l = images.length, i = 0; i < l; i++) {
var src = images[i].getAttribute("src") || images[i].getAttribute("data-src");
if (src != null && src.indexOf(options.domain) >= 0) {
var holder = parse_flags(src.substr(src.lastIndexOf(options.domain) + options.domain.length + 1)
.split("/"), options);
if (holder) {
if (holder.fluid) {
fluid(images[i], holder, src);
} else {
render("image", images[i], holder, src);
}
}
}
}
return app;
};
contentLoaded(win, function () {
if (window.addEventListener) {
window.addEventListener("resize", fluid_update, false);
window.addEventListener("orientationchange", fluid_update, false);
} else {
window.attachEvent("onresize", fluid_update)
}
preempted || app.run();
});
if ( typeof define === "function" && define.amd ) {
define( "Holder", [], function () { return app; } );
}
})(Holder, window);
+8
Ver Arquivo
@@ -0,0 +1,8 @@
/*
HTML5 Shiv v3.6.2pre | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
*/
(function(l,f){function m(){var a=e.elements;return"string"==typeof a?a.split(" "):a}function i(a){var b=n[a[o]];b||(b={},h++,a[o]=h,n[h]=b);return b}function p(a,b,c){b||(b=f);if(g)return b.createElement(a);c||(c=i(b));b=c.cache[a]?c.cache[a].cloneNode():r.test(a)?(c.cache[a]=c.createElem(a)).cloneNode():c.createElem(a);return b.canHaveChildren&&!s.test(a)?c.frag.appendChild(b):b}function t(a,b){if(!b.cache)b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag();
a.createElement=function(c){return!e.shivMethods?b.createElem(c):p(c,a,b)};a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+m().join().replace(/\w+/g,function(a){b.createElem(a);b.frag.createElement(a);return'c("'+a+'")'})+");return n}")(e,b.frag)}function q(a){a||(a=f);var b=i(a);if(e.shivCSS&&!j&&!b.hasCSS){var c,d=a;c=d.createElement("p");d=d.getElementsByTagName("head")[0]||d.documentElement;c.innerHTML="x<style>article,aside,figcaption,figure,footer,header,hgroup,nav,section{display:block}mark{background:#FF0;color:#000}</style>";
c=d.insertBefore(c.lastChild,d.firstChild);b.hasCSS=!!c}g||t(a,b);return a}var k=l.html5||{},s=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,r=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,j,o="_html5shiv",h=0,n={},g;(function(){try{var a=f.createElement("a");a.innerHTML="<xyz></xyz>";j="hidden"in a;var b;if(!(b=1==a.childNodes.length)){f.createElement("a");var c=f.createDocumentFragment();b="undefined"==typeof c.cloneNode||
"undefined"==typeof c.createDocumentFragment||"undefined"==typeof c.createElement}g=b}catch(d){g=j=!0}})();var e={elements:k.elements||"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video",version:"3.6.2pre",shivCSS:!1!==k.shivCSS,supportsUnknownElements:g,shivMethods:!1!==k.shivMethods,type:"default",shivDocument:q,createElement:p,createDocumentFragment:function(a,b){a||(a=f);if(g)return a.createDocumentFragment();
for(var b=b||i(a),c=b.frag.cloneNode(),d=0,e=m(),h=e.length;d<h;d++)c.createElement(e[d]);return c}};l.html5=e;q(f)})(this,document);
+5 -9252
Ver Arquivo
Diff do arquivo suprimido porque uma ou mais linhas são muito longas
+2024 -1472
Ver Arquivo
Diferenças do arquivo suprimidas por serem muito extensas Carregar Diff
+1 -1
Ver Arquivo
@@ -2,7 +2,7 @@
var hogan = require('hogan.js')
, fs = require('fs')
, prod = process.argv[2] == 'production'
, title = 'Twitter Bootstrap'
, title = 'Bootstrap'
var layout, pages
Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 3.3 KiB

Depois

Largura:  |  Altura:  |  Tamanho: 2.2 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 10 KiB

Depois

Largura:  |  Altura:  |  Tamanho: 4.5 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 472 B

Depois

Largura:  |  Altura:  |  Tamanho: 365 B

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 115 B

Depois

Largura:  |  Altura:  |  Tamanho: 81 B

+2202 -1493
Ver Arquivo
Diferenças do arquivo suprimidas por serem muito extensas Carregar Diff

Alguns arquivos não foram exibidos porque demasiados arquivos foram alterados neste diff Mostrar Mais