Comparar commits

...

1790 Commits

Autor SHA1 Mensagem Data
Jacob Thornton 59503e71ff 2.0.2 derp 2012-03-12 14:09:38 -07:00
Jacob Thornton 8182b1ef69 make docs again for 2.0.2 2012-03-12 14:03:24 -07:00
Jacob Thornton 1f7a64aa3d 2.0.2 2012-03-12 14:00:19 -07:00
Jacob Thornton 664a838cd6 remove test file 2012-03-12 13:56:50 -07:00
Jacob Thornton 6d4867e799 remove commented out width 2012-03-12 13:45:36 -07:00
Jacob Thornton 56fe54df43 remove collapse class on open so that dropdowns are viewable 2012-03-12 13:37:44 -07:00
Jacob Thornton cd89c34d99 can't have overflo: visible for "in" which is present during entirity of transition. 2012-03-12 13:31:38 -07:00
Mark Otto 7f3a2b3813 button group sizes for ie7 fixes 2012-03-12 12:44:47 -07:00
Mark Otto e12c66aabe adding border variable for dropdowns, making dropdown carets use dropdown vars 2012-03-12 09:57:10 -07:00
Mark Otto 40fddffeec improve button docs 2012-03-12 09:38:12 -07:00
Mark Otto 5dff63d767 fix apple touch icons in examples 2012-03-12 00:21:52 -07:00
Mark Otto 685039d608 add a super jank fix for horizontal-forms and .input-prepend/append in IE7 2012-03-12 00:16:01 -07:00
Mark Otto c35b04cccd enable buttons in input-append and input-prepend 2012-03-11 23:43:19 -07:00
Mark Otto debc4b752f more homepage links cleanup, ditching the middots 2012-03-11 23:34:22 -07:00
Mark Otto f4b51b373b more homepage links cleanup 2012-03-11 23:33:52 -07:00
Mark Otto d36f3d0a59 clean up links on docs homepage and add link to direct download with docs 2012-03-11 23:33:08 -07:00
Mark Otto 7c2ed0c095 resolve #1972, allowing add-ons at beginning and end of input-prepend/append 2012-03-11 23:21:38 -07:00
Mark Otto 5eed370856 fix more spacing issues with input append/prepend 2012-03-11 23:14:36 -07:00
Mark Otto 58cb7c631d simplify code for input-prepend/append in inline and search forms 2012-03-11 23:12:45 -07:00
Mark Otto 91eef351e4 remove need for floats and IE hacks for input-prepend and input-append--boom 2012-03-11 22:58:14 -07:00
Mark Otto 0630cd62b3 rewrite the fluid grid mixin to be simpler, per #2370 2012-03-11 22:45:10 -07:00
Mark Otto 0090fa1a6e fix overflow on .collapse.in to enable dropdowns within an open collapse 2012-03-11 22:43:35 -07:00
Mark Otto ac7f571e53 enable button groups in modal-footer by removing 5px added margin between .btn 2012-03-11 22:28:37 -07:00
Mark Otto e5a284d442 merge #2476 to allow for custom popover arrow colors 2012-03-11 22:26:07 -07:00
Mark Otto 1a11c526b9 Merge branch 'luk3thomas-popover_arrow_colors' into 2.0.2-wip 2012-03-11 22:25:34 -07:00
Mark Otto 5a28bd1e78 fix vertical align issue with labels in IE9 2012-03-11 21:44:00 -07:00
Mark Otto ee5d2ec91a add block level input mixin for border-box box-sizing 2012-03-11 21:21:51 -07:00
Mark Otto c8f4325c19 remove text indent on carets (not needed) and add inline replacement mixin 2012-03-11 21:12:59 -07:00
Mark Otto 67714d8347 remove the unused text-indent on dropdown carets 2012-03-11 20:38:17 -07:00
Mark Otto 0f23883283 fix broken dropdowns in ie7 per #2333 2012-03-11 20:16:39 -07:00
Mark Otto 2e52946fd3 fix lingering tables bug 2012-03-11 20:03:55 -07:00
Mark Otto 4109c62cf7 fix table border bug with double borders on theads and use of colgroup 2012-03-11 18:18:18 -07:00
Mark Otto 7154e378b2 use variable for navbar text line-height 2012-03-11 17:53:17 -07:00
Mark Otto 95cb6f07a8 Merge branch 'zerkms-master' into 2.0.2-wip
Conflicts:
	Makefile
2012-03-11 17:38:23 -07:00
Mark Otto 8fd126ba1b updated apple touch icons and moved input responsive fix from <480 to <767 2012-03-11 17:28:28 -07:00
Mark Otto ce292a8bb8 fix overflowing thumbnails in responsive <767px layouts 2012-03-11 15:15:55 -07:00
Mark Otto a97b9c1122 in responsive layouts <767px, ensure inputs are not larger than 100% with box-sizing and a max-width 2012-03-11 14:41:52 -07:00
Ivan Kurnosov 354252b4b5 Grammar fix in js/README.md 2012-03-12 10:24:18 +13:00
Mark Otto bf6cdff88a vertical align middle on images, run make to rebuild 2012-03-11 13:48:47 -07:00
Mark Otto ffbed0980c Merge branch 'Gavrisimo-patch-1' into 2.0.2-wip 2012-03-11 13:48:30 -07:00
Mark Otto ad1e9697ae update grid system mixins in less docs for new grid 2012-03-11 13:48:04 -07:00
Mark Otto e8ef7d5e7b tweak button sizes on homepage 2012-03-11 00:06:48 -08:00
Mark Otto 349bdc12a7 ensure right align dropdown example doesn't go all the way off page 2012-03-10 18:15:28 -08:00
Mark Otto 635ee36e11 fix gradient mixins by escaping them, add notes on progress bars 2012-03-10 18:03:59 -08:00
Mark Otto 6e72760de5 fix js typo per #2471 2012-03-10 17:38:09 -08:00
Mark Otto 6a2c519152 Merge pull request #2503 from maxbublik/patch-1
ignore Apple Double files
2012-03-10 16:23:52 -08:00
Mark Otto 5de8b277c6 add vars for navbar search 2012-03-10 16:21:34 -08:00
Mark Otto a3e9fc547c clean up search form in navbar, add new variable for placeholder text color 2012-03-10 16:15:54 -08:00
Mark Otto f4ac080f9e fix #2510, docs typo 2012-03-10 16:06:56 -08:00
Mark Otto 1dbb942d5b massive update to customize page to include all the new variables (and ensure they're being used in the .less files) 2012-03-10 16:01:06 -08:00
Mark Otto 95a3cd8732 simplify notes around using button dropdowns 2012-03-10 15:41:41 -08:00
Mark Otto cecfe72060 remove unused images, update examples to include soundready 2012-03-10 15:37:28 -08:00
Mark Otto 145a36323c add new example site thumbnail 2012-03-10 15:15:13 -08:00
Mark Otto 9c1d8e032b change title attr to re-include twitter 2012-03-10 15:14:54 -08:00
Mark Otto 700457c62a remove unused example diagrams 2012-03-10 15:09:35 -08:00
Mark Otto 67aa00d0bb make pre font-size a percentage of @baseFontSize 2012-03-10 14:36:58 -08:00
Mark Otto aef230d40a fix typo per #2494 2012-03-10 14:20:46 -08:00
Mark Otto f7d4fb61ce Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-03-10 14:12:29 -08:00
Mark Otto dd5cffc308 add button sizes to docs for button dropdowns, clean up styles for them 2012-03-10 13:40:58 -08:00
Mark Otto c7eb1ab49a make nav padding and negative margins the same 2012-03-10 13:24:46 -08:00
Jacob Thornton a07851d6af stop doing oldschool escape substitution 2012-03-10 13:01:17 -08:00
Jacob Thornton 04851652db rebuild with latest grid changes - need 1.3 to build! 2012-03-10 12:45:09 -08:00
Jacob Thornton 1fd5e55881 Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Conflicts:
	docs/assets/bootstrap.zip
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
2012-03-10 12:42:39 -08:00
Jacob Thornton 1a8d7576e0 Merge branch 'new_grid' into 2.0.2-wip
Conflicts:
	docs/assets/bootstrap.zip
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	less/mixins.less
2012-03-10 12:41:41 -08:00
Maxim Pshenichnikov 922b5fba53 ignore Apple Double files 2012-03-11 00:11:03 +04:00
Mark Otto 9ebc6b4c97 simplify buttons docs section by changing a buttons to button elements 2012-03-10 11:37:34 -08:00
Mark Otto 5d961eaeb3 rebold headings 2012-03-10 11:29:57 -08:00
Mark Otto f4e879a936 fix the font-family var by using inherit instead of empty string, fix font-weight in docs for jumbotron 2012-03-10 11:27:07 -08:00
Mark Otto c414e57dcc Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-03-10 11:23:47 -08:00
Mark Otto 305374ab1a clear up nav variables 2012-03-10 11:23:05 -08:00
Jacob Thornton b410eeb6dd Merge pull request #2480 from jonathanmaron/master
fat
2012-03-09 11:12:45 -08:00
Milos Gavrilovic 3ff78d138a Add vertical-align: middle; to img elements
More info: h5bp.com/i/440
2012-03-09 14:52:50 +01:00
Jonathan Maron aa8e6b081c Fixed double copy action in Makefile. 2012-03-09 07:38:14 +01:00
Luke Thomas 1cc1852a9a added ability to set custom colors for popover arrow mixin 2012-03-08 19:02:29 -06:00
Jacob Thornton 1562381114 remove non existent dist dir from phony makefil 2012-03-08 11:42:12 -08:00
Jacob Thornton af1dbf6581 rebuild 2012-03-08 11:39:50 -08:00
Jacob Thornton d3721c504e Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip 2012-03-08 11:39:33 -08:00
Jacob Thornton bcef12dfcc add version to min js 2012-03-08 11:39:00 -08:00
Jacob Thornton 26e683f1d0 Merge pull request #2177 from phopkins/typeahead_friendly
[2.0.2-wip] Typeahead friendly
2012-03-08 11:14:56 -08:00
Jacob Thornton 426feeef6a give pages custom titles based on names 2012-03-08 11:09:33 -08:00
Mark Otto 203d75770c Merge pull request #2449 from burningTyger/master
Examples typo
2012-03-07 11:02:15 -08:00
burningTyger d0120c94a0 fix for typo 2012-03-07 15:38:12 +01:00
Mark Otto 933136d382 Merge pull request #2443 from tarsis/master
uglify-js install information in compiling section at less.html. Improve issue #1756 in 2.0.2 wip
2012-03-06 21:44:34 -08:00
Mark Otto a613a8ebd0 Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip 2012-03-06 21:16:57 -08:00
Mark Otto 27c3d5a90b Merge pull request #2436 from gruvii/2.0.2-wip
Add new headings vars to type.less
2012-03-06 21:16:40 -08:00
Mark Otto 69e4522a4e set font-family for inputs and such via basefontfamily 2012-03-06 21:13:29 -08:00
Mark Otto 6b9f70797d adding well sizes 2012-03-06 21:12:43 -08:00
Mark Figueredo 03bdf82ca2 Added use of new headings variables. 2012-03-06 16:45:43 -05:00
Mark Otto 738fac18de move padding from container to body for max-width: 767; responsive layout 2012-03-05 23:50:03 -08:00
Mark Otto 492ccedcab Merge branch 'davewasmer-master' into 2.0.2-wip 2012-03-05 23:07:54 -08:00
Mark Otto 79090ac121 fix input grid sizing, fix background color on form actions and append add-ons 2012-03-05 23:06:27 -08:00
Mark Otto bcd9294cc4 clearing up progress bar docs and resetting the striped one to match default bar (blue instead of green) 2012-03-05 23:00:37 -08:00
Mark Otto d98a2e9234 adding table variables 2012-03-05 22:47:39 -08:00
Mark Otto ac6eff280d Merge branch 'charettes-small-button-dropdowns-caret' into 2.0.2-wip
Conflicts:
	less/dropdowns.less
2012-03-05 20:49:39 -08:00
Mark Otto 9c2b2c589d fix comment on bottom-up, should be dropup 2012-03-05 20:20:42 -08:00
Mark Otto 20b10b5d66 change dropdown hover/active color back to link color 2012-03-05 20:15:35 -08:00
Mark Otto eaf464a2c5 increase specifity of .pills li.active for dropdowns 2012-03-05 20:14:54 -08:00
Mark Otto cb9234ba46 fix warning button issue per #2392 and add warning buttons to components 2012-03-05 00:47:13 -08:00
Mark Otto 7a8d6b1976 clean up horizontal dl option and docs 2012-03-05 00:42:37 -08:00
Mark Otto fb1d4a0f04 Merge pull request #2267 from dominicbarnes/dl_horizontal
Horizontal mode for description lists
2012-03-05 00:38:26 -08:00
Mark Otto 1fa42e2f71 fix ie7 breadcrumbs per #2224 2012-03-05 00:36:57 -08:00
Mark Otto 235811cd8a Merge branch 'alexpeattie-master' into 2.0.2-wip 2012-03-05 00:34:54 -08:00
Mark Otto a95c15a530 utilize new dropdown variables 2012-03-05 00:32:02 -08:00
Mark Otto d3e922f0c8 add a ton new variables for type, buttons, inputs 2012-03-05 00:29:16 -08:00
Tarsis Azevedo 3cbc40b129 add uglify-js install information in compiling section. improve issue #1756 2012-03-05 01:38:20 -03:00
Jacob Thornton 29c63fdb6a true > child + varargs 2012-03-04 14:27:13 -08:00
Jacob Thornton 3524aa909c make sure to pass child var through 2012-03-04 14:21:54 -08:00
Jacob Thornton 2f598e35a0 when > 0 rather than when not 0 2012-03-04 14:11:51 -08:00
Jacob Thornton 1aeca545c8 new approach to grid with recursive mixins :D 2012-03-04 14:06:30 -08:00
Simon Charette efd5e29ff4 Fixed small button caret and moved less code to dropdowns 2012-03-04 15:49:55 -05:00
Alex Peattie 0112b56c9c Fix typo in .mustache file 2012-03-03 22:16:20 -08:00
Alex Peattie 6a839fb2c3 docs/scaffolding typo: Large display is 1200px and up, not 1210px 2012-03-01 15:29:32 -08:00
Dave Wasmer ff8b997a1f Added disabled styles to pager 2012-02-28 18:39:35 -05:00
Mark Otto 7bf3419647 Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip 2012-02-28 08:53:06 -08:00
Mark Otto bd55824827 .progress-warning mention in docs 2012-02-28 08:52:59 -08:00
Mark Otto 2087339035 Merge pull request #2305 from MeilleursAgents/features/warning_progress_bar
Progress bars: Added warning (orange) bar
2012-02-28 08:52:16 -08:00
Jonathan Camile a397130669 Merge branch '2.0.2-wip' of https://github.com/twitter/bootstrap into features/warning_progress_bar 2012-02-28 11:06:05 +01:00
Jonathan Camile 15759d9e7c Components: Added mention to warning progress-bar in docs 2012-02-28 10:58:23 +01:00
Mark Otto fbebb046f7 fix navbar container for default 940px grid per #2194 2012-02-27 22:34:25 -08:00
Mark Otto 6c9547f411 Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip 2012-02-27 22:08:44 -08:00
Mark Otto 9ee77f2c11 set line-height for labels to prevent change in height when floated per #2222 2012-02-27 21:50:54 -08:00
Mark Otto a7b96b3e59 set list-style to none for breadcrumbs to resolve cross browser issues per #2224 2012-02-27 21:32:48 -08:00
Mark Otto 5cc4fcf6a2 Merge branch 'meleyal-fix-carousel-docs' into 2.0.2-wip
Conflicts:
	docs/javascript.html
	docs/templates/pages/javascript.mustache
2012-02-27 21:22:20 -08:00
Dominic Barnes 0b78033f0b removing a few of the size classes, changing up the documentation 2012-02-27 23:21:25 -06:00
Dominic Barnes d12737719f undoing what I suspect are the 'dirty' parts of this commit 2012-02-27 22:55:35 -06:00
Mark Otto 2c98e18724 Merge pull request #2227 from andriijas/2.0.2-wip-pillexamplefix
Fixing nav-pills code example
2012-02-27 19:51:44 -08:00
Mark Otto 4e17b1975e Merge branch 'meleyal-patch-1' into 2.0.2-wip 2012-02-27 19:50:44 -08:00
Mark Otto ca9588c896 manually resolve #2266, typo in example HTML for breadcrumbs 2012-02-27 19:47:21 -08:00
Mark Otto 7525aac830 make .input-prepend/append .add-on text color the same as labels, #333, to close out #2276 2012-02-27 19:44:16 -08:00
Mark Otto d57598827f fix typo in js docs carousel section per #2299 2012-02-27 19:40:07 -08:00
Mark Otto af8261af93 simplify selector for .modal-form per #2218 2012-02-27 19:09:44 -08:00
Mark Otto 7bdd9551ed really add protocol to examples 2012-02-27 18:48:28 -08:00
Jacob Thornton 8615987243 add guard for child spans 2012-02-27 18:21:21 -08:00
Jacob Thornton ae3382d797 working through new grid implementation... 2012-02-27 18:15:59 -08:00
Mark Otto 163f58ff81 add heads up label to new docs mention 2012-02-26 23:31:12 -08:00
Mark Otto dd94f8d509 remove warning from icons section about :after labels, add section to explain spacing 2012-02-26 23:30:15 -08:00
Mark Otto 1a781a707e Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-02-26 23:16:11 -08:00
Mark Otto ccf7697185 Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-02-26 23:15:36 -08:00
Dominic Barnes 0a8efd5320 Adding a 'horizontal' option to description lists, similar to .form-horizontal 2012-02-25 21:21:05 -06:00
Jacob Thornton 43760eb202 fix for @pamelafox and #1861 2012-02-24 22:17:36 -08:00
Jacob Thornton fb74018ae2 and pause on hover option to carousel 2012-02-24 21:51:39 -08:00
Mark Otto 6abb2059eb fix docs example in js page per #2225 2012-02-24 21:06:17 -08:00
Mark Otto 4309153051 add version to docs homepage, fix docs example for forms 2012-02-24 21:02:24 -08:00
meleyal be9ae70060 Fix typos and clarify wording in carousel docs 2012-02-25 01:25:31 +01:00
meleyal 591908eccf Fix broken links to fav and touch icons in examples, fixes #2244 2012-02-24 23:06:02 +01:00
Jonathan Camile 1562a8a010 Progress bars: Added warning (orange) bar 2012-02-24 11:37:26 +01:00
Andreas Cederström 34268672be Fixing nav-pills code example - closes #2225 2012-02-24 07:34:23 +01:00
Jacob Thornton 74a3c763b4 add note about backdrop static 2012-02-23 16:24:33 -08:00
Mark Otto 0e8427e7b1 update modal footers to use text-align instead of float on buttons for alignment 2012-02-22 22:38:54 -08:00
Pete Hopkins 3a6f58598c Allows escape to bubble when menu isn't shown 2012-02-22 14:19:55 -05:00
Pete Hopkins 70fecd1115 Fires change event when element is selected from menu 2012-02-22 14:19:55 -05:00
Pete Hopkins 80d03e143c Allow events to propagate / default if not used.
- All key events when the menu is not shown now propagate.
 - Blur is also allowed to propagate.
2012-02-22 14:19:55 -05:00
Mark Otto 8609a77bd2 add clearfix to .form-actions for .pull-right and .pull-left supported buttons, per #1978 and #2173 2012-02-22 11:16:32 -08:00
Mark Otto 0ed6d3b28e Merge branch 'couchbaselabs-clearfix-ing-form-actions' into 2.0.2-wip 2012-02-22 11:15:53 -08:00
Mark Otto 6f3b4b857f Merge branch 'clearfix-ing-form-actions' of https://github.com/couchbaselabs/bootstrap into couchbaselabs-clearfix-ing-form-actions 2012-02-22 11:15:44 -08:00
Mark Otto a0ec422444 fix #1954: icons in tabs add jank border 2012-02-22 08:36:07 -08:00
Mark Otto b86969f762 restore fixed navbar container reset to grid mixin, add override for inputs within grid mixins to fix #2080 2012-02-22 08:21:29 -08:00
Mark Otto 4410ede8ed Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-02-22 08:12:51 -08:00
Mark Otto 92a54a7b72 tighten padding on labels and badges given default line-height 2012-02-22 08:12:25 -08:00
Jacob Thornton f3b6cf1d6d Merge branch '2.0.2-wip' of https://github.com/twitter/bootstrap into 2.0.2-wip
Conflicts:
	docs/assets/bootstrap.zip
	less/mixins.less
2012-02-21 23:18:18 -08:00
Jacob Thornton 5ad5dde1e2 rewrite the grid system. Clean shit up tons - only generate 12 columns by default - custom builder will do differently if you request it. 2012-02-21 23:16:06 -08:00
Mark Otto a139167489 set width to auto for default navbar container, then override it later for fixed navbars (done all via the #gridSystem mixins) 2012-02-21 23:15:43 -08:00
Mark Otto 9b524a16e9 clear up table styles and docs to fix rowspan and colspan issues for bordered tables, per #1918 2012-02-21 23:00:02 -08:00
Mark Otto 917df6703c clarify responsive docs on media queries 2012-02-21 22:40:21 -08:00
Mark Otto 8bd67bb124 clean up and simplify support for bottom navbar by automagically turning dropdowns into dropups 2012-02-21 22:09:51 -08:00
Mark Otto 20221a67c2 Merge branch '2.0/fork/components/dropup' of https://github.com/buraktuyan/bootstrap into buraktuyan-2.0/fork/components/dropup
Conflicts:
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/templates/pages/components.mustache
	less/navbar.less
2012-02-21 22:01:39 -08:00
Mark Otto b4cc6c74f5 add support and docs for .navbar-fixed-bottom 2012-02-21 21:12:16 -08:00
Mark Otto e3ae517555 move container up in default grid mixin 2012-02-21 15:21:18 -08:00
Mark Otto 8665fa8c50 move table columns mixin to mixins.less 2012-02-21 15:18:05 -08:00
Mark Otto 575072b74b Merge pull request #2143 from inmarelibero/2.0.2-wip
Add columns 13-24 for grid systems to enable customization up to 24 cols
2012-02-21 15:15:56 -08:00
Mark Otto bb16b9bef2 fix second part of #1962 2012-02-21 13:52:02 -08:00
Mark Otto 664a5c4438 update forms help-block 2012-02-21 13:43:13 -08:00
Emanuele Gaspari 1cfb3fd03a substituted hard-coded number of columns (12) with @gridColumns 2012-02-21 19:19:15 +01:00
Emanuele Gaspari 45cec4a6fa added .span[13-24] and .offset[12-23] to support up to 24-columns layout 2012-02-21 19:07:55 +01:00
Mark Otto d908731566 Merge branch '2.0.2-wip-nowrapfix' of https://github.com/andriijas/bootstrap into andriijas-2.0.2-wip-nowrapfix
Conflicts:
	docs/assets/bootstrap.zip
2012-02-21 09:05:04 -08:00
Mark Otto 187b3bd4bd Merge pull request #2129 from andriijas/2.0.2-wip-navtabs
Width fix on .tab-content
2012-02-21 09:00:10 -08:00
Mark Otto a78faee589 Merge pull request #2138 from laczoka/2.0.2-wip
Fix for #2137, adding select to input append/prepend
2012-02-21 08:29:08 -08:00
Mark Otto 80abc50d3e Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-02-21 08:25:19 -08:00
Mark Otto f3ad4c7183 adding responsive utility classes and matching docs section with super neato table and test 2012-02-21 08:24:18 -08:00
Laszlo Toeroek e423fc2629 .input-append should work for select element, fixes #2137 2012-02-21 16:32:57 +01:00
Andreas Cederström f50b2c9b92 100% width on .tab-content 2012-02-21 09:20:46 +01:00
Andreas Cederström dfd0326186 Bring back nowrap to labels and badges 2012-02-21 08:17:16 +01:00
Jacob Thornton d149a131c1 remake 2012-02-20 22:02:04 -08:00
Jacob Thornton f046c12bd2 fix cycling in carousel 2012-02-20 22:01:38 -08:00
Mark Otto 06d4756114 adding basic badges support 2012-02-20 21:20:06 -08:00
Mark Otto d2630ff84e introduce new mixin to do navbar vertical centering 2012-02-20 19:14:26 -08:00
Mark Otto 143b3db2c9 update inline forms to resolve checkbox label with space in it and overlapping content, per #1969 2012-02-20 18:56:05 -08:00
Mark Otto 331c85724a remove max-width on img from reset and put in docs only, per #1552 2012-02-20 16:18:13 -08:00
Mark Otto 9c74f21966 fix overflow issue on tabbed content per #2079 2012-02-20 16:06:42 -08:00
Mark Otto 91fe8bc0f4 remake after merging buttons update 2012-02-20 13:37:24 -08:00
Mark Otto 2b8fc018ba Merge branch 'billyvg-main' into 2.0.2-wip 2012-02-20 13:36:56 -08:00
Billy Vong e18a35784a Update old button selectors 'small' and 'large' to be 'btn-small' and 'btn-large' 2012-02-20 13:16:49 -08:00
Mark Otto 7ef7547a14 add horizontal divider support to nav list, including documentation for it, per #2106 2012-02-20 12:38:49 -08:00
Mark Otto 6df925bc75 enable use of span in place of a for .disabled in pagination, per #1406 2012-02-19 23:51:59 -08:00
Mark Otto 9f608411cb no more uppercase in readme 2012-02-19 22:53:34 -08:00
Mark Otto f81e5fbe9f readme cleanup 2012-02-19 22:52:32 -08:00
Mark Otto 9b09d1de86 move overflow and max-height on modal to modal-body instead 2012-02-19 21:55:09 -08:00
Mark Otto 1c7d346767 quick edit to new global styles section 2012-02-19 16:40:41 -08:00
Mark Otto 8247cb3362 add new global styles docs section for mentioning doctype requirements, base body changes, and type/links; also tightened up code styles 2012-02-19 16:28:46 -08:00
Mark Otto f4f34ab12f Merge branch 'andriijas-2.0.1-wip' into 2.0.2-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-02-19 16:00:54 -08:00
Mark Otto 59d570fc16 Merge branch 'abbr' of https://github.com/jacobrask/bootstrap into jacobrask-abbr
Conflicts:
	docs/assets/bootstrap.zip
2012-02-19 15:38:34 -08:00
Mark Otto 3470c0dc49 Merge branch 'alert-headers' of https://github.com/jacobrask/bootstrap into jacobrask-alert-headers
Conflicts:
	docs/assets/bootstrap.zip
2012-02-19 15:04:52 -08:00
Mark Otto 89ccbdf8d1 Merge branch 'gridcontainer' of https://github.com/jacobrask/bootstrap into jacobrask-gridcontainer
Conflicts:
	docs/assets/bootstrap.zip
2012-02-19 15:01:25 -08:00
Mark Otto 5f2d2893d2 Merge branch 'opera-radial' of https://github.com/jacobrask/bootstrap into jacobrask-opera-radial
Conflicts:
	docs/assets/bootstrap.zip
2012-02-19 14:59:42 -08:00
Mark Otto 8482cc4cb3 commit leftover from make 2012-02-19 14:55:07 -08:00
Mark Otto adbbf17ee4 Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-02-19 14:54:53 -08:00
Mark Otto 16d12396d0 simplify text color in navbar by placing the color on global .navbar component 2012-02-19 14:53:07 -08:00
Mark Otto 532242e626 Merge pull request #2089 from jacobrask/ie6hack
Remove IE6 hacks
2012-02-19 14:52:06 -08:00
Jacob Rask f28140897e Update documentation for abbreviations 2012-02-19 22:14:18 +01:00
Jacob Rask e145619f6d Remove underscore hack for IE6
IE6 does not seem to be supported by Bootstrap, and reducing the number
of unused and invalid properties is always nice.
2012-02-19 21:54:38 +01:00
Jacob Rask 82457603b6 Separate span12 and container classes
If you have less than 12 columns, container is too wide. Instead
generate container width using the @gridColumns variable.

Also remove duplicate container width property.
2012-02-19 21:49:17 +01:00
Jacob Rask ad546c9631 Add Opera-prefixed radial gradient
Tested and works in Opera 11.61
2012-02-19 21:42:12 +01:00
Jacob Rask 51ec513b5c Use inherit on alert-heading color
Heading then inherits from the parent alert.
Avoids a lot of extra unneccessary CSS.
2012-02-19 21:29:32 +01:00
Jacob Rask c1775da187 Add class for upper case abbreviations, aka initialisms
Read more:
 * http://en.wikipedia.org/wiki/Abbreviation
 * http://en.wikipedia.org/wiki/Initialism
2012-02-19 21:24:06 +01:00
Jacob Rask f08b407667 Only show help cursor/border for abbr with title 2012-02-19 21:23:17 +01:00
Jacob Rask df757fb040 All abbreviations are not upper case initialisms
Read more:
 * http://developers.whatwg.org/text-level-semantics.html#the-abbr-element
 * http://en.wikipedia.org/wiki/Abbreviation
 * http://en.wikipedia.org/wiki/Initialism
2012-02-19 21:21:44 +01:00
Jacob Thornton ac6e667ad9 Merge branch 'master' into 2.0.2-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-02-18 23:31:37 -08:00
Jacob Thornton 3d58b46226 fix bootstrap-button toggle regression + tests 2012-02-18 23:29:58 -08:00
Mark Otto 1948e985a3 merge in and remake for responsive navbar dropdown fix 2012-02-18 20:09:34 -08:00
Mark Otto ba97f56912 Merge branch 'tagliala-collapse-dropdown-fix' into 2.0.2-wip 2012-02-18 20:08:11 -08:00
Mark Otto bbb2fb3395 fix right aligned dropdowns 2012-02-18 20:06:38 -08:00
Mark Otto fed3b59e46 Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip 2012-02-18 15:31:44 -08:00
Mark Otto dc4a864aaa Merge pull request #2063 from DominikTo/master
fixed syntax error in sprites.less and typo in comments
2012-02-18 15:31:16 -08:00
Mark Otto 29e6ef7c70 clarify forms in navbar per #2072 2012-02-18 15:23:38 -08:00
Mark Otto db940b3d8f Merge pull request #2066 from artstorm/2.0.2-wip
Fixed compile problem with LESS 1.2.1.
2012-02-18 15:17:41 -08:00
Mark Otto 1a1816b5bd clarify misc components subhead 2012-02-18 15:17:25 -08:00
Johan Steen c900d72857 Fixed compile problem with LESS 1.2.1.
The sprite path variables introduced in v2.0.1 prevents bootstrap.less to
compile wiht LESS v1.2.1. Updated the variables to use the @{name}
construct when inserted in sprites.less, as outlined in the LESS
documentation. This change makes the CSS compile with LESS v1.2.1.
2012-02-18 14:28:44 +01:00
Geremia Taglialatela 2068b74ea8 Fixed a wrong behaviour when using collapse and dropdown in responsive layout 2012-02-18 13:08:49 +01:00
Dominik Tobschall 7609fd4dc6 fixed syntax error 2012-02-18 09:40:28 +01:00
Dominik Tobschall f5bd4b3c8f fixed typo (whitespace) 2012-02-18 09:40:18 +01:00
Mark Otto b776cae902 add mention of js compilation to single file in customize page per #2003 2012-02-17 21:18:08 -08:00
Mark Otto ec05ebc5ed add small section to navbar docs on text in the component, per #2035 2012-02-17 20:53:12 -08:00
Mark Otto 1455bc9f8f removing duplicate reset filter since we changed the main button to use buttonBackground mixin, per #2024 2012-02-17 20:47:02 -08:00
Mark Otto b559f2b8d0 fix duplicate input prepend/append css selectors per #2026 2012-02-17 20:40:56 -08:00
Mark Otto e7d45184f1 swap last .btn-dark reference 2012-02-17 20:25:49 -08:00
Mark Otto 5d02b8c3c6 fix grid typo in subnav 2012-02-17 14:41:41 -08:00
Mark Otto 7fa1578c49 fix page header example and docs per #2048 2012-02-17 14:39:30 -08:00
Andreas Cederström 1e6d386b8d Keep origin in track 2012-02-17 13:31:36 +01:00
Jacob Thornton 7ec09d0db9 2.0.1 2012-02-16 22:42:38 -08:00
Jacob Thornton 03e6dc66c2 Merge branch '2.0.1-wip' 2012-02-16 22:41:02 -08:00
Mark Otto 091622644a bring back checkbox borders to iOS by conditionalizing the border: 0; on it to IE7-9; fix word break on pre in IE 2012-02-16 22:34:30 -08:00
Mark Otto 6f6adfb52f change clearfix mixin to drop parens that prevent it from being a class, too 2012-02-16 22:04:11 -08:00
Mark Otto 268e7d67ab add mini buttons per #1971 2012-02-16 21:28:16 -08:00
Mark Otto 61e2201c64 fix buttons focus state and swap a buttons for button buttons 2012-02-16 21:25:40 -08:00
Mark Otto 489276f5be fix responsive media queries to use 979 and 980 where appropro 2012-02-16 21:08:52 -08:00
Mark Otto 0369c1fcfc add mention of navbar vertical divider in docs 2012-02-16 21:04:16 -08:00
Jacob Thornton c3d3cf7262 add note about popover placement 2012-02-16 20:46:35 -08:00
Jacob Thornton 9d12b2d601 don't try next if not next 2012-02-16 20:43:57 -08:00
Jacob Thornton b3e4e5ae22 add idea to modal markup exmaple 2012-02-16 20:33:15 -08:00
Jacob Thornton 1520ec446c rebuild bro 2012-02-16 20:30:18 -08:00
Jacob Thornton 6da16a6def fix dropdown links 2012-02-16 20:30:00 -08:00
Jacob Thornton e730f8adb5 null out interval so that pause doesn't resume on next or prev 2012-02-16 20:22:01 -08:00
Jacob Thornton f9b578260f rebuild alerts 2012-02-16 20:05:09 -08:00
Jacob Thornton 792059b7ad fix alerts 2012-02-16 20:04:26 -08:00
BigBlueHat - Web Manufacturer 18760393d7 Adding .clearfix() to .form-actions to allow for .pull-right button containers 2012-02-14 15:16:55 -05:00
Jacob Thornton a8c478e051 Merge branch '2.0.1-wip' of https://github.com/twitter/bootstrap into 2.0.1-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-02-13 18:42:57 -08:00
Jacob Thornton 6e77c9d123 add semicolons to the end of js files 2012-02-13 18:41:02 -08:00
Jacob Thornton 9143d8e449 update irc spacing in readme 2012-02-13 18:11:41 -08:00
Jacob Thornton 28cfa8be03 add irc note 2012-02-13 18:10:36 -08:00
Mark Otto 64ea59234f change up fonts on form elements to remove unnecessary font-family on label element, per #1950 2012-02-13 08:18:19 -08:00
Andreas Cederström 60826077e7 Clean up inverse button using variables, adding button group examples. Also adding inverse inline label 2012-02-13 09:41:28 +01:00
Mark Otto da94850844 fix filename mention in js docs per #1938 2012-02-12 22:50:21 -08:00
Mark Otto ce5976fb29 ensure help-block is block per #1937 2012-02-12 22:49:06 -08:00
Mark Otto cbe10bd591 clean up nav-header in responsive 2012-02-12 21:11:56 -08:00
Mark Otto 944c7298d3 adding makeRow and makeColumn mixins for generating more semantic layouts 2012-02-12 20:46:39 -08:00
Mark Otto 3e00c1261f allow .input-prepend/.input-append to work in .navbar per #1681 2012-02-12 20:28:22 -08:00
Mark Otto be6fdd9a62 add docs for alt form control sizing per #1700 2012-02-12 20:10:48 -08:00
Mark Otto 4d1f1f0fc7 add typography pattern .page-header to components per #1701 2012-02-12 20:07:25 -08:00
Mark Otto 81d101a6a7 update docs on fixed nav per #1726 2012-02-12 19:50:36 -08:00
Mark Otto 5fc62c5fcc clear up scaffolding page to separate fixed from fluid grid systems 2012-02-12 16:59:29 -08:00
Mark Otto 16f2e0e19e add link to docs compiling section in readme 2012-02-12 16:05:25 -08:00
Mark Otto 87ed82207a update readme to clarify dependencies of make command, per #1756 2012-02-12 16:04:02 -08:00
Mark Otto ac9ac4ddae add note to button dropdowns about js plugin dependency per #1746 2012-02-12 15:49:04 -08:00
Mark Otto 163c98ea7e clean up modals.less comments, add new class for optional use on modal forms to remove bottom margin 2012-02-12 15:43:04 -08:00
Mark Otto a57dbada0f change classname from .btn-dark to .btn-inverse, change use text 2012-02-12 15:18:20 -08:00
Mark Otto b8493ed8b7 Merge branch '2.0.1-wip' of https://github.com/simonfranz/bootstrap into simonfranz-2.0.1-wip 2012-02-12 15:14:27 -08:00
Mark Otto 1b32e982ad add hero-unit docs per #1880 2012-02-12 14:47:09 -08:00
Mark Otto 0ff88f2db3 enable the use of .nav-header in dropdowns per #1827 2012-02-12 14:10:07 -08:00
Mark Otto a9e469e75a add navbar background hover variable and fix uneditable-input with append/prepend controls 2012-02-12 14:01:58 -08:00
Mark Otto 86b6ea4b5f lower z-index of fixed subnav to prevent overlap of dropdown items in .navbar-fixed 2012-02-12 13:33:23 -08:00
Mark Otto de6f3d4a6f Merge branch '2.0.1-wip' of github.com:twitter/bootstrap into 2.0.1-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-02-12 13:27:29 -08:00
Mark Otto ebe547b6a0 Merge branch 'patch-2' of https://github.com/cwiederspan/bootstrap into cwiederspan-patch-2 2012-02-12 13:20:17 -08:00
Mark Otto 24df7f1e1d update ff comment in buttons 2012-02-12 13:20:08 -08:00
Mark Otto b9d5ceb14b edit comment on IE7-8 support of :focus in navbar-search 2012-02-12 11:17:46 -08:00
Jacob Thornton 5b4a29d84e honor data attributes set on modal as well 2012-02-12 11:15:12 -08:00
Mark Otto a2bc22bad5 standardize default button gradient styles to match other buttons, reset it's IE filter to improve IE7 hover 2012-02-12 11:14:13 -08:00
Mark Otto c02df93903 move shim after css 2012-02-12 11:08:58 -08:00
Mark Otto a72ef967ba re-add protocol to the shim 2012-02-12 11:08:33 -08:00
Jacob Thornton d7953a8f1e Merge branch '2.0.1-wip' of https://github.com/twitter/bootstrap into 2.0.1-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-02-12 11:07:34 -08:00
Jacob Thornton ed07a4d0ce add note about popover placement 2012-02-12 11:06:50 -08:00
Mark Otto 2eedf60d62 write out icon classes explicitly to enable find via browser 2012-02-11 22:34:41 -08:00
Mark Otto b327420e52 update comment to reflect ie support 2012-02-11 20:58:10 -08:00
Mark Otto 158419c045 reset line-height for file input in ie9 2012-02-11 20:00:44 -08:00
Mark Otto 5bb55e4615 change fixed height on responsive textareas to min-height 2012-02-11 19:21:23 -08:00
Mark Otto 343012a9af Merge branch 'patch-1' of https://github.com/cvrebert/bootstrap into cvrebert-patch-1 2012-02-11 17:28:07 -08:00
Mark Otto 5b22cf5cc3 fix tabs content wrapping per #1620 2012-02-11 17:27:08 -08:00
Mark Otto a84092d225 update buttons docs for .disabled class per #1774 2012-02-11 17:25:47 -08:00
Mark Otto c16ccf64f1 update tooltips message in upgrade docs 2012-02-11 17:25:30 -08:00
Mark Otto 85d8fe884c Merge branch '2.0.1-docs-update' of https://github.com/smaboshe/bootstrap into smaboshe-2.0.1-docs-update 2012-02-11 17:18:17 -08:00
Mark Otto a497e9010a make button examples button element and add upgrade note on tooltip positions per #1532 2012-02-11 17:12:32 -08:00
Mark Otto 5a3dfb72bf support small for legend per #1544 2012-02-11 16:50:57 -08:00
Mark Otto 4ddc8fd0e4 remove color on :active of buttons 2012-02-11 16:43:53 -08:00
Mark Otto 102bb8e684 clear up some messaging in docs on fluid grid system and nesting overall 2012-02-11 10:38:41 -08:00
Mark Otto 2679c3ebe3 remove the reset type from cancel buttons in forms examples per #1844 2012-02-11 10:13:53 -08:00
Mark Otto 8f1db4321a fix inline form checkbox/radios 2012-02-11 00:24:06 -08:00
Mark Otto 60ee768537 fix type on responsive grid per #1852 2012-02-11 00:16:13 -08:00
Mark Otto efac5441d8 move legend fix out of horizontal and to all forms 2012-02-11 00:11:34 -08:00
Mark Otto 855dcd3f56 Merge branch '2.0.1-wip' of https://github.com/jmar777/bootstrap into jmar777-2.0.1-wip 2012-02-11 00:10:58 -08:00
Mark Otto cbccbed8c8 fix javascript text on tooltips per #1862 2012-02-11 00:10:26 -08:00
Mark Otto 722c75d1b1 update selectors for icons to include matcher for icon class in middle of class attr, remove docs mention of requiring icon-* first 2012-02-11 00:07:05 -08:00
Mark Otto a63663a3b6 fix type in less docs per #1902 2012-02-11 00:02:28 -08:00
Mark Otto 02cb4df469 fix some single vs double quotes, fix typo in js docs per #1900 2012-02-11 00:01:35 -08:00
Mark Otto 89205d9db4 manually address #1895 2012-02-10 23:59:00 -08:00
Mark Otto b4b3343a61 clarify structure of responsive css file 2012-02-10 23:57:31 -08:00
Mark Otto c720d951be add best practices and re-org the button groups 2012-02-10 23:50:45 -08:00
Mark Otto 8a91f927f5 clarify npm install command in less docs 2012-02-10 23:37:54 -08:00
Mark Otto d7aefe67e3 scope th bottom vertical-align to only thead, update code styles to include more comments in less file and scrollable option for pre tag 2012-02-10 23:07:32 -08:00
Mark Otto c10661cf5d Merge branch 'barsoom-ol-unstyled' into 2.0.1-wip 2012-02-09 23:20:05 -08:00
Mark Otto 9126014e93 Merge branch 'ol-unstyled' of https://github.com/barsoom/bootstrap into barsoom-ol-unstyled 2012-02-09 23:19:31 -08:00
Simon d9eff8efc1 Added the carret of the button 2012-02-10 00:31:40 +01:00
Simon 451a642ae8 Added a black/dark button 2012-02-09 23:08:14 +01:00
Chris Wiederspan 4c7b9b8fce Added an overriding filter: progid:DXImageTransform.Microsoft.gradient(enabled=false) to the .subnav-fixed class that fixes the bug caused on nav dropdown menus when "docked" in the fixed position. 2012-02-09 14:28:12 -07:00
Jeremy Martin 920d995843 webkit legend margin fix for non-horizontal forms 2012-02-09 15:27:42 -05:00
Silumesii Maboshe 2e5a81601c Typo. 2012-02-08 17:11:51 +02:00
Jacob Thornton b0bd3efc4a Merge pull request #1781 from pamelafox/patch-7
Javascript update docs for tooltips, based on @fat's feedback.
2012-02-07 22:35:47 -08:00
Jacob Thornton b36a744fa7 remove small class 2012-02-07 22:32:32 -08:00
Jacob Thornton 687c8bf761 Merge branch 'master' of https://github.com/twitter/bootstrap into 2.0.1-wip 2012-02-07 22:05:17 -08:00
Jacob Thornton 04fd01d4b6 fix docs for carousel markup 2012-02-07 22:04:52 -08:00
Jacob Thornton e8f1a10ec9 Merge pull request #1808 from wrightlabs/patch-1
Responive design fix for examples on some devices
2012-02-07 21:58:28 -08:00
Jacob Thornton 139a077543 don't use e.target incase button has icon or other content inside it 2012-02-07 21:55:27 -08:00
John Wright d390a921dc some (android) devices need this viewport meta tag for responsive design to work 2012-02-07 11:06:08 -08:00
John Wright 9928e7fd3c some (android) devices need this viewport meta tag for responsive design to work. 2012-02-07 11:05:13 -08:00
John Wright 91d0997c79 Some devices need this for responsive design to work 2012-02-07 10:58:01 -08:00
Henrik N 25bf0af249 Add ol.unstyled 2012-02-07 19:29:45 +01:00
Mark Otto 11f72f6aa2 merge in #1782, remake to compile html, add some i18n tags 2012-02-07 00:31:01 -08:00
Mark Otto 00c13691a9 Merge branch 'pamelafox-patch-8' into 2.0.1-wip 2012-02-07 00:17:04 -08:00
Mark Otto adff17ac03 fix for #1779, use line-height var 2012-02-07 00:16:05 -08:00
Mark Otto 2d9b3c45d3 move formfieldstate mixin to mixins.less for #1785 2012-02-07 00:13:52 -08:00
Mark Otto 3b57fba754 merge in #1757 and make the chance to the mustache template, then remake 2012-02-07 00:07:08 -08:00
Mark Otto 3fa971378e Merge branch 'master' of https://github.com/bastula/bootstrap into bastula-master 2012-02-07 00:05:25 -08:00
Mark Otto 7dffeb471f fix #1786 to manually fix typo in js docs links 2012-02-06 23:55:18 -08:00
Mark Otto b5f1d2f3a4 rearrange order of 3d and skew mixins: 2012-02-06 23:48:48 -08:00
Mark Otto 6840d8f776 Merge branch 'tobaco-master' into 2.0.1-wip 2012-02-06 23:48:16 -08:00
Mark Otto 7ce62ffc98 make after merging in breadcrumbs wrap fix 2012-02-06 23:42:57 -08:00
Mark Otto 63fd119c6e Merge branch 'et-fix_long_breadcrumbs' into 2.0.1-wip 2012-02-06 23:42:45 -08:00
Mark Otto c76b32bdef Merge branch 'fix_long_breadcrumbs' of https://github.com/et/bootstrap into et-fix_long_breadcrumbs 2012-02-06 23:42:40 -08:00
Mark Otto a10c23f1aa Merge branch 'CaryLandholt-master' into 2.0.1-wip 2012-02-06 23:42:02 -08:00
Mark Otto 6325402372 Merge branch 'master' of https://github.com/CaryLandholt/bootstrap into CaryLandholt-master 2012-02-06 23:41:53 -08:00
Mark Otto 1a97cce19b manual patch of #1449 to make thumbnails use grid vars 2012-02-06 23:39:22 -08:00
Mark Otto 4ed1b13719 Merge branch 'raphaelz-patch-1' into 2.0.1-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-02-06 23:36:31 -08:00
Mark Otto 575b82473f rearrange some of the docs on buttons to show examples of all possible renderings along with code snippets and note about usage; also fix the portrait tablet media query 2012-02-06 23:34:03 -08:00
raphaelz 3722bb9a88 Grammatical changes have been made as suggested by @cvrebert for issue #1787. 2012-02-07 02:11:25 -05:00
Pamela Fox 7e92b33f12 Adding tooltip example to javascript docs. It's particularly helpful to show the pre-generated HTML for tooltips, as inspecting the source will show post-processed HTML with data-original-title attributes and may confuse folks (where folks=me :). 2012-02-06 14:37:47 -08:00
Pamela Fox 407ca09226 Javascript update docs for tooltips, based on @fat's feedback. 2012-02-06 14:33:12 -08:00
Torsten Baldes 9ba9185afc Removed double declaration of Skew
+ added translate3d to mixins.less
2012-02-06 09:59:23 +01:00
Jacob Thornton c8c4d5b392 fix alert tests + add show option back to modals 2012-02-06 00:17:31 -08:00
Chris Rebert 98cffdbf46 parallel fix to mustache template 2012-02-05 23:02:16 -08:00
Aditya Panchal 8a8daca71e Fixed a typo in base-css.html which allows the user icon to be shown on the example button 2012-02-05 22:04:46 -06:00
Mark Otto 85e401a656 add label hover style for ability to make it a link 2012-02-05 02:36:21 -08:00
Mark Otto f9847b300b Merge branch 'jarijokinen-master' into 2.0.1-wip 2012-02-05 02:33:35 -08:00
Mark Otto f8db6a3b53 Merge branch 'master' of https://github.com/jarijokinen/bootstrap into jarijokinen-master 2012-02-05 02:33:30 -08:00
Mark Otto 546332d85d resolve #1602 and add table hover style 2012-02-05 02:28:42 -08:00
Mark Otto f8c2d9b53d remove 940px from default grid heading 2012-02-05 02:24:14 -08:00
Mark Otto 59b32586af close #1628 to add padding to all inline checkboxes/radios 2012-02-05 02:16:46 -08:00
Mark Otto 91475c865d fix #1631 by adding focus to radio buttons 2012-02-05 02:14:25 -08:00
Mark Otto 4a09cf04d8 clean up labels per #1656 2012-02-05 02:01:28 -08:00
Mark Otto 2a192468d3 address #1722 by finishing incomplete sentence on responsive 2012-02-05 01:59:16 -08:00
Mark Otto d92523f329 fix for #1658 to give .label-success proper text 2012-02-05 01:57:09 -08:00
Mark Otto ff91b233eb fix #1665 by correcting tabs example markup 2012-02-05 01:50:55 -08:00
Mark Otto 53da88e561 add mixin for text-overflow 2012-02-05 01:49:36 -08:00
Mark Otto f59b7ce8ea add mention of required classes to horizontal forms 2012-02-05 01:43:22 -08:00
Mark Otto abf4ecac4d add another code example for horizontal forms 2012-02-05 01:41:45 -08:00
Mark Otto 83cb105317 adding code snippets to form examples 2012-02-05 01:36:11 -08:00
Mark Otto 9b5b8460b4 Merge branch 'noahblon-master' into 2.0.1-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-02-05 01:26:44 -08:00
Mark Otto 2f42f35c69 manually resolve #1684 2012-02-05 00:35:13 -08:00
Mark Otto 6661639b37 #1693: manual fix of the pull request to add class name changes to pills/tabs to upgrade guide 2012-02-05 00:29:19 -08:00
Mark Otto 0336f1e644 #1695: manually fix broken primary button instances 2012-02-05 00:27:08 -08:00
Mark Otto dfcb2d1ed8 #1697: update upgrading docs to include mention of no more secondary class in modals 2012-02-05 00:25:40 -08:00
Mark Otto f29e3263b0 follow up to #1702, add callout on component alignment in tabs/pills 2012-02-05 00:16:25 -08:00
Mark Otto cdb1ad1a52 #1702: add callout to navbar for component alignment 2012-02-05 00:11:21 -08:00
Mark Otto 31abeec0f2 manually handle #1703 for note on horizontal forms 2012-02-05 00:05:01 -08:00
Mark Otto 125368d4db update docs with call on meta tag for responsive 2012-02-04 23:57:15 -08:00
Mark Otto a2848ebb00 fix meta tag for viewport in examples and shims 2012-02-04 23:53:24 -08:00
Chris Rebert 93fea1f1cf The &lt; and &gt; escapes have nothing to do with Unicode. 2012-02-04 23:21:56 -08:00
Mark Otto 35fdddbc4f correct css selector for .control-label, required in the docs but not in the CSS files 2012-02-04 22:55:47 -08:00
Mark Otto 418bf5221a #1712: fix typo in js docs 2012-02-04 22:50:26 -08:00
Mark Otto 87a8c9b677 #1707: remove rgba() background override on navbar active items for customization 2012-02-04 22:40:50 -08:00
Mark Otto 679cd5ea02 #1706: protocol independent html5shim added, and moved after the CSS for loading time's sake 2012-02-04 22:38:49 -08:00
Mark Otto 6d8ac203e5 fix broken alert example with data-dismiss 2012-02-04 22:32:04 -08:00
Mark Otto b297a61f82 #1732: make examples of alerts in docs components page dismissable 2012-02-04 22:31:09 -08:00
Mark Otto 468688638d #1715: strip code of styles when in a pre 2012-02-04 22:23:20 -08:00
Mark Otto 7e81f84b29 buttons and icons updated for improved placement and variable support for icon paths 2012-02-04 22:22:19 -08:00
Mark Otto 81d1f3b96e remove max-width on dropdown menus 2012-02-04 18:52:25 -08:00
Mark Otto 9259e24f73 fix cutoff follow button 2012-02-04 18:27:05 -08:00
Mark Otto ac98cee609 allow alternate form layouts to hide inputs with .hide on them 2012-02-04 18:26:04 -08:00
Noah Blon f922a0800b Fixes typo on download page
Changed chose to choose spelling error on download template
2012-02-03 10:34:03 -06:00
Jacob Thornton f68f7870ef Merge pull request #1603 from mikaelbr/master
Fixed ID and for-attr in the doc forms
2012-02-02 23:47:22 -08:00
Jacob Thornton 7f0a64106d its core (typo) 2012-02-02 23:31:03 -08:00
Jacob Thornton c04241b615 Merge pull request #1647 from htanata/fix_alerts_code_example
Fix alerts JavaScript code example
2012-02-02 23:16:17 -08:00
Hendy Tanata 906028abdb Fix alerts JavaScript code example. 2012-02-02 20:45:58 -08:00
Eric Thomas ced08f6935 Wrap long breadcrumb trails 2012-02-02 11:02:14 -08:00
Mark Otto 9ab843b936 add mention of classes to use for button sizes 2012-02-02 09:57:22 -08:00
Mark Otto e92e9f1138 add count to follow button, tweak links to fit on one line for 940px 2012-02-02 09:46:14 -08:00
Mark Otto ab4345332d Merge branch 'shama-master' into 2.0.1-wip 2012-02-02 09:38:21 -08:00
Mark Otto bd0e952003 fix inverted warning text and bg colors in less docs page 2012-02-02 09:36:33 -08:00
Mark Otto 4c237e688b Merge branch 'zhongwei99-master' into 2.0.1-wip 2012-02-02 09:34:37 -08:00
Mark Otto cf488c2800 fix incorrect uses of it's in the docs 2012-02-02 09:33:18 -08:00
Mark Otto dfdc63e872 fix incorrect use of 'caret' 2012-02-02 09:31:07 -08:00
Mikael Brevik 8c0b47a6a8 Fixed duplicate and wrong IDs and label fors in forms. 2012-02-02 14:09:27 +01:00
zhongwei99 4158701894 Minor typo fix. 2012-02-02 18:01:16 +08:00
Kyle Robinson Young 99f395bcd7 Typo fixes 2012-02-01 23:30:37 -08:00
Mark Otto 77871a4205 Merge branch 'eirikb-master' into 2.0.1-wip 2012-02-01 23:13:16 -08:00
Mark Otto 7da9b16307 Merge branch 'master' of https://github.com/eirikb/bootstrap into eirikb-master 2012-02-01 23:12:55 -08:00
Mark Otto 9c3218c89b Merge branch 'mshafrir-master' into 2.0.1-wip 2012-02-01 23:12:17 -08:00
Mark Otto d86e77a256 Merge branch 'master' of https://github.com/mshafrir/bootstrap into mshafrir-master 2012-02-01 23:12:06 -08:00
Mark Otto 8dd2b3d3f8 follow up to #1501 to update notes in sprites.less 2012-02-01 23:10:37 -08:00
Mark Otto 1ec6628e80 add note for icon class usage per #1501 2012-02-01 23:10:00 -08:00
Mark Otto 25ffe14c1b add line item to docs on upgrading per #1488 2012-02-01 23:02:31 -08:00
Mark Otto aa8a7668cb Merge branch 'master' into 2.0.1-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-02-01 22:52:07 -08:00
Mark Otto 58fd0dea36 fixing some docs pages for i18n 2012-02-01 22:51:01 -08:00
Jacob Thornton 98d1659ef8 Merge pull request #1549 from TannerNMO/patch-1
Fixed simple grammatical errors.
2012-02-01 22:37:42 -08:00
Jacob Thornton e26da36b9a remove 2.0-wip ref 2012-02-01 22:30:51 -08:00
Mark Otto 43d797dfff #1566: add note about removal of secondary-nav in 2.0 2012-02-01 22:29:15 -08:00
Jacob Thornton e1deb4e767 fix makefile to reset zips 2012-02-01 22:27:46 -08:00
Mark Otto 4211f21e39 #1571: remove fixed width on file inputs 2012-02-01 22:27:11 -08:00
Jacob Thornton 6738042c61 rebuild with correct zip 2012-02-01 22:21:29 -08:00
Mark Otto c1f0da7cce Merge branch 'master' of github.com:twitter/bootstrap 2012-02-01 22:13:26 -08:00
Mark Otto cc8a8df125 Merge pull request #1576 from ejain/patch-1
Import the responsive css *after* setting the body padding to fix...
2012-02-01 22:13:07 -08:00
ejain 1b8863f925 Import the responsive css *after* setting the body padding to fix the issue described in #1570. 2012-02-01 21:17:04 -08:00
Cary Landholt c3c13a2474 Fixed typo "tabs" ==> "button" 2012-02-01 22:20:24 -06:00
Mark Otto f34ddb5c3f nuke all curly ticks 2012-02-01 18:27:38 -08:00
Mark Otto 94c2c70e6e fix spelling in examples page 2012-02-01 18:25:34 -08:00
Mark Otto 54bfdf1183 fix the makefile 2012-02-01 18:24:41 -08:00
Mark Otto 8a1769c9e2 fix missing ; in buttons.less 2012-02-01 18:18:39 -08:00
Mark Otto f2d3026de8 update scaffolding responsive section to reflect proper media query ranges 2012-02-01 18:12:14 -08:00
Mark Otto 1ebe51c834 fix mis-labeled label 2012-02-01 18:11:19 -08:00
Mark Otto 4d918beb26 fix js links in components 2012-02-01 18:06:52 -08:00
Mark Otto 2e1649410c remove twitter widgets js from examples 2012-02-01 18:00:40 -08:00
Mark Otto e36496fd84 Merge pull request #1490 from amenonsen/master
Typo fix: Sprited => Striped
2012-02-01 17:59:19 -08:00
Mark Otto 3ea3950225 fix icon-bar class in exampless 2012-02-01 17:57:39 -08:00
Mark Otto 2fd6a2e9f6 remove excess td in less docs 2012-02-01 17:55:32 -08:00
Mark Otto 3a2f0765bf fix hover state on .nav-list for active links 2012-02-01 17:54:21 -08:00
Mark Otto 73238701bd fixing jquery links in examples 2012-02-01 17:41:24 -08:00
Mark Otto 5c1527abc5 remove unused css files and add scaffolding and hero-unit to the builder 2012-02-01 17:06:40 -08:00
Mark Otto f166c5a35b Merge branch 'master' of github.com:twitter/bootstrap
Conflicts:
	docs/assets/bootstrap.zip
2012-02-01 16:45:25 -08:00
Mark Otto 9b9e1d309b fix that jank hack 2012-02-01 16:44:07 -08:00
Jacob Thornton 87df230408 rebuild 2012-02-01 16:39:15 -08:00
Jacob Thornton 59016d2198 only add the anyalytics to production 2012-02-01 16:38:58 -08:00
TannerNMO 11319f6da9 Fixed simple grammatical errors. http://grammar.quickanddirtytips.com/backward-versus-backwards.aspx 2012-02-01 14:14:49 -07:00
eirikb 12ed7a2b33 Removed / from 'Get the javascript' in components.mustache 2012-02-01 19:44:33 +01:00
eirikb 981cbfb4fa Removed extra / from 'Get the javascript'-link in components.html 2012-02-01 19:40:10 +01:00
Michael Shafrir b96e80cf39 Fix broken named anchor link for LESS compiling instructions. 2012-02-01 09:58:08 -08:00
Jari Jokinen a486a6f20b Allow labels to be links 2012-02-01 12:59:38 +02:00
Abhijit Menon-Sen 140d90db63 Typo fix 2012-02-01 13:21:37 +05:30
Mark Otto 7f32d15fbb fix links and rebuild 2012-01-31 19:32:42 -08:00
Jacob Thornton fd49d4a44f move examples into docs... 2012-01-31 17:35:23 -08:00
Jacob Thornton bdfb05dbac Merge branch '2.0-wip'
Conflicts:
	docs/assets/bootstrap.zip
2012-01-31 17:27:01 -08:00
Mark Otto c8fad25902 update upgrade page 2012-01-31 17:24:20 -08:00
Jacob Thornton cabba91c7c Merge branch '2.0-wip'
Conflicts:
	docs/assets/bootstrap.zip
2012-01-31 14:38:06 -08:00
Mark Otto c84b5cf5f5 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-01-31 14:30:07 -08:00
Mark Otto 6cf79a5b8e remove unused examples, update examples docs page, add starter template to examples, remove warning alert banner, add screenshots 2012-01-31 14:29:44 -08:00
Jacob Thornton 334e5f25c4 Merge branch '2.0-wip' 2012-01-31 14:11:45 -08:00
Jacob Thornton 80a752f525 add makefile to make it easier to publish to gh-pages... 2012-01-31 14:05:30 -08:00
Mark Otto 013de18e6b remove warning alert on less docs 2012-01-31 14:00:26 -08:00
Jacob Thornton fd700e358d Merge branch '2.0-wip'
Conflicts:
	docs/assets/bootstrap.zip
2012-01-31 13:59:40 -08:00
Jacob Thornton e75bc5eb5f Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-01-31 13:59:08 -08:00
Jacob Thornton 390a9af936 move js stuff into assets 2012-01-31 13:58:28 -08:00
Mark Otto aec0cb3303 fix broken nav on less page 2012-01-31 13:57:43 -08:00
Jacob Thornton b9de88890e Merge branch '2.0-wip'
Conflicts:
	docs/assets/bootstrap.zip
2012-01-31 13:23:29 -08:00
Jacob Thornton 0bfbe5058d Merge branch '2.0-wip'
Conflicts:
	.gitignore
	LICENSE
	Makefile
	bootstrap.css
	bootstrap.min.css
	docs/assets/js/application.js
	docs/assets/js/google-code-prettify/prettify.css
	docs/index.html
	docs/javascript.html
	examples/container-app.html
	examples/fluid.html
	examples/hero.html
	js/bootstrap-alerts.js
	js/bootstrap-dropdown.js
	js/bootstrap-modal.js
	js/bootstrap-popover.js
	js/bootstrap-scrollspy.js
	js/bootstrap-tabs.js
	js/bootstrap-twipsy.js
	js/tests/index.html
	js/tests/unit/bootstrap-modal.js
	js/tests/unit/bootstrap-popover.js
	js/tests/unit/bootstrap-tabs.js
	lib/forms.less
	lib/mixins.less
	lib/patterns.less
	lib/scaffolding.less
	lib/tables.less
2012-01-31 13:18:34 -08:00
Mark Otto cfc1c8a8cd clean up responsive media queries and docs css 2012-01-31 13:16:11 -08:00
Mark Otto 09b9b8a586 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-31 09:40:11 -08:00
Mark Otto 4bd1ba4e0d Merge pull request #1459 from nkryptic/add-help-text
[2.0-wip] Add form help text information to docs
2012-01-31 09:39:59 -08:00
Mark Otto 9cfae03fd4 fix typo in base css docs 2012-01-31 09:37:44 -08:00
Mark Otto cc5415b889 fix js docs typo 2012-01-31 09:37:14 -08:00
nkryptic d70ba6c5e6 add form help-* documentation 2012-01-31 03:54:07 -05:00
Mark Otto a6253f0937 fix disabled button docs 2012-01-31 00:15:43 -08:00
Mark Otto bd9221ddc0 Merge pull request #1457 from nkryptic/2.0-wip
[2.0-wip] added missing nav- prefixes to docs
2012-01-31 00:12:34 -08:00
Mark Otto b7713b83fa chance icon class 2012-01-31 00:11:19 -08:00
nkryptic d633dbb44e add nav- prefix to rest of docs 2012-01-31 02:54:10 -05:00
Mark Otto 4d93b63916 disable cursor on disabled and active pagination links 2012-01-30 23:27:58 -08:00
Mark Otto d533310bd2 once more, overhaul the icons and use the css regex selector on our icons 2012-01-30 23:24:35 -08:00
Mark Otto de994efac7 fix the other disabled button style 2012-01-30 23:17:05 -08:00
Mark Otto 5c9a687665 fix button styles on active and disabled 2012-01-30 23:16:27 -08:00
Mark Otto 61b47e91b8 update layout docs 2012-01-30 23:10:29 -08:00
Mark Otto 1cff29c33f restore a few commented out responsive items 2012-01-30 23:02:24 -08:00
Mark Otto 47a68ae3aa update icons everywhere to be scoped per other components, fix broken elements on js docs page 2012-01-30 22:57:00 -08:00
Mark Otto 31911659a2 refactor the navs to use prefixed classes, because you know, consistency is beast mode 2012-01-30 21:29:50 -08:00
Mark Otto 0f3a073b8d *really* refactor the buttons and update them all over the docs 2012-01-30 21:15:57 -08:00
Mark Otto 21bebe77fe refactor buttons.less 2012-01-30 20:50:51 -08:00
Jacob Thornton 155047c3e6 speed up topbar animation for responsive 2012-01-30 13:59:05 -08:00
Mark Otto 74f2a89611 fix wrong value in grid column width in download page 2012-01-30 10:01:02 -08:00
Mark Otto e94e0f1cf9 implement @textColor for body text 2012-01-30 09:41:31 -08:00
Mark Otto ac581eebac large carousel images and margin bottom added 2012-01-30 09:19:25 -08:00
Mark Otto 774904464d fix docs: move .pull-left from search input to search form in navbar 2012-01-30 08:58:40 -08:00
Mark Otto 3722c34b50 account for floated inputs in the .navbar-form 2012-01-30 08:20:37 -08:00
Mark Otto 2d40b07afc adding warning (orange) button, fix responsive navbar problem 2012-01-30 08:15:28 -08:00
Mark Otto a29dee44ac remove all new dropdown button stuff 2012-01-30 08:04:48 -08:00
Mark Otto a8400009da testing out button dropdown group 2012-01-30 07:59:24 -08:00
Mark Otto 2c8ca4f5e2 add skew mixin 2012-01-30 07:54:47 -08:00
Mark Otto 9f5b619094 add in regular button dropdowns, rejigger the button dropdowns section to reflect change 2012-01-30 07:49:28 -08:00
Mark Otto 9ba70796e2 remove top 5px padding from first inline radio/checkbox 2012-01-30 07:40:24 -08:00
Mark Otto 33a969dd0c update vars in less and download pages 2012-01-30 01:34:59 -08:00
Mark Otto 160a0bf560 update tests for popover to use proper classes 2012-01-30 01:30:18 -08:00
Mark Otto 175fd98a7c fix forms typo on error state 2012-01-30 01:25:02 -08:00
Mark Otto 144789788f updated upgrade page to reflect popover changes 2012-01-30 01:24:02 -08:00
Mark Otto f4e5bc1c53 namespace popover values 2012-01-30 01:20:51 -08:00
Mark Otto db31efb995 scope .content in container example 2012-01-30 01:18:45 -08:00
Mark Otto 8f448610a9 rename vertical-divider to divider-vertical, add more space around the divider 2012-01-30 01:09:34 -08:00
Mark Otto 8b77722a93 update reverse fluid layout to mirror the fluid layout 2012-01-30 01:06:20 -08:00
Mark Otto dc3d2b1044 update js docs page to clarify usage of images on carousel 2012-01-30 00:44:27 -08:00
Mark Otto 0f088af855 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	docs/assets/bootstrap.zip
	less/responsive.less
2012-01-30 00:43:57 -08:00
Mark Otto ae7f94eeff overhaul grid mixins and variables, standardize fluid grid system and enable it across responsive layouts 2012-01-30 00:39:44 -08:00
Jacob Thornton 734bfe7f78 Merge pull request #1421 from MarkReeder/2.0-wip
Fixes Opera flickering on the collapse plugin when reset is called without specifying the size
2012-01-29 23:40:34 -08:00
Mark Reeder f9b53d424e Fixes issue with Opera flickering on the collapse plugin when reset is called without specifying the size
https://github.com/twitter/bootstrap/issues/1208
2012-01-29 21:14:07 -08:00
Jacob Thornton 0de951f4f4 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-01-29 19:07:14 -08:00
Jacob Thornton fae04c8ac1 add license for responsive and rebuild 2012-01-29 19:04:26 -08:00
Mark Otto 2ba1b01f8d subnav adjustments 2012-01-29 17:03:05 -08:00
Mark Otto fda77e69eb move vars and mixins for default grid back to appropriate files 2012-01-29 16:58:51 -08:00
Mark Otto b078050702 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-01-29 16:55:56 -08:00
Mark Otto 0301d469e8 remove .collapse from navbar responsive docs 2012-01-29 16:54:51 -08:00
Jacob Thornton 90f2e8e196 rebuild zip 2012-01-29 16:46:40 -08:00
Mark Otto 882bb9dbd3 reran make 2012-01-29 16:43:03 -08:00
Mark Otto b0976bb379 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	docs/assets/bootstrap.zip
2012-01-29 16:42:37 -08:00
Mark Otto 702d3b6dfe fix broken navbar collapse 2012-01-29 16:35:55 -08:00
Jacob Thornton 298e637d00 remove dist dir 2012-01-29 16:33:29 -08:00
Jacob Thornton f622822459 check in dist dir for hb5 + update images to point to correct spot for builder 2012-01-29 16:19:41 -08:00
Burak Tuyan 19b70dc414 Fixing the Docs for Tabs dropups
New example caused an overflowing issue at the Tabs dropdowns documentation, this is a quick fix to get rid of this issue.
2012-01-30 01:22:10 +02:00
Burak Tuyan 97b3057824 Extending the dropup support to tabs and pills
This was needed to match the color of the carets that are used for tabs and pills
2012-01-30 01:13:21 +02:00
Burak Tuyan 918a17a30b Adding dropup support to split buttons and navbar
* Documents the hidden .dropdown-menu.bottom-up option (to be used for dropups)
* Extends the .bottom-up class to carets and all relevant caret styles
* Adds .dropdown-menu.pull-right class for right-aligned dropdowns and dropups
* Adds examples and some information to the "split dropdown" and "navbar" sections of the Docs
2012-01-30 00:50:47 +02:00
Mark Otto d637db1a23 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-29 14:23:06 -08:00
Mark Otto e493f7fc19 update navbar collapse everywhere and remake 2012-01-29 14:22:51 -08:00
Mark Otto 9e7f5025b4 update collapsible nav in navbar 2012-01-29 14:07:58 -08:00
Mark Otto 7095d181dc Merge pull request #1404 from ChadMoran/patch-1
warningText and warningBackground docs fix
2012-01-29 13:29:50 -08:00
Mark Otto 391661f14b Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-29 13:25:36 -08:00
Mark Otto 278858e706 fix form styles on prepend/append for consistency, update code docs with examples of the code snippets 2012-01-29 13:25:13 -08:00
Chad Moran 2696c6a4bd Fixed @warningText and @warningBackground colors in docs 2012-01-29 13:20:39 -08:00
Jacob Thornton 910e78d26a Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-29 13:16:02 -08:00
Mark Otto 9fa8bde44d fix animated/striped gradients in progress bars 2012-01-29 13:15:38 -08:00
Jacob Thornton 49d565a6da move building zip file into docs/makefile 2012-01-29 13:15:37 -08:00
Mark Otto 4e5b0e185e refined pager styles to give a border on the links and improved hover state 2012-01-29 13:12:13 -08:00
Mark Otto 8c763589a2 update text on icons note 2012-01-29 13:09:10 -08:00
Mark Otto 0952f3796e fix js readme api capitalization 2012-01-29 13:07:31 -08:00
Mark Otto 48529ad01f last minute addition of a simple fluid grid for our fluid examples; it needs work, so we're not documenting it now 2012-01-29 13:06:57 -08:00
Mark Otto 059ff6bcbd update hero example and examples overview 2012-01-29 02:27:45 -08:00
Mark Otto 7bf2767452 remove form docs from the styles and markup, it's no longer needed 2012-01-29 00:07:01 -08:00
Mark Otto 15a1c0ce79 add swatches to the color variables in less docs page 2012-01-28 23:58:39 -08:00
Mark Otto f9e01e2258 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-28 23:41:18 -08:00
Mark Otto bca269299b removing required .navbar-static class, rewrote docs to reflect the change, and updated the upgrade docs page to include the navbar section 2012-01-28 23:40:52 -08:00
Mark Otto 5e658afb2b Merge pull request #1367 from lukeman/update-example-layouts
[2.0-wip] update example layouts
2012-01-28 23:29:10 -08:00
Luke Hatcher af9de238fd update all example pages to latest version 2012-01-29 01:48:51 -05:00
Mark Otto 62f4a1571a revamped the thumbnails examples to make them work and look better at higher resolution 2012-01-28 22:48:25 -08:00
Mark Otto 487dbfdda4 namespace progress bars and labels classes 2012-01-28 22:14:51 -08:00
Mark Otto 59d9983ebc updates to responsive and docs for responsive navbar 2012-01-28 22:03:14 -08:00
Mark Otto f1e520badd clarify and tweak media queries 2012-01-28 20:34:07 -08:00
Mark Otto 5f314dcb85 remove benefits from homepage html 2012-01-28 20:27:18 -08:00
Mark Otto 3e462f1fb2 update docs to simplify some css 2012-01-28 20:26:27 -08:00
Mark Otto cf1b46bda4 fix alert close position 2012-01-28 18:46:41 -08:00
Mark Otto 99ac6ca08e update components page to include docs for the new navbar collapse feature, re-add responsive.less to downloader 2012-01-28 18:39:36 -08:00
Mark Otto e17c9249d2 fix dropdowns in subnav 2012-01-28 18:27:09 -08:00
Mark Otto e532228721 more responsive tweaks for tablet 2012-01-28 18:25:05 -08:00
Mark Otto 4fa931e403 fix the navbar click and a few jank responsive problems 2012-01-28 18:11:31 -08:00
Mark Otto 06df91ac55 remove background from accordion, and use border instead 2012-01-28 16:48:03 -08:00
Mark Otto 475b985a0e remove padding from first-child of inline radios/checkboxes 2012-01-28 16:37:43 -08:00
Jacob Thornton 22d52fca46 fix goign between small view large view with responsive collapse 2012-01-28 16:21:55 -08:00
Jacob Thornton b8a683d7f2 turn off brand hover for now + get nav toggling in mobile 2012-01-28 15:42:07 -08:00
Jacob Thornton ea1c21d62d Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-28 15:15:38 -08:00
Jacob Thornton 6493cd22c0 blah 2012-01-28 15:14:57 -08:00
Mark Otto 23e076c1bb add in a navbar button for toggling the nav items 2012-01-28 15:09:23 -08:00
Mark Otto dc74530fba Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-28 14:51:14 -08:00
Mark Otto 7843a665fd vertical align inline checkboxes/radios to improve rendering in topbar 2012-01-28 14:50:56 -08:00
Jacob Thornton 29b1e86bf9 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-28 14:48:20 -08:00
Jacob Thornton 616cbf93d2 remove uglify variable from makefile 2012-01-28 14:47:59 -08:00
Mark Otto 9db4f2a344 change .span* inputs to use content-sizing: border-box; to make them behave as block level elements 2012-01-28 14:30:45 -08:00
Mark Otto d96c0c781d comment for progress bars firefox keyframes 2012-01-28 14:20:27 -08:00
Mark Otto ab20c921df Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-28 13:30:34 -08:00
Mark Otto fe6d2f2e1d fix tabs-below typo 2012-01-28 13:30:15 -08:00
Jacob Thornton b38a13ef98 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-28 13:17:07 -08:00
Jacob Thornton 6935f693b3 typahead does case insensitive matching with simple sorter + accepts highlighter option 2012-01-28 13:16:05 -08:00
Mark Otto 1a22c3b30a restore IE filters, but reset them on buttons 2012-01-28 13:13:01 -08:00
Mark Otto 296d06a285 add checkbox/radio border for ios in responsive 2012-01-28 13:07:01 -08:00
Mark Otto 70c6a6cd85 fix border and border radius on radios/checkboxes for iOS, fix forms docs alignment on small devices 2012-01-28 12:58:26 -08:00
Mark Otto b77161f864 reset border-radius only for ie9? 2012-01-28 12:49:26 -08:00
Mark Otto 698d4b414c Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-28 12:43:45 -08:00
Mark Otto 2bfda031ce darken buttons, uncomment out firefox keyframes from progress bars 2012-01-28 12:43:19 -08:00
Jacob Thornton f768242759 add trailing ; 2012-01-28 12:14:41 -08:00
Jacob Thornton e1a1fdd35d Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-28 12:09:16 -08:00
Jacob Thornton 12d3c2fe74 fix z-index issue with modals for popovers,tooltips,and dropdowns 2012-01-28 12:08:41 -08:00
Mark Otto 39f70afed9 update mixins to fix radial gradient 2012-01-28 12:03:26 -08:00
Mark Otto f1dc214977 increase padding on modal-header after decreasing h3 line-height 2012-01-28 11:24:34 -08:00
Mark Otto 2452768259 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-28 11:22:07 -08:00
Mark Otto 28ba9d69c8 nav, buttons, and docs updates to account for outline: 0; on :active 2012-01-28 11:21:39 -08:00
Jacob Thornton c2c02d104c Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-28 11:04:05 -08:00
Jacob Thornton d465952138 clean up js api for dropdowns 2012-01-28 11:03:39 -08:00
Jacob Thornton e7e8db966e Merge pull request #1339 from lookfirst/nodebug
2.0-wip: no debugger
2012-01-28 10:47:22 -08:00
Jon Stevens 8ade6989c3 no debugger 2012-01-28 02:25:13 -08:00
Jacob Thornton ab8f4a394c remove js for table sorts 2012-01-28 01:48:45 -08:00
Jacob Thornton 68fa1e4826 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-28 01:35:36 -08:00
Jacob Thornton e61164e67a all unit tests passing in ie7 2012-01-28 01:35:13 -08:00
Mark Otto d65ce1b64c updated upgrading page 2012-01-28 01:34:07 -08:00
Jacob Thornton 81c128fd0b Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-28 00:46:21 -08:00
Jacob Thornton 09df780b75 clean up application js a bit 2012-01-28 00:46:04 -08:00
Mark Otto f1851ab133 change text on js docs page to improve rendering on iphone, update responsive for carousel considerations 2012-01-28 00:43:25 -08:00
Mark Otto edee985b96 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-28 00:39:34 -08:00
Mark Otto 967030cb53 modal refinements in docs and general responsiveness 2012-01-28 00:39:22 -08:00
Jacob Thornton 7ffec335ca Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-28 00:37:12 -08:00
Jacob Thornton 4737d693e0 remove quick start section to simplify landing page + start rewriting application js to work ie7 2012-01-28 00:36:37 -08:00
Mark Otto 18d95a163b remove fixed width from labels table 2012-01-28 00:34:54 -08:00
Mark Otto cc01d3c367 extend block level smalls to h2s in docs 2012-01-28 00:31:55 -08:00
Mark Otto 342a99f1d0 block level page-header h1 small for readability on 480px and under 2012-01-28 00:29:38 -08:00
Mark Otto 963e5e0eda scope subnav link styles to first child, and no dropdowns 2012-01-28 00:27:49 -08:00
Mark Otto 873be0e4f2 drop span2-4 on form examples to 1-3 2012-01-28 00:25:54 -08:00
Mark Otto 1453ea4bf7 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-28 00:23:44 -08:00
Mark Otto d448e6921e rewrite the code section of the type docs 2012-01-28 00:23:30 -08:00
Jacob Thornton 4a7d8de204 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-28 00:04:06 -08:00
Jacob Thornton 3451dcbc28 fix failing typeahead tests 2012-01-28 00:03:26 -08:00
Mark Otto ce69b70719 give append/prepend inputs higher z-index on focus 2012-01-27 23:53:56 -08:00
Mark Otto 08fea7587c call attention to notices in js docs more 2012-01-27 23:27:33 -08:00
Mark Otto 7a756168b5 fix regression in textarea shadows 2012-01-27 22:56:48 -08:00
Mark Otto 1d44f37fc9 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-27 22:52:56 -08:00
Mark Otto cb8606f2c8 adding wells and close icon to the docs under misc in components, with a new subnav style 2012-01-27 22:52:45 -08:00
Jacob Thornton 7cbb586825 move the matcher and sorter into the options - encourage people to override them... 2012-01-27 22:27:06 -08:00
Jacob Thornton e726b231ba add toggle to docs for popover/tooltip 2012-01-27 21:59:06 -08:00
Jacob Thornton 1e07c066a5 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-27 21:37:59 -08:00
Jacob Thornton 0255f47eb3 add zindex option for tooltips/popovers and fix modal zindex doc example 2012-01-27 21:36:58 -08:00
Mark Otto ad78caa726 fix right aligned dropdowns in navbar by adding left: auto; to nix default alignment 2012-01-27 21:25:35 -08:00
Mark Otto 78120edf72 add clearfix to control-group for longer labels and any other unforeseen circumstances 2012-01-27 21:20:58 -08:00
Mark Otto d0447e9aa5 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
2012-01-27 21:09:24 -08:00
Mark Otto 3934d1b6c4 rgba text color on active buttons for a bit more contrast from their non-active siblings 2012-01-27 21:08:04 -08:00
Jacob Thornton 15d3a4797f simplify build process more - remove really annoying date. 2012-01-27 21:06:09 -08:00
Mark Otto 4e191c423d update progress bars to have a solid edge until 100% filled 2012-01-27 20:17:03 -08:00
Mark Otto 9800196bf7 use quotes on attr selectors more consistently 2012-01-27 20:05:03 -08:00
Mark Otto 0fa6422918 icon spacing in small buttons and nav lists 2012-01-27 19:57:53 -08:00
Mark Otto d02c6957d4 fixing up buttons and examples of implementing icons 2012-01-27 19:49:56 -08:00
Mark Otto a624ac1edf Merge branch '2.0/docs/base/icons' of https://github.com/buraktuyan/bootstrap into buraktuyan-2.0/docs/base/icons 2012-01-27 19:12:09 -08:00
Mark Otto 7fc6e12b79 comment icons that are 1px off 2012-01-27 18:49:00 -08:00
Mark Otto aaa530c27e combined .disabled and [disabled] and confirmed in ie7/8 2012-01-27 18:44:17 -08:00
Mark Otto 7e72eb5063 new tab focus style and mixin 2012-01-27 18:33:25 -08:00
Mark Otto 997fc33af9 clean up use of mixins to highlight them appropriately in your fav editor 2012-01-27 16:40:14 -08:00
Mark Otto d9759abeeb Merge branch 'ie_7_components' of https://github.com/phopkins/bootstrap into phopkins-ie_7_components
Conflicts:
	docs/assets/css/bootstrap.css
2012-01-27 16:35:32 -08:00
Mark Otto f6dc566963 overhaul navbar behavior in responsive css 2012-01-27 16:26:55 -08:00
Burak Tuyan a2a10ae421 Adding new examples to the icons' docs.
- Button with dropdown menu.
- Small info button.
- Text alignment for navigation with no icon.
- Text input form with prepended icon
- Select input form with prepended icon
2012-01-28 02:13:53 +02:00
Mark Otto 800d0b24e0 remove page-header from docs and add to type.less 2012-01-27 15:28:09 -08:00
Mark Otto 91e9f6fa91 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
2012-01-27 14:49:02 -08:00
Mark Otto 22359f9dfd update examples and restore icons 2012-01-27 14:48:35 -08:00
Jacob Thornton 065ed01b1f Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
2012-01-27 14:44:58 -08:00
Jacob Thornton 748696a553 add missing paren 2012-01-27 14:44:05 -08:00
Jacob Thornton 8a2124faff only build mustache files 2012-01-27 14:43:41 -08:00
Mark Otto 003da1e089 fix inputs in navbar 2012-01-27 14:21:17 -08:00
Mark Otto 6353e5070a remove unused images from docs assets 2012-01-27 14:03:36 -08:00
Mark Otto 3807a88ee9 update the docs for icons 2012-01-27 13:56:50 -08:00
Mark Otto 8da1c176ec Merge branch '2.0-wip' of https://github.com/buraktuyan/bootstrap into buraktuyan-2.0-wip 2012-01-27 13:43:51 -08:00
Mark Otto 335a8686da Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
2012-01-27 13:43:28 -08:00
Pete Hopkins 84b9a1bfb6 Rebuild css and html 2012-01-27 16:39:38 -05:00
Pete Hopkins 1c9db106fa Moves buttonBackground to mixins (issue 1292) 2012-01-27 16:39:27 -05:00
Mark Otto b1f38bbea8 update icon examples to show icons in differently sized buttons 2012-01-27 13:39:19 -08:00
Jacob Thornton 3c7e3eb7d3 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
2012-01-27 13:37:14 -08:00
Jacob Thornton 6fd1e9f4c0 rebuil update layout 2012-01-27 13:36:31 -08:00
Mark Otto d7b8a9c930 align text in buttons so folks can easily make them different widths 2012-01-27 13:36:08 -08:00
Pete Hopkins a1fc352cc2 Changes non-transparent navbar search box color to match transparent one better 2012-01-27 16:35:40 -05:00
Mark Otto a0b40b361a i18n download page 2012-01-27 13:35:25 -08:00
Pete Hopkins faa719d59c Fixes left/right border overlap for IE7 2012-01-27 16:35:21 -05:00
Mark Otto ccd963e622 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
	docs/download.html
2012-01-27 13:21:01 -08:00
Mark Otto e8647c1b11 huuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuge update to doces and stuff 2012-01-27 13:20:02 -08:00
Pete Hopkins 8328987b15 IE7 fixes for split buttons and dropdowns 2012-01-27 16:10:40 -05:00
Pete Hopkins 347a15b69a Cleans up IE7 inline margins for buttons and adds them for sprites, also fixes button padding for large/small sizes 2012-01-27 16:10:40 -05:00
Pete Hopkins 43f1a42f7f Adds necessary ie7-inline-block macros 2012-01-27 16:10:34 -05:00
Pete Hopkins 7b31f4a334 Brings back uneditable input 2012-01-27 16:09:58 -05:00
Pete Hopkins 70d95b1bd7 Moves IE7-specific button padding to only apply to form controls 2012-01-27 16:09:58 -05:00
Jacob Thornton 3b3dbd7229 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
2012-01-27 11:07:17 -08:00
Burak Tuyan 16a28d881c Merge branch '2.0-wip' of git://github.com/twitter/bootstrap into 2.0-wip 2012-01-27 20:48:37 +02:00
Mark Otto 97546adc90 Merge branch 'ie_7_base' of https://github.com/phopkins/bootstrap into phopkins-ie_7_base 2012-01-27 09:40:04 -08:00
Mark Otto e44a7dd4ff buttons for toggle links in js docs, code example for offsetting in grid 2012-01-27 09:36:49 -08:00
Pete Hopkins f51e703ba6 Rebuild bootstrap.css 2012-01-27 12:16:36 -05:00
Pete Hopkins 526d388393 Compensates for IE7 first-child-input-inheriting-hasLayout-parents-margins bug for appended text form element 2012-01-27 12:16:17 -05:00
Pete Hopkins 841e386daf Fixes up internal and external spacing for IE7 buttons 2012-01-27 12:08:56 -05:00
Pete Hopkins 6075b5dee6 Collapses borders for IE7, which doesn't respect border-spacing 2012-01-27 12:08:56 -05:00
Mark Otto 9d0328ff00 adding outline callout as a fallback for IE--needs testing though, thought I already added this 2012-01-27 08:21:39 -08:00
Burak Tuyan acaa3b5977 Changing the color of the default icons from black (#000) to grayDark (#333) 2012-01-27 18:02:57 +02:00
Burak Tuyan 942d1b4595 Updating to latest version of Glyphicons Halflings set (v.1.5) along with some icon enhancements like:
- Updated the Gylphicons Halflings set to version 1.5 (30 new icons)
- Optimized the sprite PNG files for minimum filesize without any quality loss
- Made some fixes for horizontal alignment at the LESS/CSS level (tags, bold, arrow-up, minus, chevron-down)
- Made some fixes for vertical alignment at the LESS/CSS level (chevron-down, resize-vertical, resize-horizontal)
- Renamed the old "calendar" class as "list-alt" class (because now we've a real calendar icon)
- Changed the "background-position" of the icon class to "14px 14px", so that a wrong class name will not be showing the glass icon and instead will show a blank icon (which is useful for just positioning the text after the icons in some cases)
- Added new icons (classes) to the base-css Docs (to both HTML file and Mustache template)
- Changed one of the button examples to danger style and used a white icon
- Renamed the sprite image files to save a few bytes here and there (from glyphicons-halflings-sprite.png to lyphicons-halflings.png and from glyphicons-halflings-sprite-white.png to glyphicons-halflings-white.png)
2012-01-27 16:33:18 +02:00
Jacob Thornton aa594501bd change typeahead to data-source instead of data-data and add to docs 2012-01-26 23:16:02 -08:00
Jacob Thornton 11d7ef1515 Merge pull request #1272 from napoleond/2.0-wip
Support tab and enter in typeahead
2012-01-26 23:04:42 -08:00
Jacob Thornton c63175dc1d change endpoint to point to actual server... 2012-01-26 22:52:44 -08:00
Jacob Thornton 815a2ae9f2 rebuild + copy images to docs when making 2012-01-26 22:39:17 -08:00
Jacob Thornton a25f0cce95 simplify readme 2012-01-26 22:11:32 -08:00
Jacob Thornton ed64276e5b move doc building into base make method + build bootstrap to doc assets 2012-01-26 22:05:45 -08:00
Jacob Thornton dc2deb9a1b moving structure around + more work on builder... 2012-01-26 21:48:46 -08:00
Jacob Thornton e0e54d9c6c Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-26 20:23:28 -08:00
Jacob Thornton 1e9c2fb9d4 getting closer.... 2012-01-26 20:23:15 -08:00
Mark Otto 576ae2f561 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-26 19:10:32 -08:00
Mark Otto 7a3d04d5be scope icons to .icon 2012-01-26 19:10:09 -08:00
Mark Otto a4a8ea2328 flip order of content on home page 2012-01-26 19:09:59 -08:00
Mark Otto 824eaff1d8 Merge pull request #1280 from mistermarco/2.0-wip
Fix typo in docs/scaffolding.html and mustache template in 2.0 wip
2012-01-26 19:04:22 -08:00
Marco Wise 6886022fe6 fix typo in docs/scaffolding.html 2012-01-26 18:10:36 -08:00
Mark Otto 5a48b22b83 Merge pull request #1269 from phopkins/ie_typeahead
[2.0-wip] Fix typehead plugin for IE7/8
2012-01-26 17:04:35 -08:00
Mark Otto c8d2c4e442 fix height of download button 2012-01-26 16:45:01 -08:00
Jacob Thornton 12484a7471 more builder crap 2012-01-26 16:41:28 -08:00
Mark Otto e7bc2063be Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
2012-01-26 16:31:10 -08:00
Mark Otto 7d292f5acc Merge pull request #1274 from linrock/patch-2
[2.0 wip] Bring back the hero unit css. Fixes #1185.
2012-01-26 16:27:50 -08:00
Mark Otto af96da6e89 adding white sprites 2012-01-26 16:27:37 -08:00
Jacob Thornton c31ac846d7 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-26 16:12:51 -08:00
Jacob Thornton d531f72645 some js for javascript for builder (stil incomplete) 2012-01-26 16:12:34 -08:00
Mark Otto b260544de0 fix links to apple touch icons 2012-01-26 15:54:04 -08:00
Linmiao Xu ef4e3bc0f7 Move hero-unit css out of pattern.less and include it. Fixes #1185. 2012-01-26 15:51:11 -08:00
Mark Otto d8e1001836 fix legend margin collapse 2012-01-26 15:39:37 -08:00
Mark Otto 2d67c34084 Merge branch 'form_alignment' of https://github.com/phopkins/bootstrap into phopkins-form_alignment
Conflicts:
	bootstrap.css
	bootstrap.min.css
2012-01-26 15:25:19 -08:00
David N b9589fcb80 Enable default browser key behaviour when typeahead isn't showing. 2012-01-26 17:23:09 -06:00
Mark Otto f398926e46 move down background iamge 2012-01-26 15:22:52 -08:00
Mark Otto 95356ee062 make css after merge 2012-01-26 15:04:36 -08:00
Mark Otto 32e57efd1f Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-26 15:04:13 -08:00
Mark Otto 40b4793dea Merge pull request #1271 from linrock/patch-1
Fix icon margins in large buttons.
2012-01-26 15:03:53 -08:00
Mark Otto 5844aa550d consistent new lines at ends of files 2012-01-26 15:00:59 -08:00
Mark Otto 945870d778 small text change on downloads page 2012-01-26 14:54:24 -08:00
Mark Otto f82db4b95b separate code from type css files 2012-01-26 14:53:35 -08:00
Mark Otto 7a6737512a break scaffolding down into smaller less files 2012-01-26 14:50:55 -08:00
Mark Otto 8a6be6601d make accordion links block level 2012-01-26 14:40:19 -08:00
Mark Otto 43c8f41895 add values to inputs for grid variables on download page 2012-01-26 14:40:09 -08:00
Linmiao Xu 2aa99d17d5 Fix icon margin in large buttons. 2012-01-26 14:36:30 -08:00
Pete Hopkins 1f04481092 Switches from Array#filter to jQuery.grep for IE<=8 support 2012-01-26 17:07:06 -05:00
Mark Otto 78652a707f allow icons in small buttons 2012-01-26 13:51:12 -08:00
Pete Hopkins 721b8a1078 rebuild *.css 2012-01-26 16:15:09 -05:00
Pete Hopkins b9413460af Makes inputs and buttons align middle so they line up in all browsers 2012-01-26 16:14:54 -05:00
Pete Hopkins f76444c858 Clears border-radius on checkboxes because they look bad on IE 2012-01-26 16:04:24 -05:00
Pete Hopkins c13de3db60 Fixes off-by-1px between checkbox and form label (all browsers) 2012-01-26 16:04:24 -05:00
Mark Otto b7f22e27ec more docs homepage adjustments 2012-01-26 11:47:40 -08:00
Mark Otto 9c1ec6fb98 updated homepage docs to distill strapline 2012-01-26 11:40:29 -08:00
Mark Otto 358e3a53f7 Merge branch 'phopkins-ie_buttons' into 2.0-wip 2012-01-26 11:10:16 -08:00
Mark Otto edef89f30e move around some comments in buttons.less, update labels to use correct variables, add snippet to docs about IE9 2012-01-26 11:10:07 -08:00
Mark Otto dd9a0a3f16 Merge branch 'ie_buttons' of https://github.com/phopkins/bootstrap into phopkins-ie_buttons 2012-01-26 10:55:26 -08:00
Pete Hopkins 62b2fdc4de Rebuild *.css 2012-01-26 13:51:29 -05:00
Pete Hopkins cd907067b8 Fixes background color for disabled buttons to match pre-IE fix (which prevents hover effects) 2012-01-26 13:51:03 -05:00
Mark Otto b8c1950cbf change label fo first subnav link on js docs 2012-01-26 10:43:08 -08:00
Mark Otto 34488a4500 fix tabs example on js docs page 2012-01-26 10:39:07 -08:00
Pete Hopkins 86e0e89ee8 More *.css building 2012-01-26 13:26:28 -05:00
Pete Hopkins 7117db499f Makes default button the tiniest bit of gray for IE<=9 2012-01-26 13:26:14 -05:00
Mark Otto 5d465fab4c Merge branch 'ie_buttons' of https://github.com/phopkins/bootstrap into phopkins-ie_buttons 2012-01-26 10:12:50 -08:00
Mark Otto ef4d0dd7db space out masthead a git more 2012-01-26 10:12:25 -08:00
Pete Hopkins 2c2f8ebe3a Rebuild of *.css 2012-01-26 13:09:13 -05:00
Pete Hopkins 29f0e4c28b Removes filters as a way to provide gradients for IE<=9
- Lets us use rounded corners in IE9
 - Makes hover / active states work correctly in IE<=9

Only change for non-IE is that moving from hover -> not hovering
no longer animates (was a subtle blend) due to mismatch between the
bottom of the gradient and the background color.

Refactor: moves the primary button background to match the others.
2012-01-26 13:07:52 -05:00
Mark Otto 0ef4b6419f overhaul frontpage jumbotron, add js for twitter buttons back in, fix up some form ids and classes, straighten out the use of primary button variable 2012-01-26 10:00:09 -08:00
Mark Otto 106625a2ec fix small icons on homepage 2012-01-26 00:36:40 -08:00
Mark Otto 94ea3b62f0 fix forms examples and allow for inputs in labels 2012-01-25 21:28:24 -08:00
Mark Otto b6b19866ac remove some old -moz- prefixes from mixins while we're at it, dropping FF3.6 support 2012-01-25 20:32:19 -08:00
Mark Otto af01d37ab9 Merge branch '2.0-wip' of https://github.com/kristerkari/bootstrap into kristerkari-2.0-wip 2012-01-25 20:13:52 -08:00
Mark Otto ce467f7091 consistency in download page heading 2012-01-25 20:11:13 -08:00
Mark Otto f62c9379fb remove all tablesorter assets and css 2012-01-25 20:07:27 -08:00
Mark Otto e877d125d7 fix button group shadows, update js docs to fix alert js file link 2012-01-25 20:02:32 -08:00
Mark Otto 0db2d45350 update mixins to use slightly diff variables within some parametric mixins 2012-01-25 15:04:41 -08:00
Mark Otto b6b7d1343b finish the rest of the less page mixins docs 2012-01-25 15:03:44 -08:00
Krister Kari 0777e391ee Drop khtml gradient, shorten old webkit gradient 2012-01-26 01:03:36 +02:00
Mark Otto 7d83f45ebb start filling out mixins tables 2012-01-25 14:08:51 -08:00
Mark Otto 7ca3b98d88 docs fixes 2012-01-25 13:56:44 -08:00
Mark Otto 4ea63e5261 finish off the static stuff for build and download page 2012-01-25 13:33:55 -08:00
Mark Otto 9c4a70c597 swap fieldsets for divs 2012-01-25 12:43:38 -08:00
Mark Otto 1c66779857 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
2012-01-25 12:43:31 -08:00
Mark Otto 2b2c72b9aa fix select alignment and height 2012-01-25 12:04:19 -08:00
Mark Otto 86191d898b height auto on mutli select 2012-01-25 11:51:13 -08:00
Jacob Thornton 04f84997c1 rebuil 2012-01-25 11:49:34 -08:00
Jacob Thornton 3250ecc674 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-25 11:49:20 -08:00
Jacob Thornton 319b65e64b prevent default 2012-01-25 11:49:00 -08:00
Mark Otto 06017b26ca fix bottom visual bug on carousel images 2012-01-25 11:47:36 -08:00
Mark Otto 58d08a2db3 enable support for form states on select elements 2012-01-25 11:35:08 -08:00
Mark Otto a4b8cc2a9c darken active state on subnav with scrollspy added 2012-01-25 11:30:30 -08:00
Mark Otto e24bd40b4a Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
2012-01-25 11:27:29 -08:00
Mark Otto b851156863 change form fields back to inline-block to allow for inline-help text in default form markup 2012-01-25 11:26:45 -08:00
Jacob Thornton 25519bacd5 rebuild + add spy to template 2012-01-25 11:25:35 -08:00
Mark Otto d3c5dd4e6a updated comments in forms.less and added uneditable-textarea class to extend uneditable-input 2012-01-25 11:21:44 -08:00
Mark Otto cfa925cab6 remake after merging large button group fix 2012-01-25 11:15:48 -08:00
Mark Otto 10cb7c02f9 Merge pull request #1135 from kevva/patch
2.0-wip: Remove specific top value from large btn-dropdown.
2012-01-25 11:15:17 -08:00
Mark Otto fd3c6733a2 missing icon class in code example 2012-01-25 11:11:22 -08:00
Mark Otto 603aaa01ef remake after updating variables from @lookfirst 2012-01-25 11:05:23 -08:00
Mark Otto 66f6535579 Merge pull request #1212 from lookfirst/white
2.0-wip: s/#fff/@white/
2012-01-25 11:04:35 -08:00
Jon Stevens 0b2dd16e72 missed a white 2012-01-25 11:02:28 -08:00
Jon Stevens 6cbf2f4024 s/#fff/@white/ 2012-01-25 10:59:45 -08:00
Mark Otto e49e49ff95 fix mention of old vertical forms class' 2012-01-25 10:51:26 -08:00
Mark Otto 97bad784b5 update remaining icons in docs 2012-01-25 10:50:08 -08:00
Mark Otto 4a3ad1aa89 update responsive to use latest grid mixins 2012-01-25 10:48:08 -08:00
Mark Otto 324ebb5990 spec'ed out an examples overview page with links to current examples; examples still need work themselves though 2012-01-25 10:47:08 -08:00
Mark Otto 1fa3eab20c fix location of favicon 2012-01-25 10:19:29 -08:00
Mark Otto 9380ff8a06 clean up the updated container app layout a bit 2012-01-25 10:09:26 -08:00
Mark Otto e93c536df1 Merge pull request #1196 from OpenGrid/2.0-wip
Fixed span sum to 10 to display properly. Grid has 12 columns.
2012-01-25 10:07:57 -08:00
Mark Otto 9553b1e3e9 update docs to include separate responsive css, update docs to highlight proper file name, updated makefile to build responsive separately 2012-01-25 10:02:52 -08:00
Mark Otto c381199968 fix media queries in scaffolding 2012-01-25 09:57:40 -08:00
Mark Otto 29b4ba0fc5 fix modal examples on js page, update modal close button positioning 2012-01-25 09:53:53 -08:00
Mark Otto b01de5fc56 updated icons to require a base class .icon 2012-01-25 09:51:03 -08:00
Mark Otto d8041f7c8f fix margin on input buttons in modals 2012-01-25 08:34:20 -08:00
Lech Wilczynski 2193866bf0 fixed columns to 7+3 for better proportions 2012-01-25 16:26:51 +01:00
Lech Wilczynski eb3440b56a fixed span sum to 10 to display properly. Grid has 12 columns. 2012-01-25 15:20:01 +01:00
Mark Otto de4ada3b88 spec out all mixins on less page 2012-01-25 01:45:15 -08:00
Mark Otto bd36e2a163 remove checkboxes from js docs page overview, they'll be on the download page instead 2012-01-25 01:25:15 -08:00
Mark Otto f4f7296fa8 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	docs/less.html
	docs/templates/pages/less.mustache
2012-01-25 01:23:50 -08:00
Mark Otto b8fa6cfacf move css builder and downloader to dedicated page, start to update remaining sections on LESS docs page 2012-01-25 01:22:29 -08:00
Mark Otto c5103d0ad1 Merge pull request #1181 from jwieland/updatelessdoc
Minor doc changes about less.js version
2012-01-25 00:41:05 -08:00
Jason Wieland 64f85e0371 caught another old reference to 1.1.3 2012-01-25 00:02:37 -08:00
Mark Otto b0fb31be5e fix js link on chop shop 2012-01-24 23:45:48 -08:00
Mark Otto ae70d2a8b6 refine spacing on fixed subnav 2012-01-24 23:44:59 -08:00
Mark Otto e555f38ae4 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	docs/less.html
2012-01-24 23:36:39 -08:00
Mark Otto 6ab56051fd fix up docs css for responsive and subnav, fix forms error states 2012-01-24 23:35:34 -08:00
Jason Wieland 6be91368c0 minor doc updates to inform user they need the current less.js 1.2.1 or they will be hit by this bug #952 2012-01-24 23:24:46 -08:00
Jacob Thornton 5d3175e84b fix sub navs fer the otherrzz 2012-01-24 22:48:30 -08:00
Jacob Thornton 5a54a98925 subnav spy scrolls blaawerh 2012-01-24 22:37:35 -08:00
Jacob Thornton 5e5e87fbd0 scrollspy working for sub navs 2012-01-24 22:33:33 -08:00
Mark Otto f2fe2b1798 remove top margin from alert close, chance close line height to 18px (baseLineHeight) 2012-01-24 21:11:20 -08:00
Mark Otto 9602248ad5 Merge branch 'fix-alert-close-line-height' of https://github.com/pokonski/bootstrap into pokonski-fix-alert-close-line-height 2012-01-24 21:09:28 -08:00
Mark Otto a5c1d1f182 adding actual images to carousel to ensure you can see things are animating; updated styles of carousel controls to work on light and dark backgrounds and use opacity for effects 2012-01-24 20:45:38 -08:00
Mark Otto aa59f123c0 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-24 20:30:39 -08:00
Mark Otto a03fbc18cb allow for text in progress bars 2012-01-24 20:30:26 -08:00
Mark Otto 731821b78f updated docs css to fix subnav on iOS 2012-01-24 20:26:54 -08:00
Mark Otto 8ce9b3a676 Merge pull request #1175 from Xaro/2.0-wip
Typo in pre type section
2012-01-24 20:16:33 -08:00
Roberto Poo 74b5dc8d3b Fixed typo 2012-01-25 02:06:50 -02:00
Mark Otto c1dd1f586d Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-24 19:57:48 -08:00
Mark Otto c6d5dcd872 remove link from transitions on js page 2012-01-24 19:50:18 -08:00
Mark Otto da1906b037 Merge pull request #1140 from mchung/patch-1
Fixed typo in Makefile
2012-01-24 19:49:39 -08:00
Mark Otto bacb05608f redo the form examples to enable better responsive layout 2012-01-24 19:43:52 -08:00
Mark Otto 4a6d9106b8 fix the thumbnails more examples section 2012-01-24 19:36:42 -08:00
Mark Otto 672ba4c2fd update the subnav on all pages 2012-01-24 19:19:50 -08:00
Mark Otto f70895a605 remove rogue html elements 2012-01-24 19:01:38 -08:00
Mark Otto 8804860898 fix typo on js docs 2012-01-24 18:45:23 -08:00
Mark Otto d362223535 refine fixed docs bar 2012-01-24 18:29:17 -08:00
Mark Otto 9ef4171d03 lighten alert on less page 2012-01-24 18:26:45 -08:00
Mark Otto 26ed8202ee modify the scaffolding page to fix the language around preboot/grid variables 2012-01-24 18:24:38 -08:00
Mark Otto 4793a6f8fa Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-24 17:14:34 -08:00
Mark Otto 805a965f2e finish updating form state and alert variables in less docs page 2012-01-24 17:14:19 -08:00
Jacob Thornton a40d4993ed make subnav fix 2012-01-24 17:13:02 -08:00
Mark Otto 40e92221a6 revamp alert message and error state color/text/bg to be variables 2012-01-24 16:54:35 -08:00
Mark Otto c2312220e4 fix code type size 2012-01-24 16:19:01 -08:00
Mark Otto b9bd5c65e7 fix mailto link 2012-01-24 16:18:12 -08:00
Mark Otto 7e6797880a Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	docs/index.html
	docs/templates/pages/index.mustache
2012-01-24 16:09:32 -08:00
Mark Otto 03d2128f50 Merge pull request #1149 from Calvein/2.0-wip
[base-css] Fixed a nasty "mailto" typo and added jquery.tablesorter
2012-01-24 16:08:09 -08:00
Mark Otto 8ff621aa26 fix broken index page heading, update variables and less pages 2012-01-24 16:07:30 -08:00
Jacob Thornton 655a96869c typo with i18n 2012-01-24 15:51:28 -08:00
Jacob Thornton 3a840075dd rebuild 2012-01-24 15:42:16 -08:00
Jacob Thornton 4c5497bfcc Merge pull request #1158 from pokonski/wrap-stuff
Wrap stuff in components.mustache
2012-01-24 15:03:30 -08:00
Piotrek Okoński ef869776e5 Wrap stuff in components.mustache 2012-01-25 00:00:35 +01:00
Jacob Thornton 5f209ed810 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
	docs/templates/pages/index.mustache
2012-01-24 14:33:52 -08:00
Jacob Thornton fbc1ab14cc Merge branch '2.0-wip' of https://github.com/MGaetan89/bootstrap into 2.0-wip
Conflicts:
	docs/templates/pages/index.mustache
2012-01-24 14:31:10 -08:00
Mark Otto 58f7fd308a Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	docs/templates/pages/index.mustache
2012-01-24 14:28:14 -08:00
Mark Otto fecd4ddd13 docs updates to make the getting started section more responsive, updated the benefits to be clearer and swap x for checkmark 2012-01-24 14:25:30 -08:00
Gaëtan Muller fea1dc906e i18n for index page 2012-01-24 23:23:43 +01:00
Jacob Thornton a800d6ceac i18n index 2012-01-24 14:22:02 -08:00
Jacob Thornton f4543ecb19 add i18n to upgrading 2012-01-24 14:14:01 -08:00
Jacob Thornton 8db0cc6fda Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-24 14:08:27 -08:00
Jacob Thornton f03e170054 scaffolding i18n 2012-01-24 14:08:03 -08:00
Jacob Thornton d80985443a Merge pull request #1138 from lookfirst/fixjs
2.0-wip: Fixjs headers
2012-01-24 13:58:51 -08:00
Jacob Thornton 72117c3f97 add i18n for less.mustache 2012-01-24 13:57:44 -08:00
Jacob Thornton 3aea86370d rebuild base-css 2012-01-24 13:48:05 -08:00
Jacob Thornton 9e7f4ebd77 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-24 13:47:41 -08:00
Jacob Thornton 7d52e1dcd4 remake 2012-01-24 13:47:24 -08:00
Jacob Thornton b0a351d8f7 Merge pull request #1153 from MGaetan89/2.0-wip
#1122 - i18n in Base CSS documentation
2012-01-24 13:43:13 -08:00
Gaëtan Muller 425e5bfb71 Final translation tags in Base CSS 2012-01-24 22:17:32 +01:00
François Robichet 5fb31670af Added jquery.tablesorter js file 2012-01-24 22:12:37 +01:00
François Robichet 925fef4110 Typo on tablesorter 2012-01-24 22:11:09 +01:00
François Robichet 540d229eba Fixed a mailto typo 2012-01-24 21:57:30 +01:00
Mark Otto 3f54db9c6a remake 2012-01-24 12:53:30 -08:00
Gaëtan Muller a9c6dca094 More translation tags in Base CSS 2012-01-24 21:45:42 +01:00
Gaëtan Muller bc9c89f157 Start adding tag for Base CSS translation 2012-01-24 21:29:55 +01:00
Mark Otto f32866c2fc Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-24 12:28:37 -08:00
Mark Otto e829001e5c attempt to fix select list alignment in Firefox by removing padding. not quite fixed 100%, but getting there. 2012-01-24 12:28:20 -08:00
Jacob Thornton b5503c4c28 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-24 12:11:26 -08:00
Jacob Thornton 222067b360 javascript pages markedup with {{_i}} 2012-01-24 12:11:05 -08:00
Marc Chung 54f04d3b13 Fixed typo in Makefile 2012-01-24 12:37:57 -07:00
Jon Stevens 84a8aa1bea 2.0-wip: fix js heads 2012-01-24 11:08:03 -08:00
Mark Otto 91780529d5 Merge pull request #1134 from trevyn/2.0-wip
overzealous 2011/2012 search/replace
2012-01-24 10:48:44 -08:00
Mark Otto 72861dfbf2 Merge branch 'apostrophe-grammar' of https://github.com/phopkins/bootstrap into phopkins-apostrophe-grammar 2012-01-24 10:45:51 -08:00
Mark Otto b0bd1d8203 add bottom-up styles to the dropdown menus 2012-01-24 10:45:29 -08:00
Mark Otto 7d2e13f1b4 remake css 2012-01-24 10:43:13 -08:00
Mark Otto 43cbc94404 Merge pull request #1131 from XORwell/master
Fix textarea2's label for attribute
2012-01-24 10:41:23 -08:00
Pete Hopkins 04efc8d0a8 Fixes apostrophe in less.html 2012-01-24 12:52:06 -05:00
Pete Hopkins 37b38fe2a0 Spelling and typos in components.html and javascript.html 2012-01-24 12:49:30 -05:00
Pete Hopkins 91b32f4783 Fixes apostrophe usage in base-css.html 2012-01-24 12:12:35 -05:00
Kevin Martensson eab4d34ea0 Remove specific top value from large btn-dropdown. 2012-01-24 17:55:01 +01:00
Eden ec68b84123 i don't think the batch s/2011/2012/ was supposed to hit this. :) 2012-01-24 08:27:19 -08:00
Christian Nennemann 774d8d8d17 Fix typo in docs/index.html 2012-01-24 14:46:44 +01:00
Jacob Thornton 16440eea92 move translation tag for bootstrap 2012-01-23 19:59:05 -08:00
Jacob Thornton 82de03b67c start wrapping text in {{_i}} for translation 2012-01-23 19:55:00 -08:00
Jacob Thornton b4b1ef6839 rebuild with new templates 2012-01-23 15:17:32 -08:00
Jacob Thornton 9a68f115e7 rebuild 2012-01-23 15:07:07 -08:00
Jacob Thornton 74521e8354 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
	docs/base-css.html
	docs/components.html
	docs/index.html
	docs/javascript.html
	docs/less.html
	docs/scaffolding.html
2012-01-23 15:06:56 -08:00
Jacob Thornton f764aee4b9 add templates for doc generation 2012-01-23 14:14:16 -08:00
Mark Otto a074087034 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-23 13:51:12 -08:00
Mark Otto cd5ffbe396 fix up the modals in responsive a bit 2012-01-23 13:50:55 -08:00
Mark Otto 1954cf0019 comment in forms' 2012-01-23 13:46:26 -08:00
Piotrek Okoński cf716bbecc Set matching line-height for .close inside .alert 2012-01-23 22:03:09 +01:00
Mark Otto b636ccb281 Merge pull request #1118 from olvlvl/2.0-wip
Remove .alert-message IE hack
2012-01-23 12:49:09 -08:00
Olivier Laviale 1fa2801c2f .alert-message no longer exists 2012-01-23 21:22:08 +01:00
Mark Otto ff113acba8 cut margin in half on default forms 2012-01-23 12:21:00 -08:00
Mark Otto ea8f5883fd clean up subnav aesthetics 2012-01-23 12:04:48 -08:00
Mark Otto a7bf0295fb remove dropdowns, add in sub nav instead 2012-01-23 11:55:04 -08:00
Mark Otto 00d9258194 revert to negative margin on grid row 2012-01-23 11:35:39 -08:00
Mark Otto 22fa371259 Merge branch 'normalize' of https://github.com/necolas/bootstrap into necolas-normalize
Conflicts:
	bootstrap.css
	bootstrap.min.css
	lib/type.less
2012-01-23 11:25:16 -08:00
Jacob Thornton 1209a3756c :focus:required:invalid: http://www.alistapart.com/articles/forward-thinking-form-validation 2012-01-22 20:50:35 -08:00
Jacob Thornton 2355ea034b rebuild 2012-01-22 20:47:24 -08:00
Jacob Thornton f7b5e0f6b5 Merge pull request #1046 from kevva/dropdown-menus
Scalable dropdown menus
2012-01-22 20:41:52 -08:00
Jacob Thornton 36d2679f83 give default valuse for border-radius-custom 2012-01-22 20:31:58 -08:00
Jacob Thornton 36d56fb1ba don't use negative margin - use first child to set to 0 2012-01-22 20:12:26 -08:00
Jacob Thornton b8c0388f8a fix sans-serif order in forms.less and rebuild 2012-01-22 20:07:17 -08:00
Jacob Thornton dc5bedda14 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-22 20:03:17 -08:00
Jacob Thornton 155b72e873 share -> share-alt 2012-01-22 20:02:56 -08:00
Jacob Thornton 1593671cb2 Merge pull request #1098 from lookfirst/fixstuff
2.0-wip: clean up variable usage with colors
2012-01-22 19:50:16 -08:00
Jacob Thornton c424045c76 Merge pull request #1106 from olvlvl/2.0-wip
2.0 wip
2012-01-22 19:48:53 -08:00
Jacob Thornton 9dcc16fa8c Merge pull request #1024 from gnuwilliam/master
Buttons Tests
2012-01-22 19:44:02 -08:00
Jacob Thornton 87c676335c Merge pull request #1053 from scottwater/patch-1
Added missing 'data-dismiss="modal"' on the first example model source.
2012-01-22 19:38:48 -08:00
Olivier Laviale a583f055b3 Using variables rather than numeric values 2012-01-22 22:32:16 +01:00
Jacob Thornton 7dbd2810e3 Merge pull request #1105 from olvlvl/2.0-wip
2.0 wip
2012-01-22 13:01:28 -08:00
Olivier Laviale 0523c053a7 Fixed typo 2012-01-22 21:45:20 +01:00
Jacob Thornton a364d89936 Merge pull request #1104 from cgunther/dropdown-docs
Dropdown docs error in example
2012-01-22 12:25:51 -08:00
Jacob Thornton a6eb972bf3 Merge pull request #1101 from ansman/2.0-wip
Fix for #1102 and #1100
2012-01-22 12:20:39 -08:00
Jacob Thornton 88596797f0 rename tooltip test file 2012-01-22 12:19:22 -08:00
Chris Gunther c3625ebb23 Move placement of ID in docs example for dropdowns
The ID specified by an href or data-target attribute should match the
li.dropdown, not the ul.dropdown-menu
2012-01-22 11:46:44 -05:00
Nicklas Ansman Giertz 4882e6da2f Rename the tooltip test file
It had not been renamed when twipsys became tooltips.
2012-01-22 12:33:30 +01:00
Nicklas Ansman Giertz 05fdd43e41 Add testcase to popover
This test case verifies that custom classes are respected.
2012-01-22 12:32:37 +01:00
Nicklas Ansman Giertz 6a9f169fd6 Make the popove respect custom classes 2012-01-22 12:06:59 +01:00
Jacob Thornton 373a54187e add ability to cycle carousel to a particular frame 2012-01-21 23:02:29 -08:00
Jon Stevens 0f2dd75c97 remove tabs 2012-01-21 22:35:03 -08:00
Jacob Thornton 6e490628d1 more efficient matcher + bold matched query in item 2012-01-21 22:06:36 -08:00
Jacob Thornton 4fe11342d0 make case lookahead case insensitive 2012-01-21 21:46:47 -08:00
Jacob Thornton d3817cf466 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-21 21:35:53 -08:00
Jacob Thornton 2187e0838f change scrollspy offset to be option + fix typo in scrollspy 2012-01-21 21:35:20 -08:00
Jacob Thornton 05cc371105 Merge pull request #1097 from buraktuyan/2.0-wip
2.0-wip: Optimize all PNG files (without any quality loss)
2012-01-21 21:14:46 -08:00
Jon Stevens e0238bfb08 clean up variable usage with colors 2012-01-21 15:24:06 -08:00
Burak Tuyan 4a5867b18b Optimizing all PNG files, saving 60.02 KB in total without any quality lost. (Using PNGOUTWin 1.5.0.100, Xtreme strategy in compability mode) 2012-01-21 23:52:39 +02:00
Jacob Thornton 719713ca87 fix typo 2012-01-20 20:28:40 -08:00
Jacob Thornton 7444310c4d only prevent default of links in sections 2012-01-20 20:05:16 -08:00
Jacob Thornton 3ed836b198 should check for alert class not alertmessage 2012-01-20 13:50:36 -08:00
Jacob Thornton 93c8152216 only prevent default if getting data-href 2012-01-20 13:42:10 -08:00
Nicolas Gallagher 782c994060 Remove global reset in favour of contextual reset.
Rather than having a partial reset with individual elements having
their styles built back up, only elements without replacement
styles have specific properties 'reset'.

This commit also includes: a correction to the font mixin arguments
used on forms (the output is now valid CSS); the removal of
`overflow-y:scroll` from the `html` element which is now known to
cause some problems for jQuery modal plugins in Firefox.
2012-01-20 21:21:59 +00:00
Mark Otto c75a59e741 Merge pull request #1069 from necolas/2.0-wip
2.0-wip: Changes to .gitignore, clearfix mixin, and search input reset
2012-01-20 09:30:06 -08:00
Nicolas Gallagher 8825443d6e Remove search input cancel button in WebKit-OSX.
On input elements with a `type` of `search`, WebKit on OS X will
display a cancel button after text has been entered. This can
look ugly or be poorly position when you've added other styles to
the input (especially additional padding).
2012-01-19 22:27:24 +00:00
Nicolas Gallagher 25ac318d33 Remove unnecessary CSS properties from the clearfix mixin. 2012-01-19 20:33:22 +00:00
Nicolas Gallagher 1c014613a9 Add various always-ignore extensions, files, and folders to .gitignore 2012-01-19 20:32:57 +00:00
Scott Watermasysk 9c94078415 Added missing 'data-dismiss="modal"' on the first example model source. 2012-01-18 14:53:59 -05:00
Kevin Martensson 87113396df Make dropdown menus scalable. 2012-01-18 14:02:18 +01:00
Mark Otto ab8f2e2767 don't scope placeholder text color to just inputs 2012-01-18 00:35:14 -08:00
Mark Otto d12560c0ee make button active state clearer by lightening the inner shadow and removing the background image 2012-01-18 00:30:49 -08:00
Mark Otto f2fadf1f0a rename navbar variables, change navbar search placeholder to mixin 2012-01-18 00:24:10 -08:00
Mark Otto a920fa2993 re-org variables 2012-01-18 00:12:58 -08:00
Mark Otto dd4140319a revamp the mixins file to organize things a bit more, make placeholder text use a new variable instead of relying solely on @grayLight 2012-01-17 23:52:49 -08:00
Mark Otto 8c1a908754 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-17 23:39:28 -08:00
Mark Otto 47b8184bbb scope table styles to a class, .table, instead of on the generic element as a smarter default 2012-01-17 23:39:18 -08:00
Mark Otto 51f5b7b8af cleanup accordion css and add comments 2012-01-17 23:24:59 -08:00
Mark Otto 4f12627604 Merge pull request #1042 from boberkfell/2.0-wip
2.0 wip Small typo fix in docs
2012-01-17 23:21:52 -08:00
Mark Otto 9372fdbf97 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-17 23:19:50 -08:00
Mark Otto 41a410b8e6 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
	bootstrap.min.css
	docs/javascript.html
	lib/accordion.less
2012-01-17 23:19:21 -08:00
Ben Oberkfell 4d098a7f8e typo fix in component docs 2012-01-18 00:37:24 -06:00
Jacob Thornton 593b062c7a wrap transition 2012-01-17 10:32:25 -08:00
Mark Otto f1a88eede3 fix js link in docs nav, restyle accordion with new css 2012-01-16 17:27:30 -08:00
William Oliveira 0bc458dfd2 Creating asynchronous tests for loading buttons, because they have setTimeout() function 2012-01-16 05:32:08 -02:00
Jacob Thornton 7ec4e91324 reorder properties 2012-01-15 21:58:45 -08:00
Jacob Thornton 87bd0e0b88 do some trickery to get borders looking right 2012-01-15 21:54:58 -08:00
Jacob Thornton 036b985357 fix margin 2012-01-15 21:50:04 -08:00
Jacob Thornton 810bba97a4 make accordions little bit smoother 2012-01-15 21:48:58 -08:00
Mark Otto 1c734281c9 Merge pull request #1020 from lookfirst/fixtest
Fix typo in tables docs
2012-01-15 20:51:45 -08:00
Jon Stevens b4dd2b9a10 fix typo 2012-01-15 19:38:30 -08:00
Mark Otto f48278dac6 updated accordion and carousel; accordion still needs work 2012-01-15 18:40:17 -08:00
Mark Otto c02501e1b7 move carousel to separate stylesheet, update popovers to fix ie7 bug, fix pagination, fix alerts 2012-01-15 16:27:36 -08:00
Mark Otto 3d9298b04b fix the js alerts examples 2012-01-15 15:06:30 -08:00
Mark Otto 127c0d0b52 make dl and child elements less specific 2012-01-15 13:12:29 -08:00
Mark Otto f43f2c0ea2 fix grid sized horizontal form layout 2012-01-15 12:53:35 -08:00
Mark Otto 6077b7678c fix modal horizontal alignment 2012-01-15 11:41:46 -08:00
Mark Otto 9f732e90d4 make horizontal form labels map to default grid sizing 2012-01-15 11:33:30 -08:00
Mark Otto fe160261e4 normalize the alert classes to match last night's flip for form and table classes 2012-01-15 11:30:24 -08:00
Mark Otto 1385540d0a Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-15 11:26:21 -08:00
Mark Otto 8ceea1f559 fix some ie7 bugs, improve dropdowns for ie due to lack of a shadow, fix pager example code 2012-01-15 11:26:06 -08:00
Mark Otto a63636a248 Merge pull request #1012 from pkauders/patch-1
Fix small typo in docs home page
2012-01-15 11:23:34 -08:00
Paul Kauders ed9903f797 Fix typo in Responsive design content 2012-01-15 07:46:25 -06:00
Mark Otto f989c6892f gray out links for active state on pagination 2012-01-14 23:33:42 -08:00
Mark Otto 16eccc43d9 dates updated to 2012 2012-01-14 23:28:48 -08:00
Mark Otto dab6d2b17c change up classes on tables and forms, fix nav list styles in example 2012-01-14 21:28:47 -08:00
Mark Otto 6d916763f8 adding the pager component after rewriting the pagination docs and css 2012-01-14 20:54:37 -08:00
Mark Otto 1c6048bac2 restore top bar on home page 2012-01-14 19:17:48 -08:00
Mark Otto 2c3365f99e allow btn-groups to work in navbars 2012-01-14 17:16:46 -08:00
Mark Otto 74c0fc17c8 fix duplicate icons 2012-01-14 16:56:47 -08:00
Mark Otto 55ea574f8a update preventing double border line for bordered tables by account for th elements in tr elements 2012-01-14 16:50:36 -08:00
Mark Otto 028726a9a3 add user-select mixin 2012-01-14 16:45:01 -08:00
Mark Otto a40b2a636c make inline and search form labels inline-block 2012-01-14 16:38:40 -08:00
Mark Otto ceb6836e03 move up alert message close icon 2012-01-14 16:24:23 -08:00
Mark Otto 7455dd6b45 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-14 16:18:39 -08:00
Mark Otto f587e81b7d rewrite alert messages to use less code, combine the look of default and block messages, simplify docs 2012-01-14 16:18:15 -08:00
Mark Otto 59673bf9f7 Merge pull request #1003 from cgunther/docs-fixes
Fix links in docs top bar and section ids
2012-01-14 13:08:39 -08:00
Chris Gunther ec7f8917b1 add Progress Bars to Components narbar dropdown 2012-01-14 15:24:35 -05:00
Chris Gunther 1f54ff91b2 fix section ID for thumbnails 2012-01-14 15:21:57 -05:00
Chris Gunther b723db1e42 fix section ID for pagination 2012-01-14 15:21:09 -05:00
Chris Gunther f82fb2a197 fix navbar links to base CSS > typography 2012-01-14 15:18:59 -05:00
Chris Gunther a4b107bf87 fix navbar links to scaffolding > grid system 2012-01-14 15:15:24 -05:00
Jacob Thornton 07530073dd Merge pull request #995 from renajohn/2.0-wip
Fix bug on tooltips placement when passed as a function
2012-01-14 10:21:08 -08:00
Renault John Lecoultre 2cea94e892 Fixed when placement is a function 2012-01-13 22:33:05 +01:00
Mark Otto fc053ac8b2 update dropdowns spacing and docs section spacing 2012-01-13 10:07:56 -08:00
Mark Otto b958ac77c1 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-13 09:55:43 -08:00
Mark Otto 8f09028cff updated js includes to make nav work everywhere 2012-01-13 09:55:15 -08:00
Jacob Thornton e27ae9c50f Merge pull request #986 from purwandi/2.0-wip
Fix id anchor javascript
2012-01-13 00:32:12 -08:00
Purwandi 7b321e9c1f Remove sidebar with icon from my own repo 2012-01-13 15:03:23 +07:00
Purwandi 2623f325ec Merge branch '2.0-wip' of github.com:purwandi/bootstrap into 2.0-wip 2012-01-13 14:58:13 +07:00
Purwandi 11be9cd163 Fix id anchor javascript 2012-01-13 14:57:21 +07:00
Mark Otto 391248c0e3 nuke uber footer, bring back topbar dropdowns 2012-01-12 15:29:16 -08:00
Mark Otto ef8b27cdc7 fix heading 2012-01-12 12:30:36 -08:00
Mark Otto f58aa16f59 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-12 10:29:16 -08:00
Mark Otto 5e3c211334 fix type shorthand in blockquote 2012-01-12 10:19:07 -08:00
Jacob Thornton 8b5c8a3a90 Merge pull request #972 from billmn/2.0-wip
Fixed broken anchors on js docs page
2012-01-12 09:50:49 -08:00
Davide Bellini 1fa94bdbf4 Fixed broken anchors on js docs page 2012-01-12 12:04:17 +01:00
Mark Otto 620d987f9f Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
2012-01-11 21:59:33 -08:00
Jacob Thornton 19090ea333 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
2012-01-11 21:43:43 -08:00
Jacob Thornton 6f2f947a43 add build tool for js + rename twipsy to tooltip + lots of little doc cleanup 2012-01-11 21:42:55 -08:00
Mark Otto 32c6287259 comments and borders for multiple tbody 2012-01-11 09:43:13 -08:00
Mark Otto a2ebf0c0c1 account for multiple tbody with 2px border between 2012-01-10 21:54:11 -08:00
Mark Otto f2fdbd9113 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-10 16:22:19 -08:00
Mark Otto a34231d94d typo 2012-01-10 15:58:44 -08:00
Jacob Thornton 51e4e77034 remove some tabs from demo + fix dropdowns for pills 2012-01-09 19:53:52 -08:00
Mark Otto 5c2bf0feef remove empty margin property 2012-01-09 09:15:42 -08:00
Mark Otto 5032ef9b54 remove static popovers, modals, and twipsies from components in favor of full javascript page 2012-01-08 23:14:07 -08:00
Mark Otto 83c0896999 updated js pages to put examples first 2012-01-08 21:48:07 -08:00
Mark Otto eaa8220d70 add utilities.less file for generic classes 2012-01-08 15:38:57 -08:00
Mark Otto e654ec1336 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-08 15:33:55 -08:00
Mark Otto 4b79443bba fix dropdowns for active state in dropdown menus 2012-01-08 15:33:44 -08:00
Jacob Thornton a24cdb3e40 Merge pull request #932 from blizzy78/typo
Tiny typo fix
2012-01-08 15:13:56 -08:00
Jacob Thornton 7aca72322e move hover state out of timeout duh 2012-01-08 15:12:34 -08:00
Maik Schreiber dbe5e666af fix typo 2012-01-09 00:02:13 +01:00
Jacob Thornton 91d393fd47 change prepend to append 2012-01-08 15:01:23 -08:00
Jacob Thornton 6e8a3bba32 add note about firefox persisting disabled state on buttons 2012-01-08 14:54:36 -08:00
Jacob Thornton aa0c4acd80 fix modal insertion boolean 2012-01-08 14:38:21 -08:00
Jacob Thornton 76cadd1d2a only append modal to dom if not already present 2012-01-08 14:36:41 -08:00
Mark Otto ac68bc39ff Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-08 14:33:52 -08:00
Mark Otto 2c79030439 fix navbar styles for .brand 2012-01-08 14:33:14 -08:00
Mark Otto cb38d08ed4 updated js docs page to use grid of plugins instead of table 2012-01-08 14:33:03 -08:00
Jacob Thornton 5a33c1b96e make dropdowns toggle when clicked (for mobile) 2012-01-08 14:19:53 -08:00
Jacob Thornton 561fc8cf2a document slide and slid methods 2012-01-08 13:54:00 -08:00
Jacob Thornton 93a8b331bb Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-08 13:39:50 -08:00
Jacob Thornton f83240a8f9 add slide and slid events + disable sliding during slide 2012-01-08 13:39:27 -08:00
Mark Otto 6226b14e3b fix placement of dropdowns in navbar after getting to general in those styles 2012-01-08 13:30:23 -08:00
Mark Otto 0d62778b28 correct navbar scaffolding code snippet 2012-01-08 13:22:20 -08:00
Mark Otto cb9be7bd0c clean up dup css in responsive, fix navbar dropdown caret 2012-01-08 13:21:44 -08:00
Mark Otto 1ef9cbc6e4 rejigger z-index ranks for popovers/topbar/etc 2012-01-08 12:40:30 -08:00
Jacob Thornton fbd686ad65 get tabs working in ie9 2012-01-08 12:08:00 -08:00
Jacob Thornton d4ded76a8f get carousel working in firefox 2012-01-08 11:33:55 -08:00
Jacob Thornton c78016e3ac Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-08 11:24:16 -08:00
Jacob Thornton f1cbd22b99 fix buttons for firefox 2012-01-08 11:23:51 -08:00
Mark Otto cb52458698 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-08 03:19:06 -08:00
Mark Otto 21eb2dac8a add icons in nav list example and markup 2012-01-08 03:18:48 -08:00
Mark Otto 2376da40fb cleanup organization of tabbable nav section 2012-01-08 03:11:51 -08:00
Mark Otto b7acbd8476 move collapsing navbar nav to 480 and below, unfloat nav for 768 and below to wrap links with position absolute 2012-01-08 03:00:06 -08:00
Purwandi b14426c176 Added example sidebar navigation with icon in docs 2012-01-08 17:44:19 +07:00
Mark Otto 9e7acc6370 fix responsive navbar nav treatment by using hover instead of click 2012-01-08 02:30:18 -08:00
Mark Otto cf05dc8677 adjust navs for fine details on dropdowns in stacked nav and improved open state there 2012-01-08 02:15:47 -08:00
Jacob Thornton 0bbb64be4d add nav class to tabs in javascript demo 2012-01-08 02:04:23 -08:00
Mark Otto 916761d568 fix styles on right aligned blockquote to flip padding and border appropriately 2012-01-08 01:57:05 -08:00
Mark Otto 9daf1661c5 fix docs for fluid layout, update topbar to fix active text color for links 2012-01-08 01:54:59 -08:00
Mark Otto b780034a65 clean up some spacing on the dropdown for typeahead 2012-01-08 01:50:12 -08:00
Mark Otto 19986b3dd8 remove / on js, fix link to typeahead, remove old gradient on dropdown hover 2012-01-08 01:45:49 -08:00
Jacob Thornton bc505560a0 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
	bootstrap.min.css
2012-01-08 00:50:48 -08:00
Jacob Thornton 4478df7681 first pass at ultra basic autocomplete 2012-01-08 00:49:38 -08:00
Mark Otto 3c2f82f469 recomment out the moz stuff for progress bars since less can't compile it right now 2012-01-07 23:31:00 -08:00
Mark Otto d170224457 fix progress bars by removing border and negative margins 2012-01-07 23:21:40 -08:00
Mark Otto 961c479422 remove unused css and reorder the toggle classes 2012-01-07 22:07:36 -08:00
Mark Otto 22e0c5f7c8 redoing the tabs on bottom, left, and right 2012-01-07 22:06:44 -08:00
Mark Otto d0eecc85f8 remove tabbable stuff to try new approach 2012-01-07 21:18:47 -08:00
Mark Otto ecffa03890 nuke unused code, add to upgrading page 2012-01-07 21:10:17 -08:00
Mark Otto 95f47026cf fix up dropdowns and navbar docs for the new dropdown styles 2012-01-07 21:09:02 -08:00
Mark Otto 343dd9616d Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-07 20:40:49 -08:00
Mark Otto 2948d1c3b2 overhaul the entire tabs component structure and docs; remove side nav and make it a nav list to build on new .nav base class 2012-01-07 20:40:28 -08:00
Jacob Thornton 04e251cefa Merge pull request #923 from purwandi/2.0-wip
Fix line number pretyprint in javascript docs
2012-01-07 18:04:08 -08:00
Purwandi 4961aa8c23 Fix line number pretyprint in javascript docs 2012-01-08 08:17:54 +07:00
Mark Otto 1438b14f74 overhauled docs to include example markup, add language around browser support and classes 2012-01-07 15:52:57 -08:00
Mark Otto 418e2c7d58 Merge branch '2.0-wip' of https://github.com/pokonski/bootstrap into pokonski-2.0-wip
Conflicts:
	bootstrap.css
2012-01-07 13:52:36 -08:00
Mark Otto b81b0e2b15 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-07 13:42:35 -08:00
Mark Otto 28420311d8 more table docs cleanup 2012-01-07 13:40:05 -08:00
Mark Otto a339f0051b fixing tablesorter styles by adding the jquery plugin back to the lib, fixing the docs examples 2012-01-07 12:22:51 -08:00
Jacob Thornton 402c480097 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-07 10:56:28 -08:00
Jacob Thornton fbb42ccbbb update link to collapse plugin 2012-01-07 10:56:00 -08:00
Jacob Thornton 5217131657 Merge pull request #919 from groodt/master
Commit fixes #918
2012-01-07 10:31:03 -08:00
Greg Roodt 62e504715a Small spelling correction. 2012-01-07 17:30:47 +00:00
Mark Otto 95c88a2953 scratch that, tweaking dropdowns in tabs 2012-01-07 04:41:51 -08:00
Piotrek Okoński 3eb80591b2 Progress bars 2012-01-07 13:39:46 +01:00
Mark Otto 6dee40f469 adding back table grid sizing; will need support for responsive perhaps 2012-01-07 04:34:30 -08:00
Mark Otto 7728f7b824 add html5 invalid state for super fancy errors via browser 2012-01-07 04:28:30 -08:00
Mark Otto b6d50c892d scope close icon in modal to modal-header to allow alerts in modals to use close icons 2012-01-07 04:20:56 -08:00
Mark Otto e594107f37 change up the z-indexing and add some popover/twipsy content to the test modal on the js docs to help avoid future bugs 2012-01-07 04:17:33 -08:00
Mark Otto 5ba7c14afe another quick pass at ranking all zindexes and listing them in variables for quick overview and editing later 2012-01-07 04:07:53 -08:00
Mark Otto 8bdaf1f364 better ranking of z-indexes for tipsies so they appear above dropdown menus but below fixed topbar 2012-01-07 04:01:09 -08:00
Mark Otto 2540caeddd quick stab at fixing modal placement on 480px and down 2012-01-07 03:58:48 -08:00
Mark Otto 33dad13014 update fluid layout to use variable for sidebar width 2012-01-07 03:53:20 -08:00
Mark Otto 8ccc3bcf03 overhauled dropdowns now require use of .caret for dropdown arrow, redid the button group docs section, added the split button dropdown docs section 2012-01-07 03:45:24 -08:00
Mark Otto 5fb2c666ac update the fluid examples to use new classes and clear the floats properly from sidebar 2012-01-07 01:59:53 -08:00
Mark Otto 45d671d97f tweak spacing once more on prettify; add support for uneditable inputs to input-append and prepend 2012-01-07 01:22:52 -08:00
Mark Otto e23448ab1b make fixed navbars have lower z-index 2012-01-07 01:08:58 -08:00
Mark Otto d6a1402f2a update form shadows and tweak prettyprint styles 2012-01-07 01:03:26 -08:00
Mark Otto bcf1136f2c fix form field sizing for selects, document form field grid sizing 2012-01-07 00:47:53 -08:00
Mark Otto 0cb2866409 fix reponsive 1200+ media query to resolve mismatched gutters and negative margins on the row 2012-01-07 00:29:36 -08:00
Mark Otto 36e7660383 fix forms in navbars, fix examples' navbars 2012-01-07 00:26:58 -08:00
Mark Otto 94b825abc8 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-07 00:01:52 -08:00
Mark Otto cfc2353059 front page docs updated to include old getting started section, update code styles to look like github gists, and lots more docs updates 2012-01-06 23:59:22 -08:00
Jacob Thornton dd99e2d048 start of autocomplete plugin 2012-01-06 18:30:32 -08:00
Jacob Thornton 1f0d8b22a4 Merge pull request #910 from manveru/patch-1
Use `date` instead of `DATE`, that's the POS*X way.
2012-01-06 11:09:51 -08:00
Jacob Thornton 64c8623533 Merge pull request #907 from ansman/2.0-wip
Twipsy now respects custom classes
2012-01-06 11:07:59 -08:00
Michael Fellinger 49de3bef79 Use date instead of DATE, that's the POS*X way. 2012-01-06 13:15:18 +01:00
Nicklas Ansman Giertz 969fbe7150 Add a test case for issue #908 (twipsy doesn't respect custom classes)
The test case verifies that a custom class is respected.
2012-01-06 11:33:18 +01:00
Nicklas Ansman Giertz f07bcafd39 Make twipsy respect custom classes when using a custom template
If you had a custom class to the root object twipsy would overwrite
that class ($tip[0].className = 'twipsy'), now this has been changed
so it removes only classes that twipsy adds.
2012-01-06 11:16:29 +01:00
Mark Otto 5cb76037ae fixing conflict in dividers in navbar, fix navbar docs, fix search form in navbar 2012-01-05 23:24:19 -08:00
Mark Otto 7582520808 docs cleanup and navbar brand hover 2012-01-05 22:37:23 -08:00
Mark Otto 9bedfa447c Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-05 21:43:54 -08:00
Mark Otto c56e9d2d35 massive docs update, mostly to all our new forms, and to the buttons 2012-01-05 21:43:28 -08:00
Jacob Thornton 314feb702f listen to window for dropdown clear 2012-01-05 18:32:08 -08:00
Mark Otto 90e3a706ba add jank js back to docs application.js for responsive dropdown in topbar 2012-01-05 16:03:05 -08:00
Mark Otto aa5342888b default cursor for disabled links in pagination 2012-01-05 15:48:40 -08:00
Mark Otto 03d7c1a65e make dropdowns use unicode character for :after 2012-01-05 15:46:48 -08:00
Mark Otto 621dd13d87 move mega link footer to scaffolding to try it out, fix broken button text shadow, change UL/OL margins back, make li color same as body 2012-01-05 15:43:07 -08:00
Mark Otto 23e5fc2133 Tweak the docs and address the new forms list of controls: radios and checkboxes are now hanging controls to wrap text properly 2012-01-05 14:11:41 -08:00
Mark Otto 20add59de3 breaking out patterns.less even more, removing unnecessary div from checkbox and radio lists--now just labels and inputs 2012-01-05 10:01:42 -08:00
Mark Otto bdc22e71c8 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
2012-01-05 01:37:06 -08:00
Mark Otto a13ab64870 add a quick little example of icons in buttons 2012-01-05 01:36:05 -08:00
Mark Otto fb9401b355 tweaks abound, updated prettify styles, new sidenav component started, sprite icons started 2012-01-05 01:34:14 -08:00
Jacob Thornton fcfa231131 Merge pull request #886 from giveo/master
Changing copyright year in footer examples from 2011 to 2012
2012-01-04 10:03:28 -08:00
Jacob Thornton 3237047ac3 Merge branch 'master' of https://github.com/twitter/bootstrap 2012-01-04 10:03:11 -08:00
Jacob Thornton eb123f6b83 switch to async widget.js script 2012-01-04 10:02:51 -08:00
Jeff Nunn 175c3226b7 Changing copyright in example footers from 2011 to 2012 2012-01-04 09:28:48 -07:00
Jacob Thornton 5661855be3 actuall use interval option :P 2012-01-02 22:57:04 -08:00
Jacob Thornton e89618a47f clean up options implementation for carousel 2012-01-02 22:55:51 -08:00
Jacob Thornton f5bcfaec2c ease-in-out slide transition 2012-01-02 22:33:49 -08:00
Jacob Thornton 3fb6f6ee86 basic carousel implementation 2012-01-02 22:30:57 -08:00
Jacob Thornton 8b58a1c3d9 placeholder design for carousel 2012-01-02 19:13:02 -08:00
Jacob Thornton 0c3bf7275c add quotes to courier new 2012-01-02 16:05:14 -08:00
Jacob Thornton f8c0efbcb4 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
2012-01-02 16:04:35 -08:00
Jacob Thornton 2d092dfeea start playing with carousel stuff 2012-01-02 16:04:01 -08:00
Mark Otto 553030ca7d missing parantheses 2011-12-30 16:01:29 -08:00
Mark Otto 704d713aad border radius on large button toolbar 2011-12-27 17:39:34 -06:00
Mark Otto 53c6dbff0d add appended input example to docs, fix help-text wrapping issue by clearing float 2011-12-27 17:04:55 -06:00
Mark Otto 550879cf66 fix quotes in font-family usage 2011-12-27 16:50:27 -06:00
Mark Otto e78d5f8ff3 fix tables for rowspan 2011-12-27 16:25:22 -06:00
Mark Otto 46d2ad5e22 allow select with size attr to not have fixed height 2011-12-27 16:08:07 -06:00
Mark Otto 3426877c89 add ie7 inline block mixin and add ability to center pagination 2011-12-27 15:51:36 -06:00
Mark Otto fec02f5045 clean up some css for github issues: input prepend z-index, modals revamped for responsive 2011-12-27 15:40:58 -06:00
Mark Otto 5801c4d766 capitalize Less in makefile, add print less file (not yet compiled) 2011-12-27 13:51:50 -06:00
Mark Otto b9adae14fc remove button from topbar for testing 2011-12-27 12:40:30 -06:00
Mark Otto 324246e4f9 remove negative margin from .brand in docs, update navbar to support buttons up thurr 2011-12-27 12:39:39 -06:00
Mark Otto 058f47b33b clean up some comments and fix a bug with buttons in navbar by removing too generic of a link color 2011-12-26 17:25:25 -06:00
Mark Otto 544120264d Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
2011-12-26 16:47:10 -06:00
Jacob Thornton 1c7c5f750f Merge pull request #850 from sferik/scrollable_modal
Make modal windows scrollable
2011-12-25 20:35:44 -08:00
Erik Michaels-Ober 7fbb3660ef Rebuild CSS 2011-12-25 20:18:49 -08:00
Erik Michaels-Ober 791fd6a141 Make modal windows scrollable
Closes #849.
2011-12-25 20:17:35 -08:00
Jacob Thornton 12868933b9 clean up dead elements in firefox (which is droping transitionEnd events :( 2011-12-24 23:06:16 -08:00
Jacob Thornton 4ef5a90445 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2011-12-24 22:56:40 -08:00
Jacob Thornton 823d89dbb2 move position of twipsy into getPosition so it can easily be extended for svg use 2011-12-24 22:56:01 -08:00
Jacob Thornton 076370f3f9 fix for linux 2011-12-24 22:31:39 -08:00
Jacob Thornton a3822cfa84 Merge pull request #842 from jonathaningram/patch-2
Add close and closed hooks for alert
2011-12-24 22:16:48 -08:00
Jacob Thornton 04fee21121 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2011-12-24 22:15:29 -08:00
Jacob Thornton 1a295491b2 update docs for placement 2011-12-24 22:15:04 -08:00
Jacob Thornton 4be29ab3c4 Merge pull request #846 from purwandi/2.0-wip
Fix id tabs on docs component
2011-12-23 08:20:47 -08:00
Purwandi 3aba68f832 Fix id tabs on docs component 2011-12-23 21:39:29 +07:00
Jacob Thornton ea23461970 fix unit test for twipsy 2011-12-22 19:28:58 -08:00
Jacob Thornton 49fb910b11 more js cleanup after gnarly merge 2011-12-22 19:25:29 -08:00
Jacob Thornton 3396fc0542 check for prettyprint on window 2011-12-22 19:17:41 -08:00
Jacob Thornton 35fdbad24b Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
	docs/assets/js/application.js
	docs/base-css.html
	docs/components.html
	docs/index.html
	docs/javascript.html
	docs/less.html
	docs/scaffolding.html
	docs/upgrading.html
2011-12-22 19:15:09 -08:00
Jacob Thornton 87ac818253 change above below to top bottom and add "inside" placement option 2011-12-22 19:10:32 -08:00
Jonathan Ingram 2ebc0ad2ef Update docs to show available events on alert 2011-12-22 16:47:42 +11:00
Jonathan Ingram 5de1e39a8f From #822 2011-12-22 16:41:26 +11:00
Jacob Thornton efacac0d6c clean up all the js across all the doc pages 2011-12-21 18:42:43 -08:00
Jacob Thornton 6d5b506517 minor cleanups 2011-12-21 17:38:05 -08:00
Mark Otto 690d3f4d1a remove inline input field CSS since that's not required as all inputs are inline-block anyway 2011-12-21 19:32:14 -06:00
Mark Otto 369cedd87c update comment on select bg bug and confirmed it was fixed, scoped responsive .span* to .row 2011-12-21 19:31:01 -06:00
Mark Otto 9fb380151d Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
	docs/javascript.html
2011-12-21 18:39:02 -06:00
Mark Otto 12a0d69454 fix dropdowns in components docs page 2011-12-21 18:38:03 -06:00
Mark Otto 00cbadf994 update thumbnails to keep images from going past edges of thumbnails 2011-12-21 18:21:55 -06:00
Mark Otto af5793e1cd fix mobile example sites, remove unused JS from docs index 2011-12-21 16:41:46 -06:00
Mark Otto c854ed167c rename media grid to thumbnails, recompile bootstrap, fix examples for mobile phones 2011-12-21 16:26:21 -06:00
Mark Otto 20aecb9838 updated all docs to jQuery 1.7, move all docs JS to application.js, and move dropdowns css to dedicated file 2011-12-21 16:22:20 -06:00
Jacob Thornton a5a98a8a98 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
2011-12-21 14:03:18 -08:00
Mark Otto 8a7abc7493 docs updates, forms updated to include error states and more examples, remove text-shadow from gradientbar mixin to fix bug 2011-12-21 16:00:50 -06:00
Jacob Thornton 80cb760fac animate -> animation 2011-12-21 13:29:12 -08:00
Jacob Thornton f72a94ae28 update more readme changes - introduce target specificty convention to more plugins 2011-12-20 23:28:48 -08:00
Jacob Thornton c4364285e4 add default margin for popover and twipsy 2011-12-20 22:12:23 -08:00
Jacob Thornton 0980a33b47 update all to new on api + add animation support to tabs 2011-12-20 19:37:41 -08:00
Jacob Thornton 1ef5fa7d6b giant refactor - all spec passing again... 2011-12-20 18:02:47 -08:00
Mark Otto 069ef6a020 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2011-12-19 22:59:20 -08:00
Mark Otto 72a536393c mostly docs updates, but also some bug fixes per github issues 2011-12-19 22:58:56 -08:00
Jacob Thornton 7df0d1c7d1 rename transitions to transition and fix scrollspy example 2011-12-14 18:45:33 -08:00
Jacob Thornton e71a532185 Merge pull request #808 from piscis/patch-1
changed npm package name to less
2011-12-14 16:06:17 -08:00
Alexander Pirsig e28b080c79 changed npm package name to less 2011-12-14 16:48:50 +01:00
Mark Otto aa69286c30 rename transitions js file, fix link in js docs 2011-12-13 10:05:19 -08:00
Mark Otto d681ae9f51 updated docs to include other less apps 2011-12-12 09:51:41 -08:00
Mark Otto 4e8c26d409 updated buttons docs 2011-12-11 02:38:58 -08:00
Mark Otto 54a84f0f7f clearer grid vars docs language 2011-12-11 02:05:50 -08:00
Mark Otto ecbc9ec4a2 updated footers everywhere 2011-12-11 02:03:16 -08:00
Mark Otto 401f84a7ec center example sites in docs on mobile 2011-12-11 01:58:06 -08:00
Mark Otto 95048c271e fix specificity on pills 2011-12-11 01:03:57 -08:00
Mark Otto 6de3ed5322 Merge branch 'add-vertical-nav-divider' of https://github.com/evnm/bootstrap into evnm-add-vertical-nav-divider
Conflicts:
	bootstrap.css
2011-12-11 00:58:10 -08:00
Mark Otto 200fe25d0a Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2011-12-10 22:30:17 -08:00
Mark Otto d2e56ad53d unstyle image inputs 2011-12-10 22:29:49 -08:00
Mark Otto d587845149 tweaks and increase specificity of pills and active classes 2011-12-10 22:21:08 -08:00
Jacob Thornton 2dd0db8aa3 Merge pull request #773 from cgunther/label-in-dropdown-menu
Fix: remove text-shadow from labels
2011-12-10 15:21:27 -08:00
Jacob Thornton a0270dc7d2 Merge pull request #778 from talltroym/master
Add code block for condensed table example
2011-12-10 15:19:49 -08:00
Mark Otto e240aac6cb Merge pull request #777 from ceejayoz/2.0-wip
Updated bordered-table example to use correct class in docs
2011-12-10 15:05:09 -08:00
Mark Otto 4d55356e9b remove uber large responsive stuff 2011-12-09 14:39:23 -08:00
Mark Otto 5c8df1d285 updated index page to add featured sites, more docs tweaks 2011-12-09 14:34:38 -08:00
Mark Otto 97b285896f help tables not look like shit on mobile maybe? also fix bordered table example 2011-12-09 12:51:54 -08:00
Mark Otto 7b810bf9a6 update js in footer, add max-width to img 2011-12-09 12:10:01 -08:00
Mark Otto 1d1805ee5c add jank js for prototyping new topbar to all docs pages 2011-12-09 11:41:00 -08:00
Mark Otto 312ee6cdfb Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
2011-12-09 11:33:02 -08:00
Mark Otto b12b71bf7c updated to include sub nav and pip nav, new docs updates, topbar nav refinements for media queried settings 2011-12-09 11:32:07 -08:00
Troy Murray 5f54e4aad1 Add code block for condensed table example 2011-12-09 11:34:58 -05:00
Chris Sternal-Johnson e603009fca fix docs for bordered-table 2011-12-08 14:42:42 -05:00
Chris Gunther 40604548ce remove text-shadow from labels 2011-12-07 20:16:19 -05:00
Evan Meagher 6e70d490e1 Add vertical nav divider example in components doc page. 2011-12-02 11:37:39 -08:00
Evan Meagher 3726df695e Merge remote-tracking branch 'upstream/2.0-wip' into add-vertical-nav-divider 2011-12-02 10:47:46 -08:00
Jacob Thornton cee2f61898 define constructor on prototypes 2011-11-30 22:42:22 -08:00
Jacob Thornton b1cba98aab Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
2011-11-30 22:05:49 -08:00
Jacob Thornton dc628c9115 start of carousel 2011-11-30 22:05:09 -08:00
Mark Otto bc51c15709 adding temp idea for subnav to docs 2011-11-30 01:00:55 -08:00
Mark Otto f2c40ee24d adding step nav to components 2011-11-30 00:39:38 -08:00
Mark Otto 447c9322e9 update all leads on docs pages 2011-11-29 23:56:01 -08:00
Mark Otto 90c190d4ef updates to add warning for bordered tables to docs, fix to spacing on prettyprint pre blocks 2011-11-29 23:48:27 -08:00
Mark Otto 0c8d2e37e7 adding bordered table to docs and showing it works with colspan 2011-11-29 23:16:38 -08:00
Evan Meagher 61e84d8762 Add vertical nav divider. 2011-11-29 23:16:09 -08:00
Mark Otto 8f3150cf71 Merge branch 'form-feedback-fix' of https://github.com/tinyfly/bootstrap into tinyfly-form-feedback-fix
Conflicts:
	bootstrap.css
2011-11-29 22:53:12 -08:00
Mark Otto cbb291b8ab Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
	bootstrap.min.css
2011-11-29 22:35:58 -08:00
Mark Otto b36df46310 misc docs updates, revamped tables CSS save for grid columns and tablesorter options 2011-11-29 22:35:03 -08:00
Mark Otto 08d0aff19f Merge pull request #722 from tinyfly/grid-input-size-fix
Match input grid classes to the new 12-col grid.
2011-11-29 19:17:12 -08:00
Jeff Adams 1da19bf65f scope form feedback states to .control-group instead of unused .clearfix 2011-11-29 14:06:31 -06:00
Jeff Adams d48027d495 add input width calculation fix from #408 to the 2.0 branch 2011-11-29 11:12:32 -06:00
Mark Otto ba17414d77 Merge pull request #711 from smaboshe/updates-to-2.0-docs
Updates to 2.0 docs to address typos and capitalization
2011-11-28 11:43:36 -08:00
Silumesii Maboshe 1af3596a5e Capitalising 'Bootstrap' and abbreviations. Fixing typos. 2011-11-28 08:13:54 +02:00
Jacob Thornton 7eb340ec58 add code to reset data for collapsed element so that item can be intitialized with correct options 2011-11-27 17:31:12 -08:00
Jacob Thornton 7522517b47 derp 2011-11-27 17:12:58 -08:00
Jacob Thornton f77d0c21df turn attribute rules to list 2011-11-27 17:12:17 -08:00
Jacob Thornton 76f95f4ea2 change even was removed, in favor of show shown 2011-11-27 17:11:31 -08:00
Jacob Thornton 7f74f11262 fix heading for js readme... 2011-11-27 17:09:31 -08:00
Jacob Thornton 46fe38386a rename tabs to tab - clean up lots of api stuff make href acceptable target val 2011-11-27 17:04:55 -08:00
Jacob Thornton 3925ea9986 remove trailing semicolons - we'll be hosting minified files with semicolons - no reason to make the dev source ugly 2011-11-27 16:01:26 -08:00
Mark Otto ecc9764c83 Remove static github buttons and replace with iframe versions 2011-11-27 00:44:30 -08:00
Jacob Thornton 3157de8d1d clean up comments for better built files 2011-11-25 21:34:55 -08:00
Jacob Thornton bd8745a98b allow scrollspy to target a specific nav 2011-11-25 17:30:52 -08:00
Jacob Thornton 98fddaa355 new plugin "collapse" for collapsible lists and "accordion" like support 2011-11-25 17:23:14 -08:00
Jacob Thornton 96adf8f918 fix copy paste bug 2011-11-24 20:27:55 -08:00
Jacob Thornton 53ff2682cd clean up scrollspy a bit - add public api method 2011-11-24 20:27:18 -08:00
Jacob Thornton b14f551c9c fix some more modal things 2011-11-24 20:12:13 -08:00
Jacob Thornton 1fa02fbda2 refactor modal 2011-11-24 20:04:07 -08:00
Jacob Thornton 69372701cf refactor dropdown in accordance with readme 2011-11-24 19:40:25 -08:00
Jacob Thornton 71654cbf69 refactor alerts + add new readme which idefientifies goals for 2.0 js 2011-11-24 18:55:44 -08:00
Jacob Thornton b2650859d6 update buttons js for button groups 2011-11-24 14:43:26 -08:00
Jacob Thornton 296fad37b4 Merge pull request #694 from martinbean/patch-1
Fixed a typo (redux)
2011-11-24 11:13:33 -08:00
Martin Bean fe68f708ce Removed funky characters. 2011-11-24 19:06:00 +00:00
Martin Bean 2b5b87db7d Fixed a typo. Because I'm a Grammar Nazi. 2011-11-24 11:37:08 +00:00
Jacob Thornton e5fb1da164 push disable setting to the event loop - this allows for form submit to begin 2011-11-20 21:59:31 -08:00
Jacob Thornton 13a59a0124 remove js min from repo 2011-11-20 21:45:09 -08:00
Jacob Thornton 721e7b85d7 add minified source to min dir in js + add uglify to make process 2011-11-20 21:42:52 -08:00
Jacob Thornton 36a7eb3851 add build script for minified files and allow elements to be returned to getContent and title in popovers 2011-11-20 21:36:26 -08:00
Jacob Thornton 47c7f655ac update comment numbers 2011-11-20 21:13:28 -08:00
Jacob Thornton 8a891f2a7b act on all twipsy instances 2011-11-20 21:06:32 -08:00
Jacob Thornton bc65b58551 merge in js from 1.4... start working through js docs 2011-11-20 20:58:04 -08:00
Jacob Thornton 0b1d5d9189 revert all js stuff back to 1.4 :/ 2011-11-20 18:19:50 -08:00
Mark Otto 4e6275d0fe update property order and do some misc cleanup 2011-11-17 01:28:42 -08:00
Mark Otto 159c7a7fda remove code styling if it's in a pre tag 2011-11-17 00:52:11 -08:00
Mark Otto ba9fcd8b57 make uneditable inputs work with span* classes 2011-11-17 00:49:51 -08:00
Mark Otto 6418a40675 spelling mistake in comment 2011-11-17 00:41:26 -08:00
Mark Otto 18d2a879ae Merge pull request #621 from vshih/master
Fix tab event selector in tabs JS docs example
2011-11-17 00:40:42 -08:00
Mark Otto 160970560b updated font mixins courtesy of @apancutt 2011-11-17 00:37:14 -08:00
Mark Otto da4390ee24 Merge pull request #645 from mkaschenko/master
Fix anchor to JS dropdown docs
2011-11-17 00:10:59 -08:00
Mark Otto 5abb4b3200 update tables docs after merging in the condensed styles 2011-11-17 00:09:12 -08:00
Mark Otto b1ce89c24a Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2011-11-17 00:07:34 -08:00
Mark Otto 1d95ee5a2e Merge pull request #647 from lookfirst/condensed
Add .condensed-table example to docs
2011-11-17 00:06:32 -08:00
Mark Otto a8e88d14a4 make form classes match table classes (readable left to right), update docs associated with it 2011-11-17 00:06:16 -08:00
Mark Otto a017932285 start breaking down patterns.less into more distinct files, update docs for forms to use correct classes 2011-11-16 23:58:36 -08:00
Jon Stevens 275da020c2 added condensed example 2011-11-16 11:10:27 -08:00
Maxim Kaschenko 4be902741b Fix dropdown anchor 2011-11-17 01:25:36 +07:00
Jacob Thornton 978dfb9216 clean up var defintion 2011-11-16 00:30:11 -08:00
Jacob Thornton 90f8eb6c14 Merge branch 'master' of https://github.com/twitter/bootstrap
Conflicts:
	bootstrap.css
2011-11-16 00:28:20 -08:00
Jacob Thornton a6f055ee5e improve alert api - $("#fat").alert("close") should just work. 2011-11-16 00:27:04 -08:00
Mark Otto 270def40f7 Merge pull request #629 from leocassarani/patch-1
Fix grammatically incorrect sentence in form docs
2011-11-13 15:56:33 -08:00
Leo Cassarani e3cfd2f5b3 Fix grammatically incorrect sentence (copy-paste oversight?) 2011-11-13 21:45:43 +00:00
Vic 638211b896 Fixes tab event selector in tabs example 2011-11-12 13:18:08 -08:00
Mark Otto cabf993bc6 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2011-11-12 01:23:37 -08:00
Mark Otto 1f51ce058b ensure two-thirds grid offsets work the same as the others 2011-11-12 01:05:19 -08:00
Mark Otto a4d6e7e9a3 Merge pull request #579 from raulriera/2.0-wip
Add meta tag to all new docs pages for mobile responsiveness
2011-11-12 01:03:16 -08:00
Mark Otto ceeeffc145 fix broken state of active buttons 2011-11-12 00:52:18 -08:00
Mark Otto 1fb98bed91 updated docs pages (still wip), adding misc css classes, added form styles from 1.4, added github buttons to homepage 2011-11-12 00:46:02 -08:00
Raul Riera 0e6cd670ca Removed trailing backslash :) 2011-11-08 20:32:28 +01:00
Jacob Thornton 0c7a80c79b remove selector options for popover, in favor of more generic content selector 2011-11-08 11:04:26 -08:00
Mark Otto c5115d55ab Merge pull request #577 from smaboshe/updates-to-2.0-docs
Updates to 2.0 docs
2011-11-08 08:24:10 -08:00
Jacob Thornton b37a336417 Merge pull request #554 from rvagg/poveropt
optionable selectors for title & content elements
2011-11-07 09:58:42 -08:00
Raul Riera 74dc83f211 Added the view port meta tag for proper responsiveness 2011-11-07 10:22:28 +01:00
Silumesii Maboshe ae5badc9fb Removed the 'View javascript docs' link because it is the page we are currently on. Copy tweak for intro paragraphy of the javascript docs. 2011-11-07 09:09:17 +02:00
Silumesii Maboshe 4af6dac20e Use 'fluid-container' instead of 'container-fluid' in the docs. 2011-11-07 09:06:13 +02:00
Rod Vagg 1b43c87eaf removed twipsy options 2011-11-07 12:11:08 +11:00
Rod Vagg d725ac2feb Merge remote-tracking branch 'twitter/master' into poveropt
Conflicts:
	js/bootstrap-popover.js
2011-11-07 12:02:51 +11:00
Jacob Thornton b15e24e3d4 don't include data-content/data-title as specifications for options in twipsy/popover 2011-11-06 13:49:00 -08:00
Rod Vagg 4d2e32e809 tests & docs & twipsy too 2011-11-06 13:20:09 +11:00
Rod Vagg 3628eb79ae Merge branch 'master' into poveropt 2011-11-06 12:41:55 +11:00
Jacob Thornton c3c700fd02 rebuild 2011-11-05 17:07:55 -07:00
Jacob Thornton 5d1c721636 Merge branch 'master' of https://github.com/twitter/bootstrap 2011-11-05 17:07:39 -07:00
Jacob Thornton f03679805e update to jquery 1.7 + add toggle method to twipsy/popover 2011-11-05 17:06:41 -07:00
Jacob Thornton 8f353bcae6 Merge pull request #557 from JulianBirch/master
Fixed compilation under dotLess
2011-11-05 15:31:41 -07:00
Julian Birch c53347db79 Add a missing bracket back in. (Prevents dotLess from compiling.) 2011-11-05 04:25:31 +00:00
Rod Vagg f6a258ef36 optionable selectors for title & content elements 2011-11-05 10:50:08 +11:00
Jacob Thornton 32086c7de5 add the tab-pane class back to example 2011-11-04 13:46:03 -07:00
Jacob Thornton e87daa9078 make .tab-content backwards compat with 1.3 2011-11-04 13:44:25 -07:00
Jacob Thornton 0a268389ce Merge branch 'master' of https://github.com/twitter/bootstrap 2011-11-04 13:35:31 -07:00
Jacob Thornton de44b4c653 fix > & bug and point to 1.1.4 less version 2011-11-04 13:34:44 -07:00
Jacob Thornton 36b5864412 Merge pull request #537 from hermanschutte/master
Small change to correct the incorrect description for bootstrap-buttons.js in the Javascript section
2011-11-04 11:20:41 -07:00
Jacob Thornton 77a315d69d Merge branch 'master' of https://github.com/twitter/bootstrap 2011-11-04 11:18:06 -07:00
Jacob Thornton 913d84d7d3 update button comment 2011-11-04 11:17:28 -07:00
Jacob Thornton ec8d783799 Merge pull request #544 from nikcub/master
bump version number in docs
2011-11-04 11:14:01 -07:00
Nik Cubrilovic 3b611357aa bump version number in docs 2011-11-05 00:17:12 +11:00
Herman Schutte 79a01b7fcb Add correct description for bootstrap-buttons.js in Javascript section 2011-11-04 09:34:12 +02:00
Jacob Thornton a560eb651d remove preserve-3d 2011-11-03 18:40:18 -07:00
Jacob Thornton f92759b36d update 1.4 docs 2011-11-03 17:39:50 -07:00
Mark Otto 5a702cc6ee no idea 2011-11-03 17:14:19 -07:00
Jacob Thornton 2187703144 rebuild 2011-11-03 17:08:12 -07:00
Jacob Thornton 9defc21218 Merge branch 'master' of https://github.com/twitter/bootstrap into dev 2011-11-03 17:06:13 -07:00
Jacob Thornton 869f11305a update 1.3 to 1.4 stuffs 2011-11-03 17:03:03 -07:00
Jacob Thornton 1b4b97d530 rebuild css, add preserve-3d for faster animations, fix whitespace in mixins.less 2011-11-03 14:45:53 -07:00
Jacob Thornton f285048b34 Merge pull request #525 from mchung/patch-1
Fixed typo in Makefile
2011-11-02 10:13:58 -07:00
Marc Chung 09743c8996 Fixed typo in Makefile 2011-11-02 00:38:44 -07:00
Mark Otto d811808494 fix tipsies, modals, and popovers from overlaying topbar 2011-11-02 00:04:43 -07:00
Mark Otto 0e91eddb66 fix pagination inconsistencies 2011-11-01 23:57:48 -07:00
Mark Otto 2534fee753 adding unofficial github buttons 2011-11-01 13:56:00 -07:00
Mark Otto 5c86074fa9 Merge branch 'kriansa-patch1' into dev
Conflicts:
	bootstrap.css
2011-10-31 23:28:05 -07:00
Mark Otto 602919aae8 tweak alignment for IE7 and chrome 2011-10-31 23:27:20 -07:00
Mark Otto f4ba190821 Merge branch 'patch1' of https://github.com/kriansa/bootstrap into kriansa-patch1 2011-10-31 23:22:55 -07:00
Mark Otto a21363a749 Merge branch 'dev' of github.com:twitter/bootstrap into dev
Conflicts:
	bootstrap.css
2011-10-31 23:22:13 -07:00
Mark Otto 98007b8394 remove fixed height from select elements for IE7 2011-10-31 23:18:36 -07:00
Jacob Thornton 8f726dc6ef issue #240 - firefox drop css transition events :{o 2011-10-31 22:44:42 -07:00
Mark Otto f459f826af recompiling and pushing just to be sure 2011-10-31 21:46:45 -07:00
Mark Otto 31ea003046 remove alt tab styles for now, too complicated to accomplish both static and tabble; fix up CSS a bit 2011-10-31 21:45:46 -07:00
Mark Otto ac9073e1e4 Merge branch '2.0-left-and-right-tabs' of https://github.com/avalanche123/bootstrap into avalanche123-2.0-left-and-right-tabs 2011-10-31 21:25:21 -07:00
Mark Otto 27b8e5e4fc small docs tweak 2011-10-31 21:24:57 -07:00
Mark Otto 02bf27592c overhaul the table styles and update those everywhere in the docs, update the button docs, spec out the forms docs 2011-10-31 19:37:10 -07:00
Mark Otto ba597ef845 updating table documentation, jumping to dev to bring over new table styles from there 2011-10-31 16:32:13 -07:00
Mark Otto 3f512adf95 updated docs and type styles for blockquotes and a few fixes for type 2011-10-30 20:14:27 -07:00
Jacob Thornton 169b4b5dcb add template option and make title an optional attribute for popover 2011-10-29 19:59:51 -07:00
Jacob Thornton 640fd15464 allow the use of data attributes to define popover options 2011-10-29 19:27:02 -07:00
Jacob Thornton ea50e8aeee add active class to css for buttons, write new spec for button, "use strict" 2011-10-29 18:49:35 -07:00
Mark Otto 0218d079ad fix some of the docs styles at 480 to 768 2011-10-29 18:11:17 -07:00
Jacob Thornton e8b66a9626 star work on bootstrap-buttons.js 2011-10-29 17:58:58 -07:00
Jacob Thornton 9a30b8c05d Merge branch 'master' of github.com:twitter/bootstrap into dev
Conflicts:
	bootstrap.css
	bootstrap.min.css
	lib/forms.less
2011-10-29 17:08:35 -07:00
Mark Otto 61937a803b adding resizable class and mixin 2011-10-28 18:57:37 -07:00
Mark Otto 2764cfda6d remove html from body background 2011-10-28 18:38:06 -07:00
Chris Aniszczyk d3b8a96589 Update README.md 2011-10-28 08:57:58 -07:00
Chris Aniszczyk 9f0b79da7e Update LICENSE 2011-10-28 08:57:09 -07:00
Mark Otto 15e0068979 remove background color from html tag 2011-10-27 23:45:48 -07:00
Mark Otto 9fd4e459fe adding more icons for the homepage for open source, twitter, and html5/css3 2011-10-27 23:34:48 -07:00
Mark Otto f3128d0fa1 overhauled the front page to feel a bit more marketing-like, added the awesome glyphicons to bring some life to the docs 2011-10-27 23:00:09 -07:00
Bulat Shakirzyanov cb13f010e2 implement left and right tabs styles 2011-10-27 18:51:49 -07:00
Mark Otto 20b9390a9e update docs for responsive 2011-10-27 09:35:58 -07:00
Kriansa c9b7118a47 Fixed a bug that wasn't working as expected on Linux 2011-10-27 12:36:28 -02:00
Mark Otto 19feb1b1ff fix new navbar in components 2011-10-26 23:25:57 -07:00
Mark Otto b4c894961c address issue #414 and fix up a number of docs loose ends 2011-10-26 23:24:22 -07:00
Mark Otto 648c468927 breaking down the main page into subpages for easier, more comprehensive documentation 2011-10-26 23:11:56 -07:00
Mark Otto 58bbc754b6 Merge branch 'patch1' of https://github.com/kriansa/bootstrap into kriansa-patch1 2011-10-26 21:29:23 -07:00
Mark Otto 646870135b fix vertical position of dropdown menu in .tabs 2011-10-26 21:28:43 -07:00
Mark Otto 5736ba549c fix prettyify and update the table styles to include a condensed flavor 2011-10-26 21:22:05 -07:00
Mark Otto e616026d67 update to docs to cleanup pagination for smartphones, fix some pagination inconsistencies 2011-10-26 21:04:14 -07:00
kriansa 3045ce4692 Aligned close buttons to the middle of alert message 2011-10-27 01:29:34 -02:00
Mark Otto b4c0d2a6b2 tweaks to the responsive layout to improve type 2011-10-22 22:49:37 -07:00
Mark Otto fb7fbdb278 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
	lib/responsive.less
2011-10-22 15:51:24 -07:00
Mark Otto 2e09ffe383 Merge pull request #461 from tinyfly/responsive-row-fix
Undo negative margin on .row for responsive layouts
2011-10-22 15:50:17 -07:00
Mark Otto d4675bf4ef updating the docs to include more responsive fixes, adding rows to the responsive changes as well to undo negative margin 2011-10-22 15:49:42 -07:00
Jacob Thornton 0810b7bcf4 Merge pull request #462 from southpolesteve/master
Use proper span classes for three column layout in hero example
2011-10-22 11:23:48 -07:00
Steve Faulkner 7002a01978 Use proper classes for three column layout 2011-10-21 14:00:39 -05:00
Jeff Adams 2c0a60a777 remove negative margin on .row so we don't hang off the left edge of the screen 2011-10-21 11:56:13 -05:00
Mark Otto 41ada302ec tweaking prettify styles to introduce dark theme 2011-10-21 00:37:01 -07:00
Mark Otto d28f3d86f6 move javascript to le footer 2011-10-21 00:12:47 -07:00
Mark Otto 80332e8340 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2011-10-20 09:14:02 -07:00
Mark Otto 12d7fc82f3 fix the popover background color to work in ie7 2011-10-20 09:13:22 -07:00
Mark Otto b62475a22e updated fluid example to not use floated sidebar and instead use position absolute; not ideal, but it works in most cases 2011-10-19 23:50:41 -07:00
Jacob Thornton 523e02f7df fix scrollspy simplify stuff more - break everything. 2011-10-19 23:12:50 -07:00
Mark Otto 35793d98e7 update docs to streamline the tables section, remove redundant css for tables to simplify borders 2011-10-19 23:11:22 -07:00
Jacob Thornton 5ab84f942d Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2011-10-19 22:42:49 -07:00
Mark Otto 6ad0559e0f remove redundant styles from inline forms 2011-10-19 22:26:14 -07:00
Mark Otto 958e55f6a4 update docs copy to include mention of info alert messages 2011-10-19 22:22:44 -07:00
Jacob Thornton 8545fe9787 greatly simply js plugins - remove js api where reasonable 2011-10-19 21:56:06 -07:00
Mark Otto a5d2450e88 refinement to the responsive section 2011-10-18 08:11:18 -07:00
Mark Otto 369b9720c6 adding responsive stuff to docs to stub that out, updated type to make ul and ol margins match p tags 2011-10-17 23:45:35 -07:00
Mark Otto ae5c5e1063 update docs to change topbar to navbar 2011-10-17 20:44:52 -07:00
Mark Otto b91d210a3c overhauled tables section of docs to minize copy and emphasize code 2011-10-17 14:43:43 -07:00
Mark Otto 27cbe7f63a add abbr styles, overhaul type docs section to remove lots of verbose text and put emphasis on tables and more scannable content 2011-10-17 14:17:29 -07:00
Mark Otto d035fa731a update all code elements in docs 2011-10-17 12:59:03 -07:00
Mark Otto f48baceeda remove bottom margin from h1 2011-10-17 12:45:09 -07:00
Mark Otto 6d2e39950d updated js docs page to new 12 column layout, fix subhead jumbotron styles to match new front page 2011-10-17 00:03:52 -07:00
Mark Otto e7d2218b20 few tweaks to responsive stuff, updated docs for grid system (still needs copy editing) 2011-10-16 23:04:31 -07:00
Mark Otto c62a0239bd update to responsive to fix new masthead 2011-10-16 19:12:33 -07:00
Mark Otto 1888511d67 updated docs to include quick links and twitter buttons, added updated blueprint pattern to background 2011-10-16 18:45:11 -07:00
Mark Otto 2a82b38cff tweak the h2s again for better spacing, adjust docs, remove white bg if possible on file input, few other tweaks 2011-10-16 18:01:05 -07:00
Mark Otto 756e7c8739 more tweaks to responsive 2011-10-16 12:11:48 -07:00
Mark Otto 6f44a90edb tweak line-height of h2 and h3 to not be gihugeous, updated responsive to improve tablet grid and phone styles 2011-10-16 11:35:24 -07:00
Mark Otto d1d3807958 add responsive.less file 2011-10-16 03:15:36 -07:00
Mark Otto 3a4760637f tweak navbar styles for static version to not cause problems on responsive layouts 2011-10-16 03:15:17 -07:00
Mark Otto be926a04bc fix uber size in responsive; remove @extraspace variable by changing grid to use :first-child over negative margin 2011-10-16 03:08:14 -07:00
Mark Otto 9e9109469e biiiiiig update coming for responsiveness 2011-10-16 03:00:58 -07:00
Mark Otto fbe22f0580 updated index of docs to use html5 self closing tags, add responsive shell to bootstrap file 2011-10-15 17:21:39 -07:00
Mark Otto f4fc56b1b3 first pass at moving over the new tabs stuff to 2.0 2011-10-12 08:31:16 -07:00
Mark Otto 740e64a2c9 remove new tab stuff since it breaks backwards compatability 2011-10-11 23:49:43 -07:00
Mark Otto e2a0ce2062 adding new tabble stuff, still a huge work in progress 2011-10-11 23:46:42 -07:00
Mark Otto 12af75eef4 updated pills to include vertical (stacked) variation in patterns and documentation 2011-10-11 21:49:37 -07:00
Mark Otto fa8b1dc12d remove color scheme variables, remove font-face mixin 2011-10-11 19:31:25 -07:00
Mark Otto b644390541 update navbar search form 2011-10-11 09:52:50 -07:00
Mark Otto 8c2bb99085 share new navbar in examples 2011-10-11 09:46:02 -07:00
Mark Otto 8ba005d38d new navbar introduced to replace topbar 2011-10-11 09:44:51 -07:00
Mark Otto 70b1a6b562 Merge pull request #408 from tinyfly/grid-input-size-fix
adjust width calculations for formColumns to fix issue #404
2011-10-10 19:44:06 -07:00
Mark Otto b8a4921b57 fixing form input width sizing, removing unused CSS 2011-10-10 19:38:24 -07:00
Jeff Adams 12cb0822e8 adjust width calculations for formColumns to fix issue #404 2011-10-10 14:32:59 -05:00
Mark Otto 1b19799d70 cleanup tabs and pills to prep css for new stuff 2011-10-09 23:02:34 -07:00
Mark Otto 770e7647d1 start adding examples to docs for alternate tabs and pills 2011-10-09 22:55:12 -07:00
Mark Otto a05be0cba3 small tweak to dropdowns for autocomplete if you implement dropdowns that way 2011-10-09 22:44:45 -07:00
Mark Otto 0c1c236414 improve text color and borders for legibility 2011-10-09 22:38:48 -07:00
Mark Otto b74776281d new form state styles with lighter footprint 2011-10-09 22:32:19 -07:00
Mark Otto 831f279011 add extra states to the form examples 2011-10-09 22:02:40 -07:00
Mark Otto 7c98f1e1fc Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2011-10-09 21:25:50 -07:00
Mark Otto dd1efdf0d5 update input prepend and append to use baseline variable 2011-10-09 21:25:28 -07:00
Mark Otto f61fe3c474 refactor fluid layout to be more specific to not interfere with modal content while adding right sidebar option 2011-10-09 21:13:26 -07:00
Mark Otto 8f0671adfb remove bottom margin from form in modals for temp fix" 2011-10-09 20:57:38 -07:00
Mark Otto 13cc27a6b4 modal was not centered correctly 2011-10-08 09:21:25 -07:00
Mark Otto eddc59c634 remove select from docs form sizes 2011-10-08 00:27:52 -07:00
Mark Otto 464c2d5295 remove select from the new form grid sizes and let them inherit the default grid ones 2011-10-08 00:26:57 -07:00
Mark Otto 0692530efc add better handling to the tables so that the thead and tbody first row can have rounded corners where applicable 2011-10-08 00:19:01 -07:00
Mark Otto aa3a8af2d0 place popovers and twipsies above modals for use there 2011-10-08 00:16:21 -07:00
Mark Otto 7b665affd7 fix problems with scope in tables when using th in tbody 2011-10-08 00:14:38 -07:00
Mark Otto e025de9a83 bring hover state back to the .brand element in the topbar to fix a bug 2011-10-07 23:56:14 -07:00
Mark Otto 970c51dd99 update docs to simplify first table example and introduce nested documentation 2011-10-07 23:54:50 -07:00
Mark Otto 9991f3faa1 resolve problem with nested tables having double borders 2011-10-07 23:53:32 -07:00
Mark Otto c85e93cd90 Merge pull request #381 from smaboshe/docs
Docs
2011-10-07 23:27:19 -07:00
Silumesii Maboshe df773debab .gitignore update. 2011-10-07 06:02:02 +02:00
Silumesii Maboshe b7d4be584a For consistency, updated rendered 'pre' in docs to '<pre>' in the 'Presenting code' section. 2011-10-07 05:59:34 +02:00
Silumesii Maboshe 527521b502 Updated rendered '>html<' in docs to '<html>' in the 'Presenting code' section. 2011-10-07 05:56:45 +02:00
Jacob Thornton c9669be1ec get modal working with new data-attrs 2011-10-05 00:14:55 -07:00
Jacob Thornton 356227ef50 pass more args to placement function 2011-10-04 22:56:23 -07:00
Jacob Thornton a2c263493a add dropdown tab selection support 2011-10-04 22:11:44 -07:00
Jacob Thornton a91a407bd6 start updating to data- driven js 2011-10-04 21:48:53 -07:00
Jacob Thornton 100954eeda remake 2011-10-04 21:26:29 -07:00
Jacob Thornton 607795e37a Merge branch 'master' of github.com:twitter/bootstrap 2011-10-04 21:25:41 -07:00
Jacob Thornton d7e3bf722d add selector option to alerts, update modal settings strategy 2011-10-04 21:24:59 -07:00
Mark Otto d74dee5e0f fixing multi select on chromium ubuntu by setting background color explicitly 2011-10-04 01:16:07 -07:00
Mark Otto 913338f930 fixing multi select on chromium ubuntu by setting background color explicitly 2011-10-04 01:15:31 -07:00
Mark Otto 088a9efa4c merging master which has the label fix 2011-10-04 00:58:12 -07:00
Mark Otto 5cae222022 Merge branch 'master' into dev 2011-10-04 00:57:37 -07:00
Mark Otto bdbc352066 adding new mixins 2011-10-04 00:55:35 -07:00
Mark Otto cde17c9491 adding placeholder font-face mixin which doesn't work yet 2011-10-04 00:48:31 -07:00
Mark Otto 96dd7a2903 update variables to inlude @baseFontSize, @baseFontFamily, @baseLineHeight for easier customization; added placeholder for @primaryButtonColor, but didn't implement 2011-10-04 00:20:38 -07:00
Mark Otto 3c31d8a258 more small changes to compiled css to try things out 2011-10-03 23:50:14 -07:00
Mark Otto 45c9b489ee scope the label back to the form element 2011-10-03 22:44:35 -07:00
Mark Otto 1b245ffdf8 make links in error messages not be blue, but instead match the text color and be bold: 2011-10-03 22:36:51 -07:00
Mark Otto c843e202b5 make it so that checkboxes and radio options-list can have wrapping labels; needs to be cross browser tested yet 2011-10-03 22:27:15 -07:00
Mark Otto a968d300b4 overhaul the grid CSS to make it more durable for tables and forms to use the same sizing methods; need to see about improving this in the future 2011-10-03 22:14:50 -07:00
Mark Otto 948c59ddb3 resolve issue with form fields and errors causing no space between fields with consecutive errors; needs more work, but will address later 2011-10-03 21:43:53 -07:00
Mark Otto 0caa484aeb fix the popover bug in the app example by making the custom css more specific for .content 2011-10-03 21:36:51 -07:00
Mark Otto 2edf16c034 Merge pull request #346 from alepee/master
Add a white-space: nowrap; for .label elements.
2011-10-03 21:32:26 -07:00
Jacob Thornton b41175f030 Merge pull request #362 from purcell/safe-dropdown-initialization
Add jquery.ready hook after defining plugin, to avoid breakage with modernizr/yepnope
2011-10-03 11:46:42 -07:00
Steve Purcell bdbb1c92aa Add jquery.ready hook after defining plugin, to avoid breakage when used with modernizr/yepnope
See https://gist.github.com/1258742 for an example, which results in the error

"TypeError: Object has no method 'dropdown' at bootstrap-dropdown.js line 31"

It looks like in these circumstances, the functions hooked into
jquery.ready get run immediately, and so applying the dropdown
behavior to specific elements before defining the 'dropdown' method
causes breakage.
2011-10-03 10:05:43 +01:00
Jacob Thornton 7e01ff8a15 Merge branch 'master' of github.com:twitter/bootstrap 2011-10-02 23:00:47 -07:00
Jacob Thornton 823b063c56 preboot.less > variables.less in docs 2011-10-02 23:00:11 -07:00
Jacob Thornton 5f52c5cfc3 Merge pull request #361 from samuelcarlton/patch-1
Fixed comment to show appropriate file name.
2011-10-02 22:44:33 -07:00
Jacob Thornton 0b625d0cb5 Merge branch 'master' of github.com:twitter/bootstrap 2011-10-02 22:33:02 -07:00
Jacob Thornton f8be7a8052 remove options check in modal.js 2011-10-02 22:26:26 -07:00
Sam Carlton 6fb0eb8833 Fixed comment to show appropriate file name. 2011-10-02 20:12:50 -05:00
Antoine Lépée a61a624e1d white-space: nowrap; for .label
Add white-space: nowrap; for .label elements.
2011-09-30 14:19:56 +02:00
Jacob Thornton fda10a609c Merge pull request #329 from lmjabreu/master
make tabs plugin play well with nested tabs
2011-09-29 23:42:58 -07:00
Jacob Thornton b2b8a78971 wait for transition to end before triggering shown event 2011-09-29 23:38:11 -07:00
Jacob Thornton 2715a1e09e whitespace 2011-09-29 23:32:10 -07:00
Jacob Thornton 7a153ac817 Merge branch 'fix_hide_before_show_bug' of https://github.com/aaronj1335/bootstrap into aaronj1335-fix_hide_before_show_bug 2011-09-29 23:31:26 -07:00
Jacob Thornton a0c3250b97 add note about making sure to include boostrap-twipsy before popover script 2011-09-29 23:24:34 -07:00
Jacob Thornton fb749eee5e show should be fals for modal default 2011-09-29 23:12:27 -07:00
Jacob Thornton 87d9343a30 @dmyers settings fix #255 2011-09-29 23:09:53 -07:00
Jacob Thornton d2de00f1df Merge branch 'kasperp-tab-event' 2011-09-29 23:01:06 -07:00
Jacob Thornton a0bf8b67ff change event to use target and relatedTarget (which more closely resembles actual event api) 2011-09-29 23:00:10 -07:00
Jacob Thornton b827303511 changed event should be change event 2011-09-29 22:21:55 -07:00
Jacob Thornton 24b05fe94a Merge branch 'tab-event' of https://github.com/kasperp/bootstrap into kasperp-tab-event 2011-09-29 22:18:08 -07:00
Jacob Thornton 28c770bf67 Merge pull request #332 from pamelafox/patch-2
JS Docs Typo
2011-09-29 11:28:37 -07:00
Mark Otto 0a6d8c30db adding button groups and toolbars like a boss 2011-09-29 02:21:02 -07:00
Mark Otto f54568fa31 round the corners on the search form inputs like a boss 2011-09-29 01:47:55 -07:00
Mark Otto 00204a80cf change h4 back to lineheight * 2 2011-09-29 01:44:51 -07:00
Mark Otto 4e9849966d update topbar dropdown arrow to match link and hover colors 2011-09-29 01:43:14 -07:00
Mark Otto ecdba931ec remove that test gradient 2011-09-29 01:41:03 -07:00
Mark Otto f919f6f94f huge update to forms, docs for the new forms, added a new link for js example to tabs/pills, add some new mixins 2011-09-29 01:40:27 -07:00
Mark Otto 2d81d65533 initial idea for handling closing of modals from whatever element you want with .js-dismiss class 2011-09-28 20:21:09 -07:00
Mark Otto 1b21d5e321 updated forms.less to have better comments while pulling out all the old classes for input elements 2011-09-28 19:15:31 -07:00
Mark Otto 6d541a6066 pulling out more stuff and fixing file name at top of file 2011-09-28 19:06:10 -07:00
Pamela Fox 1be7e09b97 Think the option is supposed to be 'keyboard' in the docs, not 'closeOnEsc'. 2011-09-28 14:56:54 -07:00
Luis Abreu 9a2440aafa tweaked bootstrap-tabs plugin active tab selector to allow for nested tabs 2011-09-28 22:08:26 +01:00
Aaron Stacy 616f136371 return this 2011-09-23 16:09:18 -05:00
Aaron Stacy 1066ec4a79 updated if statement form 2011-09-23 13:38:08 -05:00
Aaron Stacy d541eceb51 added bug fix for hide-before-show bug
this commit fixes a bug where .modal('hide') is called on a modal object before
.modal('show').  this can be viewed here:

    http://jsfiddle.net/aaronj1335/7hH89/8/

(notice the JS exception that is thrown)
2011-09-23 08:46:08 -05:00
Jacob Thornton 68605bdd51 add semicolon to end of file while i think about better solution... 2011-09-22 13:13:55 -07:00
Jacob Thornton 46958b2b67 Merge branch 'master' of github.com:twitter/bootstrap 2011-09-22 12:55:34 -07:00
Jacob Thornton 41983bbe67 update table to support header and arrows 2011-09-22 12:54:57 -07:00
Jacob Thornton 323de40e80 Merge pull request #278 from adamnbowen/patch-1
Fixes typos of "bootstrap"
2011-09-21 10:59:58 -07:00
Adam Bowen 7c637bc51c Fixes typos of "bootstrap" 2011-09-21 10:38:08 -03:00
Jacob Thornton 6ec1abc53c Merge branch 'master' of github.com:twitter/bootstrap 2011-09-20 14:50:50 -07:00
Jacob Thornton f2e15402c8 fix reflow typo - should be $element not $backdrop 2011-09-20 14:50:14 -07:00
Jacob Thornton a7134dbf43 Merge pull request #268 from workwithnano/patch-1
Typo fix: "you're" to "your".
2011-09-20 10:46:26 -07:00
Nano bc6e4b8ed2 Typo fix: "you're" to "your". 2011-09-20 14:09:28 -03:00
Jacob Thornton 01ab4caa5b Merge branch 'master' of github.com:twitter/bootstrap 2011-09-19 20:14:33 -07:00
Jacob Thornton 0c6a2acd7e remove var O_O 2011-09-19 20:13:51 -07:00
Jacob Thornton 75cbf0d251 Merge pull request #259 from jacobfike/master
fixes #258, clicking a tab remove .active class from all elements on the page
2011-09-19 13:07:28 -07:00
Jacob Fike 9b61f71835 fixes #258, clicking a tab remove .active class from all elements on the page 2011-09-19 11:54:20 -07:00
Jacob Thornton fc6effae51 listen to document for ie 2011-09-18 21:13:56 -07:00
Jacob Thornton ac8001190a force reflow instead of relying on eventloop (firefox)
listen to window for escape press
2011-09-18 21:03:52 -07:00
Jacob Thornton ba6f4f03da lemme smang it giiiirl 2011-09-18 19:05:21 -07:00
Jacob Thornton 89c5eb4491 Merge pull request #241 from asmega/javascript_docs_favicon
fixing locations of favicon + apple icons
2011-09-18 13:45:12 -07:00
asmega 159ccc9de3 fixing locations of favicon + apple icons 2011-09-18 16:10:36 +01:00
Kasper Bøgebjerg Pedersen e16de59260 Added changed event to bootstrap-tabs.js 2011-09-18 10:15:24 +02:00
Mark Otto b5acabe4fd fix broken topbars in javascript 2011-09-17 22:55:29 -07:00
Jacob Thornton 3eafbe5c89 change version in makefile to 1.3 2011-09-17 18:25:40 -07:00
Jacob Thornton 39a16811eb Merge pull request #233 from cheeaun/patch-1
Documentation typo/error on scrollSpy.
2011-09-17 18:20:56 -07:00
Lim Chee Aun 7da0e5cc0c Documentation typo/error on scrollSpy. 2011-09-18 08:35:34 +08:00
Mark Otto ec8619a980 update docs to remove old stuff, update to all new classes; no more backwards compatibility 2011-09-17 17:21:43 -07:00
Jacob Thornton 7b614cfa01 allow backdrop option to accept "static" option 2011-09-17 14:20:51 -07:00
Nick Veys 2cb233319d Adding flag to prevent backdrop click hiding modal 2011-09-17 15:08:16 -05:00
Mark Otto 732ff9ed1c fix fluid example 2011-09-16 14:07:18 -07:00
Mark Otto 08d017592b Fix spelling mistake in pre on js page (/ul instead of /div). 2011-09-16 13:01:49 -07:00
Jacob Thornton f03f7da08b fix readme link spacing 2011-09-16 12:30:30 -07:00
Jacob Thornton cd556cfacd remake for version 1.3 2011-09-16 11:24:45 -07:00
Jacob Thornton c7c5ce8dcd Merge branch 'master' of github.com:twitter/bootstrap into 1.3-wip
Conflicts:
	Makefile
	README.md
	bootstrap.css
	bootstrap.min.css
	lib/bootstrap.less
	lib/scaffolding.less
2011-09-16 11:24:07 -07:00
Jacob Thornton aa43239088 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-16 11:09:46 -07:00
Jacob Thornton f0d5caf054 check for jquery/ender on window 2011-09-16 11:09:26 -07:00
Mark Otto e8d9eb264c update alert message for ie7 to adjust dismiss icon, update example pages to clean up a few things from testing 2011-09-16 10:51:44 -07:00
Mark Otto 29033316e4 Merge pull request #219 from caniszczyk/1.3-wip
Merge in pull request to clarify docs licensing as CC BY 3.0
2011-09-16 10:37:52 -07:00
Chris Aniszczyk 08b6c47ad7 Clarify documentation license to be CC BY 3.0
Signed-off-by: Chris Aniszczyk <zx@twitter.com>
2011-09-16 10:30:47 -07:00
Mark Otto 597590c15d add active class back to tabs 2011-09-16 10:15:45 -07:00
Mark Otto e663cfb43f fix tabs jitter bug when there is no active class 2011-09-16 10:14:35 -07:00
Mark Otto c579e4d550 expanding comment in application.js 2011-09-16 09:55:12 -07:00
Mark Otto 8ff18a9ffc fixing conflict and recompiling 2011-09-16 09:47:36 -07:00
Mark Otto b188c0da8b updated table styles a bit and floated the fluid columns to clear the row dropping problem we were having 2011-09-16 09:41:58 -07:00
Jacob Thornton d1b594db7a $(document).ready instead of $(function() {}) for ender support 2011-09-15 23:16:06 -07:00
Jacob Thornton 472632ba51 mv 1.3.0 file names to plane bootstrap.css for submodulers 2011-09-15 23:09:56 -07:00
Jacob Thornton 5675d8f00a remove table border seperate for ie 2011-09-15 22:40:50 -07:00
Jacob Thornton 39aca918d0 move clearfix logic back onto clearfix class for ie7 2011-09-15 22:36:32 -07:00
Jacob Thornton 68f89d109f little fixes for ie 7 2011-09-15 22:27:41 -07:00
Jacob Thornton 8896497ea8 update attributes for js and make tooltips reposition on resize 2011-09-15 21:19:39 -07:00
Mark Otto dcf6a051e7 allow multi-select lists in forms 2011-09-14 08:58:20 -07:00
Mark Otto 32a690af98 apply clearfix to appended input pattern to clear the floats 2011-09-13 22:23:08 -07:00
Mark Otto 01d9cd88e8 updated browsers image 2011-09-13 20:24:30 -07:00
Mark Otto 2af3eb6ce2 fix tab-content and pre funkiness, convert p in tab content to div 2011-09-13 14:47:18 -07:00
Mark Otto 121b62d54e updates to docs to include more example html, include links to javascript docs where necessary 2011-09-13 10:08:24 -07:00
Mark Otto 35bc3ae8d2 remove theming section from docs 2011-09-13 09:44:43 -07:00
Mark Otto 1d50fa77e4 adding quick and dirty favicons and touch icons for iOS 2011-09-13 09:35:43 -07:00
Mark Otto bc2ae90e3a Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-12 22:19:44 -07:00
Mark Otto 5249483850 comment out box-shadow on masthead and footer in docs.css because Opera sucks at inset box-shadow :" 2011-09-12 22:19:28 -07:00
Jacob Thornton e34bc6e294 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-12 21:06:53 -07:00
Jacob Thornton 5ee11ec8bd fix docs for opera 2011-09-12 21:06:29 -07:00
Mark Otto 206334ba70 remove theme.less and split preboot.less to mixins.less and variables.less to isolate customization from function 2011-09-12 20:07:26 -07:00
Mark Otto 2978934bd5 remove adaptive, recomment theme.less to avoid comments in compiled 2011-09-12 19:40:48 -07:00
Mark Otto 218976a7d8 resolve conflict 2011-09-12 19:00:59 -07:00
Mark Otto 3f64aaf82b fix topbar link with button bug 2011-09-12 19:00:44 -07:00
Mark Otto 427a001c47 Link Twitter account in readme 2011-09-12 14:33:39 -07:00
Mark Otto a218475ffc Edited README.md via GitHub 2011-09-12 14:33:00 -07:00
Jacob Thornton 4c5320b18f Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
Conflicts:
	bootstrap-1.3.0.css
2011-09-12 14:29:29 -07:00
Jacob Thornton 997c2cd6a0 make file shouldn't say file built successfully if error occurs 2011-09-12 14:28:26 -07:00
Mark Otto 8f5f35e6db Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-12 13:32:58 -07:00
Mark Otto 7af4a4cfa1 really make modals cover topbars and not cover the modal itself 2011-09-12 13:32:46 -07:00
Mark Otto bc41c58472 make modals cover topbars 2011-09-12 13:31:58 -07:00
Jacob Thornton ad87e11f03 add version number to js comments 2011-09-12 11:15:32 -07:00
Jacob Thornton 7396cb8c51 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-12 11:14:35 -07:00
Jacob Thornton 1645b57efe prevent default for hover click 2011-09-12 11:14:09 -07:00
Mark Otto b729ade54f quick fix for .clearfix with unqualified selector in forms.less 2011-09-12 09:25:57 -07:00
Mark Otto 72ce695cfd add links 2011-09-12 09:24:54 -07:00
Mark Otto 6a5fb52bb1 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-12 08:58:46 -07:00
Jacob Thornton 89465f8ce1 few more js doc wording changes 2011-09-12 00:03:24 -07:00
Jacob Thornton cc05bce597 docs coppyy 2011-09-11 23:56:44 -07:00
Jacob Thornton 44e2c73668 data-attribute="x" annndddd... now all js with ie7+ support 2011-09-11 23:48:43 -07:00
Jacob Thornton fcf816a236 index to use data attr for scrollspy initilizing 2011-09-11 23:36:59 -07:00
Jacob Thornton 02d668fd2e data-attributes need values to be picked up by jquery in ie8 and below :/ 2011-09-11 23:29:34 -07:00
Jacob Thornton dcf9aabc44 get all spec passing again 2011-09-11 22:58:51 -07:00
Mark Otto 0c46ade4d0 Merge pull request #194 from samsoffes/patch-1
Add pretty code coloring to readme
2011-09-11 22:15:49 -07:00
Mark Otto 88f2f848b3 change modal buttons back to be primary first 2011-09-11 22:02:26 -07:00
Sam Soffes 86bb0733a2 Add pretty code coloring to readme 2011-09-11 21:56:54 -07:00
Mark Otto c73533ac73 fix problem with error styles in forms that clashed with alert-messages by qualifying the .error with .clearfix 2011-09-11 21:43:23 -07:00
Mark Otto 0afba3867d Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-11 21:13:09 -07:00
Mark Otto b77e3e2f30 theme.less file cleanup; fixing blockquotes in wells 2011-09-11 21:12:55 -07:00
Jacob Thornton f8aaec5260 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-11 21:04:01 -07:00
Jacob Thornton 200f5817ba method invocation jqueryui style 2011-09-11 21:03:17 -07:00
Mark Otto c876835a02 update preboot comments about color scheme 2011-09-11 20:47:35 -07:00
Mark Otto 96e59eed20 update theme.less todos and darken link hover color more 2011-09-11 20:46:40 -07:00
Mark Otto af2223efb1 remove border from dropdowns in topbar to prevent it from looking 1px off 2011-09-11 20:38:45 -07:00
Mark Otto b7c9a639d6 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-11 20:17:49 -07:00
Mark Otto bd3448cf78 make input prepend styles look a bit better 2011-09-11 20:17:34 -07:00
Jacob Thornton e255b4f51d Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-11 20:09:20 -07:00
Jacob Thornton 173be3f1e8 change hella js... broke all the tests. i <3 wip 2011-09-11 20:08:43 -07:00
Mark Otto 2674210ff0 move the .brand from the parent to the a tag in the topbar; fix the moving text in IE7 2011-09-11 20:00:45 -07:00
Mark Otto 6bc867ed5c change template diagrams to be .media-grid 2011-09-11 19:53:48 -07:00
Mark Otto 53812bc2d8 remove qualifying tags in .span selectors for built in grid so that we can use .span-n classes in form styles 2011-09-11 18:44:25 -07:00
Mark Otto f3f60b21a6 oops, double commit last time; apply fixes to make select elements line up in IE7 with their labels, but no height fix 2011-09-11 18:09:01 -07:00
Mark Otto 18a5ef83ef fix legends in ie7 2011-09-11 18:01:29 -07:00
Mark Otto 3ad034ea96 fix legends in ie7 2011-09-11 17:36:15 -07:00
Mark Otto 1ae603fda0 make the less compile docs text now have widows, fix broken table markup 2011-09-10 23:05:30 -07:00
Mark Otto 62edafa1a4 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-10 22:55:59 -07:00
Jacob Thornton d9cbcfc20d wait for window load event before positioning images, doi 2011-09-10 22:54:47 -07:00
Mark Otto 0c656e29fc updated styles for the media grids 2011-09-10 22:50:59 -07:00
Jacob Thornton b781f6ca59 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-10 22:49:05 -07:00
Jacob Thornton a5964b07b1 add static sizes for images so tooltips get right size on load 2011-09-10 22:48:39 -07:00
Mark Otto d0f7637a7d adding more media sizes 2011-09-10 22:47:38 -07:00
Jacob Thornton 68865002af Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-10 22:44:22 -07:00
Jacob Thornton 2655117747 add some notes on installing from command line and from makefile 2011-09-10 22:43:52 -07:00
Mark Otto 3755ee158f Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-10 22:31:55 -07:00
Mark Otto 40693f2618 adding media grid styles 2011-09-10 22:31:43 -07:00
Jacob Thornton 709789d16d clicking open dropdown shoud close it 2011-09-10 22:28:17 -07:00
Jacob Thornton 7e5b304dbf add liscense to js files 2011-09-10 22:24:31 -07:00
Jacob Thornton c40e0de3c1 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
Conflicts:
	docs/index.html
2011-09-10 22:17:37 -07:00
Jacob Thornton 64176caa97 add bootstrap-scrollspy 2011-09-10 22:14:57 -07:00
Mark Otto 536fe2c743 add footer to js docs 2011-09-10 21:54:11 -07:00
Mark Otto 8130b113bb add stubbed out table for how to compile less 2011-09-10 21:50:12 -07:00
Mark Otto 6a74a313a8 tweak css for topbar to bring back z-index fix; update javascript markup and some heading text 2011-09-10 21:10:18 -07:00
Mark Otto 3407ed948d resolved conflict 2011-09-10 21:06:09 -07:00
Mark Otto 00b7dff359 overhaul docs CSS since it was scalable, converted docs mastheads and footers to classes and HTML5 elements, add masthead to js docs page but make it slate so it looks cool and stands out 2011-09-10 21:05:23 -07:00
Jacob Thornton a71d5d8e99 add the dhg flavor back 2011-09-10 19:01:16 -07:00
Jacob Thornton 235246d6fc not feeling the slide in 2011-09-10 18:26:37 -07:00
Jacob Thornton 9c76070cbd rework the transitions for the modal a bit 2011-09-10 18:13:37 -07:00
Jacob Thornton 57a8672b77 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-10 16:51:03 -07:00
Jacob Thornton 23d2fed905 tooltip 1 word 2011-09-10 16:50:42 -07:00
Mark Otto 0914027609 spelling mistake 2011-09-10 15:32:06 -07:00
Mark Otto f556da42fc zebra stripe that shit 2011-09-10 15:30:42 -07:00
Mark Otto a95a0ed71c conflict 2011-09-10 15:29:53 -07:00
Mark Otto 99ede580cf adding code and .label sections to type section 2011-09-10 15:29:38 -07:00
Jacob Thornton a8d4475827 adds twipsy js to regular index for positioning 2011-09-10 14:52:45 -07:00
Jacob Thornton 39fc13093e Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-10 14:04:51 -07:00
Jacob Thornton 5f65df9e2d add some more events to alerts and modal and update docs 2011-09-10 14:04:22 -07:00
Mark Otto 6d99ae5659 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-10 13:18:24 -07:00
Mark Otto e5b4a1ced5 adding .brand to topbar for alternative to using an h3 for wordmark; spelling mistakes fixed 2011-09-10 13:18:10 -07:00
Jacob Thornton 5bc455d370 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-10 13:17:43 -07:00
Jacob Thornton 1041977d0a finish up rounding out tests for all js plugins 2011-09-10 13:17:08 -07:00
Mark Otto c797cb61a6 conflict 2011-09-10 13:04:17 -07:00
Mark Otto 5b16150159 trying to solve firefox active outline, make .input less specific 2011-09-10 13:00:07 -07:00
Jacob Thornton 48aa209348 more tests, more js goodness 2011-09-10 12:49:21 -07:00
Jacob Thornton 79d5f90713 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
Conflicts:
	bootstrap-1.3.0.css
2011-09-09 22:48:57 -07:00
Jacob Thornton 5f4e30ed1d move js plugins to root dir, begin writing tests, and change modal plugin to be more boss like 2011-09-09 22:47:49 -07:00
Mark Otto 0b43bc9bb9 adding docs for customizing the grid 2011-09-09 21:50:41 -07:00
Mark Otto a0c3d48342 fix the stacked form legend style 2011-09-09 21:43:19 -07:00
Mark Otto a40690a17c fix the grid before 1.3.0 drops soon 2011-09-09 20:48:45 -07:00
Mark Otto c56e229ed7 start updating the grid docs for customizing it 2011-09-09 20:47:38 -07:00
Mark Otto dad058326e add version # to docs 2011-09-09 16:00:59 -07:00
Mark Otto 53135839f5 adding nested columns to the grid section 2011-09-09 10:04:07 -07:00
Mark Otto df3ca4d94a Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-09 00:03:01 -07:00
Mark Otto 1d4e345ec1 bug fixing 2011-09-09 00:02:47 -07:00
Jacob Thornton b086d94253 remove aria-control stuff 2011-09-09 00:00:03 -07:00
Mark Otto 3a99b98ad9 make dropdown menus appear above other elements on the page with a z-index 2011-09-08 23:08:38 -07:00
Mark Otto 1a8fb2dbf7 resolve conflict 2011-09-08 23:02:13 -07:00
Mark Otto ba08055a7b update the modals and alert-messages to use the same .close styles, save for some positioning in the modal after knocking down the modal padding 2011-09-08 23:01:28 -07:00
Jacob Thornton 5960711d0f some more js love - update the docs with tabs/pills plugin 2011-09-08 20:21:03 -07:00
Jacob Thornton 346122a0c7 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-08 19:13:26 -07:00
Jacob Thornton 8d2f14d8d0 tabssss 2011-09-08 19:13:08 -07:00
Mark Otto c474f996a9 tweaks to table styles to make them use @basefont and @baseline 2011-09-08 10:47:05 -07:00
Mark Otto 1c03a07591 bump css to 1.3.0, update makefile to reflect that, update form css to prepend form to the .clearfix to prevent some bullshit, small tweaks elsewhere 2011-09-08 10:36:56 -07:00
Mark Otto 1af96b9a58 what up breadcrumbs, we added you 2011-09-08 09:43:37 -07:00
Mark Otto f6d20a8939 remove active state from dropdown 2011-09-06 23:32:20 -07:00
Mark Otto daf903f847 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-06 23:30:45 -07:00
Mark Otto d640c3b14b update diagrams to use smaller border radius, add new container-app example 2011-09-06 23:30:21 -07:00
Jacob Thornton fb8987148a move javascript from examples into docs 2011-09-06 23:20:56 -07:00
Mark Otto d0882c580d first pass at enabling active states in dropdowns in topbar and fixing the bug of having an active class on parent dropdown 2011-09-06 21:54:00 -07:00
Mark Otto dfbb591953 addng docs for the themes stuff and examples 2011-09-04 14:02:56 -07:00
Jacob Thornton 43b01d1b80 Merge pull request #149 from yury/version_var
use VERSION var in build script
2011-09-03 23:12:36 -07:00
Mark Otto 7882f0f64b adding temp theme file to help with customization; still needs work 2011-09-03 22:53:21 -07:00
yury fe8cb55cc1 use @VERSION var in build script 2011-09-03 20:10:42 +04:00
Mark Otto 0b70eb630e Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-02 23:35:44 -07:00
Mark Otto bfa5ce70d4 updated address examples 2011-09-02 23:35:28 -07:00
Mark Otto df8eccbfe1 adding support for and example ul in block-messages 2011-09-02 23:28:01 -07:00
Jacob Thornton cf23dc4f24 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-02 23:16:06 -07:00
Jacob Thornton 2883888a57 adds small js section to docs index 2011-09-02 23:15:38 -07:00
Mark Otto 168551cd4f adding link support to regular text in the topbar 2011-09-02 23:09:59 -07:00
Mark Otto 4dbd2334bd updated hero example, added fluid example, resolved issue with tabs and fluid nav 2011-09-02 23:01:38 -07:00
Mark Otto 6d118411e1 resolve conflict 2011-09-02 22:09:49 -07:00
Mark Otto 1625341391 fix repeated margin-left 2011-09-02 22:09:12 -07:00
Mark Otto 5c3f0e32e6 updated container mixin to be fixed-container instead so we can keep the .container in scaffolding while removing the repeated code 2011-09-02 22:08:38 -07:00
Mark Otto d5e42cf81a tweak readonly, disabled, and uneditable form elements 2011-09-02 21:54:11 -07:00
Jacob Thornton 3c9c85b1ed Merge branch 'js-examples' into 1.3-wip
Conflicts:
	bootstrap-1.2.0.css
2011-09-02 21:06:49 -07:00
Jacob Thornton 41242b5ce6 more js chagnes 2011-09-02 21:06:20 -07:00
Jacob Thornton 0e13f8dca1 Merge branch 'master' of github.com:twitter/bootstrap into js-examples
Conflicts:
	bootstrap-1.2.0.css
	bootstrap-1.2.0.min.css
	lib/patterns.less
	lib/scaffolding.less
2011-09-02 21:04:25 -07:00
Mark Otto c4481b54a8 improve CSS properties for centering content, the container, and fluid container so as to not override properties where possible 2011-09-02 21:00:01 -07:00
Jacob Thornton 2589c0ac4e welcome to 1.2.0 2011-09-02 15:07:12 -07:00
Mark Otto 298e1b59bb fix broken checkbox in ie7 2011-09-02 12:46:47 -07:00
Mark Otto 2f4c84bba9 remove rounded corners on buttons from IE9 so gradients don't bleed out 2011-09-02 12:35:41 -07:00
Mark Otto cb244d5d51 fix docs.css spacing, add gradient support for ie9 back 2011-09-02 12:31:14 -07:00
Mark Otto e0722fcb1b cleanup docs and fix gradient in masthead 2011-09-02 12:24:28 -07:00
Mark Otto 8c1e60c638 add reset filter to preboot for turning off gradients in IE when necessary; make :disabled [disabled] for crossbrowser usage 2011-09-02 12:19:43 -07:00
Mark Otto ac57331323 resolve 2011-09-02 12:02:36 -07:00
Mark Otto b9a53b1468 button tweaks 2011-09-02 12:02:20 -07:00
Jacob Thornton 60409660d7 \9 for 8 or less ie 2011-09-02 12:01:41 -07:00
Mark Otto 6638f87f50 resolve conflicts 2011-09-02 11:54:17 -07:00
Mark Otto 62f8916407 update the file input to undo the damage of the generic input selector 2011-09-02 11:53:58 -07:00
Jacob Thornton db43777ddf Merge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip
Conflicts:
	bootstrap-1.2.0.css
	bootstrap-1.2.0.min.css
2011-09-02 11:49:41 -07:00
Jacob Thornton 3f242bc70c Merge branch 'master' of github.com:twitter/bootstrap into 1.2-wip
Conflicts:
	bootstrap-1.2.0.css
2011-09-02 11:49:03 -07:00
Mark Otto a4dc2c8955 merge in master after merging a pull request, add comment 2011-09-02 09:52:33 -07:00
Mark Otto f29c8abcbb Merge pull request #138 from pthrasher/master
Fix for popover issue from #136
2011-09-02 09:51:32 -07:00
pthrasher 55698b303d ran make build 2011-09-02 12:48:32 -04:00
Mark Otto b18633ee14 cleanup and tweaks 2011-09-02 09:48:31 -07:00
pthrasher 5960afc349 incorporated idea from @markdotto in #138 2011-09-02 12:45:03 -04:00
Mark Otto 3f22925144 remove fixed width from topbar form to allow for applying classes to resize it 2011-09-02 09:35:26 -07:00
pthrasher ce1d1c2146 ran make build, issues #136 and #138 2011-09-02 11:19:05 -04:00
pthrasher e6ffd3a86f Fix for issue #136. Now nests fine in both layouts. 2011-09-02 10:43:26 -04:00
Mark Otto db830140ee add old dropdown support to tabs dropdowns 2011-09-02 01:03:16 -07:00
Mark Otto 411e324340 fix dropdown bug, remove second topbar from docs now 2011-09-02 00:58:07 -07:00
Mark Otto 46e4fb3133 remove active state from buttons by moving the :active before :disabled 2011-09-02 00:56:03 -07:00
Mark Otto 251882892f resolve conflicts 2011-09-02 00:52:22 -07:00
Mark Otto fa94b264fa add temp second topbar to nav section, fix it's compatibility issues 2011-09-02 00:50:05 -07:00
Jacob Thornton 2a5d829c4a add doc styles back to topbar-inner 2011-09-02 00:47:06 -07:00
Jacob Thornton 813c55489f fix for dropdown 2011-09-02 00:42:22 -07:00
Jacob Thornton 75afad4325 remake 2011-09-02 00:32:57 -07:00
Jacob Thornton ec82b613d3 Merge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip
Conflicts:
	bootstrap-1.2.0.css
	bootstrap-1.2.0.min.css
	lib/patterns.less
2011-09-02 00:32:09 -07:00
Jacob Thornton 462287e25e div > ul ftw 2011-09-02 00:31:19 -07:00
Mark Otto 5ef4519ca8 move comment so less compiles 2011-09-02 00:29:54 -07:00
Mark Otto 1b06f3e84e resolve conflict 2011-09-02 00:29:27 -07:00
Mark Otto 479e0ccd6b add backwards compatability for dropdowns in topbar 2011-09-02 00:28:54 -07:00
Jacob Thornton c098225cd5 this works O_O 2011-09-02 00:26:58 -07:00
Jacob Thornton 3f1706f5f6 > seems to work O_O 2011-09-02 00:21:55 -07:00
Jacob Thornton 0ed544a82e backwards compat for old nav o_O 2011-09-02 00:17:13 -07:00
Mark Otto 02abdd6037 remove inset shadow from disabled buttons 2011-09-02 00:02:44 -07:00
Jacob Thornton 0159524413 Merge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip
Conflicts:
	bootstrap-1.2.0.css
2011-09-01 22:54:59 -07:00
Jacob Thornton 72da5dd54d for html5 style all inputs -- then unstyle checkbox, radio, button, reset, submit 2011-09-01 22:53:24 -07:00
Mark Otto 0cb6804b69 merging in remote and recompiling 2011-08-31 16:27:28 -07:00
Mark Otto 6258832776 spelling mistakes and undo of one comment 2011-08-31 16:26:47 -07:00
Jacob Thornton f6a4dd95b6 try daves background thing again... 2011-08-31 10:55:53 -07:00
Jacob Thornton 90d174a34d Merge branch 'master' of github.com:twitter/bootstrap into 1.2-wip
Conflicts:
	README.md
	bootstrap-1.2.0.css
2011-08-30 23:37:46 -07:00
Jacob Thornton 4fb1c5bd4b rename all 1.1.1 stuff -> 1.2.0 and remove templates dir and fluid.html 2011-08-30 23:34:19 -07:00
Jacob Thornton 588cb1c06d revert dhg mdo suggestion for fixing ie 2011-08-30 23:25:37 -07:00
Jacob Thornton 49e343c464 ie7 background toggle open 2011-08-30 23:08:34 -07:00
Jacob Thornton 2ed869c2ee remove * hack for ie7 + remove -1 margin bug for ie7 2011-08-30 23:03:01 -07:00
Mark Otto 44b18f4911 Merge pull request #126 from DHS/fix-select-labels
Fixed duplicate element ids in documentation
2011-08-30 18:26:11 -07:00
Mark Otto 89b5fd949b Merge pull request #125 from DHS/readme-spelling
Fixed readme spelling mistake, closes #123
2011-08-30 18:25:32 -07:00
Mark Otto ed1139e838 change type of comment 2011-08-30 08:27:55 -07:00
David Haywood Smith 55022228bc Fixed duplicate element ids
Also updated labels where required
2011-08-30 11:47:40 +01:00
David Haywood Smith a16dfb735a Fixed readme spelling mistake, closes #123 2011-08-30 11:19:46 +01:00
Jacob Thornton afec7859cc fix background color for ie7 -- negative margin bug still there though ;_; 2011-08-29 22:43:40 -07:00
Jacob Thornton efd6fd609c fix open ui for ie 7 2011-08-29 22:36:05 -07:00
Jacob Thornton fc0471a450 lulz nbsp 2011-08-29 22:34:13 -07:00
Jacob Thornton e8f1ae0073 btn's need &nbps; seperating them for ie7 2011-08-29 21:52:45 -07:00
Mark Otto d42a00c19d remove repeated table reset 2011-08-29 21:42:44 -07:00
Mark Otto 7070d44aed adding more grid docs 2011-08-29 21:41:32 -07:00
Jacob Thornton 589204803b remove duplicate defined btn class O_O 2011-08-29 21:41:12 -07:00
Mark Otto f17fc367f7 le merging conflicts 2011-08-29 21:26:53 -07:00
Mark Otto 654cc5ad3f resolving deltas between that epic css selector specifity pull request and latest changes here 2011-08-29 21:24:00 -07:00
Jacob Thornton b4a84e1e7d window -> body for ie 2011-08-28 17:52:55 -07:00
Jacob Thornton 7b041f8419 move removeClass up 2011-08-28 17:52:00 -07:00
Jacob Thornton 58cc70531a drop top position a bit 2011-08-28 17:50:14 -07:00
Jacob Thornton 484ed088fc blah 2011-08-28 17:45:57 -07:00
Jacob Thornton ebff554430 remake with opacity thin 2011-08-28 17:42:09 -07:00
Jacob Thornton 9059a72bf8 try using tricker opacity thingy 2011-08-28 17:40:25 -07:00
Jacob Thornton d8d6e40097 listen to delegation for ie 2011-08-28 17:32:31 -07:00
Jacob Thornton f1d17223b8 wrap for domready 2011-08-28 16:47:38 -07:00
Jacob Thornton a0cb72f9ae change window to 'body' 2011-08-28 16:36:44 -07:00
Jacob Thornton 1a5f8205ff alpha for ie 2011-08-28 16:23:57 -07:00
Jacob Thornton 0b1d2cc03c change backdrop for ie 2011-08-28 14:06:37 -07:00
Jacob Thornton c263504709 add google code prettify 2011-08-28 13:30:04 -07:00
Jacob Thornton ed96f181c8 add topbar dropdown js 2011-08-27 21:46:50 -07:00
Jacob Thornton e91353f362 blahsdfasldflaskdfj 2011-08-27 18:09:03 -07:00
Jacob Thornton a00b849a51 rebuild and change data-attr to have priority over options 2011-08-27 18:05:10 -07:00
Jacob Thornton e05d39d4cc make generic fade animation css class 2011-08-27 18:03:01 -07:00
Jacob Thornton 2ee7c20692 adds popover js 2011-08-27 17:22:49 -07:00
Mark Otto 650251228b redefine the grid to use attribute selectors with css regex, make previously fixed grid values use variables we use elsewhere 2011-08-27 15:30:18 -07:00
Jacob Thornton 038a9809c4 remake 2011-08-27 13:06:01 -07:00
Jacob Thornton 11721f376d add boostrap-twipsy and bootstrap-alerts 2011-08-27 13:03:06 -07:00
Mark Otto 315af8e18b Edited readme to include the versioning approach we'll be striving to use 2011-08-27 00:49:48 -07:00
Jacob Thornton b68b53dca2 rename escape method 2011-08-27 00:42:20 -07:00
Jacob Thornton 1cbda504a0 clean up show logic 2011-08-27 00:28:58 -07:00
Jacob Thornton db706a2596 white space junk 2011-08-27 00:19:05 -07:00
Jacob Thornton 52c624079e sometimes i get emotional about semicolons 2011-08-27 00:07:42 -07:00
Jacob Thornton 24c4ca0391 display none for inactive modals 2011-08-27 00:03:11 -07:00
Jacob Thornton c26eb016fb starting up bootstrap-js... 2011-08-26 23:57:35 -07:00
Mark Otto b552281558 make dropdowns in the topbar black again 2011-08-26 23:18:39 -07:00
Mark Otto 4f67e135dc adding dropdowns to tabs by refactoring the shizzzz out of them 2011-08-26 20:38:23 -07:00
Jacob Thornton df8b65445c small typo in offset generation 2011-08-26 19:31:50 -07:00
Mark Otto b9c9f1d8d6 Merge remote branch 'origin/master' into 1.2-wip 2011-08-26 16:08:03 -07:00
Jacob Thornton 842683b6df make and publish 1.1.1 2011-08-26 15:21:39 -07:00
Jacob Thornton a63fb4d234 Merge branch '1.1.1-wip' 2011-08-26 15:21:20 -07:00
Jacob Thornton 273659c8e7 update everything to 1.1.1 2011-08-26 11:13:47 -07:00
Jacob Thornton 5193619ab0 clean up redundant google prettify code 2011-08-26 10:53:21 -07:00
Mark Otto fc1118c87c bump less version number in docs 2011-08-26 10:09:57 -07:00
Mark Otto fd844c6d5d Merge pull request #89 from karthikv/clean-up
Made JavaScript Unobtrusive and Removed Unused Class
2011-08-26 09:54:08 -07:00
Mark Otto ebfe465b28 Merge pull request #94 from weslly/master
fixed background-color for disabled links in pagination
2011-08-26 09:53:22 -07:00
Weslly Honorato 9e0a526a66 fixed background-color for disabled links in pagination ('none' isn't a valid value for background-color property http://www.w3.org/TR/CSS2/colors.html#propdef-background-color) 2011-08-26 13:30:38 -03:00
Karthik Viswanathan 0a34a6d4b2 Made JavaScript unobtrusive by factoring out prettyPrint() to application.js. Also removed unused class from hero demo. 2011-08-26 00:00:05 -07:00
Mark Otto 0fcda16209 be more specific in gradient mixin 2011-08-25 23:31:16 -07:00
Mark Otto 74a18b341c updated le docs to include note about topbar and padding on box (issue #86) and add snippet about @basefont and @baseline to type section 2011-08-25 23:25:21 -07:00
Mark Otto ab77d7abd3 spacing 2011-08-25 23:19:01 -07:00
Mark Otto c715584428 pull table class from docs again 2011-08-25 23:18:15 -07:00
Mark Otto 8c2df3ac3a resolve conflicts in merging in other branch 2011-08-25 23:12:29 -07:00
Mark Otto dd4bb95c2d updated docs for b/i tags based on issue #62 2011-08-25 23:10:18 -07:00
Mark Otto 0758f64045 updated classnames in the docs for the alerts, updated colors on error and info alerts/buttons 2011-08-25 22:52:21 -07:00
Mark Otto cf47ef0b2e Merge pull request #87 from igorbozato/patch-1
.sidebar and .content in fluid layouts don't need to be divs
2011-08-25 22:44:31 -07:00
Igor Bozato 9a00619d6e .sidebar and .content in fluid layouts don't need to be divs 2011-08-26 03:17:38 -03:00
Mark Otto 7d821f18ac resolve issue #87 in this branch 2011-08-25 22:44:23 -07:00
Mark Otto ce615d016a merged in my pending changes from 1.2-wip branch, resolve diffs as best as i could, update docs and alerts to use original classes, updated docs to include smaller section for layouts 2011-08-25 22:41:45 -07:00
Mark Otto a5e6265726 remove common-table class in the docs 2011-08-25 15:53:25 -07:00
Jacob Thornton 04b8e667d0 clean up btn selectors a bit 2011-08-25 13:52:04 -07:00
Jacob Thornton 0e9d7c1c4d update alert and button styling aproach 2011-08-25 13:31:46 -07:00
Mark Otto 50f484eed6 big update to change the alerts, normal and block level, to have simpler css and new colors independent of the base color scheme 2011-08-25 02:00:07 -07:00
Mark Otto 2d99e3f8a6 base import of normalize into the reset css, tweaks to selector specificity across the board 2011-08-25 00:13:40 -07:00
Jacob Thornton 8368cfd523 add opera to browser support 2011-08-24 19:55:11 -07:00
Jacob Thornton 0739583a46 optimize btn for outputted code + line-height: normal for firefox with adjusted padding 2011-08-24 15:55:08 -07:00
Jacob Thornton 7d7156bff9 optimized grid system from @necolas 2011-08-23 20:16:39 -07:00
Jacob Thornton 38999118ac Merge pull request #71 from DHS/fix-select-labels
Fixed empty for fields on select labels in documentation
2011-08-23 19:52:27 -07:00
David Haywood Smith 70bac36a22 Fixed empty for fields on select labels
Also added id fields to selects where needed
2011-08-24 00:05:07 +01:00
Jacob Thornton 0bfce13983 add delete button + give .btn cursor:pointer 2011-08-22 23:53:02 -07:00
Jacob Thornton 411b90e4ff comment out button method with // so less doesn't compile it into source 2011-08-22 22:02:31 -07:00
Jacob Thornton 40aba9ca1d append checkbox to password input #36 2011-08-22 21:51:17 -07:00
Jacob Thornton 899c6f8d12 remake 2011-08-22 21:47:34 -07:00
Jacob Thornton 8a27d281a9 goodbye -ms-filter. 2011-08-22 21:31:30 -07:00
228 arquivos alterados com 58493 adições e 5877 exclusões
+34 -1
Ver Arquivo
@@ -1 +1,34 @@
.DS_Store
# Numerous always-ignore extensions
*.diff
*.err
*.orig
*.log
*.rej
*.swo
*.swp
*.vi
*~
*.sass-cache
# OS or Editor folders
.DS_Store
._*
Thumbs.db
.cache
.project
.settings
.tmproj
*.esproj
nbproject
*.sublime-project
*.sublime-workspace
# Komodo
*.komodoproject
.komodotools
# Folders to ignore
.hg
.svn
.CVS
.idea
+1 -1
Ver Arquivo
@@ -1,4 +1,4 @@
Copyright 2011 Twitter, Inc.
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.
+56 -24
Ver Arquivo
@@ -1,29 +1,61 @@
DATE=$(shell DATE)
BOOTSTRAP = ./bootstrap-1.1.0.css
BOOTSTRAP_MIN = ./bootstrap-1.1.0.min.css
BOOTSTRAP_LESS = ./lib/bootstrap.less
LESS_COMPESSOR ?= `which lessc`
BOOTSTRAP = ./docs/assets/css/bootstrap.css
BOOTSTRAP_LESS = ./less/bootstrap.less
BOOTSTRAP_RESPONSIVE = ./docs/assets/css/bootstrap-responsive.css
BOOTSTRAP_RESPONSIVE_LESS = ./less/responsive.less
LESS_COMPRESSOR ?= `which lessc`
WATCHR ?= `which watchr`
build:
@@if test ! -z ${LESS_COMPESSOR}; then \
sed 's/@DATE/'"${DATE}"'/' ${BOOTSTRAP_LESS} >${BOOTSTRAP_LESS}.tmp; \
lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP}; \
lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP_MIN} --compress; \
rm -f ${BOOTSTRAP_LESS}.tmp; \
echo "Bootstrap successfully built! - `date`"; \
else \
echo "You must have the LESS compiler installed in order to build Bootstrap."; \
echo "You can install it by running: npm install less -g"; \
fi
#
# BUILD DOCS
#
docs: bootstrap
rm docs/assets/bootstrap.zip
zip -r docs/assets/bootstrap.zip bootstrap
rm -r bootstrap
lessc ${BOOTSTRAP_LESS} > ${BOOTSTRAP}
lessc ${BOOTSTRAP_RESPONSIVE_LESS} > ${BOOTSTRAP_RESPONSIVE}
node docs/build
cp img/* docs/assets/img/
cp js/*.js docs/assets/js/
cp js/tests/vendor/jquery.js docs/assets/js/
#
# BUILD SIMPLE BOOTSTRAP DIRECTORY
# lessc & uglifyjs are required
#
bootstrap:
mkdir -p bootstrap/img
mkdir -p bootstrap/css
mkdir -p bootstrap/js
cp img/* bootstrap/img/
lessc ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.css
lessc --compress ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.min.css
lessc ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.css
lessc --compress ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.min.css
cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js > bootstrap/js/bootstrap.js
uglifyjs -nc bootstrap/js/bootstrap.js > bootstrap/js/bootstrap.min.tmp.js
echo "/**\n* Bootstrap.js by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > bootstrap/js/copyright.js
cat 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
#
# MAKE FOR GH-PAGES 4 FAT & MDO ONLY (O_O )
#
gh-pages: docs
rm -f ../bootstrap-gh-pages/assets/bootstrap.zip
node docs/build production
cp -r docs/* ../bootstrap-gh-pages
#
# WATCH LESS FILES
#
watch:
@@if test ! -z ${WATCHR}; then \
echo "Watching less files..."; \
watchr -e "watch('lib/.*\.less') { system 'make' }"; \
else \
echo "You must have the watchr installed in order to watch Bootstrap less files."; \
echo "You can install it by running: gem install watchr"; \
fi
echo "Watching less files..."; \
watchr -e "watch('less/.*\.less') { system 'make' }"
.PHONY: build watch
.PHONY: docs watch gh-pages
+56 -28
Ver Arquivo
@@ -1,29 +1,39 @@
TWITTER BOOTSTRAP
[Twitter Bootstrap](http://twitter.github.com/bootstrap)
=================
Bootstrap is Twitter's toolkit for kickstarting CSS for websites, apps, and more. It includes base CSS styles for typography, forms, buttons, tables, grids, navigation, alerts, and more.
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.
To get started -- checkout http://twitter.github.com/bootstrap!
To get started, checkout http://twitter.github.com/bootstrap!
Usage
-----
You can use Twitter Bootstrap in one of two ways: just drop the compiled CSS into any new project and start cranking, or run LESS on your site and compile on the fly like a boss.
Quick start
-----------
Here's what the LESS version looks like:
<link rel="stylesheet/less" type="text/css" href="lib/bootstrap.less">
<script src="less.js" type="text/javascript"></script>
Or if you prefer, the standard css way:
<link rel="stylesheet" type="text/css" href="bootstrap-1.1.0.css">
For more info, refer to the docs!
Clone the repo, `git clone git@github.com:twitter/bootstrap.git`, or [download the latest release](https://github.com/twitter/bootstrap/zipball/master).
Bug Tracker
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:
`<major>.<minor>.<patch>`
And constructed with the following guidelines:
* Breaking backward compatibility bumps the major
* New additions without breaking backward compatibility bumps the minor
* Bug fixes and misc changes bump the patch
For more information on SemVer, please visit http://semver.org/.
Bug tracker
-----------
Have a bug? Please create an issue here on GitHub!
@@ -31,7 +41,15 @@ Have a bug? Please create an issue here on GitHub!
https://github.com/twitter/bootstrap/issues
Mailing List
Twitter account
---------------
Keep up to date on announcements and more by following Bootstrap on Twitter, [@TwBootstrap](http://twitter.com/TwBootstrap).
Mailing list
------------
Have a question? Ask on our mailing list!
@@ -41,21 +59,30 @@ 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
----------
We have included a makefile with convenience methods for working with the bootstrap library.
We have included a makefile with convenience methods for working with the Bootstrap library.
+ **build** - `make build`
This will run the less compiler on the bootstrap lib and generate a bootstrap.css and bootstrap.min.css file.
The lessc compiler is required for this command to run.
+ **build** - `make`
Runs the LESS compiler to rebuild the `/less` files and compiles the docs pages. Requires lessc and uglify-js. <a href="http://twitter.github.com/bootstrap/less.html#compiling">Read more in our docs &raquo;</a>
+ **watch** - `make watch`
This is a convenience method for watching your less files and automatically building them whenever you save.
Watchr is required for this command to run.
This is a convenience method for watching just Less files and automatically building them whenever you save. Requires the Watchr gem.
AUTHORS
Authors
-------
**Mark Otto**
@@ -69,10 +96,11 @@ AUTHORS
+ http://github.com/fat
Copyright and License
Copyright and license
---------------------
Copyright 2011 Twitter, Inc.
Copyright 2012 Twitter, Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this work except in compliance with the License.
@@ -84,4 +112,4 @@ 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.
limitations under the License.
-1907
Ver Arquivo
Diferenças do arquivo suprimidas por serem muito extensas Carregar Diff
-227
Ver Arquivo
@@ -1,227 +0,0 @@
html,body{margin:0;padding:0;}
h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,cite,code,del,dfn,em,img,q,s,samp,small,strike,strong,sub,sup,tt,var,dd,dl,dt,li,ol,ul,fieldset,form,label,legend,button,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;font-weight:normal;font-style:normal;font-size:100%;line-height:1;font-family:inherit;}
table{border-collapse:collapse;border-spacing:0;}
ol,ul{list-style:none;}
q:before,q:after,blockquote:before,blockquote:after{content:"";}
header,section,footer,article,aside{display:block;}
.clearfix{zoom:1;}.clearfix:before,.clearfix:after{display:table;content:"";}
.clearfix:after{clear:both;}
.center-block{display:block;margin:0 auto;}
.container{width:940px;margin:0 auto;zoom:1;}.container:before,.container:after{display:table;content:"";}
.container:after{clear:both;}
.row{zoom:1;}.row:before,.row:after{display:table;content:"";}
.row:after{clear:both;}
.row .span1{float:left;width:40px;margin-left:20px;}.row .span1:first-child{margin-left:0;}
.row .span2{float:left;width:100px;margin-left:20px;}.row .span2:first-child{margin-left:0;}
.row .span3{float:left;width:160px;margin-left:20px;}.row .span3:first-child{margin-left:0;}
.row .span4{float:left;width:220px;margin-left:20px;}.row .span4:first-child{margin-left:0;}
.row .span5{float:left;width:280px;margin-left:20px;}.row .span5:first-child{margin-left:0;}
.row .span6{float:left;width:340px;margin-left:20px;}.row .span6:first-child{margin-left:0;}
.row .span7{float:left;width:400px;margin-left:20px;}.row .span7:first-child{margin-left:0;}
.row .span8{float:left;width:460px;margin-left:20px;}.row .span8:first-child{margin-left:0;}
.row .span9{float:left;width:520px;margin-left:20px;}.row .span9:first-child{margin-left:0;}
.row .span10{float:left;width:580px;margin-left:20px;}.row .span10:first-child{margin-left:0;}
.row .span11{float:left;width:640px;margin-left:20px;}.row .span11:first-child{margin-left:0;}
.row .span12{float:left;width:700px;margin-left:20px;}.row .span12:first-child{margin-left:0;}
.row .span13{float:left;width:760px;margin-left:20px;}.row .span13:first-child{margin-left:0;}
.row .span14{float:left;width:820px;margin-left:20px;}.row .span14:first-child{margin-left:0;}
.row .span15{float:left;width:880px;margin-left:20px;}.row .span15:first-child{margin-left:0;}
.row .span16{float:left;width:940px;margin-left:20px;}.row .span16:first-child{margin-left:0;}
.row .offset1{margin-left:80px !important;}.row .offset1:first-child{margin-left:60px !important;}
.row .offset2{margin-left:140px !important;}.row .offset2:first-child{margin-left:120px !important;}
.row .offset3{margin-left:200px !important;}.row .offset3:first-child{margin-left:180px !important;}
.row .offset4{margin-left:260px !important;}.row .offset4:first-child{margin-left:240px !important;}
.row .offset5{margin-left:320px !important;}.row .offset5:first-child{margin-left:300px !important;}
.row .offset6{margin-left:380px !important;}.row .offset6:first-child{margin-left:360px !important;}
.row .offset7{margin-left:440px !important;}.row .offset7:first-child{margin-left:420px !important;}
.row .offset8{margin-left:500px !important;}.row .offset8:first-child{margin-left:480px !important;}
.row .offset9{margin-left:500px !important;}.row .offset9:first-child{margin-left:480px !important;}
.row .offset10{margin-left:620px !important;}.row .offset10:first-child{margin-left:600px !important;}
.row .offset11{margin-left:680px !important;}.row .offset11:first-child{margin-left:660px !important;}
.row .offset12{margin-left:740px !important;}.row .offset12:first-child{margin-left:720px !important;}
html,body{background-color:#fff;}
body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;color:#808080;text-rendering:optimizeLegibility;}
div.container{width:940px;margin:0 auto;}
div.container-fluid{padding:0 20px;zoom:1;}div.container-fluid:before,div.container-fluid:after{display:table;content:"";}
div.container-fluid:after{clear:both;}
div.container-fluid div.sidebar{float:left;width:220px;}
div.container-fluid div.content{min-width:700px;max-width:1180px;margin-left:240px;}
a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:hover{color:#0050a3;text-decoration:underline;}
.btn{display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-moz-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333;font-size:13px;line-height:18px;border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);}.btn:hover{background-position:0 -15px;color:#333;text-decoration:none;}
.primary{background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(#049cdb, #0064cd);background-image:-ms-linear-gradient(#049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(#049cdb, #0064cd);background-image:-o-linear-gradient(#049cdb, #0064cd);background-image:linear-gradient(#049cdb, #0064cd);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border:1px solid #004b9a;border-bottom-color:#003f81;}.primary:hover{color:#fff;}
.btn{-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn.primary{color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#0064cd #0064cd #003f81;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;}
.btn.large{font-size:16px;line-height:28px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}
.btn.small{padding-right:9px;padding-left:9px;font-size:11px;}
.btn.disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;}
.btn:disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;color:#fff;}
.btn:active{-webkit-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);}
button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;}
p{font-size:13px;font-weight:normal;line-height:18px;margin-bottom:9px;}p small{font-size:11px;color:#bfbfbf;}
h1,h2,h3,h4,h5,h6{font-weight:bold;color:#404040;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#bfbfbf;}
h1{margin-bottom:18px;font-size:30px;line-height:36px;}h1 small{font-size:18px;}
h2{font-size:24px;line-height:36px;}h2 small{font-size:14px;}
h3,h4,h5,h6{line-height:36px;}
h3{font-size:18px;}h3 small{font-size:14px;}
h4{font-size:16px;}h4 small{font-size:12px;}
h5{font-size:14px;}
h6{font-size:13px;color:#bfbfbf;text-transform:uppercase;}
ul,ol{margin:0 0 18px 25px;}
ul ul,ul ol,ol ol,ol ul{margin-bottom:0;}
ul{list-style:disc;}
ol{list-style:decimal;}
li{line-height:18px;color:#808080;}
ul.unstyled{list-style:none;margin-left:0;}
dl{margin-bottom:18px;}dl dt,dl dd{line-height:18px;}
dl dt{font-weight:bold;}
dl dd{margin-left:9px;}
hr{margin:0 0 19px;border:0;border-bottom:1px solid #eee;}
strong{font-style:inherit;font-weight:bold;line-height:inherit;}
em{font-style:italic;font-weight:inherit;line-height:inherit;}
.muted{color:#e6e6e6;}
blockquote{margin-bottom:18px;border-left:5px solid #eee;padding-left:15px;}blockquote p{font-size:14px;font-weight:300;line-height:18px;margin-bottom:0;}
blockquote small{display:block;font-size:12px;font-weight:300;line-height:18px;color:#bfbfbf;}blockquote small:before{content:'\2014 \00A0';}
address{display:block;line-height:18px;margin-bottom:18px;}
code,pre{padding:0 3px 2px;font-family:Monaco, Andale Mono, Courier New, monospace;font-size:12px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
code{background-color:#fee9cc;color:rgba(0, 0, 0, 0.75);padding:1px 3px;}
pre{background-color:#f5f5f5;display:block;padding:17px;margin:0 0 18px;line-height:18px;font-size:12px;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre-wrap;}
form{margin-bottom:18px;}form fieldset{margin-bottom:18px;padding-top:18px;}form fieldset legend{display:block;margin-left:150px;font-size:20px;line-height:1;*margin:0 0 5px 145px;*line-height:1.5;color:#404040;}
form .clearfix{margin-bottom:18px;}
form label,form input,form select,form textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:normal;}
form label{padding-top:6px;font-size:13px;line-height:18px;float:left;width:130px;text-align:right;color:#404040;}
form div.input{margin-left:150px;}
form input[type=checkbox],form input[type=radio]{cursor:pointer;}
form input[type=text],form input[type=password],form textarea,form select,form .uneditable-input{display:inline-block;width:210px;margin:0;padding:4px;font-size:13px;line-height:18px;height:18px;color:#808080;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
form select,form input[type=file]{height:27px;line-height:27px;}
form textarea{height:auto;}
form .uneditable-input{background-color:#eee;display:block;border-color:#ccc;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.075);}
form :-moz-placeholder{color:#bfbfbf;}
form ::-webkit-input-placeholder{color:#bfbfbf;}
form input[type=text],form input[type=password],form select,form textarea{-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);}
form input[type=text]:focus,form input[type=password]:focus,form textarea:focus{outline:none;border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);}
form div.error{background:#fae5e3;padding:10px 0;margin:-10px 0 10px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}form div.error>label,form div.error span.help-inline,form div.error span.help-block{color:#9d261d;}
form div.error input[type=text],form div.error input[type=password],form div.error textarea{border-color:#c87872;-webkit-box-shadow:0 0 3px rgba(171, 41, 32, 0.25);-moz-box-shadow:0 0 3px rgba(171, 41, 32, 0.25);box-shadow:0 0 3px rgba(171, 41, 32, 0.25);}form div.error input[type=text]:focus,form div.error input[type=password]:focus,form div.error textarea:focus{border-color:#b9554d;-webkit-box-shadow:0 0 6px rgba(171, 41, 32, 0.5);-moz-box-shadow:0 0 6px rgba(171, 41, 32, 0.5);box-shadow:0 0 6px rgba(171, 41, 32, 0.5);}
form div.error .input-prepend span.add-on,form div.error .input-append span.add-on{background:#f4c8c5;border-color:#c87872;color:#b9554d;}
form .input-mini,form input.mini,form textarea.mini,form select.mini{width:60px;}
form .input-small,form input.small,form textarea.small,form select.small{width:90px;}
form .input-medium,form input.medium,form textarea.medium,form select.medium{width:150px;}
form .input-large,form input.large,form textarea.large,form select.large{width:210px;}
form .input-xlarge,form input.xlarge,form textarea.xlarge,form select.xlarge{width:270px;}
form .input-xxlarge,form input.xxlarge,form textarea.xxlarge,form select.xxlarge{width:530px;}
form textarea.xxlarge{overflow-y:scroll;}
form input[readonly]:focus,form textarea[readonly]:focus,form input.disabled{background:#f5f5f5;border-color:#ddd;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
.actions{background:#f5f5f5;margin-top:18px;margin-bottom:18px;padding:17px 20px 18px 150px;border-top:1px solid #ddd;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;}.actions .secondary-action{float:right;}.actions .secondary-action a{line-height:30px;}.actions .secondary-action a:hover{text-decoration:underline;}
.help-inline,.help-block{font-size:12px;line-height:18px;color:#bfbfbf;}
.help-inline{padding-left:5px;*position:relative;*top:-5px;}
.help-block{display:block;max-width:600px;}
.inline-inputs{color:#808080;}.inline-inputs span,.inline-inputs input[type=text]{display:inline-block;}
.inline-inputs input.mini{width:60px;}
.inline-inputs input.small{width:90px;}
.inline-inputs span{padding:0 2px 0 1px;}
.input-prepend input[type=text],.input-append input[type=text]{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
.input-prepend .add-on,.input-append .add-on{background:#f5f5f5;float:left;display:block;width:auto;min-width:16px;padding:4px 4px 4px 5px;color:#bfbfbf;font-weight:normal;line-height:18px;height:18px;text-align:center;text-shadow:0 1px 0 #fff;border:1px solid #ccc;border-right-width:0;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
.input-prepend .active,.input-append .active{background:#a9dba9;border-color:#46a546;}
.input-prepend .add-on{*margin-top:1px;}
.input-append input[type=text]{float:left;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
.input-append .add-on{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;border-right-width:1px;border-left-width:0;}
.inputs-list{margin:0 0 5px;width:100%;}.inputs-list li{display:block;padding:0;width:100%;}.inputs-list li label{display:block;float:none;width:auto;padding:0;line-height:18px;text-align:left;white-space:normal;}.inputs-list li label strong{color:#808080;}
.inputs-list li label small{font-size:12px;font-weight:normal;}
.inputs-list li ul.inputs-list{margin-left:25px;margin-bottom:10px;padding-top:0;}
.inputs-list li:first-child{padding-top:5px;}
.inputs-list input[type=radio],.inputs-list input[type=checkbox]{margin-bottom:0;}
form.form-stacked{padding-left:20px;}form.form-stacked fieldset{padding-top:9px;}
form.form-stacked legend{margin-left:0;}
form.form-stacked label{display:block;float:none;width:auto;font-weight:bold;text-align:left;line-height:20px;padding-top:0;}
form.form-stacked .clearfix{margin-bottom:9px;}form.form-stacked .clearfix div.input{margin-left:0;}
form.form-stacked .inputs-list{margin-bottom:0;}form.form-stacked .inputs-list li{padding-top:0;}form.form-stacked .inputs-list li label{font-weight:normal;padding-top:0;}
form.form-stacked div.error{padding-top:10px;padding-bottom:10px;padding-left:10px;margin-top:0;margin-left:-10px;}
form.form-stacked .actions{margin-left:-20px;padding-left:20px;}
table{width:100%;margin-bottom:18px;padding:0;border-collapse:separate;font-size:13px;}table th,table td{padding:10px 10px 9px;line-height:13.5px;text-align:left;vertical-align:middle;border-bottom:1px solid #ddd;}
table th{padding-top:9px;font-weight:bold;border-bottom-width:2px;}
.zebra-striped tbody tr:nth-child(odd) td{background-color:#f9f9f9;}
.zebra-striped tbody tr:hover td{background-color:#f5f5f5;}
.zebra-striped .header{cursor:pointer;}.zebra-striped .header:after{content:"";float:right;margin-top:7px;border-width:0 4px 4px;border-style:solid;border-color:#000 transparent;visibility:hidden;}
.zebra-striped .headerSortUp,.zebra-striped .headerSortDown{background-color:rgba(141, 192, 219, 0.25);text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;}
.zebra-striped .header:hover:after{visibility:visible;}
.zebra-striped .headerSortDown:after,.zebra-striped .headerSortDown:hover:after{visibility:visible;filter:alpha(opacity=60);-khtml-opacity:0.6;-moz-opacity:0.6;opacity:0.6;}
.zebra-striped .headerSortUp:after{border-bottom:none;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000;visibility:visible;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;filter:alpha(opacity=60);-khtml-opacity:0.6;-moz-opacity:0.6;opacity:0.6;}
table .blue{color:#049cdb;border-bottom-color:#049cdb;}
table .headerSortUp.blue,table .headerSortDown.blue{background-color:#ade6fe;}
table .green{color:#46a546;border-bottom-color:#46a546;}
table .headerSortUp.green,table .headerSortDown.green{background-color:#cdeacd;}
table .red{color:#9d261d;border-bottom-color:#9d261d;}
table .headerSortUp.red,table .headerSortDown.red{background-color:#f4c8c5;}
table .yellow{color:#ffc40d;border-bottom-color:#ffc40d;}
table .headerSortUp.yellow,table .headerSortDown.yellow{background-color:#fff6d9;}
table .orange{color:#f89406;border-bottom-color:#f89406;}
table .headerSortUp.orange,table .headerSortDown.orange{background-color:#fee9cc;}
table .purple{color:#7a43b6;border-bottom-color:#7a43b6;}
table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0;}
.topbar{height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;}.topbar .fill{background:#222;background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(#333333, #222222);background-image:-ms-linear-gradient(#333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(#333333, #222222);background-image:-o-linear-gradient(#333333, #222222);background-image:linear-gradient(#333333, #222222);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}
.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}
.topbar a:hover,.topbar ul li.active a{background-color:#333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;}
.topbar h3{position:relative;}.topbar h3 a{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;}
.topbar form{float:left;margin:5px 0 0 0;position:relative;filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;}.topbar form input{background-color:#444;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;width:220px;padding:4px 9px;color:#fff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-webkit-transition:none;-moz-transition:none;transition:none;}.topbar form input:-moz-placeholder{color:#e6e6e6;}
.topbar form input::-webkit-input-placeholder{color:#e6e6e6;}
.topbar form input:hover{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.5);color:#fff;}
.topbar form input:focus,.topbar form input.focused{outline:none;background-color:#fff;color:#404040;text-shadow:0 1px 0 #fff;border:0;padding:5px 10px;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);}
.topbar ul{display:block;float:left;margin:0 10px 0 0;position:relative;}.topbar ul.secondary-nav{float:right;margin-left:10px;margin-right:0;}
.topbar ul li{display:block;float:left;font-size:13px;}.topbar ul li a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}.topbar ul li a:hover{color:#fff;text-decoration:none;}
.topbar ul li.active a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);}
.topbar ul.primary-nav li ul{left:0;}
.topbar ul.secondary-nav li ul{right:0;}
.topbar ul li.menu{position:relative;}.topbar ul li.menu a.menu:after{width:0px;height:0px;display:inline-block;content:"&darr;";text-indent:-99999px;vertical-align:top;margin-top:8px;margin-left:4px;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #fff;filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;}
.topbar ul li.menu.open a.menu,.topbar ul li.menu.open a:hover{background-color:#444;background-color:rgba(255, 255, 255, 0.1);*background-color:#444;color:#fff;}
.topbar ul li.menu.open ul{display:block;}.topbar ul li.menu.open ul li a{background-color:transparent;font-weight:normal;}.topbar ul li.menu.open ul li a:hover{background-color:rgba(255, 255, 255, 0.1);*background-color:#444;color:#fff;}
.topbar ul li.menu.open ul li.active a{background-color:rgba(255, 255, 255, 0.1);font-weight:bold;}
.topbar ul li ul{background-color:#333;float:left;display:none;position:absolute;top:40px;min-width:160px;max-width:220px;_width:160px;margin-left:0;margin-right:0;padding:0;text-align:left;border:0;zoom:1;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);}.topbar ul li ul li{float:none;clear:both;display:block;background:none;font-size:12px;}.topbar ul li ul li a{display:block;padding:6px 15px;clear:both;font-weight:normal;line-height:19px;color:#bbb;}.topbar ul li ul li a:hover{background-color:#333;background-color:rgba(255, 255, 255, 0.25);color:#fff;}
.topbar ul li ul li.divider{height:1px;overflow:hidden;background:#222;background:rgba(0, 0, 0, 0.2);border-bottom:1px solid rgba(255, 255, 255, 0.1);margin:5px 0;}
.topbar ul li ul li span{clear:both;display:block;background:rgba(0, 0, 0, 0.2);padding:6px 15px;cursor:default;color:#808080;border-top:1px solid rgba(0, 0, 0, 0.2);}
.hero-unit{background-color:#f5f5f5;margin-top:60px;margin-bottom:30px;padding:60px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;}
.hero-unit p{font-size:18px;font-weight:200;line-height:27px;}
footer{margin-top:17px;padding-top:17px;border-top:1px solid #eee;}
.page-header{margin-bottom:17px;border-bottom:1px solid #ddd;-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}.page-header h1{margin-bottom:8px;}
.alert-message{background-color:rgba(0, 0, 0, 0.15);background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(transparent), to(rgba(0, 0, 0, 0.15)));background-image:-moz-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-ms-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, transparent), color-stop(100%, rgba(0, 0, 0, 0.15)));background-image:-webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-o-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:linear-gradient(transparent, rgba(0, 0, 0, 0.15));-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')";filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')";background-color:#e6e6e6;margin-bottom:18px;padding:8px 15px;color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.3);border-bottom:1px solid rgba(0, 0, 0, 0.3);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.alert-message p{color:#fff;margin-bottom:0;}.alert-message p+p{margin-top:5px;}
.alert-message.error{background-color:#d83a2e;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#e4776f), to(#d83a2e));background-image:-moz-linear-gradient(#e4776f, #d83a2e);background-image:-ms-linear-gradient(#e4776f, #d83a2e);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #e4776f), color-stop(100%, #d83a2e));background-image:-webkit-linear-gradient(#e4776f, #d83a2e);background-image:-o-linear-gradient(#e4776f, #d83a2e);background-image:linear-gradient(#e4776f, #d83a2e);border-bottom-color:#b32b21;}
.alert-message.warning{background-color:#ffd040;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffe38d), to(#ffd040));background-image:-moz-linear-gradient(#ffe38d, #ffd040);background-image:-ms-linear-gradient(#ffe38d, #ffd040);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffe38d), color-stop(100%, #ffd040));background-image:-webkit-linear-gradient(#ffe38d, #ffd040);background-image:-o-linear-gradient(#ffe38d, #ffd040);background-image:linear-gradient(#ffe38d, #ffd040);border-bottom-color:#ffc40d;}
.alert-message.success{background-color:#62bc62;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#97d397), to(#62bc62));background-image:-moz-linear-gradient(#97d397, #62bc62);background-image:-ms-linear-gradient(#97d397, #62bc62);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #97d397), color-stop(100%, #62bc62));background-image:-webkit-linear-gradient(#97d397, #62bc62);background-image:-o-linear-gradient(#97d397, #62bc62);background-image:linear-gradient(#97d397, #62bc62);border-bottom-color:#46a546;}
.alert-message.info{background-color:#04aef4;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#62cffc), to(#04aef4));background-image:-moz-linear-gradient(#62cffc, #04aef4);background-image:-ms-linear-gradient(#62cffc, #04aef4);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #62cffc), color-stop(100%, #04aef4));background-image:-webkit-linear-gradient(#62cffc, #04aef4);background-image:-o-linear-gradient(#62cffc, #04aef4);background-image:linear-gradient(#62cffc, #04aef4);border-bottom-color:#049cdb;}
.alert-message .close{float:right;margin-top:-2px;color:#000;font-size:20px;font-weight:bold;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-khtml-opacity:0.2;-moz-opacity:0.2;opacity:0.2;}.alert-message .close:hover{text-decoration:none;filter:alpha(opacity=40);-khtml-opacity:0.4;-moz-opacity:0.4;opacity:0.4;}
.block-message{margin-bottom:18px;padding:14px;color:#404040;color:rgba(0, 0, 0, 0.8);*color:#404040;text-shadow:0 1px 0 rgba(255, 255, 255, 0.25);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.block-message p{color:#404040;color:rgba(0, 0, 0, 0.8);*color:#404040;margin-right:30px;margin-bottom:0;}
.block-message ul{margin-bottom:0;}
.block-message strong{display:block;}
.block-message.error{background:#f8dcda;border:1px solid #f4c8c5;}
.block-message.warning{background:#fff0c0;border:1px solid #ffe38d;}
.block-message.success{background:#dff1df;border:1px solid #bbe2bb;}
.block-message.info{background:#c7eefe;border:1px solid #ade6fe;}
.tabs,.pills{margin:0 0 20px;padding:0;zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";}
.tabs:after,.pills:after{clear:both;}
.tabs li,.pills li{display:inline;}.tabs li a,.pills li a{float:left;width:auto;}
.tabs{width:100%;border-bottom:1px solid #bfbfbf;}.tabs li a{margin-bottom:-1px;margin-right:2px;padding:0 15px;line-height:35px;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;}.tabs li a:hover{background-color:#e6e6e6;border-bottom:1px solid #bfbfbf;}
.tabs li.active a{background-color:#fff;padding:0 14px;border:1px solid #ccc;border-bottom:0;color:#808080;}
.pills li a{margin:5px 3px 5px 0;padding:0 15px;text-shadow:0 1px 1px #fff;line-height:30px;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}.pills li a:hover{background:#0050a3;color:#fff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);}
.pills li.active a{background:#0069d6;color:#fff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);}
.pagination{height:36px;margin:18px 0;}.pagination ul{float:left;margin:0;border:1px solid #ddd;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);}.pagination ul li{display:inline;}.pagination ul li a{float:left;padding:0 14px;line-height:34px;border-right:1px solid;border-right-color:#ddd;border-right-color:rgba(0, 0, 0, 0.15);*border-right-color:#ddd;text-decoration:none;}
.pagination ul li a:hover,.pagination ul li.active a{background-color:#c7eefe;}
.pagination ul li.disabled a,.pagination ul li.disabled a:hover{background-color:none;color:#bfbfbf;}
.pagination ul li.next a{border:0;}
.well{background-color:#f5f5f5;margin-bottom:20px;padding:19px;min-height:20px;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}
.modal-backdrop{background-color:rgba(0, 0, 0, 0.5);position:fixed;top:0;left:0;right:0;bottom:0;z-index:1000;}
.modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-280px 0 0 -250px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal .modal-header{border-bottom:1px solid #eee;padding:5px 20px;}.modal .modal-header a.close{position:absolute;right:10px;top:10px;color:#999;line-height:10px;font-size:18px;}
.modal .modal-body{padding:20px;}
.modal .modal-footer{background-color:#f5f5f5;padding:14px 20px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;}.modal .modal-footer:before,.modal .modal-footer:after{display:table;content:"";}
.modal .modal-footer:after{clear:both;}
.modal .modal-footer .btn{float:right;margin-left:10px;}
.twipsy{display:block;position:absolute;visibility:visible;padding:5px;font-size:11px;z-index:1000;filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;}.twipsy.above .twipsy-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;}
.twipsy.left .twipsy-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;}
.twipsy.below .twipsy-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;}
.twipsy.right .twipsy-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;}
.twipsy .twipsy-inner{padding:3px 8px;background-color:#000;color:white;text-align:center;max-width:200px;text-decoration:none;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
.twipsy .twipsy-arrow{position:absolute;width:0;height:0;}
.popover{position:absolute;top:0;left:0;z-index:1000;padding:5px;display:none;}.popover.above .arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;}
.popover.right .arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;}
.popover.below .arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;}
.popover.left .arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;}
.popover .arrow{position:absolute;width:0;height:0;}
.popover .inner{background-color:#333;background-color:rgba(0, 0, 0, 0.8);*background-color:#333;padding:3px;overflow:hidden;width:280px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);}
.popover .title{background-color:#f5f5f5;padding:9px 15px;line-height:1;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;border-bottom:1px solid #eee;}
.popover .content{background-color:#ffffff;padding:14px;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;}
Arquivo binário não exibido.
+686
Ver Arquivo
@@ -0,0 +1,686 @@
/*!
* Bootstrap Responsive v2.0.2
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
*/
.clearfix {
*zoom: 1;
}
.clearfix:before,
.clearfix:after {
display: table;
content: "";
}
.clearfix:after {
clear: both;
}
.hide-text {
overflow: hidden;
text-indent: 100%;
white-space: nowrap;
}
.input-block-level {
display: block;
width: 100%;
min-height: 28px;
/* Make inputs at least the height of their button counterpart */
/* Makes inputs behave like true block-level elements */
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
-ms-box-sizing: border-box;
box-sizing: border-box;
}
.hidden {
display: none;
visibility: hidden;
}
.visible-phone {
display: none;
}
.visible-tablet {
display: none;
}
.visible-desktop {
display: block;
}
.hidden-phone {
display: block;
}
.hidden-tablet {
display: block;
}
.hidden-desktop {
display: none;
}
@media (max-width: 767px) {
.visible-phone {
display: block;
}
.hidden-phone {
display: none;
}
.hidden-desktop {
display: block;
}
.visible-desktop {
display: none;
}
}
@media (min-width: 768px) and (max-width: 979px) {
.visible-tablet {
display: block;
}
.hidden-tablet {
display: none;
}
.hidden-desktop {
display: block;
}
.visible-desktop {
display: none;
}
}
@media (max-width: 480px) {
.nav-collapse {
-webkit-transform: translate3d(0, 0, 0);
}
.page-header h1 small {
display: block;
line-height: 18px;
}
input[type="checkbox"],
input[type="radio"] {
border: 1px solid #ccc;
}
.form-horizontal .control-group > label {
float: none;
width: auto;
padding-top: 0;
text-align: left;
}
.form-horizontal .controls {
margin-left: 0;
}
.form-horizontal .control-list {
padding-top: 0;
}
.form-horizontal .form-actions {
padding-left: 10px;
padding-right: 10px;
}
.modal {
position: absolute;
top: 10px;
left: 10px;
right: 10px;
width: auto;
margin: 0;
}
.modal.fade.in {
top: auto;
}
.modal-header .close {
padding: 10px;
margin: -10px;
}
.carousel-caption {
position: static;
}
}
@media (max-width: 767px) {
body {
padding-left: 20px;
padding-right: 20px;
}
.navbar-fixed-top {
margin-left: -20px;
margin-right: -20px;
}
.container {
width: auto;
}
.row-fluid {
width: 100%;
}
.row {
margin-left: 0;
}
.row > [class*="span"],
.row-fluid > [class*="span"] {
float: none;
display: block;
width: auto;
margin: 0;
}
.thumbnails [class*="span"] {
width: auto;
}
input[class*="span"],
select[class*="span"],
textarea[class*="span"],
.uneditable-input {
display: block;
width: 100%;
min-height: 28px;
/* Make inputs at least the height of their button counterpart */
/* Makes inputs behave like true block-level elements */
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
-ms-box-sizing: border-box;
box-sizing: border-box;
}
.input-prepend input[class*="span"],
.input-append input[class*="span"] {
width: auto;
}
}
@media (min-width: 768px) and (max-width: 979px) {
.row {
margin-left: -20px;
*zoom: 1;
}
.row:before,
.row:after {
display: table;
content: "";
}
.row:after {
clear: both;
}
[class*="span"] {
float: left;
margin-left: 20px;
}
.container,
.navbar-fixed-top .container,
.navbar-fixed-bottom .container {
width: 724px;
}
.span12 {
width: 724px;
}
.span11 {
width: 662px;
}
.span10 {
width: 600px;
}
.span9 {
width: 538px;
}
.span8 {
width: 476px;
}
.span7 {
width: 414px;
}
.span6 {
width: 352px;
}
.span5 {
width: 290px;
}
.span4 {
width: 228px;
}
.span3 {
width: 166px;
}
.span2 {
width: 104px;
}
.span1 {
width: 42px;
}
.offset12 {
margin-left: 764px;
}
.offset11 {
margin-left: 702px;
}
.offset10 {
margin-left: 640px;
}
.offset9 {
margin-left: 578px;
}
.offset8 {
margin-left: 516px;
}
.offset7 {
margin-left: 454px;
}
.offset6 {
margin-left: 392px;
}
.offset5 {
margin-left: 330px;
}
.offset4 {
margin-left: 268px;
}
.offset3 {
margin-left: 206px;
}
.offset2 {
margin-left: 144px;
}
.offset1 {
margin-left: 82px;
}
.row-fluid {
width: 100%;
*zoom: 1;
}
.row-fluid:before,
.row-fluid:after {
display: table;
content: "";
}
.row-fluid:after {
clear: both;
}
.row-fluid > [class*="span"] {
float: left;
margin-left: 2.762430939%;
}
.row-fluid > [class*="span"]:first-child {
margin-left: 0;
}
.row-fluid > .span12 {
width: 99.999999993%;
}
.row-fluid > .span11 {
width: 91.436464082%;
}
.row-fluid > .span10 {
width: 82.87292817100001%;
}
.row-fluid > .span9 {
width: 74.30939226%;
}
.row-fluid > .span8 {
width: 65.74585634900001%;
}
.row-fluid > .span7 {
width: 57.182320438000005%;
}
.row-fluid > .span6 {
width: 48.618784527%;
}
.row-fluid > .span5 {
width: 40.055248616%;
}
.row-fluid > .span4 {
width: 31.491712705%;
}
.row-fluid > .span3 {
width: 22.928176794%;
}
.row-fluid > .span2 {
width: 14.364640883%;
}
.row-fluid > .span1 {
width: 5.801104972%;
}
input,
textarea,
.uneditable-input {
margin-left: 0;
}
input.span12, textarea.span12, .uneditable-input.span12 {
width: 714px;
}
input.span11, textarea.span11, .uneditable-input.span11 {
width: 652px;
}
input.span10, textarea.span10, .uneditable-input.span10 {
width: 590px;
}
input.span9, textarea.span9, .uneditable-input.span9 {
width: 528px;
}
input.span8, textarea.span8, .uneditable-input.span8 {
width: 466px;
}
input.span7, textarea.span7, .uneditable-input.span7 {
width: 404px;
}
input.span6, textarea.span6, .uneditable-input.span6 {
width: 342px;
}
input.span5, textarea.span5, .uneditable-input.span5 {
width: 280px;
}
input.span4, textarea.span4, .uneditable-input.span4 {
width: 218px;
}
input.span3, textarea.span3, .uneditable-input.span3 {
width: 156px;
}
input.span2, textarea.span2, .uneditable-input.span2 {
width: 94px;
}
input.span1, textarea.span1, .uneditable-input.span1 {
width: 32px;
}
}
@media (max-width: 979px) {
body {
padding-top: 0;
}
.navbar-fixed-top {
position: static;
margin-bottom: 18px;
}
.navbar-fixed-top .navbar-inner {
padding: 5px;
}
.navbar .container {
width: auto;
padding: 0;
}
.navbar .brand {
padding-left: 10px;
padding-right: 10px;
margin: 0 0 0 -5px;
}
.navbar .nav-collapse {
clear: left;
}
.navbar .nav {
float: none;
margin: 0 0 9px;
}
.navbar .nav > li {
float: none;
}
.navbar .nav > li > a {
margin-bottom: 2px;
}
.navbar .nav > .divider-vertical {
display: none;
}
.navbar .nav .nav-header {
color: #999999;
text-shadow: none;
}
.navbar .nav > li > a,
.navbar .dropdown-menu a {
padding: 6px 15px;
font-weight: bold;
color: #999999;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
.navbar .dropdown-menu li + li a {
margin-bottom: 2px;
}
.navbar .nav > li > a:hover,
.navbar .dropdown-menu a:hover {
background-color: #222222;
}
.navbar .dropdown-menu {
position: static;
top: auto;
left: auto;
float: none;
display: block;
max-width: none;
margin: 0 15px;
padding: 0;
background-color: transparent;
border: none;
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
}
.navbar .dropdown-menu:before,
.navbar .dropdown-menu:after {
display: none;
}
.navbar .dropdown-menu .divider {
display: none;
}
.navbar-form,
.navbar-search {
float: none;
padding: 9px 15px;
margin: 9px 0;
border-top: 1px solid #222222;
border-bottom: 1px solid #222222;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
}
.navbar .nav.pull-right {
float: none;
margin-left: 0;
}
.navbar-static .navbar-inner {
padding-left: 10px;
padding-right: 10px;
}
.btn-navbar {
display: block;
}
.nav-collapse {
overflow: hidden;
height: 0;
}
}
@media (min-width: 980px) {
.nav-collapse.collapse {
height: auto !important;
overflow: visible !important;
}
}
@media (min-width: 1200px) {
.row {
margin-left: -30px;
*zoom: 1;
}
.row:before,
.row:after {
display: table;
content: "";
}
.row:after {
clear: both;
}
[class*="span"] {
float: left;
margin-left: 30px;
}
.container,
.navbar-fixed-top .container,
.navbar-fixed-bottom .container {
width: 1170px;
}
.span12 {
width: 1170px;
}
.span11 {
width: 1070px;
}
.span10 {
width: 970px;
}
.span9 {
width: 870px;
}
.span8 {
width: 770px;
}
.span7 {
width: 670px;
}
.span6 {
width: 570px;
}
.span5 {
width: 470px;
}
.span4 {
width: 370px;
}
.span3 {
width: 270px;
}
.span2 {
width: 170px;
}
.span1 {
width: 70px;
}
.offset12 {
margin-left: 1230px;
}
.offset11 {
margin-left: 1130px;
}
.offset10 {
margin-left: 1030px;
}
.offset9 {
margin-left: 930px;
}
.offset8 {
margin-left: 830px;
}
.offset7 {
margin-left: 730px;
}
.offset6 {
margin-left: 630px;
}
.offset5 {
margin-left: 530px;
}
.offset4 {
margin-left: 430px;
}
.offset3 {
margin-left: 330px;
}
.offset2 {
margin-left: 230px;
}
.offset1 {
margin-left: 130px;
}
.row-fluid {
width: 100%;
*zoom: 1;
}
.row-fluid:before,
.row-fluid:after {
display: table;
content: "";
}
.row-fluid:after {
clear: both;
}
.row-fluid > [class*="span"] {
float: left;
margin-left: 2.564102564%;
}
.row-fluid > [class*="span"]:first-child {
margin-left: 0;
}
.row-fluid > .span12 {
width: 100%;
}
.row-fluid > .span11 {
width: 91.45299145300001%;
}
.row-fluid > .span10 {
width: 82.905982906%;
}
.row-fluid > .span9 {
width: 74.358974359%;
}
.row-fluid > .span8 {
width: 65.81196581200001%;
}
.row-fluid > .span7 {
width: 57.264957265%;
}
.row-fluid > .span6 {
width: 48.717948718%;
}
.row-fluid > .span5 {
width: 40.170940171000005%;
}
.row-fluid > .span4 {
width: 31.623931624%;
}
.row-fluid > .span3 {
width: 23.076923077%;
}
.row-fluid > .span2 {
width: 14.529914530000001%;
}
.row-fluid > .span1 {
width: 5.982905983%;
}
input,
textarea,
.uneditable-input {
margin-left: 0;
}
input.span12, textarea.span12, .uneditable-input.span12 {
width: 1160px;
}
input.span11, textarea.span11, .uneditable-input.span11 {
width: 1060px;
}
input.span10, textarea.span10, .uneditable-input.span10 {
width: 960px;
}
input.span9, textarea.span9, .uneditable-input.span9 {
width: 860px;
}
input.span8, textarea.span8, .uneditable-input.span8 {
width: 760px;
}
input.span7, textarea.span7, .uneditable-input.span7 {
width: 660px;
}
input.span6, textarea.span6, .uneditable-input.span6 {
width: 560px;
}
input.span5, textarea.span5, .uneditable-input.span5 {
width: 460px;
}
input.span4, textarea.span4, .uneditable-input.span4 {
width: 360px;
}
input.span3, textarea.span3, .uneditable-input.span3 {
width: 260px;
}
input.span2, textarea.span2, .uneditable-input.span2 {
width: 160px;
}
input.span1, textarea.span1, .uneditable-input.span1 {
width: 60px;
}
.thumbnails {
margin-left: -30px;
}
.thumbnails > li {
margin-left: 30px;
}
}
+3990
Ver Arquivo
Diferenças do arquivo suprimidas por serem muito extensas Carregar Diff
+768 -162
Ver Arquivo
Diferenças do arquivo suprimidas por serem muito extensas Carregar Diff
Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 5.9 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 2.2 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 3.1 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 1.1 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 4.3 KiB

Depois

Largura:  |  Altura:  |  Tamanho: 3.0 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 128 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 82 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 50 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 18 KiB

Depois

Largura:  |  Altura:  |  Tamanho: 19 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 39 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 7.1 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 49 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 53 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 25 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 22 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 7.0 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 398 B

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 4.3 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 4.3 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 316 B

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 305 B

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 213 B

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 345 B

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 117 B

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 172 B

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 301 B

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 292 B

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 405 B

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 1.1 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 370 B

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 312 B

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 452 B

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 264 B

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 13 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 1.2 KiB

Arquivo binário não exibido.

Depois

Largura:  |  Altura:  |  Tamanho: 1.1 KiB

Arquivo binário não exibido.

Antes

Largura:  |  Altura:  |  Tamanho: 1.5 KiB

+106
Ver Arquivo
@@ -0,0 +1,106 @@
## 2.0 BOOTSTRAP JS PHILOSOPHY
These are the high-level design rules which guide the development of Bootstrap's plugin apis.
---
### DATA-ATTRIBUTE API
We believe you should be able to use all plugins provided by Bootstrap purely through the markup API without writing a single line of javascript.
We acknowledge that this isn't always the most performant and sometimes it may be desirable to turn this functionality off altogether. Therefore, as of 2.0 we provide the ability to disable the data attribute API by unbinding all events on the body namespaced with `'data-api'`. This looks like this:
$('body').off('.data-api')
To target a specific plugin, just include the plugins name as a namespace along with the data-api namespace like this:
$('body').off('.alert.data-api')
---
### PROGRAMATIC API
We also believe you should be able to use all plugins provided by Bootstrap purely through the JS API.
All public APIs should be single, chainable methods, and return the collection acted upon.
$(".btn.danger").button("toggle").addClass("fat")
All methods should accept an optional options object, a string which targets a particular method, or null which initiates the default behavior:
$("#myModal").modal() // initialized with defaults
$("#myModal").modal({ keyboard: false }) // initialized with now keyboard
$("#myModal").modal('show') // initializes and invokes show immediately afterqwe2
---
### OPTIONS
Options should be sparse and add universal value. We should pick the right defaults.
All plugins should have a default object which can be modified to effect all instance's default options. The defaults object should be available via `$.fn.plugin.defaults`.
$.fn.modal.defaults = { … }
An options definition should take the following form:
*noun*: *adjective* - describes or modifies a quality of an instance
examples:
backdrop: true
keyboard: false
placement: 'top'
---
### EVENTS
All events should have an infinitive and past participle form. The infinitive is fired just before an action takes place, the past participle on completion of the action.
show | shown
hide | hidden
---
### CONSTRUCTORS
Each plugin should expose it's raw constructor on a `Constructor` property -- accessed in the following way:
$.fn.popover.Constructor
---
### DATA ACCESSOR
Each plugin stores a copy of the invoked class on an object. This class instance can be accessed directly through jQuery's data API like this:
$('[rel=popover]').data('popover') instanceof $.fn.popover.Constructor
---
### DATA ATTRIBUTES
Data attributes should take the following form:
- data-{{verb}}={{plugin}} - defines main interaction
- data-target || href^=# - defined on "control" element (if element controls an element other than self)
- data-{{noun}} - defines class instance options
examples:
// control other targets
data-toggle="modal" data-target="#foo"
data-toggle="collapse" data-target="#foo" data-parent="#bar"
// defined on element they control
data-spy="scroll"
data-dismiss="modal"
data-dismiss="alert"
data-toggle="dropdown"
data-toggle="button"
data-toggle="buttons-checkbox"
data-toggle="buttons-radio"
+156 -106
Ver Arquivo
@@ -1,130 +1,180 @@
$(document).ready(function(){
// NOTICE!! DO NOT USE ANY OF THIS JAVASCRIPT
// IT'S ALL JUST JUNK FOR OUR DOCS!
// ++++++++++++++++++++++++++++++++++++++++++
// scroll spy logic
// ================
!function ($) {
var activeTarget,
$window = $(window),
position = {},
nav = $('body > .topbar li a'),
targets = nav.map(function () {
return $(this).attr('href');
}),
offsets = $.map(targets, function (id) {
return $(id).offset().top;
});
$(function(){
// Disable certain links in docs
$('section [href^=#]').click(function (e) {
e.preventDefault()
})
function setButton(id) {
nav.parent("li").removeClass('active');
$(nav[$.inArray(id, targets)]).parent("li").addClass('active');
}
// make code pretty
window.prettyPrint && prettyPrint()
function processScroll(e) {
var scrollTop = $window.scrollTop() + 10, i;
for (i = offsets.length; i--;) {
if (activeTarget != targets[i] && scrollTop >= offsets[i] && (!offsets[i + 1] || scrollTop <= offsets[i + 1])) {
activeTarget = targets[i];
setButton(activeTarget);
// add-ons
$('.add-on :checkbox').on('click', function () {
var $this = $(this)
, method = $this.attr('checked') ? 'addClass' : 'removeClass'
$(this).parents('.add-on')[method]('active')
})
// position static twipsies for components page
if ($(".twipsies a").length) {
$(window).on('load resize', function () {
$(".twipsies a").each(function () {
$(this)
.tooltip({
placement: $(this).attr('title')
, trigger: 'manual'
})
.tooltip('show')
})
})
}
// add tipsies to grid for scaffolding
if ($('#grid-system').length) {
$('#grid-system').tooltip({
selector: '.show-grid > div'
, title: function () { return $(this).width() + 'px' }
})
}
// fix sub nav on scroll
var $win = $(window)
, $nav = $('.subnav')
, navTop = $('.subnav').length && $('.subnav').offset().top - 40
, isFixed = 0
processScroll()
$win.on('scroll', processScroll)
function processScroll() {
var i, scrollTop = $win.scrollTop()
if (scrollTop >= navTop && !isFixed) {
isFixed = 1
$nav.addClass('subnav-fixed')
} else if (scrollTop <= navTop && isFixed) {
isFixed = 0
$nav.removeClass('subnav-fixed')
}
}
}
nav.click(function () {
processScroll();
});
// tooltip demo
$('.tooltip-demo.well').tooltip({
selector: "a[rel=tooltip]"
})
processScroll();
$('.tooltip-test').tooltip()
$('.popover-test').popover()
$window.scroll(processScroll);
// popover demo
$("a[rel=popover]")
.popover()
.click(function(e) {
e.preventDefault()
})
// button state demo
$('#fat-btn')
.click(function () {
var btn = $(this)
btn.button('loading')
setTimeout(function () {
btn.button('reset')
}, 3000)
})
// Dropdown example for topbar nav
// ===============================
// carousel demo
$('#myCarousel').carousel()
$("body").bind("click", function (e) {
$('a.menu').parent("li").removeClass("open");
});
// javascript build logic
var inputsComponent = $("#components.download input")
, inputsPlugin = $("#plugins.download input")
, inputsVariables = $("#variables.download input")
$("a.menu").click(function (e) {
var $li = $(this).parent("li").toggleClass('open');
return false;
});
// toggle all plugin checkboxes
$('#components.download .toggle-all').on('click', function (e) {
e.preventDefault()
inputsComponent.attr('checked', !inputsComponent.is(':checked'))
})
$('#plugins.download .toggle-all').on('click', function (e) {
e.preventDefault()
inputsPlugin.attr('checked', !inputsPlugin.is(':checked'))
})
// table sort example
// ==================
$('#variables.download .toggle-all').on('click', function (e) {
e.preventDefault()
inputsVariables.val('')
})
$("#sortTableExample").tablesorter( {sortList: [[1,0]]} );
// request built javascript
$('.download-btn').on('click', function () {
var css = $("#components.download input:checked")
.map(function () { return this.value })
.toArray()
, js = $("#plugins.download input:checked")
.map(function () { return this.value })
.toArray()
, vars = {}
, img = ['glyphicons-halflings.png', 'glyphicons-halflings-white.png']
// add on logic
// ============
$("#variables.download input")
.each(function () {
$(this).val() && (vars[ $(this).prev().text() ] = $(this).val())
})
$('.add-on :checkbox').click(function() {
if ($(this).attr('checked')) {
$(this).parents('.add-on').addClass('active');
} else {
$(this).parents('.add-on').removeClass('active');
}
});
// Disable certain links in docs
// =============================
$('ul.tabs a, ul.pills a, .pagination a, .well .btn, .actions .btn, .alert-message .btn, a.close').click(function(e) {
e.preventDefault();
});
// Copy code blocks in docs
$(".copy-code").focus(function() {
var el = this;
// push select to event loop for chrome :{o
setTimeout(function () { $(el).select(); }, 1);
});
// POSITION TWIPSIES
// =================
$('.twipsies.well a').each(function () {
var type = this.title
, $anchor = $(this)
, $twipsy = $('.twipsy.' + type)
, twipsy = {
width: $twipsy.width() + 10
, height: $twipsy.height() + 10
}
, anchor = {
position: $anchor.position()
, width: $anchor.width()
, height: $anchor.height()
}
, offset = {
above: {
top: anchor.position.top - twipsy.height
, left: anchor.position.left + (anchor.width/2) - (twipsy.width/2)
}
, below: {
top: anchor.position.top + anchor.height
, left: anchor.position.left + (anchor.width/2) - (twipsy.width/2)
}
, left: {
top: anchor.position.top + (anchor.height/2) - (twipsy.height/2)
, left: anchor.position.left - twipsy.width - 5
}
, right: {
top: anchor.position.top + (anchor.height/2) - (twipsy.height/2)
, left: anchor.position.left + anchor.width + 5
}
$.ajax({
type: 'POST'
, url: 'http://bootstrap.herokuapp.com'
, dataType: 'jsonpi'
, params: {
js: js
, css: css
, vars: vars
, img: img
}
})
})
$twipsy.css(offset[type])
})
});
// Modified from the original jsonpi https://github.com/benvinegar/jquery-jsonpi
$.ajaxTransport('jsonpi', function(opts, originalOptions, jqXHR) {
var url = opts.url;
});
return {
send: function(_, completeCallback) {
var name = 'jQuery_iframe_' + jQuery.now()
, iframe, form
iframe = $('<iframe>')
.attr('name', name)
.appendTo('head')
form = $('<form>')
.attr('method', opts.type) // GET or POST
.attr('action', url)
.attr('target', name)
$.each(opts.params, function(k, v) {
$('<input>')
.attr('type', 'hidden')
.attr('name', k)
.attr('value', typeof v == 'string' ? v : JSON.stringify(v))
.appendTo(form)
})
form.appendTo('body').submit()
}
}
})
}(window.jQuery)
+94
Ver Arquivo
@@ -0,0 +1,94 @@
/* ==========================================================
* bootstrap-alert.js v2.0.2
* http://twitter.github.com/bootstrap/javascript.html#alerts
* ==========================================================
* 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"
/* ALERT CLASS DEFINITION
* ====================== */
var dismiss = '[data-dismiss="alert"]'
, Alert = function ( el ) {
$(el).on('click', dismiss, this.close)
}
Alert.prototype = {
constructor: Alert
, close: function ( e ) {
var $this = $(this)
, selector = $this.attr('data-target')
, $parent
if (!selector) {
selector = $this.attr('href')
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
}
$parent = $(selector)
$parent.trigger('close')
e && e.preventDefault()
$parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
$parent
.trigger('close')
.removeClass('in')
function removeElement() {
$parent
.trigger('closed')
.remove()
}
$.support.transition && $parent.hasClass('fade') ?
$parent.on($.support.transition.end, removeElement) :
removeElement()
}
}
/* ALERT PLUGIN DEFINITION
* ======================= */
$.fn.alert = function ( option ) {
return this.each(function () {
var $this = $(this)
, data = $this.data('alert')
if (!data) $this.data('alert', (data = new Alert(this)))
if (typeof option == 'string') data[option].call($this)
})
}
$.fn.alert.Constructor = Alert
/* ALERT DATA-API
* ============== */
$(function () {
$('body').on('click.alert.data-api', dismiss, Alert.prototype.close)
})
}( window.jQuery );
+100
Ver Arquivo
@@ -0,0 +1,100 @@
/* ============================================================
* bootstrap-button.js v2.0.2
* http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================
* 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"
/* BUTTON PUBLIC CLASS DEFINITION
* ============================== */
var Button = function ( element, options ) {
this.$element = $(element)
this.options = $.extend({}, $.fn.button.defaults, options)
}
Button.prototype = {
constructor: Button
, setState: function ( state ) {
var d = 'disabled'
, $el = this.$element
, data = $el.data()
, val = $el.is('input') ? 'val' : 'html'
state = state + 'Text'
data.resetText || $el.data('resetText', $el[val]())
$el[val](data[state] || this.options[state])
// push to event loop to allow forms to submit
setTimeout(function () {
state == 'loadingText' ?
$el.addClass(d).attr(d, d) :
$el.removeClass(d).removeAttr(d)
}, 0)
}
, toggle: function () {
var $parent = this.$element.parent('[data-toggle="buttons-radio"]')
$parent && $parent
.find('.active')
.removeClass('active')
this.$element.toggleClass('active')
}
}
/* BUTTON PLUGIN DEFINITION
* ======================== */
$.fn.button = function ( option ) {
return this.each(function () {
var $this = $(this)
, data = $this.data('button')
, options = typeof option == 'object' && option
if (!data) $this.data('button', (data = new Button(this, options)))
if (option == 'toggle') data.toggle()
else if (option) data.setState(option)
})
}
$.fn.button.defaults = {
loadingText: 'loading...'
}
$.fn.button.Constructor = Button
/* 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')
})
})
}( window.jQuery );
+161
Ver Arquivo
@@ -0,0 +1,161 @@
/* ==========================================================
* bootstrap-carousel.js v2.0.2
* http://twitter.github.com/bootstrap/javascript.html#carousel
* ==========================================================
* 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"
/* CAROUSEL CLASS DEFINITION
* ========================= */
var Carousel = function (element, options) {
this.$element = $(element)
this.options = $.extend({}, $.fn.carousel.defaults, options)
this.options.slide && this.slide(this.options.slide)
this.options.pause == 'hover' && this.$element
.on('mouseenter', $.proxy(this.pause, this))
.on('mouseleave', $.proxy(this.cycle, this))
}
Carousel.prototype = {
cycle: function () {
this.interval = setInterval($.proxy(this.next, this), this.options.interval)
return this
}
, to: function (pos) {
var $active = this.$element.find('.active')
, children = $active.parent().children()
, activePos = children.index($active)
, that = this
if (pos > (children.length - 1) || pos < 0) return
if (this.sliding) {
return this.$element.one('slid', function () {
that.to(pos)
})
}
if (activePos == pos) {
return this.pause().cycle()
}
return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos]))
}
, pause: function () {
clearInterval(this.interval)
this.interval = null
return this
}
, next: function () {
if (this.sliding) return
return this.slide('next')
}
, prev: function () {
if (this.sliding) return
return this.slide('prev')
}
, slide: function (type, next) {
var $active = this.$element.find('.active')
, $next = next || $active[type]()
, isCycling = this.interval
, direction = type == 'next' ? 'left' : 'right'
, fallback = type == 'next' ? 'first' : 'last'
, that = this
this.sliding = true
isCycling && this.pause()
$next = $next.length ? $next : this.$element.find('.item')[fallback]()
if ($next.hasClass('active')) return
if (!$.support.transition && this.$element.hasClass('slide')) {
this.$element.trigger('slide')
$active.removeClass('active')
$next.addClass('active')
this.sliding = false
this.$element.trigger('slid')
} else {
$next.addClass(type)
$next[0].offsetWidth // force reflow
$active.addClass(direction)
$next.addClass(direction)
this.$element.trigger('slide')
this.$element.one($.support.transition.end, function () {
$next.removeClass([type, direction].join(' ')).addClass('active')
$active.removeClass(['active', direction].join(' '))
that.sliding = false
setTimeout(function () { that.$element.trigger('slid') }, 0)
})
}
isCycling && this.cycle()
return this
}
}
/* CAROUSEL PLUGIN DEFINITION
* ========================== */
$.fn.carousel = function ( option ) {
return this.each(function () {
var $this = $(this)
, data = $this.data('carousel')
, options = typeof option == 'object' && option
if (!data) $this.data('carousel', (data = new Carousel(this, options)))
if (typeof option == 'number') data.to(option)
else if (typeof option == 'string' || (option = options.slide)) data[option]()
else data.cycle()
})
}
$.fn.carousel.defaults = {
interval: 5000
, pause: 'hover'
}
$.fn.carousel.Constructor = Carousel
/* 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()
})
})
}( window.jQuery );
+138
Ver Arquivo
@@ -0,0 +1,138 @@
/* =============================================================
* bootstrap-collapse.js v2.0.2
* http://twitter.github.com/bootstrap/javascript.html#collapse
* =============================================================
* 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"
var Collapse = function ( element, options ) {
this.$element = $(element)
this.options = $.extend({}, $.fn.collapse.defaults, options)
if (this.options["parent"]) {
this.$parent = $(this.options["parent"])
}
this.options.toggle && this.toggle()
}
Collapse.prototype = {
constructor: Collapse
, dimension: function () {
var hasWidth = this.$element.hasClass('width')
return hasWidth ? 'width' : 'height'
}
, show: function () {
var dimension = this.dimension()
, scroll = $.camelCase(['scroll', dimension].join('-'))
, actives = this.$parent && this.$parent.find('.in')
, hasData
if (actives && actives.length) {
hasData = actives.data('collapse')
actives.collapse('hide')
hasData || actives.data('collapse', null)
}
this.$element[dimension](0)
this.transition('addClass', 'show', 'shown')
this.$element[dimension](this.$element[0][scroll])
}
, hide: function () {
var dimension = this.dimension()
this.reset(this.$element[dimension]())
this.transition('removeClass', 'hide', 'hidden')
this.$element[dimension](0)
}
, reset: function ( size ) {
var dimension = this.dimension()
this.$element
.removeClass('collapse')
[dimension](size || 'auto')
[0].offsetWidth
this.$element[size ? 'addClass' : 'removeClass']('collapse')
return this
}
, transition: function ( method, startEvent, completeEvent ) {
var that = this
, complete = function () {
if (startEvent == 'show') that.reset()
that.$element.trigger(completeEvent)
}
this.$element
.trigger(startEvent)
[method]('in')
$.support.transition && this.$element.hasClass('collapse') ?
this.$element.one($.support.transition.end, complete) :
complete()
}
, toggle: function () {
this[this.$element.hasClass('in') ? 'hide' : 'show']()
}
}
/* COLLAPSIBLE PLUGIN DEFINITION
* ============================== */
$.fn.collapse = function ( option ) {
return this.each(function () {
var $this = $(this)
, data = $this.data('collapse')
, options = typeof option == 'object' && option
if (!data) $this.data('collapse', (data = new Collapse(this, options)))
if (typeof option == 'string') data[option]()
})
}
$.fn.collapse.defaults = {
toggle: true
}
$.fn.collapse.Constructor = Collapse
/* COLLAPSIBLE DATA-API
* ==================== */
$(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)
})
})
}( window.jQuery );
+92
Ver Arquivo
@@ -0,0 +1,92 @@
/* ============================================================
* bootstrap-dropdown.js v2.0.2
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
* ============================================================
* 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"
/* DROPDOWN CLASS DEFINITION
* ========================= */
var toggle = '[data-toggle="dropdown"]'
, Dropdown = function ( element ) {
var $el = $(element).on('click.dropdown.data-api', this.toggle)
$('html').on('click.dropdown.data-api', function () {
$el.parent().removeClass('open')
})
}
Dropdown.prototype = {
constructor: Dropdown
, toggle: function ( e ) {
var $this = $(this)
, selector = $this.attr('data-target')
, $parent
, isActive
if (!selector) {
selector = $this.attr('href')
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
}
$parent = $(selector)
$parent.length || ($parent = $this.parent())
isActive = $parent.hasClass('open')
clearMenus()
!isActive && $parent.toggleClass('open')
return false
}
}
function clearMenus() {
$(toggle).parent().removeClass('open')
}
/* DROPDOWN PLUGIN DEFINITION
* ========================== */
$.fn.dropdown = function ( option ) {
return this.each(function () {
var $this = $(this)
, data = $this.data('dropdown')
if (!data) $this.data('dropdown', (data = new Dropdown(this)))
if (typeof option == 'string') data[option].call($this)
})
}
$.fn.dropdown.Constructor = Dropdown
/* APPLY TO STANDARD DROPDOWN ELEMENTS
* =================================== */
$(function () {
$('html').on('click.dropdown.data-api', clearMenus)
$('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
})
}( window.jQuery );
+210
Ver Arquivo
@@ -0,0 +1,210 @@
/* =========================================================
* bootstrap-modal.js v2.0.2
* http://twitter.github.com/bootstrap/javascript.html#modals
* =========================================================
* 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"
/* MODAL CLASS DEFINITION
* ====================== */
var Modal = function ( content, options ) {
this.options = options
this.$element = $(content)
.delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
}
Modal.prototype = {
constructor: Modal
, toggle: function () {
return this[!this.isShown ? 'show' : 'hide']()
}
, show: function () {
var that = this
if (this.isShown) return
$('body').addClass('modal-open')
this.isShown = true
this.$element.trigger('show')
escape.call(this)
backdrop.call(this, function () {
var transition = $.support.transition && that.$element.hasClass('fade')
!that.$element.parent().length && that.$element.appendTo(document.body) //don't move modals dom position
that.$element
.show()
if (transition) {
that.$element[0].offsetWidth // force reflow
}
that.$element.addClass('in')
transition ?
that.$element.one($.support.transition.end, function () { that.$element.trigger('shown') }) :
that.$element.trigger('shown')
})
}
, hide: function ( e ) {
e && e.preventDefault()
if (!this.isShown) return
var that = this
this.isShown = false
$('body').removeClass('modal-open')
escape.call(this)
this.$element
.trigger('hide')
.removeClass('in')
$.support.transition && this.$element.hasClass('fade') ?
hideWithTransition.call(this) :
hideModal.call(this)
}
}
/* 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))
}
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(removeBackdrop, this)) :
removeBackdrop.call(this)
} else if (callback) {
callback()
}
}
function removeBackdrop() {
this.$backdrop.remove()
this.$backdrop = null
}
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')
}
}
/* MODAL PLUGIN DEFINITION
* ======================= */
$.fn.modal = function ( option ) {
return this.each(function () {
var $this = $(this)
, data = $this.data('modal')
, options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option)
if (!data) $this.data('modal', (data = new Modal(this, options)))
if (typeof option == 'string') data[option]()
else if (options.show) data.show()
})
}
$.fn.modal.defaults = {
backdrop: true
, keyboard: true
, show: true
}
$.fn.modal.Constructor = Modal
/* 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())
e.preventDefault()
$target.modal(option)
})
})
}( window.jQuery );
+95
Ver Arquivo
@@ -0,0 +1,95 @@
/* ===========================================================
* bootstrap-popover.js v2.0.2
* http://twitter.github.com/bootstrap/javascript.html#popovers
* ===========================================================
* 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"
var Popover = function ( element, options ) {
this.init('popover', element, options)
}
/* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js
========================================== */
Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, {
constructor: Popover
, setContent: function () {
var $tip = this.tip()
, title = this.getTitle()
, content = this.getContent()
$tip.find('.popover-title')[ $.type(title) == 'object' ? 'append' : 'html' ](title)
$tip.find('.popover-content > *')[ $.type(content) == 'object' ? 'append' : 'html' ](content)
$tip.removeClass('fade top bottom left right in')
}
, hasContent: function () {
return this.getTitle() || this.getContent()
}
, getContent: function () {
var content
, $e = this.$element
, o = this.options
content = $e.attr('data-content')
|| (typeof o.content == 'function' ? o.content.call($e[0]) : o.content)
content = content.toString().replace(/(^\s*|\s*$)/, "")
return content
}
, tip: function() {
if (!this.$tip) {
this.$tip = $(this.options.template)
}
return this.$tip
}
})
/* POPOVER PLUGIN DEFINITION
* ======================= */
$.fn.popover = function ( option ) {
return this.each(function () {
var $this = $(this)
, data = $this.data('popover')
, options = typeof option == 'object' && option
if (!data) $this.data('popover', (data = new Popover(this, options)))
if (typeof option == 'string') data[option]()
})
}
$.fn.popover.Constructor = Popover
$.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, {
placement: 'right'
, 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>'
})
}( window.jQuery );
+125
Ver Arquivo
@@ -0,0 +1,125 @@
/* =============================================================
* bootstrap-scrollspy.js v2.0.2
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
* =============================================================
* 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"
/* SCROLLSPY CLASS DEFINITION
* ========================== */
function ScrollSpy( element, options) {
var process = $.proxy(this.process, this)
, $element = $(element).is('body') ? $(window) : $(element)
, href
this.options = $.extend({}, $.fn.scrollspy.defaults, options)
this.$scrollElement = $element.on('scroll.scroll.data-api', process)
this.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.refresh()
this.process()
}
ScrollSpy.prototype = {
constructor: ScrollSpy
, refresh: function () {
this.targets = this.$body
.find(this.selector)
.map(function () {
var href = $(this).attr('href')
return /^#\w/.test(href) && $(href).length ? href : null
})
this.offsets = $.map(this.targets, function (id) {
return $(id).position().top
})
}
, process: function () {
var scrollTop = this.$scrollElement.scrollTop() + this.options.offset
, offsets = this.offsets
, targets = this.targets
, activeTarget = this.activeTarget
, i
for (i = offsets.length; i--;) {
activeTarget != targets[i]
&& scrollTop >= offsets[i]
&& (!offsets[i + 1] || scrollTop <= offsets[i + 1])
&& this.activate( targets[i] )
}
}
, activate: function (target) {
var active
this.activeTarget = target
this.$body
.find(this.selector).parent('.active')
.removeClass('active')
active = this.$body
.find(this.selector + '[href="' + target + '"]')
.parent('li')
.addClass('active')
if ( active.parent('.dropdown-menu') ) {
active.closest('li.dropdown').addClass('active')
}
}
}
/* SCROLLSPY PLUGIN DEFINITION
* =========================== */
$.fn.scrollspy = function ( option ) {
return this.each(function () {
var $this = $(this)
, data = $this.data('scrollspy')
, options = typeof option == 'object' && option
if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options)))
if (typeof option == 'string') data[option]()
})
}
$.fn.scrollspy.Constructor = ScrollSpy
$.fn.scrollspy.defaults = {
offset: 10
}
/* SCROLLSPY DATA-API
* ================== */
$(function () {
$('[data-spy="scroll"]').each(function () {
var $spy = $(this)
$spy.scrollspy($spy.data())
})
})
}( window.jQuery );
+130
Ver Arquivo
@@ -0,0 +1,130 @@
/* ========================================================
* bootstrap-tab.js v2.0.2
* http://twitter.github.com/bootstrap/javascript.html#tabs
* ========================================================
* 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"
/* TAB CLASS DEFINITION
* ==================== */
var Tab = function ( element ) {
this.element = $(element)
}
Tab.prototype = {
constructor: Tab
, show: function () {
var $this = this.element
, $ul = $this.closest('ul:not(.dropdown-menu)')
, selector = $this.attr('data-target')
, previous
, $target
if (!selector) {
selector = $this.attr('href')
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
}
if ( $this.parent('li').hasClass('active') ) return
previous = $ul.find('.active a').last()[0]
$this.trigger({
type: 'show'
, relatedTarget: previous
})
$target = $(selector)
this.activate($this.parent('li'), $ul)
this.activate($target, $target.parent(), function () {
$this.trigger({
type: 'shown'
, relatedTarget: previous
})
})
}
, activate: function ( element, container, callback) {
var $active = container.find('> .active')
, transition = callback
&& $.support.transition
&& $active.hasClass('fade')
function next() {
$active
.removeClass('active')
.find('> .dropdown-menu > .active')
.removeClass('active')
element.addClass('active')
if (transition) {
element[0].offsetWidth // reflow for transition
element.addClass('in')
} else {
element.removeClass('fade')
}
if ( element.parent('.dropdown-menu') ) {
element.closest('li.dropdown').addClass('active')
}
callback && callback()
}
transition ?
$active.one($.support.transition.end, next) :
next()
$active.removeClass('in')
}
}
/* TAB PLUGIN DEFINITION
* ===================== */
$.fn.tab = function ( option ) {
return this.each(function () {
var $this = $(this)
, data = $this.data('tab')
if (!data) $this.data('tab', (data = new Tab(this)))
if (typeof option == 'string') data[option]()
})
}
$.fn.tab.Constructor = Tab
/* TAB DATA-API
* ============ */
$(function () {
$('body').on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
e.preventDefault()
$(this).tab('show')
})
})
}( window.jQuery );
+270
Ver Arquivo
@@ -0,0 +1,270 @@
/* ===========================================================
* bootstrap-tooltip.js v2.0.2
* http://twitter.github.com/bootstrap/javascript.html#tooltips
* Inspired by the original jQuery.tipsy by Jason Frame
* ===========================================================
* 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"
/* TOOLTIP PUBLIC CLASS DEFINITION
* =============================== */
var Tooltip = function ( element, options ) {
this.init('tooltip', element, options)
}
Tooltip.prototype = {
constructor: Tooltip
, init: function ( type, element, options ) {
var eventIn
, eventOut
this.type = type
this.$element = $(element)
this.options = this.getOptions(options)
this.enabled = true
if (this.options.trigger != 'manual') {
eventIn = this.options.trigger == 'hover' ? 'mouseenter' : 'focus'
eventOut = this.options.trigger == 'hover' ? 'mouseleave' : 'blur'
this.$element.on(eventIn, this.options.selector, $.proxy(this.enter, this))
this.$element.on(eventOut, this.options.selector, $.proxy(this.leave, this))
}
this.options.selector ?
(this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
this.fixTitle()
}
, getOptions: function ( options ) {
options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data())
if (options.delay && typeof options.delay == 'number') {
options.delay = {
show: options.delay
, hide: options.delay
}
}
return options
}
, enter: function ( e ) {
var self = $(e.currentTarget)[this.type](this._options).data(this.type)
if (!self.options.delay || !self.options.delay.show) {
self.show()
} else {
self.hoverState = 'in'
setTimeout(function() {
if (self.hoverState == 'in') {
self.show()
}
}, self.options.delay.show)
}
}
, leave: function ( e ) {
var self = $(e.currentTarget)[this.type](this._options).data(this.type)
if (!self.options.delay || !self.options.delay.hide) {
self.hide()
} else {
self.hoverState = 'out'
setTimeout(function() {
if (self.hoverState == 'out') {
self.hide()
}
}, self.options.delay.hide)
}
}
, show: function () {
var $tip
, inside
, pos
, actualWidth
, actualHeight
, placement
, tp
if (this.hasContent() && this.enabled) {
$tip = this.tip()
this.setContent()
if (this.options.animation) {
$tip.addClass('fade')
}
placement = typeof this.options.placement == 'function' ?
this.options.placement.call(this, $tip[0], this.$element[0]) :
this.options.placement
inside = /in/.test(placement)
$tip
.remove()
.css({ top: 0, left: 0, display: 'block' })
.appendTo(inside ? this.$element : document.body)
pos = this.getPosition(inside)
actualWidth = $tip[0].offsetWidth
actualHeight = $tip[0].offsetHeight
switch (inside ? placement.split(' ')[1] : placement) {
case 'bottom':
tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2}
break
case 'top':
tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2}
break
case 'left':
tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth}
break
case 'right':
tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width}
break
}
$tip
.css(tp)
.addClass(placement)
.addClass('in')
}
}
, setContent: function () {
var $tip = this.tip()
$tip.find('.tooltip-inner').html(this.getTitle())
$tip.removeClass('fade in top bottom left right')
}
, hide: function () {
var that = this
, $tip = this.tip()
$tip.removeClass('in')
function removeWithAnimation() {
var timeout = setTimeout(function () {
$tip.off($.support.transition.end).remove()
}, 500)
$tip.one($.support.transition.end, function () {
clearTimeout(timeout)
$tip.remove()
})
}
$.support.transition && this.$tip.hasClass('fade') ?
removeWithAnimation() :
$tip.remove()
}
, fixTitle: function () {
var $e = this.$element
if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') {
$e.attr('data-original-title', $e.attr('title') || '').removeAttr('title')
}
}
, hasContent: function () {
return this.getTitle()
}
, getPosition: function (inside) {
return $.extend({}, (inside ? {top: 0, left: 0} : this.$element.offset()), {
width: this.$element[0].offsetWidth
, height: this.$element[0].offsetHeight
})
}
, getTitle: function () {
var title
, $e = this.$element
, o = this.options
title = $e.attr('data-original-title')
|| (typeof o.title == 'function' ? o.title.call($e[0]) : o.title)
title = (title || '').toString().replace(/(^\s*|\s*$)/, "")
return title
}
, tip: function () {
return this.$tip = this.$tip || $(this.options.template)
}
, validate: function () {
if (!this.$element[0].parentNode) {
this.hide()
this.$element = null
this.options = null
}
}
, enable: function () {
this.enabled = true
}
, disable: function () {
this.enabled = false
}
, toggleEnabled: function () {
this.enabled = !this.enabled
}
, toggle: function () {
this[this.tip().hasClass('in') ? 'hide' : 'show']()
}
}
/* TOOLTIP PLUGIN DEFINITION
* ========================= */
$.fn.tooltip = function ( option ) {
return this.each(function () {
var $this = $(this)
, data = $this.data('tooltip')
, options = typeof option == 'object' && option
if (!data) $this.data('tooltip', (data = new Tooltip(this, options)))
if (typeof option == 'string') data[option]()
})
}
$.fn.tooltip.Constructor = Tooltip
$.fn.tooltip.defaults = {
animation: true
, delay: 0
, selector: false
, placement: 'top'
, trigger: 'hover'
, title: ''
, template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
}
}( window.jQuery );
+51
Ver Arquivo
@@ -0,0 +1,51 @@
/* ===================================================
* bootstrap-transition.js v2.0.2
* http://twitter.github.com/bootstrap/javascript.html#transitions
* ===================================================
* 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( $ ) {
$(function () {
"use strict"
/* CSS TRANSITION SUPPORT (https://gist.github.com/373874)
* ======================================================= */
$.support.transition = (function () {
var thisBody = document.body || document.documentElement
, thisStyle = thisBody.style
, support = thisStyle.transition !== undefined || thisStyle.WebkitTransition !== undefined || thisStyle.MozTransition !== undefined || thisStyle.MsTransition !== undefined || thisStyle.OTransition !== undefined
return support && {
end: (function () {
var transitionEnd = "TransitionEnd"
if ( $.browser.webkit ) {
transitionEnd = "webkitTransitionEnd"
} else if ( $.browser.mozilla ) {
transitionEnd = "transitionend"
} else if ( $.browser.opera ) {
transitionEnd = "oTransitionEnd"
}
return transitionEnd
}())
}
})()
})
}( window.jQuery );
+271
Ver Arquivo
@@ -0,0 +1,271 @@
/* =============================================================
* bootstrap-typeahead.js v2.0.2
* http://twitter.github.com/bootstrap/javascript.html#typeahead
* =============================================================
* 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"
var Typeahead = function ( element, options ) {
this.$element = $(element)
this.options = $.extend({}, $.fn.typeahead.defaults, options)
this.matcher = this.options.matcher || this.matcher
this.sorter = this.options.sorter || this.sorter
this.highlighter = this.options.highlighter || this.highlighter
this.$menu = $(this.options.menu).appendTo('body')
this.source = this.options.source
this.shown = false
this.listen()
}
Typeahead.prototype = {
constructor: Typeahead
, select: function () {
var val = this.$menu.find('.active').attr('data-value')
this.$element.val(val)
this.$element.change();
return this.hide()
}
, show: function () {
var pos = $.extend({}, this.$element.offset(), {
height: this.$element[0].offsetHeight
})
this.$menu.css({
top: pos.top + pos.height
, left: pos.left
})
this.$menu.show()
this.shown = true
return this
}
, hide: function () {
this.$menu.hide()
this.shown = false
return this
}
, lookup: function (event) {
var that = this
, items
, q
this.query = this.$element.val()
if (!this.query) {
return this.shown ? this.hide() : this
}
items = $.grep(this.source, function (item) {
if (that.matcher(item)) return item
})
items = this.sorter(items)
if (!items.length) {
return this.shown ? this.hide() : this
}
return this.render(items.slice(0, this.options.items)).show()
}
, matcher: function (item) {
return ~item.toLowerCase().indexOf(this.query.toLowerCase())
}
, sorter: function (items) {
var beginswith = []
, caseSensitive = []
, caseInsensitive = []
, item
while (item = items.shift()) {
if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item)
else if (~item.indexOf(this.query)) caseSensitive.push(item)
else caseInsensitive.push(item)
}
return beginswith.concat(caseSensitive, caseInsensitive)
}
, highlighter: function (item) {
return item.replace(new RegExp('(' + this.query + ')', 'ig'), function ($1, match) {
return '<strong>' + match + '</strong>'
})
}
, render: function (items) {
var that = this
items = $(items).map(function (i, item) {
i = $(that.options.item).attr('data-value', item)
i.find('a').html(that.highlighter(item))
return i[0]
})
items.first().addClass('active')
this.$menu.html(items)
return this
}
, next: function (event) {
var active = this.$menu.find('.active').removeClass('active')
, next = active.next()
if (!next.length) {
next = $(this.$menu.find('li')[0])
}
next.addClass('active')
}
, prev: function (event) {
var active = this.$menu.find('.active').removeClass('active')
, prev = active.prev()
if (!prev.length) {
prev = this.$menu.find('li').last()
}
prev.addClass('active')
}
, listen: function () {
this.$element
.on('blur', $.proxy(this.blur, this))
.on('keypress', $.proxy(this.keypress, this))
.on('keyup', $.proxy(this.keyup, this))
if ($.browser.webkit || $.browser.msie) {
this.$element.on('keydown', $.proxy(this.keypress, this))
}
this.$menu
.on('click', $.proxy(this.click, this))
.on('mouseenter', 'li', $.proxy(this.mouseenter, this))
}
, keyup: function (e) {
switch(e.keyCode) {
case 40: // down arrow
case 38: // up arrow
break
case 9: // tab
case 13: // enter
if (!this.shown) return
this.select()
break
case 27: // escape
if (!this.shown) return
this.hide()
break
default:
this.lookup()
}
e.stopPropagation()
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
e.preventDefault()
this.prev()
break
case 40: // down arrow
e.preventDefault()
this.next()
break
}
e.stopPropagation()
}
, blur: function (e) {
var that = this
setTimeout(function () { that.hide() }, 150)
}
, click: function (e) {
e.stopPropagation()
e.preventDefault()
this.select()
}
, mouseenter: function (e) {
this.$menu.find('.active').removeClass('active')
$(e.currentTarget).addClass('active')
}
}
/* TYPEAHEAD PLUGIN DEFINITION
* =========================== */
$.fn.typeahead = function ( option ) {
return this.each(function () {
var $this = $(this)
, data = $this.data('typeahead')
, options = typeof option == 'object' && option
if (!data) $this.data('typeahead', (data = new Typeahead(this, options)))
if (typeof option == 'string') data[option]()
})
}
$.fn.typeahead.defaults = {
source: []
, items: 8
, menu: '<ul class="typeahead dropdown-menu"></ul>'
, item: '<li><a href="#"></a></li>'
}
$.fn.typeahead.Constructor = Typeahead
/* 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())
})
})
}( window.jQuery );
+23 -34
Ver Arquivo
@@ -2,40 +2,29 @@
.lit { color: #195f91; }
.pun, .opn, .clo { color: #93a1a1; }
.fun { color: #dc322f; }
.str, .atv { color: #268bd2; }
.kwd, .tag { color: #195f91; }
.typ, .atn, .dec, .var { color: #CB4B16; }
.pln { color: #93a1a1; }
pre.prettyprint {
background: #fefbf3;
padding: 9px;
border: 1px solid rgba(0,0,0,.2);
-webkit-box-shadow: 0 1px 2px rgba(0,0,0,.1);
-moz-box-shadow: 0 1px 2px rgba(0,0,0,.1);
box-shadow: 0 1px 2px rgba(0,0,0,.1);
.str, .atv { color: #D14; }
.kwd, .linenums .tag { color: #1e347b; }
.typ, .atn, .dec, .var { color: teal; }
.pln { color: #48484c; }
.prettyprint {
padding: 8px;
background-color: #f7f7f9;
border: 1px solid #e1e1e8;
}
.prettyprint.linenums {
-webkit-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
-moz-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
}
/* Specify class=linenums on a pre to get line numbering */
ol.linenums { margin: 0 0 0 40px; } /* IE indents via margin-left */
ol.linenums li { color: rgba(0,0,0,.15); line-height: 20px; }
/* Alternate shading for lines */
li.L1, li.L3, li.L5, li.L7, li.L9 { }
/*
$base03: #002b36;
$base02: #073642;
$base01: #586e75;
$base00: #657b83;
$base0: #839496;
$base1: #93a1a1;
$base2: #eee8d5;
$base3: #fdf6e3;
$yellow: #b58900;
$orange: #cb4b16;
$red: #dc322f;
$magenta: #d33682;
$violet: #6c71c4;
$blue: #268bd2;
$cyan: #2aa198;
$green: #859900;
*/
ol.linenums {
margin: 0 0 0 33px; /* IE indents via margin-left */
}
ol.linenums li {
padding-left: 12px;
color: #bebec5;
line-height: 18px;
text-shadow: 0 1px 0 #fff;
}
+9252
Ver Arquivo
Diferenças do arquivo suprimidas por serem muito extensas Carregar Diff
-104
Ver Arquivo
@@ -1,104 +0,0 @@
(function($) {
$.fn.tipsy = function(options) {
options = $.extend({}, $.fn.tipsy.defaults, options);
return this.each(function() {
var opts = $.fn.tipsy.elementOptions(this, options);
$(this).hover(function() {
$.data(this, 'cancel.tipsy', true);
var tip = $.data(this, 'active.tipsy');
if (!tip) {
tip = $('<div class="tipsy"><div class="tipsy-inner"/></div>');
tip.css({position: 'absolute', zIndex: 100000});
$.data(this, 'active.tipsy', tip);
}
if ($(this).attr('title') || typeof($(this).attr('original-title')) != 'string') {
$(this).attr('original-title', $(this).attr('title') || '').removeAttr('title');
}
var title;
if (typeof opts.title == 'string') {
title = $(this).attr(opts.title == 'title' ? 'original-title' : opts.title);
} else if (typeof opts.title == 'function') {
title = opts.title.call(this);
}
tip.find('.tipsy-inner')[opts.html ? 'html' : 'text'](title || opts.fallback);
var pos = $.extend({}, $(this).offset(), {width: this.offsetWidth, height: this.offsetHeight});
tip.get(0).className = 'tipsy'; // reset classname in case of dynamic gravity
tip.remove().css({top: 0, left: 0, visibility: 'hidden', display: 'block'}).appendTo(document.body);
var actualWidth = tip[0].offsetWidth, actualHeight = tip[0].offsetHeight;
var gravity = (typeof opts.gravity == 'function') ? opts.gravity.call(this) : opts.gravity;
switch (gravity.charAt(0)) {
case 'n':
tip.css({top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2}).addClass('tipsy-north');
break;
case 's':
tip.css({top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2}).addClass('tipsy-south');
break;
case 'e':
tip.css({top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth}).addClass('tipsy-east');
break;
case 'w':
tip.css({top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width}).addClass('tipsy-west');
break;
}
if (opts.fade) {
tip.css({opacity: 0, display: 'block', visibility: 'visible'}).animate({opacity: 0.8});
} else {
tip.css({visibility: 'visible'});
}
}, function() {
$.data(this, 'cancel.tipsy', false);
var self = this;
setTimeout(function() {
if ($.data(this, 'cancel.tipsy')) return;
var tip = $.data(self, 'active.tipsy');
if (opts.fade) {
tip.stop().fadeOut(function() { $(this).remove(); });
} else {
tip.remove();
}
}, 100);
});
});
};
// Overwrite this method to provide options on a per-element basis.
// For example, you could store the gravity in a 'tipsy-gravity' attribute:
// return $.extend({}, options, {gravity: $(ele).attr('tipsy-gravity') || 'n' });
// (remember - do not modify 'options' in place!)
$.fn.tipsy.elementOptions = function(ele, options) {
return $.metadata ? $.extend({}, options, $(ele).metadata()) : options;
};
$.fn.tipsy.defaults = {
fade: false,
fallback: '',
gravity: 'n',
html: false,
title: 'title'
};
$.fn.tipsy.autoNS = function() {
return $(this).offset().top > ($(document).scrollTop() + $(window).height() / 2) ? 's' : 'n';
};
$.fn.tipsy.autoWE = function() {
return $(this).offset().left > ($(document).scrollLeft() + $(window).width() / 2) ? 'e' : 'w';
};
})(jQuery);
+1688
Ver Arquivo
Diferenças do arquivo suprimidas por serem muito extensas Carregar Diff
+44
Ver Arquivo
@@ -0,0 +1,44 @@
#!/usr/bin/env node
var hogan = require('hogan.js')
, fs = require('fs')
, prod = process.argv[2] == 'production'
, title = 'Twitter Bootstrap'
var layout, pages
// compile layout template
layout = fs.readFileSync(__dirname + '/../templates/layout.mustache', 'utf-8')
layout = hogan.compile(layout, { sectionTags: [{o:'_i', c:'i'}] })
// retrieve pages
pages = fs.readdirSync(__dirname + '/../templates/pages')
// iterate over pages
pages.forEach(function (name) {
if (!name.match(/\.mustache$/)) return
var page = fs.readFileSync(__dirname + '/../templates/pages/' + name, 'utf-8')
, context = {}
context[name.replace(/\.mustache$/, '')] = 'active'
context._i = true
context.production = prod
context.title = name
.replace(/\.mustache/, '')
.replace(/\-.*/, '')
.replace(/(.)/, function ($1) { return $1.toUpperCase() })
if (context.title == 'Index') {
context.title = title
} else {
context.title += ' · ' + title
}
page = hogan.compile(page, { sectionTags: [{o:'_i', c:'i'}] })
page = layout.render(context, {
body: page
})
fs.writeFileSync(__dirname + '/../' + name.replace(/mustache$/, 'html'), page, 'utf-8')
})
gerado externo Arquivo executável
+93
Ver Arquivo
@@ -0,0 +1,93 @@
#!/usr/bin/env node
/*
* Copyright 2011 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.
*/
var hogan = require('../lib/hogan.js'),
path = require('path'),
fs = require('fs');
var specials = ['/', '.', '*', '+', '?', '|','(', ')', '[', ']', '{', '}', '\\'],
specialsRegExp = new RegExp('(\\' + specials.join('|\\') + ')', 'g'),
templates;
// Escape special regexp characters
function esc(text) {
return text.replace(specialsRegExp, '\\$1');
}
// Check for dirs and correct ext (<3 for windows)
function extractFiles(args) {
var usage = 'USAGE: hulk ./templates/*.mustaches\n' +
'NOTE: hulk supports the "*" wildcard and allows you to target specific extensions too',
files = [];
if (!args.length) {
console.log(usage);
process.exit(-1);
}
args.forEach(function (arg) {
if (/\*/.test(arg)) {
arg = arg.split('*');
return files = files.concat(
fs.readdirSync(arg[0] || '.')
.map(function (f) {
return new RegExp(esc(arg[1]) + '$').test(f) && path.join(arg[0], f);
})
.filter(function (f) {
return f;
})
);
}
files.push(arg);
})
return files;
}
// Remove utf-8 byte order mark, http://en.wikipedia.org/wiki/Byte_order_mark
function removeByteOrderMark(text) {
if (text.charCodeAt(0) === 0xfeff) {
return text.substring(1);
}
return text;
}
// Write a template foreach file that matches template extension
templates = extractFiles(process.argv.slice(2))
.map(function (file) {
var openedFile = fs.readFileSync(file, 'utf-8'), name;
if (!openedFile) return;
name = file.replace(/\..*$/, '');
openedFile = removeByteOrderMark(openedFile.trim());
return 'templates.' + name + ' = new Hogan.Template(' + hogan.compile(openedFile, { asString: 1 }) + ');';
})
.filter(function (t) {
return t;
});
// Output templates
if (!templates.length) return;
console.log('var templates = {};');
console.log(templates.join('\n'));
+1
Ver Arquivo
@@ -0,0 +1 @@
node_modules
+3
Ver Arquivo
@@ -0,0 +1,3 @@
[submodule "test/spec"]
path = test/spec
url = https://github.com/mustache/spec.git
+177
Ver Arquivo
@@ -0,0 +1,177 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
+62
Ver Arquivo
@@ -0,0 +1,62 @@
REPO = git@github.com:twitter/hogan.js.git
BUILD := build
VERSION = ${shell node -e 'var s = JSON.parse(require("fs").readFileSync("package.json").toString()).version; console.log(s.substring(0, s.indexOf("-")));'}
#
# Run command line tests
#
test:
@ node test/index.js
#
# Run Mustache spec tests
#
spec:
@ node test/spec.js
#
# Run benchmark
#
benchmark:
@ node benchmark/console/index.js
clean:
@ rm -rf dist/*
#
# Make a new version of Hogan from the current dev version.
#
release: clean
@ echo "Creating a new version of Hogan."
@ mkdir -p dist/nodejs
@ cp -R lib dist/nodejs/lib
@ node tools/release.js
@ mkdir -p web/builds/$(VERSION)
@ cp dist/*.* web/builds/$(VERSION)/.
#
# Make the gh-pages website
#
# This target builds the hogan.js github website using hogan.js.
#
# cd into build/gh-pages to check in the new site.
#
GH_PAGES = $(BUILD)/gh-pages
web: | pages
@cp -R web/* $(GH_PAGES)
@@ node tools/web_templates.js
@echo
@echo "Website built in $(GH_PAGES)."
#
# Checkout the gh-pages branch.
#
pages: | $(BUILD)
@if [ ! -d "$(GH_PAGES)" ]; then \
git clone -b gh-pages $(REPO) $(GH_PAGES); \
rm -rf $(GH_PAGES)/*; \
fi;
@mkdir -p $(GH_PAGES)/images
$(BUILD):
mkdir -p $(BUILD)
.PHONY: test spec benchmark web release
+93
Ver Arquivo
@@ -0,0 +1,93 @@
## Hogan.js - A mustache compiler.
[Hogan.js](http://twitter.github.com/hogan.js/) is a compiler for the
[Mustache](http://mustache.github.com/) templating language. For information
on Mustache, see the [manpage](http://mustache.github.com/mustache.5.html) and
the [spec](https://github.com/mustache/spec).
## Basics
Hogan compiles templates to HoganTemplate objects, which have a render method.
```js
var data = {
screenName: "dhg",
};
var template = Hogan.compile("Follow @{{screenName}}.");
var output = template.render(data);
// prints "Follow @dhg."
console.log(output);
```
## Features
Hogan is fast--try it on your workload.
Hogan has separate scanning, parsing and code generation phases. This way it's
possible to add new features without touching the scanner at all, and many
different code generation techniques can be tried without changing the parser.
Hogan exposes scan and parse methods. These can be useful for
pre-processing templates on the server.
```js
var text = "{{^check}}{{i18n}}No{{/i18n}}{{/check}}";
text += "{{#check}}{{i18n}}Yes{{/i18n}}{{/check}}";
var tree = Hogan.parse(Hogan.scan(text));
// outputs "# check"
console.log(tree[0].tag + " " + tree[0].name);
// outputs "Yes"
console.log(tree[1].nodes[0].nodes[0]);
```
It's also possible to use HoganTemplate objects without the Hogan compiler
present. That means you can pre-compile your templates on the server, and
avoid shipping the compiler. However, the optional lambda features from the
Mustache spec do require the compiler to be present.
## Why Hogan.js?
Why another templating library?
Hogan.js was written to meet three templating library requirements: good
performance, standalone template objects, and a parser API.
## Issues
Have a bug? Please create an issue here on GitHub!
https://github.com/twitter/hogan.js/issues
## Versioning
For transparency and insight into our release cycle, releases will be numbered with the follow format:
`<major>.<minor>.<patch>`
And constructed with the following guidelines:
* Breaking backwards compatibility bumps the major
* New additions without breaking backwards compatibility bumps the minor
* Bug fixes and misc changes bump the patch
For more information on semantic versioning, please visit http://semver.org/.
## Authors
**Robert Sayre**
+ http://github.com/sayrer
**Jacob Thornton**
+ http://github.com/fat
## License
Copyright 2011 Twitter, Inc.
Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
gerado externo Arquivo executável
+93
Ver Arquivo
@@ -0,0 +1,93 @@
#!/usr/bin/env node
/*
* Copyright 2011 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.
*/
var hogan = require('../lib/hogan.js'),
path = require('path'),
fs = require('fs');
var specials = ['/', '.', '*', '+', '?', '|','(', ')', '[', ']', '{', '}', '\\'],
specialsRegExp = new RegExp('(\\' + specials.join('|\\') + ')', 'g'),
templates;
// Escape special regexp characters
function esc(text) {
return text.replace(specialsRegExp, '\\$1');
}
// Check for dirs and correct ext (<3 for windows)
function extractFiles(args) {
var usage = 'USAGE: hulk ./templates/*.mustaches\n' +
'NOTE: hulk supports the "*" wildcard and allows you to target specific extensions too',
files = [];
if (!args.length) {
console.log(usage);
process.exit(-1);
}
args.forEach(function (arg) {
if (/\*/.test(arg)) {
arg = arg.split('*');
return files = files.concat(
fs.readdirSync(arg[0] || '.')
.map(function (f) {
return new RegExp(esc(arg[1]) + '$').test(f) && path.join(arg[0], f);
})
.filter(function (f) {
return f;
})
);
}
files.push(arg);
})
return files;
}
// Remove utf-8 byte order mark, http://en.wikipedia.org/wiki/Byte_order_mark
function removeByteOrderMark(text) {
if (text.charCodeAt(0) === 0xfeff) {
return text.substring(1);
}
return text;
}
// Write a template foreach file that matches template extension
templates = extractFiles(process.argv.slice(2))
.map(function (file) {
var openedFile = fs.readFileSync(file, 'utf-8'), name;
if (!openedFile) return;
name = file.replace(/\..*$/, '');
openedFile = removeByteOrderMark(openedFile.trim());
return 'templates.' + name + ' = new Hogan.Template(' + hogan.compile(openedFile, { asString: 1 }) + ');';
})
.filter(function (t) {
return t;
});
// Output templates
if (!templates.length) return;
console.log('var templates = {};');
console.log(templates.join('\n'));
+348
Ver Arquivo
@@ -0,0 +1,348 @@
/*
* Copyright 2011 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 (Hogan) {
// Setup regex assignments
// remove whitespace according to Mustache spec
var rIsWhitespace = /\S/,
rQuot = /\"/g,
rNewline = /\n/g,
rCr = /\r/g,
rSlash = /\\/g,
tagTypes = {
'#': 1, '^': 2, '/': 3, '!': 4, '>': 5,
'<': 6, '=': 7, '_v': 8, '{': 9, '&': 10
};
Hogan.scan = function scan(text, delimiters) {
var len = text.length,
IN_TEXT = 0,
IN_TAG_TYPE = 1,
IN_TAG = 2,
state = IN_TEXT,
tagType = null,
tag = null,
buf = '',
tokens = [],
seenTag = false,
i = 0,
lineStart = 0,
otag = '{{',
ctag = '}}';
function addBuf() {
if (buf.length > 0) {
tokens.push(new String(buf));
buf = '';
}
}
function lineIsWhitespace() {
var isAllWhitespace = true;
for (var j = lineStart; j < tokens.length; j++) {
isAllWhitespace =
(tokens[j].tag && tagTypes[tokens[j].tag] < tagTypes['_v']) ||
(!tokens[j].tag && tokens[j].match(rIsWhitespace) === null);
if (!isAllWhitespace) {
return false;
}
}
return isAllWhitespace;
}
function filterLine(haveSeenTag, noNewLine) {
addBuf();
if (haveSeenTag && lineIsWhitespace()) {
for (var j = lineStart, next; j < tokens.length; j++) {
if (!tokens[j].tag) {
if ((next = tokens[j+1]) && next.tag == '>') {
// set indent to token value
next.indent = tokens[j].toString()
}
tokens.splice(j, 1);
}
}
} else if (!noNewLine) {
tokens.push({tag:'\n'});
}
seenTag = false;
lineStart = tokens.length;
}
function changeDelimiters(text, index) {
var close = '=' + ctag,
closeIndex = text.indexOf(close, index),
delimiters = trim(
text.substring(text.indexOf('=', index) + 1, closeIndex)
).split(' ');
otag = delimiters[0];
ctag = delimiters[1];
return closeIndex + close.length - 1;
}
if (delimiters) {
delimiters = delimiters.split(' ');
otag = delimiters[0];
ctag = delimiters[1];
}
for (i = 0; i < len; i++) {
if (state == IN_TEXT) {
if (tagChange(otag, text, i)) {
--i;
addBuf();
state = IN_TAG_TYPE;
} else {
if (text.charAt(i) == '\n') {
filterLine(seenTag);
} else {
buf += text.charAt(i);
}
}
} else if (state == IN_TAG_TYPE) {
i += otag.length - 1;
tag = tagTypes[text.charAt(i + 1)];
tagType = tag ? text.charAt(i + 1) : '_v';
if (tagType == '=') {
i = changeDelimiters(text, i);
state = IN_TEXT;
} else {
if (tag) {
i++;
}
state = IN_TAG;
}
seenTag = i;
} else {
if (tagChange(ctag, text, i)) {
tokens.push({tag: tagType, n: trim(buf), otag: otag, ctag: ctag,
i: (tagType == '/') ? seenTag - ctag.length : i + otag.length});
buf = '';
i += ctag.length - 1;
state = IN_TEXT;
if (tagType == '{') {
if (ctag == '}}') {
i++;
} else {
cleanTripleStache(tokens[tokens.length - 1]);
}
}
} else {
buf += text.charAt(i);
}
}
}
filterLine(seenTag, true);
return tokens;
}
function cleanTripleStache(token) {
if (token.n.substr(token.n.length - 1) === '}') {
token.n = token.n.substring(0, token.n.length - 1);
}
}
function trim(s) {
if (s.trim) {
return s.trim();
}
return s.replace(/^\s*|\s*$/g, '');
}
function tagChange(tag, text, index) {
if (text.charAt(index) != tag.charAt(0)) {
return false;
}
for (var i = 1, l = tag.length; i < l; i++) {
if (text.charAt(index + i) != tag.charAt(i)) {
return false;
}
}
return true;
}
function buildTree(tokens, kind, stack, customTags) {
var instructions = [],
opener = null,
token = null;
while (tokens.length > 0) {
token = tokens.shift();
if (token.tag == '#' || token.tag == '^' || isOpener(token, customTags)) {
stack.push(token);
token.nodes = buildTree(tokens, token.tag, stack, customTags);
instructions.push(token);
} else if (token.tag == '/') {
if (stack.length === 0) {
throw new Error('Closing tag without opener: /' + token.n);
}
opener = stack.pop();
if (token.n != opener.n && !isCloser(token.n, opener.n, customTags)) {
throw new Error('Nesting error: ' + opener.n + ' vs. ' + token.n);
}
opener.end = token.i;
return instructions;
} else {
instructions.push(token);
}
}
if (stack.length > 0) {
throw new Error('missing closing tag: ' + stack.pop().n);
}
return instructions;
}
function isOpener(token, tags) {
for (var i = 0, l = tags.length; i < l; i++) {
if (tags[i].o == token.n) {
token.tag = '#';
return true;
}
}
}
function isCloser(close, open, tags) {
for (var i = 0, l = tags.length; i < l; i++) {
if (tags[i].c == close && tags[i].o == open) {
return true;
}
}
}
function writeCode(tree) {
return 'i = i || "";var b = i + "";var _ = this;' + walk(tree) + 'return b;';
}
Hogan.generate = function (code, text, options) {
if (options.asString) {
return 'function(c,p,i){' + code + ';}';
}
return new Hogan.Template(new Function('c', 'p', 'i', code), text, Hogan);
}
function esc(s) {
return s.replace(rSlash, '\\\\')
.replace(rQuot, '\\\"')
.replace(rNewline, '\\n')
.replace(rCr, '\\r');
}
function chooseMethod(s) {
return (~s.indexOf('.')) ? 'd' : 'f';
}
function walk(tree) {
var code = '';
for (var i = 0, l = tree.length; i < l; i++) {
var tag = tree[i].tag;
if (tag == '#') {
code += section(tree[i].nodes, tree[i].n, chooseMethod(tree[i].n),
tree[i].i, tree[i].end, tree[i].otag + " " + tree[i].ctag);
} else if (tag == '^') {
code += invertedSection(tree[i].nodes, tree[i].n,
chooseMethod(tree[i].n));
} else if (tag == '<' || tag == '>') {
code += partial(tree[i]);
} else if (tag == '{' || tag == '&') {
code += tripleStache(tree[i].n, chooseMethod(tree[i].n));
} else if (tag == '\n') {
code += text('"\\n"' + (tree.length-1 == i ? '' : ' + i'));
} else if (tag == '_v') {
code += variable(tree[i].n, chooseMethod(tree[i].n));
} else if (tag === undefined) {
code += text('"' + esc(tree[i]) + '"');
}
}
return code;
}
function section(nodes, id, method, start, end, tags) {
return 'if(_.s(_.' + method + '("' + esc(id) + '",c,p,1),' +
'c,p,0,' + start + ',' + end + ', "' + tags + '")){' +
'b += _.rs(c,p,' +
'function(c,p){ var b = "";' +
walk(nodes) +
'return b;});c.pop();}' +
'else{b += _.b; _.b = ""};';
}
function invertedSection(nodes, id, method) {
return 'if (!_.s(_.' + method + '("' + esc(id) + '",c,p,1),c,p,1,0,0,"")){' +
walk(nodes) +
'};';
}
function partial(tok) {
return 'b += _.rp("' + esc(tok.n) + '",c,p,"' + (tok.indent || '') + '");';
}
function tripleStache(id, method) {
return 'b += (_.' + method + '("' + esc(id) + '",c,p,0));';
}
function variable(id, method) {
return 'b += (_.v(_.' + method + '("' + esc(id) + '",c,p,0)));';
}
function text(id) {
return 'b += ' + id + ';';
}
Hogan.parse = function(tokens, options) {
options = options || {};
return buildTree(tokens, '', [], options.sectionTags || []);
},
Hogan.cache = {};
Hogan.compile = function(text, options) {
// options
//
// asString: false (default)
//
// sectionTags: [{o: '_foo', c: 'foo'}]
// An array of object with o and c fields that indicate names for custom
// section tags. The example above allows parsing of {{_foo}}{{/foo}}.
//
// delimiters: A string that overrides the default delimiters.
// Example: "<% %>"
//
options = options || {};
var key = text + '||' + !!options.asString;
var t = this.cache[key];
if (t) {
return t;
}
t = this.generate(writeCode(this.parse(this.scan(text, options.delimiters), options)), text, options);
return this.cache[key] = t;
};
})(typeof exports !== 'undefined' ? exports : Hogan);
+20
Ver Arquivo
@@ -0,0 +1,20 @@
/*
* Copyright 2011 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.
*/
// This file is for use with Node.js. See dist/ for browser files.
var Hogan = require('./compiler');
Hogan.Template = require('./template').Template;
module.exports = Hogan;
+233
Ver Arquivo
@@ -0,0 +1,233 @@
/*
* Copyright 2011 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.
*/
var Hogan = {};
(function (Hogan) {
Hogan.Template = function constructor(renderFunc, text, compiler) {
if (renderFunc) {
this.r = renderFunc;
}
this.c = compiler;
this.text = text || '';
}
Hogan.Template.prototype = {
// render: replaced by generated code.
r: function (context, partials, indent) { return ''; },
// variable escaping
v: hoganEscape,
render: function render(context, partials, indent) {
return this.ri([context], partials || {}, indent);
},
// render internal -- a hook for overrides that catches partials too
ri: function (context, partials, indent) {
return this.r(context, partials, indent);
},
// tries to find a partial in the curent scope and render it
rp: function(name, context, partials, indent) {
var partial = partials[name];
if (!partial) {
return '';
}
if (this.c && typeof partial == 'string') {
partial = this.c.compile(partial);
}
return partial.ri(context, partials, indent);
},
// render a section
rs: function(context, partials, section) {
var buf = '',
tail = context[context.length - 1];
if (!isArray(tail)) {
return buf = section(context, partials);
}
for (var i = 0; i < tail.length; i++) {
context.push(tail[i]);
buf += section(context, partials);
context.pop();
}
return buf;
},
// maybe start a section
s: function(val, ctx, partials, inverted, start, end, tags) {
var pass;
if (isArray(val) && val.length === 0) {
return false;
}
if (typeof val == 'function') {
val = this.ls(val, ctx, partials, inverted, start, end, tags);
}
pass = (val === '') || !!val;
if (!inverted && pass && ctx) {
ctx.push((typeof val == 'object') ? val : ctx[ctx.length - 1]);
}
return pass;
},
// find values with dotted names
d: function(key, ctx, partials, returnFound) {
var names = key.split('.'),
val = this.f(names[0], ctx, partials, returnFound),
cx = null;
if (key === '.' && isArray(ctx[ctx.length - 2])) {
return ctx[ctx.length - 1];
}
for (var i = 1; i < names.length; i++) {
if (val && typeof val == 'object' && names[i] in val) {
cx = val;
val = val[names[i]];
} else {
val = '';
}
}
if (returnFound && !val) {
return false;
}
if (!returnFound && typeof val == 'function') {
ctx.push(cx);
val = this.lv(val, ctx, partials);
ctx.pop();
}
return val;
},
// find values with normal names
f: function(key, ctx, partials, returnFound) {
var val = false,
v = null,
found = false;
for (var i = ctx.length - 1; i >= 0; i--) {
v = ctx[i];
if (v && typeof v == 'object' && key in v) {
val = v[key];
found = true;
break;
}
}
if (!found) {
return (returnFound) ? false : "";
}
if (!returnFound && typeof val == 'function') {
val = this.lv(val, ctx, partials);
}
return val;
},
// higher order templates
ho: function(val, cx, partials, text, tags) {
var compiler = this.c;
var t = val.call(cx, text, function(t) {
return compiler.compile(t, {delimiters: tags}).render(cx, partials);
});
var s = compiler.compile(t.toString(), {delimiters: tags}).render(cx, partials);
this.b = s;
return false;
},
// higher order template result buffer
b: '',
// lambda replace section
ls: function(val, ctx, partials, inverted, start, end, tags) {
var cx = ctx[ctx.length - 1],
t = null;
if (!inverted && this.c && val.length > 0) {
return this.ho(val, cx, partials, this.text.substring(start, end), tags);
}
t = val.call(cx);
if (typeof t == 'function') {
if (inverted) {
return true;
} else if (this.c) {
return this.ho(t, cx, partials, this.text.substring(start, end), tags);
}
}
return t;
},
// lambda replace variable
lv: function(val, ctx, partials) {
var cx = ctx[ctx.length - 1];
var result = val.call(cx);
if (typeof result == 'function') {
result = result.call(cx);
}
result = result.toString();
if (this.c && ~result.indexOf("{{")) {
return this.c.compile(result).render(cx, partials);
}
return result;
}
};
var rAmp = /&/g,
rLt = /</g,
rGt = />/g,
rApos =/\'/g,
rQuot = /\"/g,
hChars =/[&<>\"\']/;
function hoganEscape(str) {
str = String((str === null || str === undefined) ? '' : str);
return hChars.test(str) ?
str
.replace(rAmp,'&amp;')
.replace(rLt,'&lt;')
.replace(rGt,'&gt;')
.replace(rApos,'&#39;')
.replace(rQuot, '&quot;') :
str;
}
var isArray = Array.isArray || function(a) {
return Object.prototype.toString.call(a) === '[object Array]';
};
})(typeof exports !== 'undefined' ? exports : Hogan);
+20
Ver Arquivo
@@ -0,0 +1,20 @@
{
"name": "hogan.js"
, "description": "A mustache compiler."
, "version": "1.0.5-dev"
, "keywords": ["mustache", "template"]
, "main": "./lib/hogan.js"
, "homepage": "http://twitter.github.com/hogan.js/"
, "author": "Twitter Inc."
, "repository": {
"type": "git"
, "url": "https://github.com/twitter/hogan.js.git"
}
, "licenses": [
{ "type": "Apache-2.0"
, "url": "http://www.apache.org/licenses/LICENSE-2.0"
}
]
, "devDependencies": { "uglify-js": "*" }
, "bin" : { "hulk" : "./bin/hulk" }
}
+8
Ver Arquivo
@@ -0,0 +1,8 @@
<ul>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
</ul>
+13
Ver Arquivo
@@ -0,0 +1,13 @@
<html>
<head>
<title>test</title>
<script src="https://raw.github.com/douglascrockford/JSON-js/master/json2.js"></script>
</head>
<body>
<code id="console"></code>
<script>var Hogan = {};</script>
<script src="../lib/template.js"></script>
<script src="../lib/compiler.js"></script>
<script src="./index.js"></script>
</body>
</html>
+848
Ver Arquivo
@@ -0,0 +1,848 @@
/*
* Copyright 2011 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.
*/
var Hogan = Hogan || require('../lib/hogan')
, doc = this["document"]
function testScanTextNoTags() {
var text = "<h2>hi</h2>";
var tokens = Hogan.scan(text);
is(tokens.length, 1, "One token");
is(tokens[0]+'', text, "text is equal to first token");
}
function testScanOneTag() {
var text = "{{hmm}}";
var tokens = Hogan.scan(text);
is(tokens.length, 1, "One token");
is(tokens[0].n, "hmm", "First token content is variable name.");
}
function testScanMultipleTags() {
var text = "asdf{{hmm}}asdf2{{hmm2}}asdf3";
var tokens = Hogan.scan(text);
is(tokens.length, 5, "3 text tokens, 2 tag tokens.");
is(tokens[0]+'', "asdf", "first token is text");
is(tokens[1].n, "hmm", "second token is tag");
is(tokens[1].tag, "_v", "second token is a variable");
is(tokens[2]+'', "asdf2", "third token is text");
is(tokens[3].n, "hmm2", "fourth token is tag");
is(tokens[3].tag, "_v", "fourth token is a variable");
is(tokens[4]+'', "asdf3", "Fifth token is text");
}
function testScanSectionOpen() {
var text = "{{#hmm}}";
var tokens = Hogan.scan(text);
is(tokens.length, 1, "One token");
is(tokens[0].n, "hmm", "First token content is variable name.");
is(tokens[0].tag, "#", "First token is a section.");
}
function testScanSectionClose() {
var text = "{{/hmm}}";
var tokens = Hogan.scan(text);
is(tokens.length, 1, "One token");
is(tokens[0].n, "hmm", "First token content is variable name.");
is(tokens[0].tag, "/", "First token is a section.");
}
function testScanSection() {
var text = "{{#hmm}}{{/hmm}}";
var tokens = Hogan.scan(text);
is(tokens.length, 2, "One token");
is(tokens[0].n, "hmm", "First token content is variable name.");
is(tokens[0].tag, "#", "First token is a section.");
is(tokens[1].n, "hmm", "Second token content is variable name.");
is(tokens[1].tag, "/", "Second token is a section.");
}
function testScanSectionInContent() {
var text = "abc{{#hmm}}def{{/hmm}}ghi";
var tokens = Hogan.scan(text);
is(tokens.length, 5, "3 text tokens, 2 tag tokens.");
is(tokens[0]+'', "abc", "first token is text");
is(tokens[1].n, "hmm", "second token is tag");
is(tokens[1].tag, "#", "second token is a variable");
is(tokens[2]+'', "def", "third token is text");
is(tokens[3].n, "hmm", "fourth token is tag");
is(tokens[3].tag, "/", "fourth token is a variable");
is(tokens[4]+'', "ghi", "Fifth token is text");
}
function testScanNegativeSection() {
var text = "{{^hmm}}{{/hmm}}";
var tokens = Hogan.scan(text);
is(tokens.length, 2, "One token");
is(tokens[0].n, "hmm", "First token content is variable name.");
is(tokens[0].tag, "^", "First token is a negative section.");
is(tokens[1].n, "hmm", "First token content is variable name.");
is(tokens[1].tag, "/", "Second token is a section.");
}
function testScanPartial() {
var text = "{{>hmm}}";
var tokens = Hogan.scan(text);
is(tokens.length, 1, "One token");
is(tokens[0].n, "hmm", "First token content is variable name.");
is(tokens[0].tag, ">", "First token is a partial.");
}
function testScanBackwardPartial() {
var text = "{{<hmm}}";
var tokens = Hogan.scan(text);
is(tokens.length, 1, "One token");
is(tokens[0].n, "hmm", "First token content is variable name.");
is(tokens[0].tag, "<", "First token is a backward partial.");
}
function testScanAmpersandNoEscapeTag() {
var text = "{{&hmm}}";
var tokens = Hogan.scan(text);
is(tokens.length, 1, "One token");
is(tokens[0].n, "hmm", "First token content is variable name.");
is(tokens[0].tag, "&", "First token is an ampersand no-escape.");
}
function testScanTripleStache() {
var text = "{{{hmm}}}";
var tokens = Hogan.scan(text);
is(tokens.length, 1, "One token");
is(tokens[0].n, "hmm", "First token content is variable name.");
is(tokens[0].tag, "{", "First token is a triple-stache.");
}
function testScanSectionWithTripleStacheInside() {
var text = "a{{#yo}}b{{{hmm}}}c{{/yo}}d";
var tokens = Hogan.scan(text);
is(tokens.length, 7, "One token");
is(tokens[0]+'', "a", "First token content is correct text.");
is(tokens[1].n, "yo", "Second token content is correct text.");
is(tokens[1].tag, "#", "Second token is a section.");
is(tokens[2]+'', "b", "Third token content is correct text.");
is(tokens[3].n, "hmm", "Fourth token content is correct text.");
is(tokens[3].tag, "{", "Fourth token is a triple stache.");
is(tokens[4]+'', "c", "Fifth token content is correct text.");
is(tokens[5].n, "yo", "Sixth token content is correct text.");
is(tokens[5].tag, "/", "Sixth token is a close.");
is(tokens[6]+'', "d", "Seventh token content is correct text.");
}
function testScanSetDelimiter() {
var text = "a{{=<% %>=}}b";
var tokens = Hogan.scan(text);
is(tokens.length, 2, "change delimiter doesn't appear as token.");
is(tokens[0]+'', "a", "text before change delimiter is processed.");
is(tokens[1]+'', "b", "text after change delimiter is processed.");
}
function testScanResetDelimiter() {
var text = "a{{=<% %>=}}b<%hmm%>c<%={{ }}=%>d{{hmm}}";
var tokens = Hogan.scan(text);
is(tokens.length, 6, "8 tokens, delimiter changes don't count.");
is(tokens[0]+'', "a", "first token is correct.");
is(tokens[1]+'', "b", "third token is correct.");
is(tokens[2].tag, "_v", "third token is correct tag.");
is(tokens[2].n, "hmm", "third token is correct name.");
is(tokens[3]+'', "c", "fifth token is correct.");
is(tokens[4]+'', "d", "seventh token is correct.");
is(tokens[5].tag, "_v", "eighth token is correct tag.");
is(tokens[5].n, "hmm", "eighth token is correct name.");
}
function testSingleCharDelimiter() {
var text = '({{foo}} {{=[ ]=}}[text])';
var tokens = Hogan.scan(text);
var t = Hogan.compile(text);
s = t.render({foo: "bar", text: 'It worked!'});
is(s, '(bar It worked!)', "Hogan substitution worked after custom delimiters.");
}
function testSetDelimiterWithWhitespace() {
var text = "{{= | | =}}|foo|";
var t = Hogan.compile(text);
s = t.render({foo: "bar"});
is(s, 'bar', "custom delimiters with whitespace works.")
}
function testParseBasic() {
var text = "test";
var tree = Hogan.parse(Hogan.scan(text));
is(tree.length, 1, "one parse node");
is(tree[0]+'', "test", "text is correct");
}
function testParseVariables() {
var text = "test{{foo}}test!{{bar}}test!!{{baz}}test!!!";
var tree = Hogan.parse(Hogan.scan(text));
is(tree.length, 7, "one parse node");
is(tree[0]+'', "test", "first text is correct");
is(tree[2]+'', "test!", "second text is correct")
is(tree[4]+'', "test!!", "third text is correct")
is(tree[6]+'', "test!!!", "last text is correct")
is(tree[1].n, "foo", "first var is correct");
is(tree[3].n, "bar", "second var is correct");
is(tree[5].n, "baz", "third var is correct");
}
function testParseSection() {
var text = "a{{#foo}}b{{/foo}}c";
var tree = Hogan.parse(Hogan.scan(text));
is(tree.length, 3, "three nodes at base");
is(tree[0]+'', "a", "correct text in first node");
is(tree[1].hasOwnProperty('nodes'), true, "second node is a section");
is(tree[1].tag, '#', "second node is a section");
is(tree[1].n, "foo", "correct name for section");
is(tree[1].nodes[0]+'', "b", "correct text in section");
is(tree[2]+'', "c", "correct text in last node");
}
function testParseIndexes() {
var text = "abc{{#foo}}asdf{{bar}}asdf{{/foo}}def";
var tree = Hogan.parse(Hogan.scan(text));
is(text.substring(tree[1].i, tree[1].end), "asdf{{bar}}asdf", "section text indexes are correct");
}
function testParseNegativeSection() {
var text = "a{{^foo}}b{{/foo}}c";
var tree = Hogan.parse(Hogan.scan(text));
is(tree.length, 3, "three nodes at base");
is(tree[0]+'', "a", "correct text in first node");
is(tree[1].hasOwnProperty('nodes'), true, "second node is a section");
is(tree[1].tag, '^', "second node is a negative section");
is(tree[1].n, "foo", "correct name for section");
is(tree[1].nodes[0]+'', "b", "correct text in section");
is(tree[2]+'', "c", "correct text in last node");
}
function testParseNestedSections() {
var text = "{{#bar}}{{#foo}}c{{/foo}}{{/bar}}"
var tree = Hogan.parse(Hogan.scan(text));
is(tree.length, 1, "one node at base");
is(tree[0].tag, "#", "open section is first node");
is(tree[0].n, "bar", "first section name is 'bar'");
is(tree[0].nodes.length, 1, "first section contains one node.");
is(tree[0].nodes[0].n, "foo", "correct name for nested section");
is(tree[0].nodes[0].nodes[0]+'', "c", "correct text in nested section");
}
function testMissingClosingTag() {
var text = "a{{#foo}}bc";
var msg = '';
try {
var tree = Hogan.parse(Hogan.scan(text));
} catch (e) {
msg = e.message;
}
is(msg, "missing closing tag: foo", "Error is generated");
}
function testBadNesting() {
var text = "a{{#foo}}{{#bar}}b{{/foo}}{{/bar}}c";
var msg = '';
try {
var tree = Hogan.parse(Hogan.scan(text));
} catch (e) {
msg = e.message;
}
is(msg, "Nesting error: bar vs. foo", "Error is generated");
}
function testBasicOutput() {
var text = "test";
var t = Hogan.compile(text);
is(t.render(), text, "template renders one text node");
}
function testBasicOutputAsString() {
var text = "test";
var textFunc = Hogan.compile(text, true);
is(textFunc, "function(context, partials){this.buffer.push('test');};", "template renders correct text function.");
}
function testOneVariable() {
var text = "test {{foo}} test";
var t = Hogan.compile(text);
var s = t.render({foo:'bar'});
is(s, "test bar test", "basic variable substitution works.");
}
function testOneVariableAsString() {
var text = "test {{foo}} test";
var funcText = Hogan.compile(text, true);
is(funcText, "function(context, partials){this.buffer.push('test ');\nthis.buffer.push(this.find('foo', context));\nthis.buffer.push(' test');};",
"Function text is correct with variable substitution.");
}
function testRenderWithWhitespace() {
var text = "{{ string }}";
var t = Hogan.compile(text);
is(t.render({string: "---" }), "---", "tags with whitespace render correctly.");
}
function testRenderWithWhitespaceAroundTripleStache() {
var text = " {{{string}}}\n";
var t = Hogan.compile(text);
is(t.render({string: "---" }), " ---\n", "triple stache surrounded by whitespace render correctly.");
}
function testRenderWithWhitespaceAroundAmpersand() {
var text = " {{& string }}\n";
var t = Hogan.compile(text);
is(t.render({string: "---" }), " ---\n", "ampersand surrounded by whitespace render correctly.");
}
function testMultipleVariables() {
var text = "test {{foo}} test {{bar}} test {{baz}} test {{foo}} test";
var t = Hogan.compile(text);
var s = t.render({foo:'42', bar: '43', baz: '44'});
is(s, "test 42 test 43 test 44 test 42 test", "all variables render correctly.");
}
function testNumberValues() {
var text = "integer: {{foo}} float: {{bar}} negative: {{baz}}";
var t = Hogan.compile(text);
var s = t.render({foo: 42, bar: 42.42, baz: -42});
is(s, "integer: 42 float: 42.42 negative: -42", "numbers render correctly");
}
function testObjectRender() {
var text = "object: {{foo}}";
var t = Hogan.compile(text);
var s = t.render({foo: {}});
is(s, "object: [object Object]", "objects render default toString.");
}
function testObjectToStringRender() {
var text = "object: {{foo}}";
var t = Hogan.compile(text);
var s = t.render({foo: {toString: function(){ return "yo!"}}});
is(s, "object: yo!", "objects render supplied toString.");
}
function testArrayRender() {
var text = "array: {{foo}}";
var t = Hogan.compile(text);
var s = t.render({foo: ["a","b","c"]});
is(s, "array: a,b,c", "arrays render default toString.");
}
function testEscaping() {
var text = "{{foo}}";
var t = Hogan.compile(text);
var s = t.render();
var s = t.render({foo: "< > <div> \' \" &"});
is(s, "&lt; &gt; &lt;div&gt; &#39; &quot; &amp;", "input correctly escaped.");
var ec ={ "'": "&#39;", '"': "&quot;", "<": "&lt;", ">": "&gt;", "&": "&amp;"}
for (var char in ec) {
var s = t.render({foo: char + " just me"});
is(s, ec[char] + " just me", "input correctly escaped.");
}
}
function testMustacheInjection() {
var text = "{{foo}}";
var t = Hogan.compile(text);
s = t.render({foo:"{{{<42}}}"})
is(s, "{{{&lt;42}}}", "Can't inject mustache");
}
function testTripleStache() {
var text = "{{{foo}}}";
var t = Hogan.compile(text);
var s = t.render({foo: "< > <div> \' \" &"});
is(s, "< > <div> \' \" &", "input correctly not-escaped.");
}
function testAmpNoEscaping() {
var text = "{{&foo}}";
var t = Hogan.compile(text);
var s = t.render({foo: "< > <div> \' \" &"});
is(s, "< > <div> \' \" &", "input correctly not-escaped.");
}
function testPartial() {
var partialText = "this is text from the partial--the magic number {{foo}} is from a variable";
var p = Hogan.compile(partialText);
var text = "This template contains a partial ({{>testPartial}})."
var t = Hogan.compile(text);
var s = t.render({foo: 42}, {testPartial: p});
is(s, "This template contains a partial (this is text from the partial--the magic number 42 is from a variable).", "partials work");
}
function testNestedPartials() {
var partialText = "this is text from the partial--the magic number {{foo}} is from a variable";
var p = Hogan.compile(partialText);
var partialText2 = "This template contains a partial ({{>testPartial}})."
var p2 = Hogan.compile(partialText2);
var text = "This template contains a partial that contains a partial [{{>testPartial2}}]."
var t = Hogan.compile(text);
var s = t.render({foo: 42}, {testPartial: p, testPartial2: p2});
is(s, "This template contains a partial that contains a partial [This template contains a partial (this is text from the partial--the magic number 42 is from a variable).].", "nested partials work");
}
function testNegativeSection() {
var text = "This template {{^foo}}BOO {{/foo}}contains an inverted section."
var t = Hogan.compile(text);
var s = t.render();
is(s, "This template BOO contains an inverted section.", "inverted sections with no context work");
s = t.render({foo:[]});
is(s, "This template BOO contains an inverted section.", "inverted sections with empty list context work");
s = t.render({ foo:false });
is(s, "This template BOO contains an inverted section.", "inverted sections with false context work");
s = t.render({foo:''});
is(s, "This template contains an inverted section.", "inverted sections with empty string context work");
s = t.render({foo:true});
is(s, "This template contains an inverted section.", "inverted sections with true context work");
s = t.render({foo: function() { return false; }});
is(s, "This template BOO contains an inverted section.", "inverted sections with false returning method in context work");
}
function testSectionElision() {
var text = "This template {{#foo}}BOO {{/foo}}contains a section."
var t = Hogan.compile(text);
var s = t.render();
is(s, "This template contains a section.", "sections with no context work");
s = t.render({foo:[]});
is(s, "This template contains a section.", "sections with empty list context work");
s = t.render({foo:false});
is(s, "This template contains a section.", "sections with false context work");
}
function testSectionObjectContext() {
var text = "This template {{#foo}}{{bar}} {{/foo}}contains a section."
var t = Hogan.compile(text);
var s = t.render({foo:{bar:42}});
is(s, "This template 42 contains a section.", "sections with object context work");
}
function testSectionArrayContext() {
var text = "This template {{#foo}}{{bar}} {{/foo}}contains a section."
var t = Hogan.compile(text);
var s = t.render({foo:[{bar:42}, {bar:43}, {bar:44}]});
is(s, "This template 42 43 44 contains a section.", "sections with object ctx and array values work");
}
function testFalsyVariableNoRender() {
var text = "I ({{cannot}}) be seen!";
var t = Hogan.compile(text);
var s = t.render();
is(s, "I () be seen!", "missing value doesn't render.");
}
function testSectionExtensions() {
var text = "Test {{_//|__foo}}bar{{/foo}}";
var options = {sectionTags:[{o:'_//|__foo', c:'foo'}]};
var tree = Hogan.parse(Hogan.scan(text), options);
is(tree[1].tag, "#", "_//|__foo node transformed to section");
is(tree[1].n, "_//|__foo", "_//|__foo node transformed to section");
var t = Hogan.compile(text, options );
var s = t.render({'_//|__foo':true});
is(s, "Test bar", "Custom sections work");
}
function testMisnestedSectionExtensions() {
var text = "Test {{__foo}}bar{{/bar}}";
var options = {sectionTags:[{o:'__foo', c:'foo'}, {o:'__bar', c:'bar'}]};
var msg = '';
try {
var tree = Hogan.parse(Hogan.scan(text), options);
} catch (e) {
msg = e.message;
}
is(msg, "Nesting error: __foo vs. bar", "Error is generated");
}
function testNestedSection() {
var text = "{{#foo}}{{#bar}}{{baz}}{{/bar}}{{/foo}}";
var t = Hogan.compile(text);
var s = t.render({foo: 42, bar: 42, baz:42});
is(s, "42", "can reach up context stack");
}
function testDottedNames() {
var text = '"{{person.name}}" == "{{#person}}{{name}}{{/person}}"';
var t = Hogan.compile(text);
var s = t.render({person:{name:'Joe'}});
is(s, '"Joe" == "Joe"', "dotted names work");
}
function testImplicitIterator() {
var text = '{{#stuff}} {{.}} {{/stuff}}';
var t = Hogan.compile(text);
var s = t.render({stuff:[42,43,44]});
is(s, " 42 43 44 ", "implicit iterators work");
}
function testPartialsAndDelimiters() {
var text = '{{>include}}*\n{{= | | =}}\n*|>include|';
var partialText = ' .{{value}}. ';
var partial = Hogan.compile(partialText);
var t = Hogan.compile(text);
var s = t.render({value:"yes"}, {'include':partial});
is(s, " .yes. *\n* .yes. ", "partials work around delimiters");
}
function testStringPartials() {
var text = "foo{{>mypartial}}baz";
var partialText = " bar ";
var t = Hogan.compile(text);
var s = t.render({}, {'mypartial': partialText});
is(s, "foo bar baz", "string partial works.");
}
function testMissingPartials() {
var text = "foo{{>mypartial}} bar";
var t = Hogan.compile(text);
var s = t.render({});
is(s, "foo bar", "missing partial works.");
}
function testIndentedStandaloneComment() {
var text = 'Begin.\n {{! Indented Comment Block! }}\nEnd.';
var t = Hogan.compile(text);
var s = t.render();
is(s, 'Begin.\nEnd.', "Standalone comment blocks are removed.");
}
function testNewLineBetweenDelimiterChanges() {
var data = { section: true, data: 'I got interpolated.' };
var text = '\n{{#section}}\n {{data}}\n |data|\n{{/section}}x\n\n{{= | | =}}\n|#section|\n {{data}}\n |data|\n|/section|';
var t = Hogan.compile(text);
var s = t.render(data);
is(s, '\n I got interpolated.\n |data|\nx\n\n {{data}}\n I got interpolated.\n', 'render correct')
}
function testMustacheJSApostrophe() {
var text = '{{apos}}{{control}}';
var t = Hogan.compile(text);
var s = t.render({'apos':"'", 'control':"X"});
is(s, '&#39;X', 'Apostrophe is escaped.');
}
function testMustacheJSArrayOfImplicitPartials() {
var text = 'Here is some stuff!\n{{#numbers}}\n{{>partial}}\n{{/numbers}}\n';
var partialText = '{{.}}\n';
var t = Hogan.compile(text);
var s = t.render({numbers:[1,2,3,4]}, {partial: partialText});
is(s, 'Here is some stuff!\n1\n2\n3\n4\n', 'Partials with implicit iterators work.');
}
function testMustacheJSArrayOfPartials() {
var text = 'Here is some stuff!\n{{#numbers}}\n{{>partial}}\n{{/numbers}}\n';
var partialText = '{{i}}\n';
var t = Hogan.compile(text);
var s = t.render({numbers:[{i:1},{i:2},{i:3},{i:4}]}, {partial: partialText});
is(s, 'Here is some stuff!\n1\n2\n3\n4\n', 'Partials with arrays work.');
}
function testMustacheJSArrayOfStrings() {
var text = '{{#strings}}{{.}} {{/strings}}';
var t = Hogan.compile(text);
var s = t.render({strings:['foo', 'bar', 'baz']});
is(s, 'foo bar baz ', 'array of strings works with implicit iterators.');
}
function testMustacheJSUndefinedString() {
var text = 'foo{{bar}}baz';
var t = Hogan.compile(text);
var s = t.render({bar:undefined});
is(s, 'foobaz', 'undefined value does not render.');
}
function testMustacheJSTripleStacheAltDelimiter() {
var text = '{{=<% %>=}}<% foo %> {{foo}} <%{bar}%> {{{bar}}}';
var t = Hogan.compile(text);
var s = t.render({foo:'yeah', bar:'hmm'});
is(s, 'yeah {{foo}} hmm {{{bar}}}', 'triple stache inside alternate delimiter works.');
}
/* shootout benchmark tests */
function testShootOutString() {
var text = "Hello World!";
var expected = "Hello World!"
var t = Hogan.compile(text)
var s = t.render({})
is(s, expected, "Shootout String compiled correctly");
}
function testShootOutReplace() {
var text = "Hello {{name}}! You have {{count}} new messages.";
var expected = "Hello Mick! You have 30 new messages.";
var t = Hogan.compile(text)
var s = t.render({ name: "Mick", count: 30 })
is(s, expected, "Shootout Replace compiled correctly");
}
function testShootOutArray() {
var text = "{{#names}}{{name}}{{/names}}";
var expected = "MoeLarryCurlyShemp";
var t = Hogan.compile(text);
var s = t.render({ names: [{name: "Moe"}, {name: "Larry"}, {name: "Curly"}, {name: "Shemp"}] })
is(s, expected, "Shootout Array compiled correctly");
}
function testShootOutObject() {
var text = "{{#person}}{{name}}{{age}}{{/person}}";
var expected = "Larry45";
var t = Hogan.compile(text)
var s = t.render({ person: { name: "Larry", age: 45 } })
is(s, expected, "Shootout Object compiled correctly");
}
function testShootOutPartial() {
var text = "{{#peeps}}{{>replace}}{{/peeps}}";
var t = Hogan.compile(text);
var partial = Hogan.compile(" Hello {{name}}! You have {{count}} new messages.");
var s = t.render({ peeps: [{name: "Moe", count: 15}, {name: "Larry", count: 5}, {name: "Curly", count: 2}] }, { replace: partial });
var expected = " Hello Moe! You have 15 new messages. Hello Larry! You have 5 new messages. Hello Curly! You have 2 new messages.";
is(s, expected, "Shootout Partial compiled correctly");
}
function testShootOutRecurse() {
var text = "{{name}}{{#kids}}{{>recursion}}{{/kids}}";
var t = Hogan.compile(text);
var partial = Hogan.compile("{{name}}{{#kids}}{{>recursion}}{{/kids}}");
var s = t.render({
name: '1',
kids: [
{
name: '1.1',
kids: [
{ name: '1.1.1', kids: [] }
]
}
]
}, { recursion: partial });
var expected = "11.11.1.1";
is(s, expected, "Shootout Recurse compiled correctly");
}
function testShootOutFilter() {
var text = "{{#filter}}foo {{bar}}{{/filter}}";
var t = Hogan.compile(text);
var s = t.render({
filter: function() {
return function(text, render) {
return render(text).toUpperCase();
}
},
bar: "bar"
});
var expected = "FOO BAR"
is(s, expected, "Shootout Filter compiled correctly");
}
function testShootOutComplex() {
var text =
"<h1>{{header}}</h1>" +
"{{#hasItems}}" +
"<ul>" +
"{{#items}}" +
"{{#current}}" +
"<li><strong>{{name}}</strong></li>" +
"{{/current}}" +
"{{^current}}" +
"<li><a href=\"{{url}}\">{{name}}</a></li>" +
"{{/current}}" +
"{{/items}}" +
"</ul>" +
"{{/hasItems}}" +
"{{^hasItems}}" +
"<p>The list is empty.</p>" +
"{{/hasItems}}";
var expected = "<h1>Colors</h1><ul><li><strong>red</strong></li><li><a href=\"#Green\">green</a></li><li><a href=\"#Blue\">blue</a></li></ul>";
var t = Hogan.compile(text)
var s = t.render({
header: function() {
return "Colors";
},
items: [
{name: "red", current: true, url: "#Red"},
{name: "green", current: false, url: "#Green"},
{name: "blue", current: false, url: "#Blue"}
],
hasItems: function() {
return this.items.length !== 0;
},
empty: function() {
return this.items.length === 0;
}
})
is(s, expected, "Shootout Complex compiled correctly");
}
function testRenderOutput() {
if (doc) return
var fs = require('fs');
var inPath = 'test/templates';
var outPath = 'test/html';
fs.readdirSync(inPath).forEach(function (file) {
var i = fs.readFileSync([inPath, file].join('/'), 'utf-8');
var t = Hogan.compile(i);
var r = t.render({});
var o = fs.readFileSync([outPath, file].join('/').replace(/mustache$/, 'html')).toString();
is(r === o, true, file + ' should correctly render html')
})
}
function testDefaultRenderImpl() {
var ht = new Hogan.Template();
is(ht.render() === '', true, 'default renderImpl returns an array.');
}
function appendText(el, text) {
var textNode = document.createTextNode(text);
el.appendChild(textNode);
el.appendChild(document.createElement('br'));
}
if (!this["output"]) {
var output = function (s) {
return doc ? appendText(doc.getElementById('console'), s) : console.log(s);
};
}
var passed = 0;
var failed = 0;
function is(got, expected, msg) {
if (got === expected) {
output("OK: " + msg);
++passed;
} else {
output("FAIL: " + msg);
output("Expected |" + expected + "|");
output(" Got |" + got + "|");
++failed;
}
}
function complete() {
output("\nTests Complete");
output("--------------");
output("Passed: " + passed);
output("Failed: " + failed);
output("\n");
}
function runTests() {
output("Tests Starting");
output("--------------");
testScanTextNoTags();
testScanOneTag();
testScanMultipleTags();
testScanSectionOpen();
testScanSectionClose();
testScanSection();
testScanSectionInContent();
testScanNegativeSection();
testScanPartial();
testScanBackwardPartial();
testScanAmpersandNoEscapeTag();
testScanTripleStache();
testScanSectionWithTripleStacheInside();
testScanSetDelimiter();
testScanResetDelimiter();
testSetDelimiterWithWhitespace();
testSingleCharDelimiter();
testParseBasic();
testParseVariables();
testParseSection();
testParseIndexes();
testParseNegativeSection();
testParseNestedSections();
testMissingClosingTag();
testBadNesting();
testBasicOutput();
//testBasicOutputAsString();
testOneVariable();
//testOneVariableAsString();
testMultipleVariables();
testNumberValues();
testObjectRender();
testObjectToStringRender();
testArrayRender();
testEscaping();
testMustacheInjection();
testTripleStache();
testAmpNoEscaping();
testPartial();
testNestedPartials();
testNegativeSection();
testSectionElision();
testSectionObjectContext();
testSectionArrayContext();
testRenderWithWhitespace();
testRenderWithWhitespaceAroundTripleStache();
testRenderWithWhitespaceAroundAmpersand();
testFalsyVariableNoRender();
testRenderOutput();
testDefaultRenderImpl();
testSectionExtensions();
testMisnestedSectionExtensions();
testNestedSection();
testShootOutString();
testShootOutReplace();
testShootOutArray();
testShootOutObject();
testShootOutPartial();
testShootOutRecurse();
testShootOutFilter();
testShootOutComplex();
testDottedNames();
testImplicitIterator();
testPartialsAndDelimiters();
testStringPartials();
testMissingPartials();
testIndentedStandaloneComment();
testNewLineBetweenDelimiterChanges();
testMustacheJSApostrophe();
testMustacheJSArrayOfImplicitPartials();
testMustacheJSArrayOfPartials();
testMustacheJSArrayOfStrings();
testMustacheJSUndefinedString();
testMustacheJSTripleStacheAltDelimiter();
complete();
}
if (doc) {
window.onload = runTests;
} else {
runTests();
}
+90
Ver Arquivo
@@ -0,0 +1,90 @@
/*
* Copyright 2011 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.
*/
var doc = this['document'];
var fs = require('fs');
var passed = 0;
var failed = 0;
if (!this['output']) {
var output = function (string) {
return doc ? doc.write(string + '<br/>') : console.log(string);
};
}
var Hogan = require(__dirname + '/../lib/hogan');
var template = fs.readFileSync(__dirname + '/../lib/template.js').toString();
var compiler = fs.readFileSync(__dirname + '/../lib/compiler.js').toString();
var mustache_wrapper = fs.readFileSync(__dirname + '/../wrappers/mustache.js.mustache').toString();
// Create a Mustache.js emulator from the distribution template
var engines = (new Function(Hogan.compile(mustache_wrapper).render({template: template, compiler: compiler}) +
'; return {Hogan: Hogan, Mustache: Mustache};'))();
var Mustache = engines.Mustache;
var Hogan2 = engines.Hogan;
// sanity check
is(Mustache.hasOwnProperty('to_html'), true, 'Mustache has to_html method.');
// Check for Mustache.js partial resolution behavior.
var context = {
foo: 'bar',
mypartial: {
baz: 'qux'
}
}
var text = 'abc {{foo}} def {{>mypartial}} ghi';
var partialText = '{{baz}}';
var s = Mustache.to_html(text, context, {'mypartial': partialText});
is(s, 'abc bar def qux ghi', 'Correct emulation of Mustache.js partial-name-in-context resolution.');
// Now check to see that the Hogan resolution is unaffected.
var t = Hogan2.compile(text);
s = t.render(context, {'mypartial': partialText});
is(s, 'abc bar def ghi', 'Hogan behavior not changed by Mustache.js emulation.');
// Check for sendFun behavior
var buf = "";
function send(s) {
buf += "-FOO " + s + " FOO-";
}
var s = Mustache.to_html(text, context, {'mypartial': partialText}, send);
is(buf, '-FOO abc bar def qux ghi FOO-', 'Correct emulation of Mustache.js sendFun.');
function is(got, expected, msg) {
if (got === expected) {
output("OK: " + msg);
++passed;
} else {
output("FAIL: " + msg);
output("Expected |" + expected + "|");
output(" Got |" + got + "|");
++failed;
}
}
function complete() {
output("\nTests Complete");
output("--------------");
output("Passed: " + passed);
output("Failed: " + failed);
output("\n");
}
complete();
+77
Ver Arquivo
@@ -0,0 +1,77 @@
/*
* Copyright 2011 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.
*/
var Hogan = Hogan || require('../lib/hogan');
var doc = this["document"];
var fs = require('fs');
var passed = 0;
var failed = 0;
if (!this["output"]) {
var output = function (string) {
return doc ? doc.write(string + '<br/>') : console.log(string);
};
}
function runTest(tests) {
tests.forEach(function(test) {
var partials = {};
for (var i in test.partials) {
partials[i] = Hogan.compile(test.partials[i]);
}
var t = Hogan.compile(test.template);
if (test.data.lambda) {
var func = (new Function ('return ' + test.data.lambda.js)());
test.data.lambda = function() { return func; };
}
var s = t.render(test.data, partials);
is(s, test.expected, test.name + ': ' + test.desc);
});
}
var testDir = './test/spec/specs';
var files = fs.readdirSync(testDir)
.filter(function(f) { return f.indexOf('.json') > 0; })
.map(function(f) { return testDir + '/' + f});
for (var i = 0; i < files.length; i++) {
var test = JSON.parse(fs.readFileSync(files[i]).toString());
runTest(test.tests);
}
function is(got, expected, msg) {
if (got === expected) {
output("OK: " + msg);
++passed;
} else {
output("FAIL: " + msg);
output("Expected |" + expected + "|");
output(" Got |" + got + "|");
++failed;
}
}
function complete() {
output("\nTests Complete");
output("--------------");
output("Passed: " + passed);
output("Failed: " + failed);
output("\n");
}
complete();
+31
Ver Arquivo
@@ -0,0 +1,31 @@
2011-03-20: v1.1.2
Added tests for standalone tags at string boundaries.
Added tests for rendering lambda returns after delimiter changes.
2011-03-20: v1.0.3
Added tests for standalone tags at string boundaries.
Added tests for rendering lambda returns after delimiter changes.
2011-03-05: v1.1.1
Added tests for indented inline sections.
Added tests for Windows-style newlines.
2011-03-05: v1.0.2
Added tests for indented inline sections.
Added tests for Windows-style newlines.
2011-03-04: v1.1.0
Implicit iterators.
A single period (`.`) may now be used as a name in Interpolation tags,
which represents the top of stack (cast as a String).
Dotted names.
Names containing one or more periods should be resolved as chained
properties; naïvely, this is like nesting section tags, but with some
built-in scoping protections.
2011-03-02: v1.0.1
Clarifying a point in the README about version compliance.
Adding high-level documentation to each spec file.
2011-02-28: v1.0.0
Initial Release
+65
Ver Arquivo
@@ -0,0 +1,65 @@
The repository at https://github.com/mustache/spec is the formal standard for
Mustache. It defines both normal usage and edge-case behavior for libraries
parsing the Mustache templating language (or a superset thereof).
The specification is developed as a series of YAML files, under the `specs`
directory.
Versioning
----------
This specification is being [semantically versioned](http://semver.org).
Roughly described, major version changes will always represent backwards
incompatible changes, minor version changes will always represent new language
features and will be backwards compatible, and patch ('tiny') version changes
will always be bug fixes. For the purposes of semantic versioning, the public
API is the contents of the `specs` directory and the algorithm for testing
against it.
Mustache implementations SHOULD report the most recent version of the spec
(major and minor version numbers). If an implementation has support for any
optional modules, they SHOULD indicate so with a remark attached to the
version number (e.g. "vX.Y, including lambdas" or "v.X.Y+λ"). It is
RECOMMENDED that implementations not supporting at least v1.0.0 of this spec
refer to themselves as "Mustache-like", or "Mustache-inspired".
Alternate Formats
-----------------
Since YAML is a reasonably complex format that not every language has good
tools for working with, we also provide JSON versions of the specs on a
best-effort basis.
These should be identical to the YAML specifications, but if you find the need
to regenerate them, they can be trivially rebuilt by invoking `rake build`.
It is also worth noting that some specifications (notably, the lambda module)
rely on YAML "tags" to denote special types of data (e.g. source code). Since
JSON offers no way to denote this, a special key ("`__tag__`") is injected
with the name of the tag as its value. See `TESTING.md` for more information
about handling tagged data.
Optional Modules
----------------
Specification files beginning with a tilde (`~`) describe optional modules.
At present, the only module being described as optional is regarding support
for lambdas. As a guideline, a module may be a candidate for optionality
when:
* It does not affect the core syntax of the language.
* It does not significantly affect the output of rendered templates.
* It concerns implementation language features or data types that are not
common to or core in every targeted language.
* The lack of support by an implementation does not diminish the usage of
Mustache in the target language.
As an example, the lambda module is primarily concerned with the handling of a
particular data type (code). This is a type of data that may be difficult to
support in some languages, and users of those languages will not see the lack
as an 'inconsistency' between implementations.
Support for specific pragmas or syntax extensions, however, are best managed
outside this core specification, as adjunct specifications.
Implementors are strongly encouraged to support any and all modules they are
reasonably capable of supporting.
+27
Ver Arquivo
@@ -0,0 +1,27 @@
require 'json'
require 'yaml'
# Our custom YAML tags must retain their magic.
%w[ code ].each do |tag|
YAML::add_builtin_type(tag) { |_,val| val.merge(:__tag__ => tag) }
end
desc 'Build all alternate versions of the specs.'
multitask :build => [ 'build:json' ]
namespace :build do
note = 'Do not edit this file; changes belong in the appropriate YAML file.'
desc 'Build JSON versions of the specs.'
task :json do
rm(Dir['specs/*.json'], :verbose => false)
Dir.glob('specs/*.yml').each do |filename|
json_file = filename.gsub('.yml', '.json')
File.open(json_file, 'w') do |file|
doc = YAML.load_file(filename)
file << doc.merge(:__ATTN__ => note).to_json()
end
end
end
end
+46
Ver Arquivo
@@ -0,0 +1,46 @@
Testing your Mustache implementation against this specification should be
relatively simple. If you have a readily available testing framework on your
platform, your task may be even simpler.
In general, the process for each `.yml` file is as follows:
1. Use a YAML parser to load the file.
2. For each test in the 'tests' array:
1. Ensure that each element of the 'partials' hash (if it exists) is
stored in a place where the interpreter will look for it.
2. If your implementation will not support lambdas, feel free to skip over
the optional '~lambdas.yml' file.
2.1. If your implementation will support lambdas, ensure that each member of
'data' tagged with '!code' is properly processed into a language-
specific lambda reference.
* e.g. Given this YAML data hash:
`{ x: !code { ruby: 'proc { "x" }', perl: 'sub { "x" }' } }`
a Ruby-based Mustache implementation would process it such that it
was equivalent to this Ruby hash:
`{ 'x' => proc { "x" } }`
* If your implementation language does not currently have lambda
examples in the spec, feel free to implement them and send a pull
request.
* The JSON version of the spec represents these tagged values as a hash
with a '`__tag__`' key of 'code'.
3. Render the template (stored in the 'template' key) with the given 'data'
hash.
4. Compare the results of your rendering against the 'expected' value; any
differences should be reported, along with any useful debugging
information.
* Of note, the 'desc' key contains a rough one-line description of the
behavior being tested -- this is most useful in conjunction with the
file name and test 'name'.
+1
Ver Arquivo
@@ -0,0 +1 @@
{"__ATTN__":"Do not edit this file; changes belong in the appropriate YAML file.","overview":"Comment tags represent content that should never appear in the resulting\noutput.\n\nThe tag's content may contain any substring (including newlines) EXCEPT the\nclosing delimiter.\n\nComment tags SHOULD be treated as standalone when appropriate.\n","tests":[{"name":"Inline","data":{},"expected":"1234567890","template":"12345{{! Comment Block! }}67890","desc":"Comment blocks should be removed from the template."},{"name":"Multiline","data":{},"expected":"1234567890\n","template":"12345{{!\n This is a\n multi-line comment...\n}}67890\n","desc":"Multiline comments should be permitted."},{"name":"Standalone","data":{},"expected":"Begin.\nEnd.\n","template":"Begin.\n{{! Comment Block! }}\nEnd.\n","desc":"All standalone comment lines should be removed."},{"name":"Indented Standalone","data":{},"expected":"Begin.\nEnd.\n","template":"Begin.\n {{! Indented Comment Block! }}\nEnd.\n","desc":"All standalone comment lines should be removed."},{"name":"Standalone Line Endings","data":{},"expected":"|\r\n|","template":"|\r\n{{! Standalone Comment }}\r\n|","desc":"\"\\r\\n\" should be considered a newline for standalone tags."},{"name":"Standalone Without Previous Line","data":{},"expected":"!","template":" {{! I'm Still Standalone }}\n!","desc":"Standalone tags should not require a newline to precede them."},{"name":"Standalone Without Newline","data":{},"expected":"!\n","template":"!\n {{! I'm Still Standalone }}","desc":"Standalone tags should not require a newline to follow them."},{"name":"Multiline Standalone","data":{},"expected":"Begin.\nEnd.\n","template":"Begin.\n{{!\nSomething's going on here...\n}}\nEnd.\n","desc":"All standalone comment lines should be removed."},{"name":"Indented Multiline Standalone","data":{},"expected":"Begin.\nEnd.\n","template":"Begin.\n {{!\n Something's going on here...\n }}\nEnd.\n","desc":"All standalone comment lines should be removed."},{"name":"Indented Inline","data":{},"expected":" 12 \n","template":" 12 {{! 34 }}\n","desc":"Inline comments should not strip whitespace"},{"name":"Surrounding Whitespace","data":{},"expected":"12345 67890","template":"12345 {{! Comment Block! }} 67890","desc":"Comment removal should preserve surrounding whitespace."}]}
+103
Ver Arquivo
@@ -0,0 +1,103 @@
overview: |
Comment tags represent content that should never appear in the resulting
output.
The tag's content may contain any substring (including newlines) EXCEPT the
closing delimiter.
Comment tags SHOULD be treated as standalone when appropriate.
tests:
- name: Inline
desc: Comment blocks should be removed from the template.
data: { }
template: '12345{{! Comment Block! }}67890'
expected: '1234567890'
- name: Multiline
desc: Multiline comments should be permitted.
data: { }
template: |
12345{{!
This is a
multi-line comment...
}}67890
expected: |
1234567890
- name: Standalone
desc: All standalone comment lines should be removed.
data: { }
template: |
Begin.
{{! Comment Block! }}
End.
expected: |
Begin.
End.
- name: Indented Standalone
desc: All standalone comment lines should be removed.
data: { }
template: |
Begin.
{{! Indented Comment Block! }}
End.
expected: |
Begin.
End.
- name: Standalone Line Endings
desc: '"\r\n" should be considered a newline for standalone tags.'
data: { }
template: "|\r\n{{! Standalone Comment }}\r\n|"
expected: "|\r\n|"
- name: Standalone Without Previous Line
desc: Standalone tags should not require a newline to precede them.
data: { }
template: " {{! I'm Still Standalone }}\n!"
expected: "!"
- name: Standalone Without Newline
desc: Standalone tags should not require a newline to follow them.
data: { }
template: "!\n {{! I'm Still Standalone }}"
expected: "!\n"
- name: Multiline Standalone
desc: All standalone comment lines should be removed.
data: { }
template: |
Begin.
{{!
Something's going on here...
}}
End.
expected: |
Begin.
End.
- name: Indented Multiline Standalone
desc: All standalone comment lines should be removed.
data: { }
template: |
Begin.
{{!
Something's going on here...
}}
End.
expected: |
Begin.
End.
- name: Indented Inline
desc: Inline comments should not strip whitespace
data: { }
template: " 12 {{! 34 }}\n"
expected: " 12 \n"
- name: Surrounding Whitespace
desc: Comment removal should preserve surrounding whitespace.
data: { }
template: '12345 {{! Comment Block! }} 67890'
expected: '12345 67890'
+1
Ver Arquivo
@@ -0,0 +1 @@
{"__ATTN__":"Do not edit this file; changes belong in the appropriate YAML file.","overview":"Set Delimiter tags are used to change the tag delimiters for all content\nfollowing the tag in the current compilation unit.\n\nThe tag's content MUST be any two non-whitespace sequences (separated by\nwhitespace) EXCEPT an equals sign ('=') followed by the current closing\ndelimiter.\n\nSet Delimiter tags SHOULD be treated as standalone when appropriate.\n","tests":[{"name":"Pair Behavior","data":{"text":"Hey!"},"expected":"(Hey!)","template":"{{=<% %>=}}(<%text%>)","desc":"The equals sign (used on both sides) should permit delimiter changes."},{"name":"Special Characters","data":{"text":"It worked!"},"expected":"(It worked!)","template":"({{=[ ]=}}[text])","desc":"Characters with special meaning regexen should be valid delimiters."},{"name":"Sections","data":{"section":true,"data":"I got interpolated."},"expected":"[\n I got interpolated.\n |data|\n\n {{data}}\n I got interpolated.\n]\n","template":"[\n{{#section}}\n {{data}}\n |data|\n{{/section}}\n\n{{= | | =}}\n|#section|\n {{data}}\n |data|\n|/section|\n]\n","desc":"Delimiters set outside sections should persist."},{"name":"Inverted Sections","data":{"section":false,"data":"I got interpolated."},"expected":"[\n I got interpolated.\n |data|\n\n {{data}}\n I got interpolated.\n]\n","template":"[\n{{^section}}\n {{data}}\n |data|\n{{/section}}\n\n{{= | | =}}\n|^section|\n {{data}}\n |data|\n|/section|\n]\n","desc":"Delimiters set outside inverted sections should persist."},{"name":"Partial Inheritence","data":{"value":"yes"},"expected":"[ .yes. ]\n[ .yes. ]\n","template":"[ {{>include}} ]\n{{= | | =}}\n[ |>include| ]\n","desc":"Delimiters set in a parent template should not affect a partial.","partials":{"include":".{{value}}."}},{"name":"Post-Partial Behavior","data":{"value":"yes"},"expected":"[ .yes. .yes. ]\n[ .yes. .|value|. ]\n","template":"[ {{>include}} ]\n[ .{{value}}. .|value|. ]\n","desc":"Delimiters set in a partial should not affect the parent template.","partials":{"include":".{{value}}. {{= | | =}} .|value|."}},{"name":"Surrounding Whitespace","data":{},"expected":"| |","template":"| {{=@ @=}} |","desc":"Surrounding whitespace should be left untouched."},{"name":"Outlying Whitespace (Inline)","data":{},"expected":" | \n","template":" | {{=@ @=}}\n","desc":"Whitespace should be left untouched."},{"name":"Standalone Tag","data":{},"expected":"Begin.\nEnd.\n","template":"Begin.\n{{=@ @=}}\nEnd.\n","desc":"Standalone lines should be removed from the template."},{"name":"Indented Standalone Tag","data":{},"expected":"Begin.\nEnd.\n","template":"Begin.\n {{=@ @=}}\nEnd.\n","desc":"Indented standalone lines should be removed from the template."},{"name":"Standalone Line Endings","data":{},"expected":"|\r\n|","template":"|\r\n{{= @ @ =}}\r\n|","desc":"\"\\r\\n\" should be considered a newline for standalone tags."},{"name":"Standalone Without Previous Line","data":{},"expected":"=","template":" {{=@ @=}}\n=","desc":"Standalone tags should not require a newline to precede them."},{"name":"Standalone Without Newline","data":{},"expected":"=\n","template":"=\n {{=@ @=}}","desc":"Standalone tags should not require a newline to follow them."},{"name":"Pair with Padding","data":{},"expected":"||","template":"|{{= @ @ =}}|","desc":"Superfluous in-tag whitespace should be ignored."}]}
+158
Ver Arquivo
@@ -0,0 +1,158 @@
overview: |
Set Delimiter tags are used to change the tag delimiters for all content
following the tag in the current compilation unit.
The tag's content MUST be any two non-whitespace sequences (separated by
whitespace) EXCEPT an equals sign ('=') followed by the current closing
delimiter.
Set Delimiter tags SHOULD be treated as standalone when appropriate.
tests:
- name: Pair Behavior
desc: The equals sign (used on both sides) should permit delimiter changes.
data: { text: 'Hey!' }
template: '{{=<% %>=}}(<%text%>)'
expected: '(Hey!)'
- name: Special Characters
desc: Characters with special meaning regexen should be valid delimiters.
data: { text: 'It worked!' }
template: '({{=[ ]=}}[text])'
expected: '(It worked!)'
- name: Sections
desc: Delimiters set outside sections should persist.
data: { section: true, data: 'I got interpolated.' }
template: |
[
{{#section}}
{{data}}
|data|
{{/section}}
{{= | | =}}
|#section|
{{data}}
|data|
|/section|
]
expected: |
[
I got interpolated.
|data|
{{data}}
I got interpolated.
]
- name: Inverted Sections
desc: Delimiters set outside inverted sections should persist.
data: { section: false, data: 'I got interpolated.' }
template: |
[
{{^section}}
{{data}}
|data|
{{/section}}
{{= | | =}}
|^section|
{{data}}
|data|
|/section|
]
expected: |
[
I got interpolated.
|data|
{{data}}
I got interpolated.
]
- name: Partial Inheritence
desc: Delimiters set in a parent template should not affect a partial.
data: { value: 'yes' }
partials:
include: '.{{value}}.'
template: |
[ {{>include}} ]
{{= | | =}}
[ |>include| ]
expected: |
[ .yes. ]
[ .yes. ]
- name: Post-Partial Behavior
desc: Delimiters set in a partial should not affect the parent template.
data: { value: 'yes' }
partials:
include: '.{{value}}. {{= | | =}} .|value|.'
template: |
[ {{>include}} ]
[ .{{value}}. .|value|. ]
expected: |
[ .yes. .yes. ]
[ .yes. .|value|. ]
# Whitespace Sensitivity
- name: Surrounding Whitespace
desc: Surrounding whitespace should be left untouched.
data: { }
template: '| {{=@ @=}} |'
expected: '| |'
- name: Outlying Whitespace (Inline)
desc: Whitespace should be left untouched.
data: { }
template: " | {{=@ @=}}\n"
expected: " | \n"
- name: Standalone Tag
desc: Standalone lines should be removed from the template.
data: { }
template: |
Begin.
{{=@ @=}}
End.
expected: |
Begin.
End.
- name: Indented Standalone Tag
desc: Indented standalone lines should be removed from the template.
data: { }
template: |
Begin.
{{=@ @=}}
End.
expected: |
Begin.
End.
- name: Standalone Line Endings
desc: '"\r\n" should be considered a newline for standalone tags.'
data: { }
template: "|\r\n{{= @ @ =}}\r\n|"
expected: "|\r\n|"
- name: Standalone Without Previous Line
desc: Standalone tags should not require a newline to precede them.
data: { }
template: " {{=@ @=}}\n="
expected: "="
- name: Standalone Without Newline
desc: Standalone tags should not require a newline to follow them.
data: { }
template: "=\n {{=@ @=}}"
expected: "=\n"
# Whitespace Insensitivity
- name: Pair with Padding
desc: Superfluous in-tag whitespace should be ignored.
data: { }
template: '|{{= @ @ =}}|'
expected: '||'
Diff do arquivo suprimido porque uma ou mais linhas são muito longas
+230
Ver Arquivo
@@ -0,0 +1,230 @@
overview: |
Interpolation tags are used to integrate dynamic content into the template.
The tag's content MUST be a non-whitespace character sequence NOT containing
the current closing delimiter.
This tag's content names the data to replace the tag. A single period (`.`)
indicates that the item currently sitting atop the context stack should be
used; otherwise, name resolution is as follows:
1) Split the name on periods; the first part is the name to resolve, any
remaining parts should be retained.
2) Walk the context stack from top to bottom, finding the first context
that is a) a hash containing the name as a key OR b) an object responding
to a method with the given name.
3) If the context is a hash, the data is the value associated with the
name.
4) If the context is an object, the data is the value returned by the
method with the given name.
5) If any name parts were retained in step 1, each should be resolved
against a context stack containing only the result from the former
resolution. If any part fails resolution, the result should be considered
falsey, and should interpolate as the empty string.
Data should be coerced into a string (and escaped, if appropriate) before
interpolation.
The Interpolation tags MUST NOT be treated as standalone.
tests:
- name: No Interpolation
desc: Mustache-free templates should render as-is.
data: { }
template: |
Hello from {Mustache}!
expected: |
Hello from {Mustache}!
- name: Basic Interpolation
desc: Unadorned tags should interpolate content into the template.
data: { subject: "world" }
template: |
Hello, {{subject}}!
expected: |
Hello, world!
- name: HTML Escaping
desc: Basic interpolation should be HTML escaped.
data: { forbidden: '& " < >' }
template: |
These characters should be HTML escaped: {{forbidden}}
expected: |
These characters should be HTML escaped: &amp; &quot; &lt; &gt;
- name: Triple Mustache
desc: Triple mustaches should interpolate without HTML escaping.
data: { forbidden: '& " < >' }
template: |
These characters should not be HTML escaped: {{{forbidden}}}
expected: |
These characters should not be HTML escaped: & " < >
- name: Ampersand
desc: Ampersand should interpolate without HTML escaping.
data: { forbidden: '& " < >' }
template: |
These characters should not be HTML escaped: {{&forbidden}}
expected: |
These characters should not be HTML escaped: & " < >
- name: Basic Integer Interpolation
desc: Integers should interpolate seamlessly.
data: { mph: 85 }
template: '"{{mph}} miles an hour!"'
expected: '"85 miles an hour!"'
- name: Triple Mustache Integer Interpolation
desc: Integers should interpolate seamlessly.
data: { mph: 85 }
template: '"{{{mph}}} miles an hour!"'
expected: '"85 miles an hour!"'
- name: Ampersand Integer Interpolation
desc: Integers should interpolate seamlessly.
data: { mph: 85 }
template: '"{{&mph}} miles an hour!"'
expected: '"85 miles an hour!"'
- name: Basic Decimal Interpolation
desc: Decimals should interpolate seamlessly with proper significance.
data: { power: 1.210 }
template: '"{{power}} jiggawatts!"'
expected: '"1.21 jiggawatts!"'
- name: Triple Mustache Decimal Interpolation
desc: Decimals should interpolate seamlessly with proper significance.
data: { power: 1.210 }
template: '"{{{power}}} jiggawatts!"'
expected: '"1.21 jiggawatts!"'
- name: Ampersand Decimal Interpolation
desc: Decimals should interpolate seamlessly with proper significance.
data: { power: 1.210 }
template: '"{{&power}} jiggawatts!"'
expected: '"1.21 jiggawatts!"'
# Context Misses
- name: Basic Context Miss Interpolation
desc: Failed context lookups should default to empty strings.
data: { }
template: "I ({{cannot}}) be seen!"
expected: "I () be seen!"
- name: Triple Mustache Context Miss Interpolation
desc: Failed context lookups should default to empty strings.
data: { }
template: "I ({{{cannot}}}) be seen!"
expected: "I () be seen!"
- name: Ampersand Context Miss Interpolation
desc: Failed context lookups should default to empty strings.
data: { }
template: "I ({{&cannot}}) be seen!"
expected: "I () be seen!"
# Dotted Names
- name: Dotted Names - Basic Interpolation
desc: Dotted names should be considered a form of shorthand for sections.
data: { person: { name: 'Joe' } }
template: '"{{person.name}}" == "{{#person}}{{name}}{{/person}}"'
expected: '"Joe" == "Joe"'
- name: Dotted Names - Triple Mustache Interpolation
desc: Dotted names should be considered a form of shorthand for sections.
data: { person: { name: 'Joe' } }
template: '"{{{person.name}}}" == "{{#person}}{{{name}}}{{/person}}"'
expected: '"Joe" == "Joe"'
- name: Dotted Names - Ampersand Interpolation
desc: Dotted names should be considered a form of shorthand for sections.
data: { person: { name: 'Joe' } }
template: '"{{&person.name}}" == "{{#person}}{{&name}}{{/person}}"'
expected: '"Joe" == "Joe"'
- name: Dotted Names - Arbitrary Depth
desc: Dotted names should be functional to any level of nesting.
data:
a: { b: { c: { d: { e: { name: 'Phil' } } } } }
template: '"{{a.b.c.d.e.name}}" == "Phil"'
expected: '"Phil" == "Phil"'
- name: Dotted Names - Broken Chains
desc: Any falsey value prior to the last part of the name should yield ''.
data:
a: { }
template: '"{{a.b.c}}" == ""'
expected: '"" == ""'
- name: Dotted Names - Broken Chain Resolution
desc: Each part of a dotted name should resolve only against its parent.
data:
a: { b: { } }
c: { name: 'Jim' }
template: '"{{a.b.c.name}}" == ""'
expected: '"" == ""'
- name: Dotted Names - Initial Resolution
desc: The first part of a dotted name should resolve as any other name.
data:
a: { b: { c: { d: { e: { name: 'Phil' } } } } }
b: { c: { d: { e: { name: 'Wrong' } } } }
template: '"{{#a}}{{b.c.d.e.name}}{{/a}}" == "Phil"'
expected: '"Phil" == "Phil"'
# Whitespace Sensitivity
- name: Interpolation - Surrounding Whitespace
desc: Interpolation should not alter surrounding whitespace.
data: { string: '---' }
template: '| {{string}} |'
expected: '| --- |'
- name: Triple Mustache - Surrounding Whitespace
desc: Interpolation should not alter surrounding whitespace.
data: { string: '---' }
template: '| {{{string}}} |'
expected: '| --- |'
- name: Ampersand - Surrounding Whitespace
desc: Interpolation should not alter surrounding whitespace.
data: { string: '---' }
template: '| {{&string}} |'
expected: '| --- |'
- name: Interpolation - Standalone
desc: Standalone interpolation should not alter surrounding whitespace.
data: { string: '---' }
template: " {{string}}\n"
expected: " ---\n"
- name: Triple Mustache - Standalone
desc: Standalone interpolation should not alter surrounding whitespace.
data: { string: '---' }
template: " {{{string}}}\n"
expected: " ---\n"
- name: Ampersand - Standalone
desc: Standalone interpolation should not alter surrounding whitespace.
data: { string: '---' }
template: " {{&string}}\n"
expected: " ---\n"
# Whitespace Insensitivity
- name: Interpolation With Padding
desc: Superfluous in-tag whitespace should be ignored.
data: { string: "---" }
template: '|{{ string }}|'
expected: '|---|'
- name: Triple Mustache With Padding
desc: Superfluous in-tag whitespace should be ignored.
data: { string: "---" }
template: '|{{{ string }}}|'
expected: '|---|'
- name: Ampersand With Padding
desc: Superfluous in-tag whitespace should be ignored.
data: { string: "---" }
template: '|{{& string }}|'
expected: '|---|'
Diff do arquivo suprimido porque uma ou mais linhas são muito longas
+193
Ver Arquivo
@@ -0,0 +1,193 @@
overview: |
Inverted Section tags and End Section tags are used in combination to wrap a
section of the template.
These tags' content MUST be a non-whitespace character sequence NOT
containing the current closing delimiter; each Inverted Section tag MUST be
followed by an End Section tag with the same content within the same
section.
This tag's content names the data to replace the tag. Name resolution is as
follows:
1) Split the name on periods; the first part is the name to resolve, any
remaining parts should be retained.
2) Walk the context stack from top to bottom, finding the first context
that is a) a hash containing the name as a key OR b) an object responding
to a method with the given name.
3) If the context is a hash, the data is the value associated with the
name.
4) If the context is an object and the method with the given name has an
arity of 1, the method SHOULD be called with a String containing the
unprocessed contents of the sections; the data is the value returned.
5) Otherwise, the data is the value returned by calling the method with
the given name.
6) If any name parts were retained in step 1, each should be resolved
against a context stack containing only the result from the former
resolution. If any part fails resolution, the result should be considered
falsey, and should interpolate as the empty string.
If the data is not of a list type, it is coerced into a list as follows: if
the data is truthy (e.g. `!!data == true`), use a single-element list
containing the data, otherwise use an empty list.
This section MUST NOT be rendered unless the data list is empty.
Inverted Section and End Section tags SHOULD be treated as standalone when
appropriate.
tests:
- name: Falsey
desc: Falsey sections should have their contents rendered.
data: { boolean: false }
template: '"{{^boolean}}This should be rendered.{{/boolean}}"'
expected: '"This should be rendered."'
- name: Truthy
desc: Truthy sections should have their contents omitted.
data: { boolean: true }
template: '"{{^boolean}}This should not be rendered.{{/boolean}}"'
expected: '""'
- name: Context
desc: Objects and hashes should behave like truthy values.
data: { context: { name: 'Joe' } }
template: '"{{^context}}Hi {{name}}.{{/context}}"'
expected: '""'
- name: List
desc: Lists should behave like truthy values.
data: { list: [ { n: 1 }, { n: 2 }, { n: 3 } ] }
template: '"{{^list}}{{n}}{{/list}}"'
expected: '""'
- name: Empty List
desc: Empty lists should behave like falsey values.
data: { list: [ ] }
template: '"{{^list}}Yay lists!{{/list}}"'
expected: '"Yay lists!"'
- name: Doubled
desc: Multiple inverted sections per template should be permitted.
data: { bool: false, two: 'second' }
template: |
{{^bool}}
* first
{{/bool}}
* {{two}}
{{^bool}}
* third
{{/bool}}
expected: |
* first
* second
* third
- name: Nested (Falsey)
desc: Nested falsey sections should have their contents rendered.
data: { bool: false }
template: "| A {{^bool}}B {{^bool}}C{{/bool}} D{{/bool}} E |"
expected: "| A B C D E |"
- name: Nested (Truthy)
desc: Nested truthy sections should be omitted.
data: { bool: true }
template: "| A {{^bool}}B {{^bool}}C{{/bool}} D{{/bool}} E |"
expected: "| A E |"
- name: Context Misses
desc: Failed context lookups should be considered falsey.
data: { }
template: "[{{^missing}}Cannot find key 'missing'!{{/missing}}]"
expected: "[Cannot find key 'missing'!]"
# Dotted Names
- name: Dotted Names - Truthy
desc: Dotted names should be valid for Inverted Section tags.
data: { a: { b: { c: true } } }
template: '"{{^a.b.c}}Not Here{{/a.b.c}}" == ""'
expected: '"" == ""'
- name: Dotted Names - Falsey
desc: Dotted names should be valid for Inverted Section tags.
data: { a: { b: { c: false } } }
template: '"{{^a.b.c}}Not Here{{/a.b.c}}" == "Not Here"'
expected: '"Not Here" == "Not Here"'
- name: Dotted Names - Broken Chains
desc: Dotted names that cannot be resolved should be considered falsey.
data: { a: { } }
template: '"{{^a.b.c}}Not Here{{/a.b.c}}" == "Not Here"'
expected: '"Not Here" == "Not Here"'
# Whitespace Sensitivity
- name: Surrounding Whitespace
desc: Inverted sections should not alter surrounding whitespace.
data: { boolean: false }
template: " | {{^boolean}}\t|\t{{/boolean}} | \n"
expected: " | \t|\t | \n"
- name: Internal Whitespace
desc: Inverted should not alter internal whitespace.
data: { boolean: false }
template: " | {{^boolean}} {{! Important Whitespace }}\n {{/boolean}} | \n"
expected: " | \n | \n"
- name: Indented Inline Sections
desc: Single-line sections should not alter surrounding whitespace.
data: { boolean: false }
template: " {{^boolean}}NO{{/boolean}}\n {{^boolean}}WAY{{/boolean}}\n"
expected: " NO\n WAY\n"
- name: Standalone Lines
desc: Standalone lines should be removed from the template.
data: { boolean: false }
template: |
| This Is
{{^boolean}}
|
{{/boolean}}
| A Line
expected: |
| This Is
|
| A Line
- name: Standalone Indented Lines
desc: Standalone indented lines should be removed from the template.
data: { boolean: false }
template: |
| This Is
{{^boolean}}
|
{{/boolean}}
| A Line
expected: |
| This Is
|
| A Line
- name: Standalone Line Endings
desc: '"\r\n" should be considered a newline for standalone tags.'
data: { boolean: false }
template: "|\r\n{{^boolean}}\r\n{{/boolean}}\r\n|"
expected: "|\r\n|"
- name: Standalone Without Previous Line
desc: Standalone tags should not require a newline to precede them.
data: { boolean: false }
template: " {{^boolean}}\n^{{/boolean}}\n/"
expected: "^\n/"
- name: Standalone Without Newline
desc: Standalone tags should not require a newline to follow them.
data: { boolean: false }
template: "^{{^boolean}}\n/\n {{/boolean}}"
expected: "^\n/\n"
# Whitespace Insensitivity
- name: Padding
desc: Superfluous in-tag whitespace should be ignored.
data: { boolean: false }
template: '|{{^ boolean }}={{/ boolean }}|'
expected: '|=|'
+1
Ver Arquivo
@@ -0,0 +1 @@
{"__ATTN__":"Do not edit this file; changes belong in the appropriate YAML file.","overview":"Partial tags are used to expand an external template into the current\ntemplate.\n\nThe tag's content MUST be a non-whitespace character sequence NOT containing\nthe current closing delimiter.\n\nThis tag's content names the partial to inject. Set Delimiter tags MUST NOT\naffect the parsing of a partial. The partial MUST be rendered against the\ncontext stack local to the tag. If the named partial cannot be found, the\nempty string SHOULD be used instead, as in interpolations.\n\nPartial tags SHOULD be treated as standalone when appropriate. If this tag\nis used standalone, any whitespace preceding the tag should treated as\nindentation, and prepended to each line of the partial before rendering.\n","tests":[{"name":"Basic Behavior","data":{},"expected":"\"from partial\"","template":"\"{{>text}}\"","desc":"The greater-than operator should expand to the named partial.","partials":{"text":"from partial"}},{"name":"Failed Lookup","data":{},"expected":"\"\"","template":"\"{{>text}}\"","desc":"The empty string should be used when the named partial is not found.","partials":{}},{"name":"Context","data":{"text":"content"},"expected":"\"*content*\"","template":"\"{{>partial}}\"","desc":"The greater-than operator should operate within the current context.","partials":{"partial":"*{{text}}*"}},{"name":"Recursion","data":{"content":"X","nodes":[{"content":"Y","nodes":[]}]},"expected":"X<Y<>>","template":"{{>node}}","desc":"The greater-than operator should properly recurse.","partials":{"node":"{{content}}<{{#nodes}}{{>node}}{{/nodes}}>"}},{"name":"Surrounding Whitespace","data":{},"expected":"| \t|\t |","template":"| {{>partial}} |","desc":"The greater-than operator should not alter surrounding whitespace.","partials":{"partial":"\t|\t"}},{"name":"Inline Indentation","data":{"data":"|"},"expected":" | >\n>\n","template":" {{data}} {{> partial}}\n","desc":"Whitespace should be left untouched.","partials":{"partial":">\n>"}},{"name":"Standalone Line Endings","data":{},"expected":"|\r\n>|","template":"|\r\n{{>partial}}\r\n|","desc":"\"\\r\\n\" should be considered a newline for standalone tags.","partials":{"partial":">"}},{"name":"Standalone Without Previous Line","data":{},"expected":" >\n >>","template":" {{>partial}}\n>","desc":"Standalone tags should not require a newline to precede them.","partials":{"partial":">\n>"}},{"name":"Standalone Without Newline","data":{},"expected":">\n >\n >","template":">\n {{>partial}}","desc":"Standalone tags should not require a newline to follow them.","partials":{"partial":">\n>"}},{"name":"Standalone Indentation","data":{"content":"<\n->"},"expected":"\\\n |\n <\n->\n |\n/\n","template":"\\\n {{>partial}}\n/\n","desc":"Each line of the partial should be indented before rendering.","partials":{"partial":"|\n{{{content}}}\n|\n"}},{"name":"Padding Whitespace","data":{"boolean":true},"expected":"|[]|","template":"|{{> partial }}|","desc":"Superfluous in-tag whitespace should be ignored.","partials":{"partial":"[]"}}]}
+109
Ver Arquivo
@@ -0,0 +1,109 @@
overview: |
Partial tags are used to expand an external template into the current
template.
The tag's content MUST be a non-whitespace character sequence NOT containing
the current closing delimiter.
This tag's content names the partial to inject. Set Delimiter tags MUST NOT
affect the parsing of a partial. The partial MUST be rendered against the
context stack local to the tag. If the named partial cannot be found, the
empty string SHOULD be used instead, as in interpolations.
Partial tags SHOULD be treated as standalone when appropriate. If this tag
is used standalone, any whitespace preceding the tag should treated as
indentation, and prepended to each line of the partial before rendering.
tests:
- name: Basic Behavior
desc: The greater-than operator should expand to the named partial.
data: { }
template: '"{{>text}}"'
partials: { text: 'from partial' }
expected: '"from partial"'
- name: Failed Lookup
desc: The empty string should be used when the named partial is not found.
data: { }
template: '"{{>text}}"'
partials: { }
expected: '""'
- name: Context
desc: The greater-than operator should operate within the current context.
data: { text: 'content' }
template: '"{{>partial}}"'
partials: { partial: '*{{text}}*' }
expected: '"*content*"'
- name: Recursion
desc: The greater-than operator should properly recurse.
data: { content: "X", nodes: [ { content: "Y", nodes: [] } ] }
template: '{{>node}}'
partials: { node: '{{content}}<{{#nodes}}{{>node}}{{/nodes}}>' }
expected: 'X<Y<>>'
# Whitespace Sensitivity
- name: Surrounding Whitespace
desc: The greater-than operator should not alter surrounding whitespace.
data: { }
template: '| {{>partial}} |'
partials: { partial: "\t|\t" }
expected: "| \t|\t |"
- name: Inline Indentation
desc: Whitespace should be left untouched.
data: { data: '|' }
template: " {{data}} {{> partial}}\n"
partials: { partial: ">\n>" }
expected: " | >\n>\n"
- name: Standalone Line Endings
desc: '"\r\n" should be considered a newline for standalone tags.'
data: { }
template: "|\r\n{{>partial}}\r\n|"
partials: { partial: ">" }
expected: "|\r\n>|"
- name: Standalone Without Previous Line
desc: Standalone tags should not require a newline to precede them.
data: { }
template: " {{>partial}}\n>"
partials: { partial: ">\n>"}
expected: " >\n >>"
- name: Standalone Without Newline
desc: Standalone tags should not require a newline to follow them.
data: { }
template: ">\n {{>partial}}"
partials: { partial: ">\n>" }
expected: ">\n >\n >"
- name: Standalone Indentation
desc: Each line of the partial should be indented before rendering.
data: { content: "<\n->" }
template: |
\
{{>partial}}
/
partials:
partial: |
|
{{{content}}}
|
expected: |
\
|
<
->
|
/
# Whitespace Insensitivity
- name: Padding Whitespace
desc: Superfluous in-tag whitespace should be ignored.
data: { boolean: true }
template: "|{{> partial }}|"
partials: { partial: "[]" }
expected: '|[]|'
Diff do arquivo suprimido porque uma ou mais linhas são muito longas
+256
Ver Arquivo
@@ -0,0 +1,256 @@
overview: |
Section tags and End Section tags are used in combination to wrap a section
of the template for iteration
These tags' content MUST be a non-whitespace character sequence NOT
containing the current closing delimiter; each Section tag MUST be followed
by an End Section tag with the same content within the same section.
This tag's content names the data to replace the tag. Name resolution is as
follows:
1) Split the name on periods; the first part is the name to resolve, any
remaining parts should be retained.
2) Walk the context stack from top to bottom, finding the first context
that is a) a hash containing the name as a key OR b) an object responding
to a method with the given name.
3) If the context is a hash, the data is the value associated with the
name.
4) If the context is an object and the method with the given name has an
arity of 1, the method SHOULD be called with a String containing the
unprocessed contents of the sections; the data is the value returned.
5) Otherwise, the data is the value returned by calling the method with
the given name.
6) If any name parts were retained in step 1, each should be resolved
against a context stack containing only the result from the former
resolution. If any part fails resolution, the result should be considered
falsey, and should interpolate as the empty string.
If the data is not of a list type, it is coerced into a list as follows: if
the data is truthy (e.g. `!!data == true`), use a single-element list
containing the data, otherwise use an empty list.
For each element in the data list, the element MUST be pushed onto the
context stack, the section MUST be rendered, and the element MUST be popped
off the context stack.
Section and End Section tags SHOULD be treated as standalone when
appropriate.
tests:
- name: Truthy
desc: Truthy sections should have their contents rendered.
data: { boolean: true }
template: '"{{#boolean}}This should be rendered.{{/boolean}}"'
expected: '"This should be rendered."'
- name: Falsey
desc: Falsey sections should have their contents omitted.
data: { boolean: false }
template: '"{{#boolean}}This should not be rendered.{{/boolean}}"'
expected: '""'
- name: Context
desc: Objects and hashes should be pushed onto the context stack.
data: { context: { name: 'Joe' } }
template: '"{{#context}}Hi {{name}}.{{/context}}"'
expected: '"Hi Joe."'
- name: Deeply Nested Contexts
desc: All elements on the context stack should be accessible.
data:
a: { one: 1 }
b: { two: 2 }
c: { three: 3 }
d: { four: 4 }
e: { five: 5 }
template: |
{{#a}}
{{one}}
{{#b}}
{{one}}{{two}}{{one}}
{{#c}}
{{one}}{{two}}{{three}}{{two}}{{one}}
{{#d}}
{{one}}{{two}}{{three}}{{four}}{{three}}{{two}}{{one}}
{{#e}}
{{one}}{{two}}{{three}}{{four}}{{five}}{{four}}{{three}}{{two}}{{one}}
{{/e}}
{{one}}{{two}}{{three}}{{four}}{{three}}{{two}}{{one}}
{{/d}}
{{one}}{{two}}{{three}}{{two}}{{one}}
{{/c}}
{{one}}{{two}}{{one}}
{{/b}}
{{one}}
{{/a}}
expected: |
1
121
12321
1234321
123454321
1234321
12321
121
1
- name: List
desc: Lists should be iterated; list items should visit the context stack.
data: { list: [ { item: 1 }, { item: 2 }, { item: 3 } ] }
template: '"{{#list}}{{item}}{{/list}}"'
expected: '"123"'
- name: Empty List
desc: Empty lists should behave like falsey values.
data: { list: [ ] }
template: '"{{#list}}Yay lists!{{/list}}"'
expected: '""'
- name: Doubled
desc: Multiple sections per template should be permitted.
data: { bool: true, two: 'second' }
template: |
{{#bool}}
* first
{{/bool}}
* {{two}}
{{#bool}}
* third
{{/bool}}
expected: |
* first
* second
* third
- name: Nested (Truthy)
desc: Nested truthy sections should have their contents rendered.
data: { bool: true }
template: "| A {{#bool}}B {{#bool}}C{{/bool}} D{{/bool}} E |"
expected: "| A B C D E |"
- name: Nested (Falsey)
desc: Nested falsey sections should be omitted.
data: { bool: false }
template: "| A {{#bool}}B {{#bool}}C{{/bool}} D{{/bool}} E |"
expected: "| A E |"
- name: Context Misses
desc: Failed context lookups should be considered falsey.
data: { }
template: "[{{#missing}}Found key 'missing'!{{/missing}}]"
expected: "[]"
# Implicit Iterators
- name: Implicit Iterator - String
desc: Implicit iterators should directly interpolate strings.
data:
list: [ 'a', 'b', 'c', 'd', 'e' ]
template: '"{{#list}}({{.}}){{/list}}"'
expected: '"(a)(b)(c)(d)(e)"'
- name: Implicit Iterator - Integer
desc: Implicit iterators should cast integers to strings and interpolate.
data:
list: [ 1, 2, 3, 4, 5 ]
template: '"{{#list}}({{.}}){{/list}}"'
expected: '"(1)(2)(3)(4)(5)"'
- name: Implicit Iterator - Decimal
desc: Implicit iterators should cast decimals to strings and interpolate.
data:
list: [ 1.10, 2.20, 3.30, 4.40, 5.50 ]
template: '"{{#list}}({{.}}){{/list}}"'
expected: '"(1.1)(2.2)(3.3)(4.4)(5.5)"'
# Dotted Names
- name: Dotted Names - Truthy
desc: Dotted names should be valid for Section tags.
data: { a: { b: { c: true } } }
template: '"{{#a.b.c}}Here{{/a.b.c}}" == "Here"'
expected: '"Here" == "Here"'
- name: Dotted Names - Falsey
desc: Dotted names should be valid for Section tags.
data: { a: { b: { c: false } } }
template: '"{{#a.b.c}}Here{{/a.b.c}}" == ""'
expected: '"" == ""'
- name: Dotted Names - Broken Chains
desc: Dotted names that cannot be resolved should be considered falsey.
data: { a: { } }
template: '"{{#a.b.c}}Here{{/a.b.c}}" == ""'
expected: '"" == ""'
# Whitespace Sensitivity
- name: Surrounding Whitespace
desc: Sections should not alter surrounding whitespace.
data: { boolean: true }
template: " | {{#boolean}}\t|\t{{/boolean}} | \n"
expected: " | \t|\t | \n"
- name: Internal Whitespace
desc: Sections should not alter internal whitespace.
data: { boolean: true }
template: " | {{#boolean}} {{! Important Whitespace }}\n {{/boolean}} | \n"
expected: " | \n | \n"
- name: Indented Inline Sections
desc: Single-line sections should not alter surrounding whitespace.
data: { boolean: true }
template: " {{#boolean}}YES{{/boolean}}\n {{#boolean}}GOOD{{/boolean}}\n"
expected: " YES\n GOOD\n"
- name: Standalone Lines
desc: Standalone lines should be removed from the template.
data: { boolean: true }
template: |
| This Is
{{#boolean}}
|
{{/boolean}}
| A Line
expected: |
| This Is
|
| A Line
- name: Indented Standalone Lines
desc: Indented standalone lines should be removed from the template.
data: { boolean: true }
template: |
| This Is
{{#boolean}}
|
{{/boolean}}
| A Line
expected: |
| This Is
|
| A Line
- name: Standalone Line Endings
desc: '"\r\n" should be considered a newline for standalone tags.'
data: { boolean: true }
template: "|\r\n{{#boolean}}\r\n{{/boolean}}\r\n|"
expected: "|\r\n|"
- name: Standalone Without Previous Line
desc: Standalone tags should not require a newline to precede them.
data: { boolean: true }
template: " {{#boolean}}\n#{{/boolean}}\n/"
expected: "#\n/"
- name: Standalone Without Newline
desc: Standalone tags should not require a newline to follow them.
data: { boolean: true }
template: "#{{#boolean}}\n/\n {{/boolean}}"
expected: "#\n/\n"
# Whitespace Insensitivity
- name: Padding
desc: Superfluous in-tag whitespace should be ignored.
data: { boolean: true }
template: '|{{# boolean }}={{/ boolean }}|'
expected: '|=|'
Diff do arquivo suprimido porque uma ou mais linhas são muito longas
+149
Ver Arquivo
@@ -0,0 +1,149 @@
overview: |
Lambdas are a special-cased data type for use in interpolations and
sections.
When used as the data value for an Interpolation tag, the lambda MUST be
treatable as an arity 0 function, and invoked as such. The returned value
MUST be rendered against the default delimiters, then interpolated in place
of the lambda.
When used as the data value for a Section tag, the lambda MUST be treatable
as an arity 1 function, and invoked as such (passing a String containing the
unprocessed section contents). The returned value MUST be rendered against
the current delimiters, then interpolated in place of the section.
tests:
- name: Interpolation
desc: A lambda's return value should be interpolated.
data:
lambda: !code
ruby: 'proc { "world" }'
perl: 'sub { "world" }'
js: 'function() { return "world" }'
php: 'return "world";'
python: 'lambda: "world"'
clojure: '(fn [] "world")'
template: "Hello, {{lambda}}!"
expected: "Hello, world!"
- name: Interpolation - Expansion
desc: A lambda's return value should be parsed.
data:
planet: "world"
lambda: !code
ruby: 'proc { "{{planet}}" }'
perl: 'sub { "{{planet}}" }'
js: 'function() { return "{{planet}}" }'
php: 'return "{{planet}}";'
python: 'lambda: "{{planet}}"'
clojure: '(fn [] "{{planet}}")'
template: "Hello, {{lambda}}!"
expected: "Hello, world!"
- name: Interpolation - Alternate Delimiters
desc: A lambda's return value should parse with the default delimiters.
data:
planet: "world"
lambda: !code
ruby: 'proc { "|planet| => {{planet}}" }'
perl: 'sub { "|planet| => {{planet}}" }'
js: 'function() { return "|planet| => {{planet}}" }'
php: 'return "|planet| => {{planet}}";'
python: 'lambda: "|planet| => {{planet}}"'
clojure: '(fn [] "|planet| => {{planet}}")'
template: "{{= | | =}}\nHello, (|&lambda|)!"
expected: "Hello, (|planet| => world)!"
- name: Interpolation - Multiple Calls
desc: Interpolated lambdas should not be cached.
data:
lambda: !code
ruby: 'proc { $calls ||= 0; $calls += 1 }'
perl: 'sub { no strict; $calls += 1 }'
js: 'function() { return (g=(function(){return this})()).calls=(g.calls||0)+1 }'
php: 'global $calls; return ++$calls;'
python: 'lambda: globals().update(calls=globals().get("calls",0)+1) or calls'
clojure: '(def g (atom 0)) (fn [] (swap! g inc))'
template: '{{lambda}} == {{{lambda}}} == {{lambda}}'
expected: '1 == 2 == 3'
- name: Escaping
desc: Lambda results should be appropriately escaped.
data:
lambda: !code
ruby: 'proc { ">" }'
perl: 'sub { ">" }'
js: 'function() { return ">" }'
php: 'return ">";'
python: 'lambda: ">"'
clojure: '(fn [] ">")'
template: "<{{lambda}}{{{lambda}}}"
expected: "<&gt;>"
- name: Section
desc: Lambdas used for sections should receive the raw section string.
data:
x: 'Error!'
lambda: !code
ruby: 'proc { |text| text == "{{x}}" ? "yes" : "no" }'
perl: 'sub { $_[0] eq "{{x}}" ? "yes" : "no" }'
js: 'function(txt) { return (txt == "{{x}}" ? "yes" : "no") }'
php: 'return ($text == "{{x}}") ? "yes" : "no";'
python: 'lambda text: text == "{{x}}" and "yes" or "no"'
clojure: '(fn [text] (if (= text "{{x}}") "yes" "no"))'
template: "<{{#lambda}}{{x}}{{/lambda}}>"
expected: "<yes>"
- name: Section - Expansion
desc: Lambdas used for sections should have their results parsed.
data:
planet: "Earth"
lambda: !code
ruby: 'proc { |text| "#{text}{{planet}}#{text}" }'
perl: 'sub { $_[0] . "{{planet}}" . $_[0] }'
js: 'function(txt) { return txt + "{{planet}}" + txt }'
php: 'return $text . "{{planet}}" . $text;'
python: 'lambda text: "%s{{planet}}%s" % (text, text)'
clojure: '(fn [text] (str text "{{planet}}" text))'
template: "<{{#lambda}}-{{/lambda}}>"
expected: "<-Earth->"
- name: Section - Alternate Delimiters
desc: Lambdas used for sections should parse with the current delimiters.
data:
planet: "Earth"
lambda: !code
ruby: 'proc { |text| "#{text}{{planet}} => |planet|#{text}" }'
perl: 'sub { $_[0] . "{{planet}} => |planet|" . $_[0] }'
js: 'function(txt) { return txt + "{{planet}} => |planet|" + txt }'
php: 'return $text . "{{planet}} => |planet|" . $text;'
python: 'lambda text: "%s{{planet}} => |planet|%s" % (text, text)'
clojure: '(fn [text] (str text "{{planet}} => |planet|" text))'
template: "{{= | | =}}<|#lambda|-|/lambda|>"
expected: "<-{{planet}} => Earth->"
- name: Section - Multiple Calls
desc: Lambdas used for sections should not be cached.
data:
lambda: !code
ruby: 'proc { |text| "__#{text}__" }'
perl: 'sub { "__" . $_[0] . "__" }'
js: 'function(txt) { return "__" + txt + "__" }'
php: 'return "__" . $text . "__";'
python: 'lambda text: "__%s__" % (text)'
clojure: '(fn [text] (str "__" text "__"))'
template: '{{#lambda}}FILE{{/lambda}} != {{#lambda}}LINE{{/lambda}}'
expected: '__FILE__ != __LINE__'
- name: Inverted Section
desc: Lambdas used for inverted sections should be considered truthy.
data:
static: 'static'
lambda: !code
ruby: 'proc { |text| false }'
perl: 'sub { 0 }'
js: 'function(txt) { return false }'
php: 'return false;'
python: 'lambda text: 0'
clojure: '(fn [text] false)'
template: "<{{^lambda}}{{static}}{{/lambda}}>"
expected: "<>"

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