Compare commits

...

1035 Commits

Author SHA1 Message Date
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 ×
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 × 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
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
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
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
200 changed files with 24541 additions and 35242 deletions
+1
View File
@@ -34,3 +34,4 @@ nbproject
.CVS
.idea
node_modules
dist
+75
View File
@@ -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 cases](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/twitter/bootstrap/blob/master/LICENSE
+12 -5
View File
@@ -26,9 +26,9 @@ build:
@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 > docs/assets/js/bootstrap.js
@uglifyjs -nc docs/assets/js/bootstrap.js > docs/assets/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*/" > docs/assets/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 > docs/assets/js/bootstrap.js
@uglifyjs docs/assets/js/bootstrap.js -nc > docs/assets/js/bootstrap.min.tmp.js
@echo "/**\n* Bootstrap.js v2.2.2 by @fat & @mdo\n* Copyright 2012 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"
@@ -50,6 +50,13 @@ test:
kill -9 `cat js/tests/pid.txt`
rm js/tests/pid.txt
#
# CLEANS THE ROOT DIRECTORY OF PRIOR BUILDS
#
clean:
rm -r bootstrap
#
# BUILD SIMPLE BOOTSTRAP DIRECTORY
# recess & uglifyjs are required
@@ -64,8 +71,8 @@ bootstrap:
recess --compress ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.min.css
recess --compile ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.css
recess --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
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
uglifyjs bootstrap/js/bootstrap.js -nc > 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 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
+36 -56
View File
@@ -1,25 +1,26 @@
[Twitter Bootstrap](http://twitter.github.com/bootstrap) [![Build Status](https://secure.travis-ci.org/twitter/bootstrap.png)](http://travis-ci.org/twitter/bootstrap)
=================
# [Twitter Bootstrap v2.2.2](http://twitter.github.com/bootstrap) [![Build Status](https://secure.travis-ci.org/twitter/bootstrap.png)](http://travis-ci.org/twitter/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!
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/twitter/bootstrap/zipball/master).
* Clone the repo: `git clone git://github.com/twitter/bootstrap.git`.
* Install with Twitter's [Bower](http://twitter.github.com/bower): `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>`
@@ -33,79 +34,59 @@ For more information on SemVer, please visit 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/twitter/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.
Blog
----
Read more detailed announcements, discussions, and more on [The Official Twitter Bootstrap Blog](http://blog.getbootstrap.com).
Mailing list
------------
Have a question? Ask on our mailing list!
twitter-bootstrap@googlegroups.com
http://groups.google.com/group/twitter-bootstrap
IRC
---
Server: irc.freenode.net
Channel: ##twitter-bootstrap (the double ## is not a typo)
Developers
----------
## Developers
We have included a makefile with convenience methods for working with the Bootstrap library.
+ **dependencies**
Our makefile depends on you having recess, uglify.js, and jshint installed. To install, just run the following command in npm:
Our makefile depends on you having recess, connect, uglify.js, and jshint installed. To install, just run the following command in npm:
```
$ npm install recess uglify-js jshint -g
$ npm install recess connect uglify-js jshint -g
```
+ **build** - `make`
Runs the recess compiler to rebuild the `/less` files and compiles the docs pages. Requires recess and uglify-js. <a href="http://twitter.github.com/bootstrap/less.html#compiling">Read more in our docs &raquo;</a>
Runs the recess compiler to rebuild the `/less` files and compiles the docs pages. Requires recess and uglify-js. <a href="http://twitter.github.com/bootstrap/extend.html#compiling">Read more in our docs &raquo;</a>
+ **test** - `make test`
Runs jshint and qunit tests headlessly in phantom js (used for ci). Depends on having phatomjs installed.
Runs jshint and qunit tests headlessly in [phantomjs](http://code.google.com/p/phantomjs/) (used for ci). Depends on having phantomjs installed.
+ **watch** - `make watch`
This is a convenience method for watching just Less files and automatically building them whenever you save. Requires the Watchr gem.
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://github.com/mdo
**Jacob Thornton**
@@ -114,8 +95,7 @@ Authors
Copyright and license
---------------------
## Copyright and license
Copyright 2012 Twitter, Inc.
+8
View File
@@ -0,0 +1,8 @@
{
"name": "bootstrap",
"version": "2.2.2",
"main": ["./docs/assets/js/bootstrap.js", "./docs/assets/css/bootstrap.css"],
"dependencies": {
"jquery": "~1.8.0"
}
}
+10
View File
@@ -0,0 +1,10 @@
{
"name": "twitter/bootstrap"
, "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development."
, "keywords": ["bootstrap", "css"]
, "homepage": "http://twitter.github.com/bootstrap/"
, "author": "Twitter Inc."
, "license": "Apache-2.0"
, "target-dir": "twitter/bootstrap"
}
+695 -411
View File
File diff suppressed because it is too large Load Diff
+2156 -1077
View File
File diff suppressed because it is too large Load Diff
+642 -419
View File
File diff suppressed because it is too large Load Diff
Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.3 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 128 KiB

After

Width:  |  Height:  |  Size: 122 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 82 KiB

After

Width:  |  Height:  |  Size: 79 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 61 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 133 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 71 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 75 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 53 KiB

After

Width:  |  Height:  |  Size: 49 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 172 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 205 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 81 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 134 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 134 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 398 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 316 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 305 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 213 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 345 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 117 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 172 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 301 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 292 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 405 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 84 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 370 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 312 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 452 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 264 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1008 B

+1 -1
View File
@@ -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.
+14 -44
View File
@@ -6,11 +6,21 @@
$(function(){
var $window = $(window)
// Disable certain links in docs
$('section [href^=#]').click(function (e) {
e.preventDefault()
})
// side bar
$('.bs-docs-sidenav').affix({
offset: {
top: function () { return $window.width() <= 980 ? 290 : 210 }
, bottom: 270
}
})
// make code pretty
window.prettyPrint && prettyPrint()
@@ -21,56 +31,16 @@
$(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({
if ($('#gridSystem').length) {
$('#gridSystem').tooltip({
selector: '.show-grid > div'
, 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()
// hack sad times - holdover until rewrite for 2.1
$nav.on('click', function () {
if (!isFixed) setTimeout(function () { $win.scrollTop($win.scrollTop() - 47) }, 10)
})
$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({
$('.tooltip-demo').tooltip({
selector: "a[rel=tooltip]"
})
@@ -119,7 +89,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 })
+117
View File
@@ -0,0 +1,117 @@
/* ==========================================================
* bootstrap-affix.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#affix
* ==========================================================
* Copyright 2012 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);
+13 -4
View File
@@ -1,5 +1,5 @@
/* ==========================================================
* bootstrap-alert.js v2.0.3
* bootstrap-alert.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#alerts
* ==========================================================
* Copyright 2012 Twitter, Inc.
@@ -68,6 +68,8 @@
/* ALERT PLUGIN DEFINITION
* ======================= */
var old = $.fn.alert
$.fn.alert = function (option) {
return this.each(function () {
var $this = $(this)
@@ -80,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);
+17 -8
View File
@@ -1,5 +1,5 @@
/* ============================================================
* bootstrap-button.js v2.0.3
* bootstrap-button.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================
* Copyright 2012 Twitter, Inc.
@@ -51,7 +51,7 @@
}
Button.prototype.toggle = function () {
var $parent = this.$element.parent('[data-toggle="buttons-radio"]')
var $parent = this.$element.closest('[data-toggle="buttons-radio"]')
$parent && $parent
.find('.active')
@@ -64,6 +64,8 @@
/* BUTTON PLUGIN DEFINITION
* ======================== */
var old = $.fn.button
$.fn.button = function (option) {
return this.each(function () {
var $this = $(this)
@@ -82,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);
+30 -14
View File
@@ -1,5 +1,5 @@
/* ==========================================================
* bootstrap-carousel.js v2.0.3
* bootstrap-carousel.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#carousel
* ==========================================================
* Copyright 2012 Twitter, Inc.
@@ -29,7 +29,6 @@
var Carousel = function (element, options) {
this.$element = $(element)
this.options = options
this.options.slide && this.slide(this.options.slide)
this.options.pause == 'hover' && this.$element
.on('mouseenter', $.proxy(this.pause, this))
.on('mouseleave', $.proxy(this.cycle, this))
@@ -46,7 +45,7 @@
}
, to: function (pos) {
var $active = this.$element.find('.active')
var $active = this.$element.find('.item.active')
, children = $active.parent().children()
, activePos = children.index($active)
, that = this
@@ -68,6 +67,10 @@
, 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()
}
clearInterval(this.interval)
this.interval = null
return this
@@ -84,13 +87,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 = $.Event('slide')
, e
this.sliding = true
@@ -98,6 +101,10 @@
$next = $next.length ? $next : this.$element.find('.item')[fallback]()
e = $.Event('slide', {
relatedTarget: $next[0]
})
if ($next.hasClass('active')) return
if ($.support.transition && this.$element.hasClass('slide')) {
@@ -133,14 +140,17 @@
/* CAROUSEL PLUGIN DEFINITION
* ========================== */
var old = $.fn.carousel
$.fn.carousel = function (option) {
return this.each(function () {
var $this = $(this)
, data = $this.data('carousel')
, 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 if (action) data[action]()
else if (options.interval) data.cycle()
})
}
@@ -153,17 +163,23 @@
$.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]', 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())
$target.carousel(options)
e.preventDefault()
})
}(window.jQuery);
+24 -14
View File
@@ -1,5 +1,5 @@
/* =============================================================
* bootstrap-collapse.js v2.0.3
* bootstrap-collapse.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#collapse
* =============================================================
* Copyright 2012 Twitter, Inc.
@@ -67,7 +67,7 @@
this.$element[dimension](0)
this.transition('addClass', $.Event('show'), 'shown')
this.$element[dimension](this.$element[0][scroll])
$.support.transition && this.$element[dimension](this.$element[0][scroll])
}
, hide: function () {
@@ -120,8 +120,10 @@
}
/* COLLAPSIBLE PLUGIN DEFINITION
* ============================== */
/* COLLAPSE PLUGIN DEFINITION
* ========================== */
var old = $.fn.collapse
$.fn.collapse = function (option) {
return this.each(function () {
@@ -140,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);
+81 -20
View File
@@ -1,5 +1,5 @@
/* ============================================================
* bootstrap-dropdown.js v2.0.3
* bootstrap-dropdown.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
* ============================================================
* Copyright 2012 Twitter, Inc.
@@ -26,7 +26,7 @@
/* DROPDOWN CLASS DEFINITION
* ========================= */
var toggle = '[data-toggle="dropdown"]'
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 () {
@@ -41,40 +41,92 @@
, toggle: function (e) {
var $this = $(this)
, $parent
, selector
, isActive
if ($this.is('.disabled, :disabled')) return
selector = $this.attr('data-target')
if (!selector) {
selector = $this.attr('href')
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
}
$parent = $(selector)
$parent.length || ($parent = $this.parent())
$parent = getParent($this)
isActive = $parent.hasClass('open')
clearMenus()
if (!isActive) $parent.toggleClass('open')
if (!isActive) {
$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)) 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')
$(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)
$parent.length || ($parent = $this.parent())
return $parent
}
/* DROPDOWN PLUGIN DEFINITION
* ========================== */
var old = $.fn.dropdown
$.fn.dropdown = function (option) {
return this.each(function () {
var $this = $(this)
@@ -87,14 +139,23 @@
$.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', '.dropdown form', function (e) { e.stopPropagation() })
.on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
})
$(document)
.on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus)
.on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
.on('touchstart.dropdown.data-api', '.dropdown-menu', function (e) { e.stopPropagation() })
.on('click.dropdown.data-api touchstart.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
.on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
}(window.jQuery);
+117 -90
View File
@@ -1,5 +1,5 @@
/* =========================================================
* bootstrap-modal.js v2.0.3
* bootstrap-modal.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#modals
* =========================================================
* Copyright 2012 Twitter, Inc.
@@ -26,10 +26,11 @@
/* 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 = {
@@ -48,12 +49,11 @@
if (this.isShown || e.isDefaultPrevented()) return
$('body').addClass('modal-open')
this.isShown = true
escape.call(this)
backdrop.call(this, function () {
this.escape()
this.backdrop(function () {
var transition = $.support.transition && that.$element.hasClass('fade')
if (!that.$element.parent().length) {
@@ -67,11 +67,15 @@
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')
})
}
@@ -89,98 +93,108 @@
this.isShown = false
$('body').removeClass('modal-open')
this.escape()
escape.call(this)
$(document).off('focusin.modal')
this.$element.removeClass('in')
this.$element
.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 (that) {
this.$element
.hide()
.trigger('hidden')
$.support.transition && this.$element.hasClass('fade')?
this.$backdrop.one($.support.transition.end, $.proxy(removeBackdrop, this)) :
removeBackdrop.call(this)
this.backdrop()
}
} else if (callback) {
callback()
}
}
, removeBackdrop: function () {
this.$backdrop.remove()
this.$backdrop = null
}
function removeBackdrop() {
this.$backdrop.remove()
this.$backdrop = null
}
, backdrop: function (callback) {
var that = this
, animate = this.$element.hasClass('fade') ? 'fade' : ''
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')
}
if (this.isShown && this.options.backdrop) {
var doAnimate = $.support.transition && animate
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')
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, $.proxy(this.removeBackdrop, this)) :
this.removeBackdrop()
} else if (callback) {
callback()
}
}
}
/* MODAL PLUGIN DEFINITION
* ======================= */
var old = $.fn.modal
$.fn.modal = function (option) {
return this.each(function () {
var $this = $(this)
@@ -201,18 +215,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);
+21 -5
View File
@@ -1,5 +1,5 @@
/* ===========================================================
* bootstrap-popover.js v2.0.3
* bootstrap-popover.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#popovers
* ===========================================================
* Copyright 2012 Twitter, Inc.
@@ -26,7 +26,7 @@
/* POPOVER PUBLIC CLASS DEFINITION
* =============================== */
var Popover = function ( element, options ) {
var Popover = function (element, options) {
this.init('popover', element, options)
}
@@ -43,8 +43,8 @@
, title = this.getTitle()
, content = this.getContent()
$tip.find('.popover-title')[this.isHTML(title) ? 'html' : 'text'](title)
$tip.find('.popover-content > *')[this.isHTML(content) ? 'html' : 'text'](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')
}
@@ -71,12 +71,18 @@
return this.$tip
}
, destroy: function () {
this.hide().$element.off('.' + this.type).removeData(this.type)
}
})
/* POPOVER PLUGIN DEFINITION
* ======================= */
var old = $.fn.popover
$.fn.popover = function (option) {
return this.each(function () {
var $this = $(this)
@@ -91,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><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"></div></div></div>'
})
/* POPOVER NO CONFLICT
* =================== */
$.fn.popover.noConflict = function () {
$.fn.popover = old
return this
}
}(window.jQuery);
+22 -11
View File
@@ -1,5 +1,5 @@
/* =============================================================
* bootstrap-scrollspy.js v2.0.3
* bootstrap-scrollspy.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
* =============================================================
* Copyright 2012 Twitter, Inc.
@@ -23,19 +23,19 @@
"use strict"; // jshint ;_;
/* SCROLLSPY CLASS DEFINITION
* ========================== */
/* SCROLLSPY CLASS DEFINITION
* ========================== */
function ScrollSpy( element, options) {
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()
}
@@ -58,8 +58,8 @@
, href = $el.data('target') || $el.attr('href')
, $href = /^#\w/.test(href) && $(href)
return ( $href
&& href.length
&& [[ $href.position().top, href ]] ) || null
&& $href.length
&& [[ $href.position().top + self.$scrollElement.scrollTop(), href ]] ) || null
})
.sort(function (a, b) { return a[0] - b[0] })
.each(function () {
@@ -108,7 +108,7 @@
.parent('li')
.addClass('active')
if (active.parent('.dropdown-menu')) {
if (active.parent('.dropdown-menu').length) {
active = active.closest('li.dropdown').addClass('active')
}
@@ -121,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')
@@ -138,10 +140,19 @@
}
/* 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())
+17 -8
View File
@@ -1,5 +1,5 @@
/* ========================================================
* bootstrap-tab.js v2.0.3
* bootstrap-tab.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#tabs
* ========================================================
* Copyright 2012 Twitter, Inc.
@@ -26,7 +26,7 @@
/* TAB CLASS DEFINITION
* ==================== */
var Tab = function ( element ) {
var Tab = function (element) {
this.element = $(element)
}
@@ -49,7 +49,7 @@
if ( $this.parent('li').hasClass('active') ) return
previous = $ul.find('.active a').last()[0]
previous = $ul.find('.active:last a')[0]
e = $.Event('show', {
relatedTarget: previous
@@ -110,6 +110,8 @@
/* TAB PLUGIN DEFINITION
* ===================== */
var old = $.fn.tab
$.fn.tab = function ( option ) {
return this.each(function () {
var $this = $(this)
@@ -122,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);
+36 -24
View File
@@ -1,5 +1,5 @@
/* ===========================================================
* bootstrap-tooltip.js v2.0.3
* bootstrap-tooltip.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#tooltips
* Inspired by the original jQuery.tipsy by Jason Frame
* ===========================================================
@@ -44,11 +44,13 @@
this.options = this.getOptions(options)
this.enabled = true
if (this.options.trigger != 'manual') {
eventIn = this.options.trigger == 'hover' ? 'mouseenter' : 'focus'
if (this.options.trigger == 'click') {
this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this))
} else 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))
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 ?
@@ -84,9 +86,9 @@
, leave: function (e) {
var self = $(e.currentTarget)[this.type](this._options).data(this.type)
if (this.timeout) clearTimeout(this.timeout)
if (!self.options.delay || !self.options.delay.hide) return self.hide()
clearTimeout(this.timeout)
self.hoverState = 'out'
this.timeout = setTimeout(function() {
if (self.hoverState == 'out') self.hide()
@@ -117,9 +119,9 @@
inside = /in/.test(placement)
$tip
.remove()
.detach()
.css({ top: 0, left: 0, display: 'block' })
.appendTo(inside ? this.$element : document.body)
.insertAfter(this.$element)
pos = this.getPosition(inside)
@@ -142,26 +144,17 @@
}
$tip
.css(tp)
.offset(tp)
.addClass(placement)
.addClass('in')
}
}
, isHTML: function(text) {
// html string detection logic adapted from jQuery
return typeof text != 'string'
|| ( text.charAt(0) === "<"
&& text.charAt( text.length - 1 ) === ">"
&& text.length >= 3
) || /^(?:[^<]*<[\w\W]+>[^>]*$)/.exec(text)
}
, setContent: function () {
var $tip = this.tip()
, title = this.getTitle()
$tip.find('.tooltip-inner')[this.isHTML(title) ? 'html' : 'text'](title)
$tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title)
$tip.removeClass('fade in top bottom left right')
}
@@ -173,18 +166,20 @@
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()
return this
}
, fixTitle: function () {
@@ -240,8 +235,13 @@
this.enabled = !this.enabled
}
, toggle: function () {
this[this.tip().hasClass('in') ? 'hide' : 'show']()
, toggle: function (e) {
var self = $(e.currentTarget)[this.type](this._options).data(this.type)
self[self.tip().hasClass('in') ? 'hide' : 'show']()
}
, destroy: function () {
this.hide().$element.off('.' + this.type).removeData(this.type)
}
}
@@ -250,6 +250,8 @@
/* TOOLTIP PLUGIN DEFINITION
* ========================= */
var old = $.fn.tooltip
$.fn.tooltip = function ( option ) {
return this.each(function () {
var $this = $(this)
@@ -270,6 +272,16 @@
, trigger: 'hover'
, title: ''
, delay: 0
, html: false
}
/* TOOLTIP NO CONFLICT
* =================== */
$.fn.tooltip.noConflict = function () {
$.fn.tooltip = old
return this
}
}(window.jQuery);
+8 -9
View File
@@ -1,5 +1,5 @@
/* ===================================================
* bootstrap-transition.js v2.0.3
* bootstrap-transition.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#transitions
* ===================================================
* Copyright 2012 Twitter, Inc.
@@ -20,14 +20,14 @@
!function ($) {
"use strict"; // jshint ;_;
/* CSS TRANSITION SUPPORT (http://www.modernizr.com/)
* ======================================================= */
$(function () {
"use strict"; // jshint ;_;
/* CSS TRANSITION SUPPORT (http://www.modernizr.com/)
* ======================================================= */
$.support.transition = (function () {
var transitionEnd = (function () {
@@ -36,8 +36,7 @@
, transEndEventNames = {
'WebkitTransition' : 'webkitTransitionEnd'
, 'MozTransition' : 'transitionend'
, 'OTransition' : 'oTransitionEnd'
, 'msTransition' : 'MSTransitionEnd'
, 'OTransition' : 'oTransitionEnd otransitionend'
, 'transition' : 'transitionend'
}
, name
+86 -48
View File
@@ -1,5 +1,5 @@
/* =============================================================
* bootstrap-typeahead.js v2.0.3
* bootstrap-typeahead.js v2.2.2
* http://twitter.github.com/bootstrap/javascript.html#typeahead
* =============================================================
* Copyright 2012 Twitter, Inc.
@@ -33,8 +33,8 @@
this.sorter = this.options.sorter || this.sorter
this.highlighter = this.options.highlighter || this.highlighter
this.updater = this.options.updater || this.updater
this.$menu = $(this.options.menu).appendTo('body')
this.source = this.options.source
this.$menu = $(this.options.menu)
this.shown = false
this.listen()
}
@@ -60,12 +60,14 @@
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
}
@@ -77,17 +79,23 @@
}
, 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) {
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)
})
@@ -168,8 +176,8 @@
.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
@@ -177,10 +185,56 @@
.on('mouseenter', 'li', $.proxy(this.mouseenter, this))
}
, eventSupported: function(eventName) {
var isSupported = eventName in this.$element
if (!isSupported) {
this.$element.setAttribute(eventName, 'return;')
isSupported = typeof this.$element[eventName] === 'function'
}
return isSupported
}
, move: function (e) {
if (!this.shown) return
switch(e.keyCode) {
case 9: // tab
case 13: // enter
case 27: // escape
e.preventDefault()
break
case 38: // up arrow
e.preventDefault()
this.prev()
break
case 40: // down arrow
e.preventDefault()
this.next()
break
}
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
@@ -202,32 +256,6 @@
e.preventDefault()
}
, keypress: function (e) {
if (!this.shown) return
switch(e.keyCode) {
case 9: // tab
case 13: // enter
case 27: // escape
e.preventDefault()
break
case 38: // up arrow
if (e.type != 'keydown') break
e.preventDefault()
this.prev()
break
case 40: // down arrow
if (e.type != 'keydown') break
e.preventDefault()
this.next()
break
}
e.stopPropagation()
}
, blur: function (e) {
var that = this
setTimeout(function () { that.hide() }, 150)
@@ -250,6 +278,8 @@
/* TYPEAHEAD PLUGIN DEFINITION
* =========================== */
var old = $.fn.typeahead
$.fn.typeahead = function (option) {
return this.each(function () {
var $this = $(this)
@@ -265,21 +295,29 @@
, 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
e.preventDefault()
$this.typeahead($this.data())
})
}(window.jQuery);
}(window.jQuery);
+587 -252
View File
File diff suppressed because it is too large Load Diff
+2 -2
View File
File diff suppressed because one or more lines are too long
@@ -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;
}
+342
View File
@@ -0,0 +1,342 @@
/*
Holder - 1.6 - client side image placeholders
(c) 2012 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}
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;
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 sans-serif";
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);
}
ctx.font = "bold " + (text_height * ratio) + "px sans-serif";
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;
var dimensions_caption = dimensions.width + "x" + dimensions.height;
theme = (text ? extend(theme, {
text: text
}) : 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);
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("table");
fluid.setAttribute("cellspacing",0)
fluid.setAttribute("cellpadding",0)
fluid.setAttribute("border",0)
var row = document.createElement("tr")
.appendChild(document.createElement("td")
.appendChild(document.createTextNode(theme.text)));
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;
var frag = document.createDocumentFragment(),
tbody = document.createElement("tbody"),
tr = document.createElement("tr"),
td = document.createElement("td");
tr.appendChild(td);
tbody.appendChild(tr);
frag.appendChild(tbody);
if (theme.text) {
td.appendChild(document.createTextNode(theme.text))
fluid.appendChild(frag);
} else {
td.appendChild(document.createTextNode(dimensions_caption))
fluid.appendChild(frag);
fluid_images.push(fluid);
setTimeout(fluid_update, 0);
}
el.parentNode.replaceChild(fluid, el);
}
function fluid_update() {
for (i in fluid_images) {
var el = fluid_images[i];
var label = el.getElementsByTagName("td")[0].firstChild;
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);
}
}
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",
elements: ".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;border-collapse:collapse;border:0;vertical-align:middle;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];
}
}
}
for (var flag in app.flags) {
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_nodes = selector(options.images),
elements = selector(options.elements),
preempted = true,
images = [];
for (i = 0, l = images_nodes.length; i < l; i++) images.push(images_nodes[i]);
var holdercss = document.createElement("style");
holdercss.type = "text/css";
holdercss.styleSheet ? holdercss.styleSheet.cssText = options.stylesheet : holdercss.textContent = options.stylesheet;
document.getElementsByTagName("head")[0].appendChild(holdercss);
var cssregex = new RegExp(options.domain + "\/(.*?)\"?\\)");
for (var l = elements.length, i = 0; i < l; i++) {
var src = window.getComputedStyle(elements[i], null)
.getPropertyValue("background-image");
var flags = src.match(cssregex);
if (flags) {
var holder = parse_flags(flags[1].split("/"), options);
if (holder) {
render("background", elements[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();
});
})(Holder, window);
+2 -9252
View File
File diff suppressed because one or more lines are too long
+1972 -1486
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -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
Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 472 B

After

Width:  |  Height:  |  Size: 365 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 115 B

After

Width:  |  Height:  |  Size: 81 B

+2145 -1469
View File
File diff suppressed because it is too large Load Diff
+514
View File
@@ -0,0 +1,514 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Customize · Bootstrap</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">
<!-- Le styles -->
<link href="assets/css/bootstrap.css" rel="stylesheet">
<link href="assets/css/bootstrap-responsive.css" rel="stylesheet">
<link href="assets/css/docs.css" rel="stylesheet">
<link href="assets/js/google-code-prettify/prettify.css" rel="stylesheet">
<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<!-- Le fav and touch icons -->
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="assets/ico/apple-touch-icon-144-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="assets/ico/apple-touch-icon-114-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png">
<link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png">
<link rel="shortcut icon" href="assets/ico/favicon.png">
</head>
<body data-spy="scroll" data-target=".bs-docs-sidebar">
<!-- Navbar
================================================== -->
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse collapse">
<ul class="nav">
<li class="">
<a href="./index.html">Home</a>
</li>
<li class="">
<a href="./getting-started.html">Get started</a>
</li>
<li class="">
<a href="./scaffolding.html">Scaffolding</a>
</li>
<li class="">
<a href="./base-css.html">Base CSS</a>
</li>
<li class="">
<a href="./components.html">Components</a>
</li>
<li class="">
<a href="./javascript.html">JavaScript</a>
</li>
<li class="active">
<a href="./customize.html">Customize</a>
</li>
</ul>
</div>
</div>
</div>
</div>
<!-- Masthead
================================================== -->
<header class="jumbotron subhead" id="overview">
<div class="container">
<h1>Customize and download</h1>
<p class="lead"><a href="https://github.com/twitter/bootstrap/zipball/master">Download Bootstrap</a> or customize variables, components, JavaScript plugins, and more.</p>
</div>
</header>
<div class="container">
<!-- Docs nav
================================================== -->
<div class="row">
<div class="span3 bs-docs-sidebar">
<ul class="nav nav-list bs-docs-sidenav">
<li><a href="#components"><i class="icon-chevron-right"></i> 1. Choose components</a></li>
<li><a href="#plugins"><i class="icon-chevron-right"></i> 2. Select jQuery plugins</a></li>
<li><a href="#variables"><i class="icon-chevron-right"></i> 3. Customize variables</a></li>
<li><a href="#download"><i class="icon-chevron-right"></i> 4. Download</a></li>
</ul>
</div>
<div class="span9">
<!-- Customize form
================================================== -->
<form>
<section class="download" id="components">
<div class="page-header">
<a class="btn btn-small pull-right toggle-all" href="#">Toggle all</a>
<h1>
1. Choose components
</h1>
</div>
<div class="row download-builder">
<div class="span3">
<h3>Scaffolding</h3>
<label class="checkbox"><input checked="checked" type="checkbox" value="reset.less"> Normalize and reset</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="scaffolding.less"> Body type and links</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="grid.less"> Grid system</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="layouts.less"> Layouts</label>
<h3>Base CSS</h3>
<label class="checkbox"><input checked="checked" type="checkbox" value="type.less"> Headings, body, etc</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="code.less"> Code and pre</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="labels-badges.less"> Labels and badges</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="tables.less"> Tables</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="forms.less"> Forms</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="buttons.less"> Buttons</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="sprites.less"> Icons</label>
</div><!-- /span -->
<div class="span3">
<h3>Components</h3>
<label class="checkbox"><input checked="checked" type="checkbox" value="button-groups.less"> Button groups and dropdowns</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="navs.less"> Navs, tabs, and pills</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="navbar.less"> Navbar</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="breadcrumbs.less"> Breadcrumbs</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="pagination.less"> Pagination</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="pager.less"> Pager</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="thumbnails.less"> Thumbnails</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="alerts.less"> Alerts</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="progress-bars.less"> Progress bars</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="hero-unit.less"> Hero unit</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="media.less"> Media component</label>
<h3>JS Components</h3>
<label class="checkbox"><input checked="checked" type="checkbox" value="tooltip.less"> Tooltips</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="popovers.less"> Popovers</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="modals.less"> Modals</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="dropdowns.less"> Dropdowns</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="accordion.less"> Collapse</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="carousel.less"> Carousel</label>
</div><!-- /span -->
<div class="span3">
<h3>Miscellaneous</h3>
<label class="checkbox"><input checked="checked" type="checkbox" value="wells.less"> Wells</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="close.less"> Close icon</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="utilities.less"> Utilities</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="component-animations.less"> Component animations</label>
<h3>Responsive</h3>
<label class="checkbox"><input checked="checked" type="checkbox" value="responsive-utilities.less"> Visible/hidden classes</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="responsive-767px-max.less"> Narrow tablets and below (<767px)</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="responsive-768px-979px.less"> Tablets to desktops (767-979px)</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="responsive-1200px-min.less"> Large desktops (>1200px)</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="responsive-navbar.less"> Responsive navbar</label>
</div><!-- /span -->
</div><!-- /row -->
</section>
<section class="download" id="plugins">
<div class="page-header">
<a class="btn btn-small pull-right toggle-all" href="#">Toggle all</a>
<h1>
2. Select jQuery plugins
</h1>
</div>
<div class="row download-builder">
<div class="span3">
<label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-transition.js">
Transitions <small>(required for any animation)</small>
</label>
<label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-modal.js">
Modals
</label>
<label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-dropdown.js">
Dropdowns
</label>
<label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-scrollspy.js">
Scrollspy
</label>
<label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-tab.js">
Togglable tabs
</label>
<label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-tooltip.js">
Tooltips
</label>
<label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-popover.js">
Popovers <small>(requires Tooltips)</small>
</label>
</div><!-- /span -->
<div class="span3">
<label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-affix.js">
Affix
</label>
<label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-alert.js">
Alert messages
</label>
<label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-button.js">
Buttons
</label>
<label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-collapse.js">
Collapse
</label>
<label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-carousel.js">
Carousel
</label>
<label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-typeahead.js">
Typeahead
</label>
</div><!-- /span -->
<div class="span3">
<h4 class="muted">Heads up!</h4>
<p class="muted">All checked plugins will be compiled into a single file, bootstrap.js. All plugins require the latest version of <a href="http://jquery.com/" target="_blank">jQuery</a> to be included.</p>
</div><!-- /span -->
</div><!-- /row -->
</section>
<section class="download" id="variables">
<div class="page-header">
<a class="btn btn-small pull-right toggle-all" href="#">Reset to defaults</a>
<h1>
3. Customize variables
</h1>
</div>
<div class="row download-builder">
<div class="span3">
<h3>Scaffolding</h3>
<label>@bodyBackground</label>
<input type="text" class="span3" placeholder="@white">
<label>@textColor</label>
<input type="text" class="span3" placeholder="@grayDark">
<h3>Links</h3>
<label>@linkColor</label>
<input type="text" class="span3" placeholder="#08c">
<label>@linkColorHover</label>
<input type="text" class="span3" placeholder="darken(@linkColor, 15%)">
<h3>Colors</h3>
<label>@blue</label>
<input type="text" class="span3" placeholder="#049cdb">
<label>@green</label>
<input type="text" class="span3" placeholder="#46a546">
<label>@red</label>
<input type="text" class="span3" placeholder="#9d261d">
<label>@yellow</label>
<input type="text" class="span3" placeholder="#ffc40d">
<label>@orange</label>
<input type="text" class="span3" placeholder="#f89406">
<label>@pink</label>
<input type="text" class="span3" placeholder="#c3325f">
<label>@purple</label>
<input type="text" class="span3" placeholder="#7a43b6">
<h3>Sprites</h3>
<label>@iconSpritePath</label>
<input type="text" class="span3" placeholder="'../img/glyphicons-halflings.png'">
<label>@iconWhiteSpritePath</label>
<input type="text" class="span3" placeholder="'../img/glyphicons-halflings-white.png'">
<h3>Grid system</h3>
<label>@gridColumns</label>
<input type="text" class="span3" placeholder="12">
<label>@gridColumnWidth</label>
<input type="text" class="span3" placeholder="60px">
<label>@gridGutterWidth</label>
<input type="text" class="span3" placeholder="20px">
<label>@gridColumnWidth1200</label>
<input type="text" class="span3" placeholder="70px">
<label>@gridGutterWidth1200</label>
<input type="text" class="span3" placeholder="30px">
<label>@gridColumnWidth768</label>
<input type="text" class="span3" placeholder="42px">
<label>@gridGutterWidth768</label>
<input type="text" class="span3" placeholder="20px">
</div><!-- /span -->
<div class="span3">
<h3>Typography</h3>
<label>@sansFontFamily</label>
<input type="text" class="span3" placeholder="'Helvetica Neue', Helvetica, Arial, sans-serif">
<label>@serifFontFamily</label>
<input type="text" class="span3" placeholder="Georgia, 'Times New Roman', Times, serif">
<label>@monoFontFamily</label>
<input type="text" class="span3" placeholder="Menlo, Monaco, 'Courier New', monospace">
<label>@baseFontSize</label>
<input type="text" class="span3" placeholder="14px">
<label>@baseFontFamily</label>
<input type="text" class="span3" placeholder="@sansFontFamily">
<label>@baseLineHeight</label>
<input type="text" class="span3" placeholder="20px">
<label>@altFontFamily</label>
<input type="text" class="span3" placeholder="@serifFontFamily">
<label>@headingsFontFamily</label>
<input type="text" class="span3" placeholder="inherit">
<label>@headingsFontWeight</label>
<input type="text" class="span3" placeholder="bold">
<label>@headingsColor</label>
<input type="text" class="span3" placeholder="inherit">
<label>@fontSizeLarge</label>
<input type="text" class="span3" placeholder="@baseFontSize * 1.25">
<label>@fontSizeSmall</label>
<input type="text" class="span3" placeholder="@baseFontSize * 0.85">
<label>@fontSizeMini</label>
<input type="text" class="span3" placeholder="@baseFontSize * 0.75">
<label>@paddingLarge</label>
<input type="text" class="span3" placeholder="11px 19px">
<label>@paddingSmall</label>
<input type="text" class="span3" placeholder="2px 10px">
<label>@paddingMini</label>
<input type="text" class="span3" placeholder="1px 6px">
<label>@baseBorderRadius</label>
<input type="text" class="span3" placeholder="4px">
<label>@borderRadiusLarge</label>
<input type="text" class="span3" placeholder="6px">
<label>@borderRadiusSmall</label>
<input type="text" class="span3" placeholder="3px">
<label>@heroUnitBackground</label>
<input type="text" class="span3" placeholder="@grayLighter">
<label>@heroUnitHeadingColor</label>
<input type="text" class="span3" placeholder="inherit">
<label>@heroUnitLeadColor</label>
<input type="text" class="span3" placeholder="inherit">
<h3>Tables</h3>
<label>@tableBackground</label>
<input type="text" class="span3" placeholder="transparent">
<label>@tableBackgroundAccent</label>
<input type="text" class="span3" placeholder="#f9f9f9">
<label>@tableBackgroundHover</label>
<input type="text" class="span3" placeholder="#f5f5f5">
<label>@tableBorder</label>
<input type="text" class="span3" placeholder="#ddd">
<h3>Forms</h3>
<label>@placeholderText</label>
<input type="text" class="span3" placeholder="@grayLight">
<label>@inputBackground</label>
<input type="text" class="span3" placeholder="@white">
<label>@inputBorder</label>
<input type="text" class="span3" placeholder="#ccc">
<label>@inputBorderRadius</label>
<input type="text" class="span3" placeholder="3px">
<label>@inputDisabledBackground</label>
<input type="text" class="span3" placeholder="@grayLighter">
<label>@formActionsBackground</label>
<input type="text" class="span3" placeholder="#f5f5f5">
<label>@btnPrimaryBackground</label>
<input type="text" class="span3" placeholder="@linkColor">
<label>@btnPrimaryBackgroundHighlight</label>
<input type="text" class="span3" placeholder="darken(@white, 10%)">
</div><!-- /span -->
<div class="span3">
<h3>Form states &amp; alerts</h3>
<label>@warningText</label>
<input type="text" class="span3" placeholder="#c09853">
<label>@warningBackground</label>
<input type="text" class="span3" placeholder="#fcf8e3">
<label>@errorText</label>
<input type="text" class="span3" placeholder="#b94a48">
<label>@errorBackground</label>
<input type="text" class="span3" placeholder="#f2dede">
<label>@successText</label>
<input type="text" class="span3" placeholder="#468847">
<label>@successBackground</label>
<input type="text" class="span3" placeholder="#dff0d8">
<label>@infoText</label>
<input type="text" class="span3" placeholder="#3a87ad">
<label>@infoBackground</label>
<input type="text" class="span3" placeholder="#d9edf7">
<h3>Navbar</h3>
<label>@navbarHeight</label>
<input type="text" class="span3" placeholder="40px">
<label>@navbarBackground</label>
<input type="text" class="span3" placeholder="@grayDarker">
<label>@navbarBackgroundHighlight</label>
<input type="text" class="span3" placeholder="@grayDark">
<label>@navbarText</label>
<input type="text" class="span3" placeholder="@grayLight">
<label>@navbarBrandColor</label>
<input type="text" class="span3" placeholder="@navbarLinkColor">
<label>@navbarLinkColor</label>
<input type="text" class="span3" placeholder="@grayLight">
<label>@navbarLinkColorHover</label>
<input type="text" class="span3" placeholder="@white">
<label>@navbarLinkColorActive</label>
<input type="text" class="span3" placeholder="@navbarLinkColorHover">
<label>@navbarLinkBackgroundHover</label>
<input type="text" class="span3" placeholder="transparent">
<label>@navbarLinkBackgroundActive</label>
<input type="text" class="span3" placeholder="@navbarBackground">
<label>@navbarSearchBackground</label>
<input type="text" class="span3" placeholder="lighten(@navbarBackground, 25%)">
<label>@navbarSearchBackgroundFocus</label>
<input type="text" class="span3" placeholder="@white">
<label>@navbarSearchBorder</label>
<input type="text" class="span3" placeholder="darken(@navbarSearchBackground, 30%)">
<label>@navbarSearchPlaceholderColor</label>
<input type="text" class="span3" placeholder="#ccc">
<label>@navbarCollapseWidth</label>
<input type="text" class="span3" placeholder="979px">
<label>@navbarCollapseDesktopWidth</label>
<input type="text" class="span3" placeholder="@navbarCollapseWidth + 1">
<h3>Dropdowns</h3>
<label>@dropdownBackground</label>
<input type="text" class="span3" placeholder="@white">
<label>@dropdownBorder</label>
<input type="text" class="span3" placeholder="rgba(0,0,0,.2)">
<label>@dropdownLinkColor</label>
<input type="text" class="span3" placeholder="@grayDark">
<label>@dropdownLinkColorHover</label>
<input type="text" class="span3" placeholder="@white">
<label>@dropdownLinkBackgroundHover</label>
<input type="text" class="span3" placeholder="@linkColor">
</div><!-- /span -->
</div><!-- /row -->
</section>
<section class="download" id="download">
<div class="page-header">
<h1>
4. Download
</h1>
</div>
<div class="download-btn">
<a class="btn btn-primary" href="#" >Customize and Download</a>
<h4>What's included?</h4>
<p>Downloads include compiled CSS, compiled and minified CSS, and compiled jQuery plugins, all nicely packed up into a zipball for your convenience.</p>
</div>
</section><!-- /download -->
</form>
</div>
</div>
</div>
<!-- Footer
================================================== -->
<footer class="footer">
<div class="container">
<p>Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
<p>Code licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
<p><a href="http://glyphicons.com">Glyphicons Free</a> licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
<ul class="footer-links">
<li><a href="http://blog.getbootstrap.com">Blog</a></li>
<li class="muted">&middot;</li>
<li><a href="https://github.com/twitter/bootstrap/issues?state=open">Issues</a></li>
<li class="muted">&middot;</li>
<li><a href="https://github.com/twitter/bootstrap/wiki">Roadmap and changelog</a></li>
</ul>
</div>
</footer>
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
<script src="assets/js/jquery.js"></script>
<script src="assets/js/bootstrap-transition.js"></script>
<script src="assets/js/bootstrap-alert.js"></script>
<script src="assets/js/bootstrap-modal.js"></script>
<script src="assets/js/bootstrap-dropdown.js"></script>
<script src="assets/js/bootstrap-scrollspy.js"></script>
<script src="assets/js/bootstrap-tab.js"></script>
<script src="assets/js/bootstrap-tooltip.js"></script>
<script src="assets/js/bootstrap-popover.js"></script>
<script src="assets/js/bootstrap-button.js"></script>
<script src="assets/js/bootstrap-collapse.js"></script>
<script src="assets/js/bootstrap-carousel.js"></script>
<script src="assets/js/bootstrap-typeahead.js"></script>
<script src="assets/js/bootstrap-affix.js"></script>
<script src="assets/js/holder/holder.js"></script>
<script src="assets/js/google-code-prettify/prettify.js"></script>
<script src="assets/js/application.js"></script>
</body>
</html>
-453
View File
@@ -1,453 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Download · Twitter Bootstrap</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">
<!-- Le styles -->
<link href="assets/css/bootstrap.css" rel="stylesheet">
<link href="assets/css/bootstrap-responsive.css" rel="stylesheet">
<link href="assets/css/docs.css" rel="stylesheet">
<link href="assets/js/google-code-prettify/prettify.css" rel="stylesheet">
<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<!-- Le fav and touch icons -->
<link rel="shortcut icon" href="assets/ico/favicon.ico">
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="assets/ico/apple-touch-icon-144-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="assets/ico/apple-touch-icon-114-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png">
<link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png">
</head>
<body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar
================================================== -->
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse collapse">
<ul class="nav">
<li class="">
<a href="./index.html">Overview</a>
</li>
<li class="">
<a href="./scaffolding.html">Scaffolding</a>
</li>
<li class="">
<a href="./base-css.html">Base CSS</a>
</li>
<li class="">
<a href="./components.html">Components</a>
</li>
<li class="">
<a href="./javascript.html">Javascript plugins</a>
</li>
<li class="">
<a href="./less.html">Using LESS</a>
</li>
<li class="divider-vertical"></li>
<li class="active">
<a href="./download.html">Customize</a>
</li>
<li class="">
<a href="./examples.html">Examples</a>
</li>
</ul>
</div>
</div>
</div>
</div>
<div class="container">
<!-- Masthead
================================================== -->
<header class="jumbotron subhead" id="overview">
<h1>Customize and download</h1>
<p class="lead"><a href="https://github.com/twitter/bootstrap/zipball/master">Download the full repository</a> or customize your entire Bootstrap build by selecting only the components, javascript plugins, and assets you need.</p>
<div class="subnav">
<ul class="nav nav-pills">
<li><a href="#components">1. Choose components</a></li>
<li><a href="#plugins">2. Select jQuery plugins</a></li>
<li><a href="#variables">3. Customize variables</a></li>
<li><a href="#download">4. Download</a></li>
</ul>
</div>
</header>
<section class="download" id="components">
<div class="page-header">
<a class="btn btn-small pull-right toggle-all" href="#">Toggle all</a>
<h1>
1. Choose components
<small>Get just the CSS you need</small>
</h1>
</div>
<div class="row download-builder">
<div class="span3">
<h3>Scaffolding</h3>
<label class="checkbox"><input checked="checked" type="checkbox" value="reset.less"> Normalize and reset</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="scaffolding.less"> Body type and links</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="grid.less"> Grid system</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="layouts.less"> Layouts</label>
<h3>Base CSS</h3>
<label class="checkbox"><input checked="checked" type="checkbox" value="type.less"> Headings, body, etc</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="code.less"> Code and pre</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="labels-badges.less"> Labels and badges</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="tables.less"> Tables</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="forms.less"> Forms</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="buttons.less"> Buttons</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="sprites.less"> Icons</label>
</div><!-- /span -->
<div class="span3">
<h3>Components</h3>
<label class="checkbox"><input checked="checked" type="checkbox" value="button-groups.less"> Button groups and dropdowns</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="navs.less"> Navs, tabs, and pills</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="navbar.less"> Navbar</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="breadcrumbs.less"> Breadcrumbs</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="pagination.less"> Pagination</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="pager.less"> Pager</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="thumbnails.less"> Thumbnails</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="alerts.less"> Alerts</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="progress-bars.less"> Progress bars</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="hero-unit.less"> Hero unit</label>
</div><!-- /span -->
<div class="span3">
<h3>JS Components</h3>
<label class="checkbox"><input checked="checked" type="checkbox" value="tooltip.less"> Tooltips</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="popovers.less"> Popovers</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="modals.less"> Modals</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="dropdowns.less"> Dropdowns</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="accordion.less"> Collapse</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="carousel.less"> Carousel</label>
</div><!-- /span -->
<div class="span3">
<h3>Miscellaneous</h3>
<label class="checkbox"><input checked="checked" type="checkbox" value="wells.less"> Wells</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="close.less"> Close icon</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="utilities.less"> Utilities</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="component-animations.less"> Component animations</label>
<h3>Responsive</h3>
<label class="checkbox"><input checked="checked" type="checkbox" value="responsive-utilities.less"> Visible/hidden classes</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="responsive-767px-max.less"> Narrow tablets and below (<767px)</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="responsive-768px-979px.less"> Tablets to desktops (767-979px)</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="responsive-1200px-min.less"> Large desktops (>1200px)</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="responsive-navbar.less"> Responsive navbar</label>
</div><!-- /span -->
</div><!-- /row -->
</section>
<section class="download" id="plugins">
<div class="page-header">
<a class="btn btn-small pull-right toggle-all" href="#">Toggle all</a>
<h1>
2. Select jQuery plugins
<small>Quickly add only the necessary javascript</small>
</h1>
</div>
<div class="row download-builder">
<div class="span4">
<label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-transition.js">
Transitions <small>(required for any animation)</small>
</label>
<label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-modal.js">
Modals
</label>
<label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-dropdown.js">
Dropdowns
</label>
<label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-scrollspy.js">
Scrollspy
</label>
<label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-tab.js">
Togglable tabs
</label>
<label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-tooltip.js">
Tooltips
</label>
</div><!-- /span -->
<div class="span4">
<label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-popover.js">
Popovers <small>(requires Tooltips)</small>
</label>
<label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-alert.js">
Alert messages
</label>
<label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-button.js">
Buttons
</label>
<label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-collapse.js">
Collapse
</label>
<label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-carousel.js">
Carousel
</label>
<label class="checkbox">
<input type="checkbox" checked="true" value="bootstrap-typeahead.js">
Typeahead
</label>
</div><!-- /span -->
<div class="span4">
<h4 class="muted">Heads up!</h4>
<p class="muted">All checked plugins will be compiled into a single file, bootstrap.js. All plugins require the latest version of <a href="http://jquery.com/" target="_blank">jQuery</a> to be included.</p>
</div><!-- /span -->
</div><!-- /row -->
</section>
<section class="download" id="variables">
<div class="page-header">
<a class="btn btn-small pull-right toggle-all" href="#">Reset to defaults</a>
<h1>
3. Customize variables
<small>Optionally modify Bootstrap without a compiler</small>
</h1>
</div>
<div class="row download-builder">
<div class="span3">
<h3>Scaffolding</h3>
<label>@bodyBackground</label>
<input type="text" class="span3" placeholder="@white">
<label>@textColor</label>
<input type="text" class="span3" placeholder="@grayDark">
<h3>Links</h3>
<label>@linkColor</label>
<input type="text" class="span3" placeholder="#08c">
<label>@linkColorHover</label>
<input type="text" class="span3" placeholder="darken(@linkColor, 15%)">
<h3>Colors</h3>
<label>@blue</label>
<input type="text" class="span3" placeholder="#049cdb">
<label>@green</label>
<input type="text" class="span3" placeholder="#46a546">
<label>@red</label>
<input type="text" class="span3" placeholder="#9d261d">
<label>@yellow</label>
<input type="text" class="span3" placeholder="#ffc40d">
<label>@orange</label>
<input type="text" class="span3" placeholder="#f89406">
<label>@pink</label>
<input type="text" class="span3" placeholder="#c3325f">
<label>@purple</label>
<input type="text" class="span3" placeholder="#7a43b6">
<h3>Sprites</h3>
<label>@iconSpritePath</label>
<input type="text" class="span3" placeholder="'../img/glyphicons-halflings.png'">
<label>@iconWhiteSpritePath</label>
<input type="text" class="span3" placeholder="'../img/glyphicons-halflings-white.png'">
</div><!-- /span -->
<div class="span3">
<h3>Grid system</h3>
<label>@gridColumns</label>
<input type="text" class="span3" placeholder="12">
<label>@gridColumnWidth</label>
<input type="text" class="span3" placeholder="60px">
<label>@gridGutterWidth</label>
<input type="text" class="span3" placeholder="20px">
<h3>Fluid grid system</h3>
<label>@fluidGridColumnWidth</label>
<input type="text" class="span3" placeholder="6.382978723%">
<label>@fluidGridGutterWidth</label>
<input type="text" class="span3" placeholder="2.127659574%">
<h3>Typography</h3>
<label>@sansFontFamily</label>
<input type="text" class="span3" placeholder="'Helvetica Neue', Helvetica, Arial, sans-serif">
<label>@serifFontFamily</label>
<input type="text" class="span3" placeholder="Georgia, 'Times New Roman', Times, serif">
<label>@monoFontFamily</label>
<input type="text" class="span3" placeholder="Menlo, Monaco, 'Courier New', monospace">
<label>@baseFontSize</label>
<input type="text" class="span3" placeholder="13px">
<label>@baseFontFamily</label>
<input type="text" class="span3" placeholder="@sansFontFamily">
<label>@baseLineHeight</label>
<input type="text" class="span3" placeholder="18px">
<label>@altFontFamily</label>
<input type="text" class="span3" placeholder="@serifFontFamily">
<label>@headingsFontFamily</label>
<input type="text" class="span3" placeholder="inherit">
<label>@headingsFontWeight</label>
<input type="text" class="span3" placeholder="bold">
<label>@headingsColor</label>
<input type="text" class="span3" placeholder="inherit">
<label>@heroUnitBackground</label>
<input type="text" class="span3" placeholder="@grayLighter">
<label>@heroUnitHeadingColor</label>
<input type="text" class="span3" placeholder="inherit">
<label>@heroUnitLeadColor</label>
<input type="text" class="span3" placeholder="inherit">
</div><!-- /span -->
<div class="span3">
<h3>Tables</h3>
<label>@tableBackground</label>
<input type="text" class="span3" placeholder="transparent">
<label>@tableBackgroundAccent</label>
<input type="text" class="span3" placeholder="#f9f9f9">
<label>@tableBackgroundHover</label>
<input type="text" class="span3" placeholder="#f5f5f5">
<label>@tableBorder</label>
<input type="text" class="span3" placeholder="#ddd">
<h3>Navbar</h3>
<label>@navbarHeight</label>
<input type="text" class="span3" placeholder="40px">
<label>@navbarBackground</label>
<input type="text" class="span3" placeholder="@grayDarker">
<label>@navbarBackgroundHighlight</label>
<input type="text" class="span3" placeholder="@grayDark">
<label>@navbarText</label>
<input type="text" class="span3" placeholder="@grayLight">
<label>@navbarBrandColor</label>
<input type="text" class="span3" placeholder="@navbarLinkColor">
<label>@navbarLinkColor</label>
<input type="text" class="span3" placeholder="@grayLight">
<label>@navbarLinkColorHover</label>
<input type="text" class="span3" placeholder="@white">
<label>@navbarLinkColorActive</label>
<input type="text" class="span3" placeholder="@navbarLinkColorHover">
<label>@navbarLinkBackgroundHover</label>
<input type="text" class="span3" placeholder="transparent">
<label>@navbarLinkBackgroundActive</label>
<input type="text" class="span3" placeholder="@navbarBackground">
<label>@navbarSearchBackground</label>
<input type="text" class="span3" placeholder="lighten(@navbarBackground, 25%)">
<label>@navbarSearchBackgroundFocus</label>
<input type="text" class="span3" placeholder="@white">
<label>@navbarSearchBorder</label>
<input type="text" class="span3" placeholder="darken(@navbarSearchBackground, 30%)">
<label>@navbarSearchPlaceholderColor</label>
<input type="text" class="span3" placeholder="#ccc">
<h3>Dropdowns</h3>
<label>@dropdownBackground</label>
<input type="text" class="span3" placeholder="@white">
<label>@dropdownBorder</label>
<input type="text" class="span3" placeholder="rgba(0,0,0,.2)">
<label>@dropdownLinkColor</label>
<input type="text" class="span3" placeholder="@grayDark">
<label>@dropdownLinkColorHover</label>
<input type="text" class="span3" placeholder="@white">
<label>@dropdownLinkBackgroundHover</label>
<input type="text" class="span3" placeholder="@linkColor">
</div><!-- /span -->
<div class="span3">
<h3>Forms</h3>
<label>@placeholderText</label>
<input type="text" class="span3" placeholder="@grayLight">
<label>@inputBackground</label>
<input type="text" class="span3" placeholder="@white">
<label>@inputBorder</label>
<input type="text" class="span3" placeholder="#ccc">
<label>@inputBorderRadius</label>
<input type="text" class="span3" placeholder="3px">
<label>@inputDisabledBackground</label>
<input type="text" class="span3" placeholder="@grayLighter">
<label>@formActionsBackground</label>
<input type="text" class="span3" placeholder="#f5f5f5">
<label>@btnPrimaryBackground</label>
<input type="text" class="span3" placeholder="@linkColor">
<label>@btnPrimaryBackgroundHighlight</label>
<input type="text" class="span3" placeholder="darken(@white, 10%);">
<h3>Form states &amp; alerts</h3>
<label>@warningText</label>
<input type="text" class="span3" placeholder="#c09853">
<label>@warningBackground</label>
<input type="text" class="span3" placeholder="#fcf8e3">
<label>@errorText</label>
<input type="text" class="span3" placeholder="#b94a48">
<label>@errorBackground</label>
<input type="text" class="span3" placeholder="#f2dede">
<label>@successText</label>
<input type="text" class="span3" placeholder="#468847">
<label>@successBackground</label>
<input type="text" class="span3" placeholder="#dff0d8">
<label>@infoText</label>
<input type="text" class="span3" placeholder="#3a87ad">
<label>@infoBackground</label>
<input type="text" class="span3" placeholder="#d9edf7">
</div><!-- /span -->
</div><!-- /row -->
</section>
<section class="download" id="download">
<div class="page-header">
<h1>
4. Download
</h1>
</div>
<div class="download-btn">
<a class="btn btn-primary" href="#">Customize and Download</a>
<h4>What's included?</h4>
<p>Downloads include compiled CSS, compiled and minified CSS, and compiled jQuery plugins, all nicely packed up into a zipball for your convenience.</p>
</div>
</section><!-- /download -->
<!-- Footer
================================================== -->
<footer class="footer">
<p class="pull-right"><a href="#">Back to top</a></p>
<p>Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
<p>Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
<p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
</footer>
</div><!-- /container -->
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
<script src="assets/js/jquery.js"></script>
<script src="assets/js/google-code-prettify/prettify.js"></script>
<script src="assets/js/bootstrap-transition.js"></script>
<script src="assets/js/bootstrap-alert.js"></script>
<script src="assets/js/bootstrap-modal.js"></script>
<script src="assets/js/bootstrap-dropdown.js"></script>
<script src="assets/js/bootstrap-scrollspy.js"></script>
<script src="assets/js/bootstrap-tab.js"></script>
<script src="assets/js/bootstrap-tooltip.js"></script>
<script src="assets/js/bootstrap-popover.js"></script>
<script src="assets/js/bootstrap-button.js"></script>
<script src="assets/js/bootstrap-collapse.js"></script>
<script src="assets/js/bootstrap-carousel.js"></script>
<script src="assets/js/bootstrap-typeahead.js"></script>
<script src="assets/js/application.js"></script>
</body>
</html>
-146
View File
@@ -1,146 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Examples · Twitter Bootstrap</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">
<!-- Le styles -->
<link href="assets/css/bootstrap.css" rel="stylesheet">
<link href="assets/css/bootstrap-responsive.css" rel="stylesheet">
<link href="assets/css/docs.css" rel="stylesheet">
<link href="assets/js/google-code-prettify/prettify.css" rel="stylesheet">
<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<!-- Le fav and touch icons -->
<link rel="shortcut icon" href="assets/ico/favicon.ico">
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="assets/ico/apple-touch-icon-144-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="assets/ico/apple-touch-icon-114-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png">
<link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png">
</head>
<body data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar
================================================== -->
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<a class="brand" href="./index.html">Bootstrap</a>
<div class="nav-collapse collapse">
<ul class="nav">
<li class="">
<a href="./index.html">Overview</a>
</li>
<li class="">
<a href="./scaffolding.html">Scaffolding</a>
</li>
<li class="">
<a href="./base-css.html">Base CSS</a>
</li>
<li class="">
<a href="./components.html">Components</a>
</li>
<li class="">
<a href="./javascript.html">Javascript plugins</a>
</li>
<li class="">
<a href="./less.html">Using LESS</a>
</li>
<li class="divider-vertical"></li>
<li class="">
<a href="./download.html">Customize</a>
</li>
<li class="active">
<a href="./examples.html">Examples</a>
</li>
</ul>
</div>
</div>
</div>
</div>
<div class="container">
<!-- Masthead
================================================== -->
<header class="jumbotron subhead" id="overview">
<h1>Bootstrap examples</h1>
<p class="lead">We've included a few basic examples as starting points for your work with Bootstrap. We encourage folks to iterate on these examples and not simply use them as an end result.</p>
</header>
<ul class="thumbnails bootstrap-examples">
<li class="span4">
<a class="thumbnail" href="examples/hero.html">
<img src="assets/img/examples/bootstrap-example-hero.jpg" alt="">
</a>
<h3>Basic marketing site</h3>
<p>Featuring a hero unit for a primary message and three supporting elements.</p>
</li>
<li class="span4">
<a class="thumbnail" href="examples/fluid.html">
<img src="assets/img/examples/bootstrap-example-fluid.jpg" alt="">
</a>
<h3>Fluid layout</h3>
<p>Uses our new responsive, fluid grid system to create a seamless liquid layout.</p>
</li>
<li class="span4">
<a class="thumbnail" href="examples/starter-template.html">
<img src="assets/img/examples/bootstrap-example-starter.jpg" alt="">
</a>
<h3>Starter template</h3>
<p>A barebones HTML document with all the Bootstrap CSS and javascript included.</p>
</li>
</ul>
<!-- Footer
================================================== -->
<footer class="footer">
<p class="pull-right"><a href="#">Back to top</a></p>
<p>Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
<p>Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
<p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
</footer>
</div><!-- /container -->
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
<script src="assets/js/jquery.js"></script>
<script src="assets/js/google-code-prettify/prettify.js"></script>
<script src="assets/js/bootstrap-transition.js"></script>
<script src="assets/js/bootstrap-alert.js"></script>
<script src="assets/js/bootstrap-modal.js"></script>
<script src="assets/js/bootstrap-dropdown.js"></script>
<script src="assets/js/bootstrap-scrollspy.js"></script>
<script src="assets/js/bootstrap-tab.js"></script>
<script src="assets/js/bootstrap-tooltip.js"></script>
<script src="assets/js/bootstrap-popover.js"></script>
<script src="assets/js/bootstrap-button.js"></script>
<script src="assets/js/bootstrap-collapse.js"></script>
<script src="assets/js/bootstrap-carousel.js"></script>
<script src="assets/js/bootstrap-typeahead.js"></script>
<script src="assets/js/application.js"></script>
</body>
</html>
+452
View File
@@ -0,0 +1,452 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Carousel Template &middot; Bootstrap</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">
<!-- Le styles -->
<link href="../assets/css/bootstrap.css" rel="stylesheet">
<link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
<style>
/* GLOBAL STYLES
-------------------------------------------------- */
/* Padding below the footer and lighter body text */
body {
padding-bottom: 40px;
color: #5a5a5a;
}
/* CUSTOMIZE THE NAVBAR
-------------------------------------------------- */
/* Special class on .container surrounding .navbar, used for positioning it into place. */
.navbar-wrapper {
position: absolute;
top: 0;
left: 0;
right: 0;
z-index: 10;
margin-top: 20px;
margin-bottom: -90px; /* Negative margin to pull up carousel. 90px is roughly margins and height of navbar. */
}
.navbar-wrapper .navbar {
}
/* Remove border and change up box shadow for more contrast */
.navbar .navbar-inner {
border: 0;
-webkit-box-shadow: 0 2px 10px rgba(0,0,0,.25);
-moz-box-shadow: 0 2px 10px rgba(0,0,0,.25);
box-shadow: 0 2px 10px rgba(0,0,0,.25);
}
/* Downsize the brand/project name a bit */
.navbar .brand {
padding: 14px 20px 16px; /* Increase vertical padding to match navbar links */
font-size: 16px;
font-weight: bold;
text-shadow: 0 -1px 0 rgba(0,0,0,.5);
}
/* Navbar links: increase padding for taller navbar */
.navbar .nav > li > a {
padding: 15px 20px;
}
/* Offset the responsive button for proper vertical alignment */
.navbar .btn-navbar {
margin-top: 10px;
}
/* CUSTOMIZE THE NAVBAR
-------------------------------------------------- */
/* Carousel base class */
.carousel {
margin-bottom: 60px;
}
.carousel .container {
position: relative;
z-index: 10;
}
.carousel-control {
height: 80px;
margin-top: 0;
font-size: 120px;
text-shadow: 0 1px 1px rgba(0,0,0,.4);
background-color: transparent;
border: 0;
}
.carousel .item {
height: 500px;
}
.carousel img {
position: absolute;
top: 0;
left: 0;
min-width: 100%;
height: 500px;
}
.carousel-caption {
background-color: transparent;
position: static;
max-width: 550px;
padding: 0 20px;
margin-top: 200px;
}
.carousel-caption h1,
.carousel-caption .lead {
margin: 0;
line-height: 1.25;
color: #fff;
text-shadow: 0 1px 1px rgba(0,0,0,.4);
}
.carousel-caption .btn {
margin-top: 10px;
}
/* MARKETING CONTENT
-------------------------------------------------- */
/* Center align the text within the three columns below the carousel */
.marketing .span4 {
text-align: center;
}
.marketing h2 {
font-weight: normal;
}
.marketing .span4 p {
margin-left: 10px;
margin-right: 10px;
}
/* Featurettes
------------------------- */
.featurette-divider {
margin: 80px 0; /* Space out the Bootstrap <hr> more */
}
.featurette {
padding-top: 120px; /* Vertically center images part 1: add padding above and below text. */
overflow: hidden; /* Vertically center images part 2: clear their floats. */
}
.featurette-image {
margin-top: -120px; /* Vertically center images part 3: negative margin up the image the same amount of the padding to center it. */
}
/* Give some space on the sides of the floated elements so text doesn't run right into it. */
.featurette-image.pull-left {
margin-right: 40px;
}
.featurette-image.pull-right {
margin-left: 40px;
}
/* Thin out the marketing headings */
.featurette-heading {
font-size: 50px;
font-weight: 300;
line-height: 1;
letter-spacing: -1px;
}
/* RESPONSIVE CSS
-------------------------------------------------- */
@media (max-width: 979px) {
.container.navbar-wrapper {
margin-bottom: 0;
width: auto;
}
.navbar-inner {
border-radius: 0;
margin: -20px 0;
}
.carousel .item {
height: 500px;
}
.carousel img {
width: auto;
height: 500px;
}
.featurette {
height: auto;
padding: 0;
}
.featurette-image.pull-left,
.featurette-image.pull-right {
display: block;
float: none;
max-width: 40%;
margin: 0 auto 20px;
}
}
@media (max-width: 767px) {
.navbar-inner {
margin: -20px;
}
.carousel {
margin-left: -20px;
margin-right: -20px;
}
.carousel .container {
}
.carousel .item {
height: 300px;
}
.carousel img {
height: 300px;
}
.carousel-caption {
width: 65%;
padding: 0 70px;
margin-top: 100px;
}
.carousel-caption h1 {
font-size: 30px;
}
.carousel-caption .lead,
.carousel-caption .btn {
font-size: 18px;
}
.marketing .span4 + .span4 {
margin-top: 40px;
}
.featurette-heading {
font-size: 30px;
}
.featurette .lead {
font-size: 18px;
line-height: 1.5;
}
}
</style>
<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<!-- Fav and touch icons -->
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
<link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
<link rel="shortcut icon" href="../assets/ico/favicon.png">
</head>
<body>
<!-- NAVBAR
================================================== -->
<div class="navbar-wrapper">
<!-- Wrap the .navbar in .container to center it within the absolutely positioned parent. -->
<div class="container">
<div class="navbar navbar-inverse">
<div class="navbar-inner">
<!-- Responsive Navbar Part 1: Button for triggering responsive navbar (not covered in tutorial). Include responsive CSS to utilize. -->
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<a class="brand" href="#">Project name</a>
<!-- Responsive Navbar Part 2: Place all navbar contents you want collapsed withing .navbar-collapse.collapse. -->
<div class="nav-collapse collapse">
<ul class="nav">
<li class="active"><a href="#">Home</a></li>
<li><a href="#about">About</a></li>
<li><a href="#contact">Contact</a></li>
<!-- Read about Bootstrap dropdowns at http://twitter.github.com/bootstrap/javascript.html#dropdowns -->
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li>
<li><a href="#">Something else here</a></li>
<li class="divider"></li>
<li class="nav-header">Nav header</li>
<li><a href="#">Separated link</a></li>
<li><a href="#">One more separated link</a></li>
</ul>
</li>
</ul>
</div><!--/.nav-collapse -->
</div><!-- /.navbar-inner -->
</div><!-- /.navbar -->
</div> <!-- /.container -->
</div><!-- /.navbar-wrapper -->
<!-- Carousel
================================================== -->
<div id="myCarousel" class="carousel slide">
<div class="carousel-inner">
<div class="item active">
<img src="../assets/img/examples/slide-01.jpg" alt="">
<div class="container">
<div class="carousel-caption">
<h1>Example headline.</h1>
<p class="lead">Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
<a class="btn btn-large btn-primary" href="#">Sign up today</a>
</div>
</div>
</div>
<div class="item">
<img src="../assets/img/examples/slide-02.jpg" alt="">
<div class="container">
<div class="carousel-caption">
<h1>Another example headline.</h1>
<p class="lead">Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
<a class="btn btn-large btn-primary" href="#">Learn more</a>
</div>
</div>
</div>
<div class="item">
<img src="../assets/img/examples/slide-03.jpg" alt="">
<div class="container">
<div class="carousel-caption">
<h1>One more for good measure.</h1>
<p class="lead">Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
<a class="btn btn-large btn-primary" href="#">Browse gallery</a>
</div>
</div>
</div>
</div>
<a class="left carousel-control" href="#myCarousel" data-slide="prev">&lsaquo;</a>
<a class="right carousel-control" href="#myCarousel" data-slide="next">&rsaquo;</a>
</div><!-- /.carousel -->
<!-- Marketing messaging and featurettes
================================================== -->
<!-- Wrap the rest of the page in another container to center all the content. -->
<div class="container marketing">
<!-- Three columns of text below the carousel -->
<div class="row">
<div class="span4">
<img class="img-circle" data-src="holder.js/140x140">
<h2>Heading</h2>
<p>Donec sed odio dui. Etiam porta sem malesuada magna mollis euismod. Nullam id dolor id nibh ultricies vehicula ut id elit. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.</p>
<p><a class="btn" href="#">View details &raquo;</a></p>
</div><!-- /.span4 -->
<div class="span4">
<img class="img-circle" data-src="holder.js/140x140">
<h2>Heading</h2>
<p>Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
<p><a class="btn" href="#">View details &raquo;</a></p>
</div><!-- /.span4 -->
<div class="span4">
<img class="img-circle" data-src="holder.js/140x140">
<h2>Heading</h2>
<p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
<p><a class="btn" href="#">View details &raquo;</a></p>
</div><!-- /.span4 -->
</div><!-- /.row -->
<!-- START THE FEATURETTES -->
<hr class="featurette-divider">
<div class="featurette">
<img class="featurette-image pull-right" src="../assets/img/examples/browser-icon-chrome.png">
<h2 class="featurette-heading">First featurette headling. <span class="muted">It'll blow your mind.</span></h2>
<p class="lead">Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Praesent commodo cursus magna, vel scelerisque nisl consectetur. Fusce dapibus, tellus ac cursus commodo.</p>
</div>
<hr class="featurette-divider">
<div class="featurette">
<img class="featurette-image pull-left" src="../assets/img/examples/browser-icon-firefox.png">
<h2 class="featurette-heading">Oh yeah, it's that good. <span class="muted">See for yourself.</span></h2>
<p class="lead">Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Praesent commodo cursus magna, vel scelerisque nisl consectetur. Fusce dapibus, tellus ac cursus commodo.</p>
</div>
<hr class="featurette-divider">
<div class="featurette">
<img class="featurette-image pull-right" src="../assets/img/examples/browser-icon-safari.png">
<h2 class="featurette-heading">And lastly, this one. <span class="muted">Checkmate.</span></h2>
<p class="lead">Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Praesent commodo cursus magna, vel scelerisque nisl consectetur. Fusce dapibus, tellus ac cursus commodo.</p>
</div>
<hr class="featurette-divider">
<!-- /END THE FEATURETTES -->
<!-- FOOTER -->
<footer>
<p class="pull-right"><a href="#">Back to top</a></p>
<p>&copy; 2012 Company, Inc. &middot; <a href="#">Privacy</a> &middot; <a href="#">Terms</a></p>
</footer>
</div><!-- /.container -->
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="../assets/js/jquery.js"></script>
<script src="../assets/js/bootstrap-transition.js"></script>
<script src="../assets/js/bootstrap-alert.js"></script>
<script src="../assets/js/bootstrap-modal.js"></script>
<script src="../assets/js/bootstrap-dropdown.js"></script>
<script src="../assets/js/bootstrap-scrollspy.js"></script>
<script src="../assets/js/bootstrap-tab.js"></script>
<script src="../assets/js/bootstrap-tooltip.js"></script>
<script src="../assets/js/bootstrap-popover.js"></script>
<script src="../assets/js/bootstrap-button.js"></script>
<script src="../assets/js/bootstrap-collapse.js"></script>
<script src="../assets/js/bootstrap-carousel.js"></script>
<script src="../assets/js/bootstrap-typeahead.js"></script>
<script>
!function ($) {
$(function(){
// carousel demo
$('#myCarousel').carousel()
})
}(window.jQuery)
</script>
</body>
</html>
+10 -18
View File
@@ -20,22 +20,22 @@
</style>
<link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<!-- Le fav and touch icons -->
<link rel="shortcut icon" href="../assets/ico/favicon.ico">
<!-- Fav and touch icons -->
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
<link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
<link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
<link rel="shortcut icon" href="../assets/ico/favicon.png">
</head>
<body>
<div class="navbar navbar-fixed-top">
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container-fluid">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
@@ -44,18 +44,10 @@
<span class="icon-bar"></span>
</a>
<a class="brand" href="#">Project name</a>
<div class="btn-group pull-right">
<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
<i class="icon-user"></i> Username
<span class="caret"></span>
</a>
<ul class="dropdown-menu">
<li><a href="#">Profile</a></li>
<li class="divider"></li>
<li><a href="#">Sign Out</a></li>
</ul>
</div>
<div class="nav-collapse">
<div class="nav-collapse collapse">
<p class="navbar-text pull-right">
Logged in as <a href="#" class="navbar-link">Username</a>
</p>
<ul class="nav">
<li class="active"><a href="#">Home</a></li>
<li><a href="#about">About</a></li>
+26 -9
View File
@@ -17,22 +17,22 @@
</style>
<link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<!-- Le fav and touch icons -->
<link rel="shortcut icon" href="../assets/ico/favicon.ico">
<!-- Fav and touch icons -->
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
<link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
<link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
<link rel="shortcut icon" href="../assets/ico/favicon.png">
</head>
<body>
<div class="navbar navbar-fixed-top">
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
@@ -41,12 +41,29 @@
<span class="icon-bar"></span>
</a>
<a class="brand" href="#">Project name</a>
<div class="nav-collapse">
<div class="nav-collapse collapse">
<ul class="nav">
<li class="active"><a href="#">Home</a></li>
<li><a href="#about">About</a></li>
<li><a href="#contact">Contact</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li>
<li><a href="#">Something else here</a></li>
<li class="divider"></li>
<li class="nav-header">Nav header</li>
<li><a href="#">Separated link</a></li>
<li><a href="#">One more separated link</a></li>
</ul>
</li>
</ul>
<form class="navbar-form pull-right">
<input class="span2" type="text" placeholder="Email">
<input class="span2" type="password" placeholder="Password">
<button type="submit" class="btn">Sign in</button>
</form>
</div><!--/.nav-collapse -->
</div>
</div>
@@ -65,12 +82,12 @@
<div class="row">
<div class="span4">
<h2>Heading</h2>
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
<p><a class="btn" href="#">View details &raquo;</a></p>
</div>
<div class="span4">
<h2>Heading</h2>
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
<p><a class="btn" href="#">View details &raquo;</a></p>
</div>
<div class="span4">
+172
View File
@@ -0,0 +1,172 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Template &middot; Bootstrap</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">
<!-- Le styles -->
<link href="../assets/css/bootstrap.css" rel="stylesheet">
<style type="text/css">
body {
padding-top: 20px;
padding-bottom: 60px;
}
/* Custom container */
.container {
margin: 0 auto;
max-width: 1000px;
}
.container > hr {
margin: 60px 0;
}
/* Main marketing message and sign up button */
.jumbotron {
margin: 80px 0;
text-align: center;
}
.jumbotron h1 {
font-size: 100px;
line-height: 1;
}
.jumbotron .lead {
font-size: 24px;
line-height: 1.25;
}
.jumbotron .btn {
font-size: 21px;
padding: 14px 24px;
}
/* Supporting marketing content */
.marketing {
margin: 60px 0;
}
.marketing p + h4 {
margin-top: 28px;
}
/* Customize the navbar links to be fill the entire space of the .navbar */
.navbar .navbar-inner {
padding: 0;
}
.navbar .nav {
margin: 0;
}
.navbar .nav li {
display: table-cell;
width: 1%;
float: none;
}
.navbar .nav li a {
font-weight: bold;
text-align: center;
border-left: 1px solid rgba(255,255,255,.75);
border-right: 1px solid rgba(0,0,0,.1);
}
.navbar .nav li:first-child a {
border-left: 0;
border-radius: 3px 0 0 3px;
}
.navbar .nav li:last-child a {
border-right: 0;
border-radius: 0 3px 3px 0;
}
</style>
<link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<!-- Fav and touch icons -->
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
<link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
<link rel="shortcut icon" href="../assets/ico/favicon.png">
</head>
<body>
<div class="container">
<div class="masthead">
<h3 class="muted">Project name</h3>
<div class="navbar">
<div class="navbar-inner">
<div class="container">
<ul class="nav">
<li class="active"><a href="#">Home</a></li>
<li><a href="#">Projects</a></li>
<li><a href="#">Services</a></li>
<li><a href="#">Downloads</a></li>
<li><a href="#">About</a></li>
<li><a href="#">Contact</a></li>
</ul>
</div>
</div>
</div><!-- /.navbar -->
</div>
<!-- Jumbotron -->
<div class="jumbotron">
<h1>Marketing stuff!</h1>
<p class="lead">Cras justo odio, dapibus ac facilisis in, egestas eget quam. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
<a class="btn btn-large btn-success" href="#">Get started today</a>
</div>
<hr>
<!-- Example row of columns -->
<div class="row-fluid">
<div class="span4">
<h2>Heading</h2>
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
<p><a class="btn" href="#">View details &raquo;</a></p>
</div>
<div class="span4">
<h2>Heading</h2>
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
<p><a class="btn" href="#">View details &raquo;</a></p>
</div>
<div class="span4">
<h2>Heading</h2>
<p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa.</p>
<p><a class="btn" href="#">View details &raquo;</a></p>
</div>
</div>
<hr>
<div class="footer">
<p>&copy; Company 2012</p>
</div>
</div> <!-- /container -->
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="../assets/js/jquery.js"></script>
<script src="../assets/js/bootstrap-transition.js"></script>
<script src="../assets/js/bootstrap-alert.js"></script>
<script src="../assets/js/bootstrap-modal.js"></script>
<script src="../assets/js/bootstrap-dropdown.js"></script>
<script src="../assets/js/bootstrap-scrollspy.js"></script>
<script src="../assets/js/bootstrap-tab.js"></script>
<script src="../assets/js/bootstrap-tooltip.js"></script>
<script src="../assets/js/bootstrap-popover.js"></script>
<script src="../assets/js/bootstrap-button.js"></script>
<script src="../assets/js/bootstrap-collapse.js"></script>
<script src="../assets/js/bootstrap-carousel.js"></script>
<script src="../assets/js/bootstrap-typeahead.js"></script>
</body>
</html>
+137
View File
@@ -0,0 +1,137 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Template &middot; Bootstrap</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">
<!-- Le styles -->
<link href="../assets/css/bootstrap.css" rel="stylesheet">
<style type="text/css">
body {
padding-top: 20px;
padding-bottom: 40px;
}
/* Custom container */
.container-narrow {
margin: 0 auto;
max-width: 700px;
}
.container-narrow > hr {
margin: 30px 0;
}
/* Main marketing message and sign up button */
.jumbotron {
margin: 60px 0;
text-align: center;
}
.jumbotron h1 {
font-size: 72px;
line-height: 1;
}
.jumbotron .btn {
font-size: 21px;
padding: 14px 24px;
}
/* Supporting marketing content */
.marketing {
margin: 60px 0;
}
.marketing p + h4 {
margin-top: 28px;
}
</style>
<link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<!-- Fav and touch icons -->
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
<link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
<link rel="shortcut icon" href="../assets/ico/favicon.png">
</head>
<body>
<div class="container-narrow">
<div class="masthead">
<ul class="nav nav-pills pull-right">
<li class="active"><a href="#">Home</a></li>
<li><a href="#">About</a></li>
<li><a href="#">Contact</a></li>
</ul>
<h3 class="muted">Project name</h3>
</div>
<hr>
<div class="jumbotron">
<h1>Super awesome marketing speak!</h1>
<p class="lead">Cras justo odio, dapibus ac facilisis in, egestas eget quam. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
<a class="btn btn-large btn-success" href="#">Sign up today</a>
</div>
<hr>
<div class="row-fluid marketing">
<div class="span6">
<h4>Subheading</h4>
<p>Donec id elit non mi porta gravida at eget metus. Maecenas faucibus mollis interdum.</p>
<h4>Subheading</h4>
<p>Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Cras mattis consectetur purus sit amet fermentum.</p>
<h4>Subheading</h4>
<p>Maecenas sed diam eget risus varius blandit sit amet non magna.</p>
</div>
<div class="span6">
<h4>Subheading</h4>
<p>Donec id elit non mi porta gravida at eget metus. Maecenas faucibus mollis interdum.</p>
<h4>Subheading</h4>
<p>Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Cras mattis consectetur purus sit amet fermentum.</p>
<h4>Subheading</h4>
<p>Maecenas sed diam eget risus varius blandit sit amet non magna.</p>
</div>
</div>
<hr>
<div class="footer">
<p>&copy; Company 2012</p>
</div>
</div> <!-- /container -->
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="../assets/js/jquery.js"></script>
<script src="../assets/js/bootstrap-transition.js"></script>
<script src="../assets/js/bootstrap-alert.js"></script>
<script src="../assets/js/bootstrap-modal.js"></script>
<script src="../assets/js/bootstrap-dropdown.js"></script>
<script src="../assets/js/bootstrap-scrollspy.js"></script>
<script src="../assets/js/bootstrap-tab.js"></script>
<script src="../assets/js/bootstrap-tooltip.js"></script>
<script src="../assets/js/bootstrap-popover.js"></script>
<script src="../assets/js/bootstrap-button.js"></script>
<script src="../assets/js/bootstrap-collapse.js"></script>
<script src="../assets/js/bootstrap-carousel.js"></script>
<script src="../assets/js/bootstrap-typeahead.js"></script>
</body>
</html>
+94
View File
@@ -0,0 +1,94 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Sign in &middot; Twitter Bootstrap</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">
<!-- Le styles -->
<link href="../assets/css/bootstrap.css" rel="stylesheet">
<style type="text/css">
body {
padding-top: 40px;
padding-bottom: 40px;
background-color: #f5f5f5;
}
.form-signin {
max-width: 300px;
padding: 19px 29px 29px;
margin: 0 auto 20px;
background-color: #fff;
border: 1px solid #e5e5e5;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
-webkit-box-shadow: 0 1px 2px rgba(0,0,0,.05);
-moz-box-shadow: 0 1px 2px rgba(0,0,0,.05);
box-shadow: 0 1px 2px rgba(0,0,0,.05);
}
.form-signin .form-signin-heading,
.form-signin .checkbox {
margin-bottom: 10px;
}
.form-signin input[type="text"],
.form-signin input[type="password"] {
font-size: 16px;
height: auto;
margin-bottom: 15px;
padding: 7px 9px;
}
</style>
<link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<!-- Fav and touch icons -->
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
<link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
<link rel="shortcut icon" href="../assets/ico/favicon.png">
</head>
<body>
<div class="container">
<form class="form-signin">
<h2 class="form-signin-heading">Please sign in</h2>
<input type="text" class="input-block-level" placeholder="Email address">
<input type="password" class="input-block-level" placeholder="Password">
<label class="checkbox">
<input type="checkbox" value="remember-me"> Remember me
</label>
<button class="btn btn-large btn-primary" type="submit">Sign in</button>
</form>
</div> <!-- /container -->
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="../assets/js/jquery.js"></script>
<script src="../assets/js/bootstrap-transition.js"></script>
<script src="../assets/js/bootstrap-alert.js"></script>
<script src="../assets/js/bootstrap-modal.js"></script>
<script src="../assets/js/bootstrap-dropdown.js"></script>
<script src="../assets/js/bootstrap-scrollspy.js"></script>
<script src="../assets/js/bootstrap-tab.js"></script>
<script src="../assets/js/bootstrap-tooltip.js"></script>
<script src="../assets/js/bootstrap-popover.js"></script>
<script src="../assets/js/bootstrap-button.js"></script>
<script src="../assets/js/bootstrap-collapse.js"></script>
<script src="../assets/js/bootstrap-carousel.js"></script>
<script src="../assets/js/bootstrap-typeahead.js"></script>
</body>
</html>
+7 -7
View File
@@ -16,22 +16,22 @@
</style>
<link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<!-- Le fav and touch icons -->
<link rel="shortcut icon" href="../assets/ico/favicon.ico">
<!-- Fav and touch icons -->
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
<link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
<link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
<link rel="shortcut icon" href="../assets/ico/favicon.png">
</head>
<body>
<div class="navbar navbar-fixed-top">
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
@@ -40,7 +40,7 @@
<span class="icon-bar"></span>
</a>
<a class="brand" href="#">Project name</a>
<div class="nav-collapse">
<div class="nav-collapse collapse">
<ul class="nav">
<li class="active"><a href="#">Home</a></li>
<li><a href="#about">About</a></li>
+124
View File
@@ -0,0 +1,124 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Sticky footer &middot; Twitter Bootstrap</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">
<!-- CSS -->
<link href="../assets/css/bootstrap.css" rel="stylesheet">
<style type="text/css">
/* Sticky footer styles
-------------------------------------------------- */
html,
body {
height: 100%;
/* The html and body elements cannot have any padding or margin. */
}
/* Wrapper for page content to push down footer */
#wrap {
min-height: 100%;
height: auto !important;
height: 100%;
/* Negative indent footer by it's height */
margin: 0 auto -60px;
}
/* Set the fixed height of the footer here */
#push,
#footer {
height: 60px;
}
#footer {
background-color: #f5f5f5;
}
/* Lastly, apply responsive CSS fixes as necessary */
@media (max-width: 767px) {
#footer {
margin-left: -20px;
margin-right: -20px;
padding-left: 20px;
padding-right: 20px;
}
}
/* Custom page CSS
-------------------------------------------------- */
/* Not required for template or sticky footer method. */
.container {
width: auto;
max-width: 680px;
}
.container .credit {
margin: 20px 0;
}
</style>
<link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<!-- Fav and touch icons -->
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
<link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
<link rel="shortcut icon" href="../assets/ico/favicon.png">
</head>
<body>
<!-- Part 1: Wrap all page content here -->
<div id="wrap">
<!-- Begin page content -->
<div class="container">
<div class="page-header">
<h1>Sticky footer</h1>
</div>
<p class="lead">Pin a fixed-height footer to the bottom of the viewport in desktop browsers with this custom HTML and CSS.</p>
</div>
<div id="push"></div>
</div>
<div id="footer">
<div class="container">
<p class="muted credit">Example courtesy <a href="http://martinbean.co.uk">Martin Bean</a> and <a href="http://ryanfait.com/sticky-footer/">Ryan Fait</a>.</p>
</div>
</div>
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="../assets/js/jquery.js"></script>
<script src="../assets/js/bootstrap-transition.js"></script>
<script src="../assets/js/bootstrap-alert.js"></script>
<script src="../assets/js/bootstrap-modal.js"></script>
<script src="../assets/js/bootstrap-dropdown.js"></script>
<script src="../assets/js/bootstrap-scrollspy.js"></script>
<script src="../assets/js/bootstrap-tab.js"></script>
<script src="../assets/js/bootstrap-tooltip.js"></script>
<script src="../assets/js/bootstrap-popover.js"></script>
<script src="../assets/js/bootstrap-button.js"></script>
<script src="../assets/js/bootstrap-collapse.js"></script>
<script src="../assets/js/bootstrap-carousel.js"></script>
<script src="../assets/js/bootstrap-typeahead.js"></script>
</body>
</html>

Some files were not shown because too many files have changed in this diff Show More