root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
2,256 Commits 111 Branches 92 Tags 666 MiB
Commit Graph

1434 Commits

Author SHA1 Message Date
Jacob Thornton 706ee46b73 sort scrollspy to prevent flicker for unordered nav 2012-03-21 23:45:58 -07:00
Jacob Thornton 94b24aaa47 clear timeout to reset delays for tooltip/popover 2012-03-21 21:57:06 -07:00
Jacob Thornton 22963d7346 Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-03-21 21:37:17 -07:00
Jacob Thornton d5fb653914 top stripping leading and trailing whitespace + always use .html method 2012-03-21 21:35:02 -07:00
Marcus Bointon 2f06366399 Make changes in page templates, rebuild 2012-03-21 12:09:00 +01:00
Marcus Bointon 02a67ea59e Add note about styling tabs 
Fix typo in popover docs
 2012-03-21 11:28:23 +01:00
Marcus Bointon a0203bc8e0 Fix and improve docs on tab config 2012-03-21 11:20:56 +01:00
Jacob Thornton cb8dcfcebf if transitioning collapse, don't start new transition 2012-03-20 22:43:27 -07:00
Jacob Thornton 663e41d74f prevent dropdowns from closing when clicking inside form element inside dropdown 2012-03-19 23:13:55 -07:00
Jacob Thornton 63bd7cb478 fix slide logic for ie+ in carousel 2012-03-19 21:39:39 -07:00
Jacob Thornton bce33bbb09 if parent in collapse, only grab children 2012-03-19 21:10:55 -07:00
Jacob Thornton 630ff4ff7d fix collapse bug in ie7+ for initial collapse in 2012-03-19 20:51:20 -07:00
Jacob Thornton 07d23b927e add activate to scrollspy docs 2012-03-19 20:29:22 -07:00
Jacob Thornton 67f199678c if interval is false, do not autocycle the carousel 2012-03-19 15:48:57 -07:00
Jacob Thornton bf59220b87 ;) 2012-03-19 15:19:01 -07:00
Jacob Thornton 5a2c7eb50a select last item in scrollspy if you've reached the bottom of the document or element 2012-03-19 15:18:00 -07:00
Mark cdd158c571 Could have sworn I added that 's'! 2012-03-18 12:49:18 -06:00
Mark 4c0905c5f2 Added URL fix from #2643 - Thanks ctalkington 2012-03-18 12:44:31 -06:00
ctalkington 2c4230e2d3 update docs to match variable addition. 2012-03-15 14:46:27 -05:00
ctalkington 99e96f64f7 update docs to match variable addition. 2012-03-15 14:39:28 -05:00
ctalkington bf09c979ca make brand links follow navbarLinkColor but also be customizable in advanced cases. 2012-03-15 14:21:27 -05:00
Mark d3873b0fc7 Typo Fixes for .mustache files 
Added the doc typo fixes to the .mustache files as well.
 2012-03-14 20:28:24 -06:00
Jacob Thornton 8e0afbeaa4 update hide text to h5bp technique #2586 2012-03-14 12:00:27 -07:00
Mark 6a61e81b7a Another Typo 
Fixed another typo pointed out by panahi.
 2012-03-13 13:36:58 -06:00
Mark ffa0d2f180 Some Doc Typos 
Fixed doc typos in Components and Scaffolding.
 2012-03-13 10:35:08 -06:00
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 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 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 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
Mark Otto bf6cdff88a vertical align middle on images, run make to rebuild 2012-03-11 13:48:47 -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 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
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 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 bcef12dfcc add version to min js 2012-03-08 11:39:00 -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 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 Otto 738fac18de move padding from container to body for max-width: 767; responsive layout 2012-03-05 23:50:03 -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 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
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
Mark Otto bd55824827 .progress-warning mention in docs 2012-02-28 08:52:59 -08:00
Mark Otto fbebb046f7 fix navbar container for default 940px grid per #2194 2012-02-27 22:34:25 -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 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
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
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 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 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
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 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
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
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 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 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
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 bbb2fb3395 fix right aligned dropdowns 2012-02-18 20:06:38 -08:00
Mark Otto 29e6ef7c70 clarify forms in navbar per #2072 2012-02-18 15:23:38 -08:00