Commit Graph

477 Commits

Author SHA1 Message Date
Mark Otto 3d04d9ba75 Super lame typo on my part, sorry @necolas :) 2012-12-28 19:24:13 -06:00
Mark Otto c063f7c9c2 Update docs to reflect latest on .clearfix 2012-12-24 02:08:45 -08:00
Mark Otto d206ec1659 Remove .badge-info and .badge-inverse; change docs label of .badge-important to .badge-danger 2012-12-24 02:06:28 -08:00
Mark Otto c11f41ba04 flatten buttons and forms 2012-12-21 00:50:28 -08:00
Mark Otto 7c04d573d0 update docs regarding normalize and clearfix 2012-12-20 21:44:45 -08:00
Quy Ton a27bf30f0d Miscellaneous changes to docs 2012-12-20 21:38:53 -08:00
Mark Otto 4e54e7bb35 Remove dropdown submenu docs 2012-12-20 00:27:46 -08:00
Mark Otto 65edc9cd6e Change .jumbotron usage in docs layout to .bs-docs-jumbotron 2012-12-19 21:42:36 -08:00
Mark Otto b6945a2168 Rename .hero-unit to .jumbotron becaue fuck dashes in filenames and sports metaphors are cooler than ad ones 2012-12-19 21:37:16 -08:00
Mark Otto 2011a0d50f Drop labels from the docs 2012-12-19 21:29:57 -08:00
Mark Otto bc0b94a3fd Merge branch 'master' into 3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap.js
	docs/css.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/javascript.mustache
	less/breadcrumbs.less
	less/tables.less
	less/tests/css-tests.html
2012-12-08 17:40:42 -08:00
Quy Ton 81679981c5 Escape × 2012-12-05 15:28:14 -08:00
Mark Otto 33e14fe5bf Merge branch '2.2.2-wip' into 3.0.0-wip
Conflicts:
	README.md
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/examples/fluid.html
	docs/scaffolding.html
	less/breadcrumbs.less
	less/popovers.less
	less/responsive.less
2012-12-05 11:05:10 -08:00
Mark Otto b3019d7aab add gallery page, fill with a few screenshots to start 2012-12-04 20:30:21 -08:00
Mark Otto 12916b06aa Fix up display of dropdown submenu examples on responsive views 2012-12-04 18:25:16 -08:00
Mark Otto 0f2a423b8d Once more, update all the favicons to retina 2012-12-03 13:25:56 -08:00
Mark Otto 15a4399015 Align the touch icons attributes 2012-12-03 13:22:10 -08:00
Mark Otto dd11d0a3fa move around social buttons 2012-12-01 13:47:07 -08:00
Mark Otto ebd2215e49 remove deleted css files, run make 2012-11-30 16:31:24 -08:00
Mark Otto fca35c0dba Merge branch '2.2.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/templates/pages/components.mustache
	less/alerts.less
	less/button-groups.less
	less/buttons.less
	less/tests/css-tests.html
2012-11-30 00:13:30 -08:00
Mark Otto acc037de15 add holder and replace placehold.it 2012-11-29 20:59:14 -08:00
Mark Otto 7e56e2265d Merge branch '2.2.2-wip' into exploratory
Conflicts:
	less/button-groups.less
2012-11-22 22:04:21 -08:00
Mark Otto 8df2811d49 Simpler footer for docs
* Remove back to top link (ya'll are lazy :P)
* Center text
* Decrease vertical padding
2012-11-21 23:29:20 -08:00
Mark Otto fa1c130552 Change important badges/labels to danger 2012-11-15 09:17:11 -08:00
Mark Otto 83a3789b5e add justified nav links for tabs and pills 2012-11-04 00:52:10 -07:00
Mark Otto 05a2d37559 run make after removing responsive css file 2012-11-04 00:37:49 -07:00
Mark Otto 3de6f3ff88 Swap old icons for new in docs 2012-11-03 16:18:02 -07:00
Mark Otto c0eacca0db Navs refactor, restoring .nav-list 2012-11-03 16:14:44 -07:00
Mark Otto a249d1c8ee Merge branch '2.2.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap.css
	docs/scaffolding.html
	docs/templates/pages/scaffolding.mustache
2012-11-03 13:44:01 -07:00
Mark Otto ead5dbeba5 Fixes #5775: Collapse labels/badges
* When :empty, display: none;
* Add documentation for change in behavior
2012-11-03 13:18:23 -07:00
Mark Otto 1477e081d4 Merge branch '2.2.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap.css
	docs/getting-started.html
	docs/templates/pages/getting-started.mustache
	less/accordion.less
	less/alerts.less
	less/breadcrumbs.less
	less/buttons.less
	less/code.less
	less/dropdowns.less
	less/forms.less
	less/navbar.less
	less/progress-bars.less
	less/responsive-navbar.less
	less/tables.less
	less/thumbnails.less
	less/tooltip.less
	less/wells.less
2012-11-02 09:36:51 -07:00
Mark Otto d5697fcf6b fixes #5717: add retina favicon, recompile docs 2012-10-31 10:41:41 -07:00
Bradly Feeley ed5c5994a7 Fixing typo in docs. 2012-10-13 18:31:41 -07:00
Mark Otto 6203535d2f Changing title of docs pages to simply say 'Bootstrap' like the docs home page 2012-10-07 21:38:28 -07:00
Mark Otto e73cd15fc8 copy and style changes to improve docs rendering on mobile devices 2012-10-02 17:01:18 -07:00
Mark Otto 7732d8b9b0 Merge branch '2.1.2-wip' into exploratory 2012-10-02 15:41:31 -07:00
Mark Otto a2369021ce fixes #5352: update docs messaging for disable nav links 2012-10-02 15:10:22 -07:00
Mark Otto 4ab7b77aa3 Merge branch '2.1.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/templates/pages/components.mustache
	less/labels-badges.less
	less/navbar.less
	less/tables.less
2012-10-01 23:41:00 -07:00
Mark Otto 1b814458c9 improve dropdown submenu docs; add docs for left submenu; remove all dupe css for left submenu 2012-10-01 16:41:13 -07:00
Mark Otto 86d5ed6f4f fixes #5377: change selectors for navbar collapse to be unique so only one open/closes at a time 2012-10-01 13:52:50 -07:00
Mark Otto eb555b7a9d remove .nav-list, instead use .nav-stacked on .nav-tabs or .nav-pills from now on 2012-10-01 00:06:44 -07:00
Mark Otto 26386ad615 remove tabbable tabs on left, right, and bottom; instead, from here out use stacked pills or tabs 2012-10-01 00:05:18 -07:00
Mark Otto ecbf1159a4 remove .dividers from breadcrumbs, instead use :after and content 2012-09-25 22:57:20 -07:00
Mark Otto c59e5251e1 initial pass at removing navbar-inner from .navbar component 2012-09-25 22:48:02 -07:00
Mark Otto f12946be5a thumbnails cleanup: no more UL or LI elements needed, instead just use standard grid markup 2012-09-25 22:40:48 -07:00
Mark Otto 443c43f6c4 fixes #5102, #5166, #5194, #5205: add overflow: visible; to .nav-collapse.collapse so that dropdowns overflow correctly in the navbar in IE7-8 2012-09-20 10:28:27 -07:00
Mark Otto 2d90c816ac add new vars for common border-radius, upping border-radius of inputs to 4px; add border-radius changes to -large, -small, -mini for buttons and paginations 2012-09-18 21:16:08 -07:00
Mark Otto 2769241aeb add new vars for common font-sizes and paddings with large, small, and mini components; resize pagination and buttons to better match each other 2012-09-18 20:56:20 -07:00
Mark Otto 37460e58d3 Merge branch '2.1.2-wip' of https://github.com/uberspeck/bootstrap into uberspeck-2.1.2-wip 2012-09-18 14:58:39 -07:00
Mark Otto 26ca131a95 Merge branch 'wpbrains-media-component' into 2.1.2-wip 2012-09-17 18:15:44 -07:00
Mark Otto 143fef9f95 overhaul the docs and css to merge into 2.1.2 since this was against master 2012-09-17 18:15:39 -07:00
Martin Bean 2ead9a5bc3 Standardized spelling of 'JavaScript'; added icons to file trees 2012-09-14 14:06:15 +01:00
Mark Otto 595e1a189c fixes #5119: javascript in navbar typo 2012-09-13 10:07:57 -07:00
Brian Campbell 2c8eff0eec Updated pagination to support .pagination-large, .pagination-small, .pagination-mini matching button sizes. Updated related docs. 2012-09-12 14:10:03 -06:00
Mark Otto 61332d727e fixes #5020: submenu support in dropup 2012-09-07 11:34:05 -07:00
Mark Otto 1c9d5c43b0 fixes #4640: pagination span issues resolved by scoping selectors to appropriate children, not all children; clarify docs on use of spans for disabled and active links 2012-08-27 10:56:46 -07:00
Mark Otto f744ad57fc fixes #4676 manually: example html updated 2012-08-25 22:31:10 -07:00
Mark Otto 099cec1ca7 fixes #4493: typo in dimiss alerts docs 2012-08-21 13:00:40 -07:00
Mark Otto 6cf3752b9b fix ie7 dropdowns examples in docs 2012-08-20 12:16:15 -07:00
Mark Otto 2fda6a45aa bump up height of progress bars, give some extra depth with stacking bars, and then make the stacked bars actually work 2012-08-20 11:22:37 -07:00
Jonas Pommerening a1951ed7c0 stack mutliple progress bars 2012-08-20 10:12:03 +02:00
Mark Otto a667fd93ab pre font-size increase; revert static top navbar, undo contents section for now 2012-08-19 23:01:24 -07:00
Mark Otto 4e979f084d fix static navbar container issues, clean up docs presentation by unfixing the top navbar in favor of static one, start adding table of contents for longer sections of docs 2012-08-19 21:12:52 -07:00
Mark Otto e4d4ef43b0 copy change for previous commit 2012-08-19 20:38:27 -07:00
Mark Otto e71e2b4be2 fixes #4460 and #4461: copy change for opera animations support 2012-08-19 20:38:16 -07:00
Mark Otto 077577c7f3 fixes #4421: add static top navbar class 2012-08-17 11:46:23 -07:00
Mark Otto b8715ddfd0 fixes #4417: proper height on thumbnail placeholder image 2012-08-17 11:27:11 -07:00
Jacob Thornton dee57462e2 get affix actually working and update docs 2012-08-14 21:06:08 -07:00
Mark Otto 97a23ef2e6 fixes #4342: navbar vars not in use, render navbar dividers 2012-08-13 22:57:40 -07:00
Henning Hoefer a74457a203 Fixed a typo in inverse navbar code sample 2012-08-14 02:10:07 +02:00
Ben Oakes e31f06b857 Fix wording (presumed typo) 2012-08-13 13:22:08 -05:00
Mark Otto 9f8ce77751 running make on previous changes 2012-08-13 10:05:19 -07:00
Mark Otto c2e899f2a0 remove the canvas slider doodad 2012-08-01 19:00:25 -07:00
Mark Otto 9795e9bbe6 place chevrons first in sidenav in docs, fix ie7 bugs for said sidenav 2012-07-30 23:48:26 -07:00
Mark Otto 04164e4367 fixes #3858: add var for responsive navbar. also add additional examples to navbar docs 2012-07-30 10:25:04 -07:00
Mark Otto a30045daef reverse navbar styles to save code 2012-07-29 00:30:15 -07:00
Mark Otto 16b4ac0d8f add docs for sub menu support on dropdowns, add caret via :after to submenu toggles 2012-07-27 10:35:15 -07:00
Mark Otto 9d5c431223 add basic support for sub menus in dropdown menus 2012-07-27 10:06:54 -07:00
Mark Otto b7b4fd5c82 wrap footer in bs docs canvas for scrolling doodad 2012-07-24 01:53:32 -07:00
Jacob Thornton e38fa4b1f4 fix scroll thinggg 2012-07-24 00:30:58 -07:00
Mark Otto f085dbadd1 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
Conflicts:
	docs/assets/css/docs.css
	docs/base-css.html
	docs/components.html
	docs/customize.html
	docs/getting-started.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/customize.mustache
	docs/templates/pages/getting-started.mustache
	docs/templates/pages/javascript.mustache
	docs/templates/pages/scaffolding.mustache
2012-07-23 23:01:38 -07:00
Mark Otto 0dda2c4659 make docs scroll over jumbotrons, but only for 980px up 2012-07-23 22:36:08 -07:00
Jacob Thornton dcf75697ec some progress on affix plugin 2012-07-22 18:28:39 -07:00
Mark Otto b9105b98f9 move from downloads.html to customize.html to better match purpose of page, fix up customize page layout to match other docs, link style refinement to jumbotrons 2012-07-20 22:06:47 -07:00
Mark Otto 6c23fff4d6 misc docs content changes 2012-07-18 01:06:52 -07:00
Mark Otto 5cb116beb8 cleanup subnav example 2012-07-13 10:58:20 -07:00
Mark Otto 9343e1e933 remove getting started link from home, add to navbar, overhaul getting started docs 2012-07-12 21:38:18 -07:00
Mark Otto a12f0e551f overhaul docs on sub pages, clean up css and copy 2012-07-12 18:11:49 -07:00
Mark Otto 549d61fc28 updated footer 2012-07-12 17:02:55 -07:00
Mark Otto c884d6eaa6 clean up docs for subnav 2012-07-12 13:50:27 -07:00
Mark Otto 338c7ef2b6 tweak code snippet on pager and clean up type and font-sizes on docs Home 2012-07-12 13:45:07 -07:00
Mark Otto 75d952ffd8 fix indenting and remove hidden subnav on Components 2012-07-09 22:40:58 -07:00
Mark Otto 9887d3cf4a updating docs examples to remove 13/18 resets, fix up buttons alignments and carets 2012-07-09 00:26:32 -07:00
Mark Otto 20676ddd4d adding getting started page based on Bootstrap University from awhile back, testing out side nav on docs instead of subnav bar 2012-07-08 01:47:36 -07:00
Mark Otto 5f861ef517 fix up docs to use default container, fix responsive home changes 2012-07-07 23:16:07 -07:00
Mark Otto 3c07eaa251 updates to type scale 2012-07-05 15:11:54 -07:00
Mark Otto c6ee96c025 fix up subnav styles, add subnav search form styles, add some basic docs for subnav 2012-07-05 10:37:23 -07:00
Mark Otto a645664e50 update thumbnails to fix display issues and refine aesthetics 2012-07-05 10:12:15 -07:00
Mark Otto a683497dbc renamed less.html to extend.html, removing all the vars and mixins 2012-06-27 23:56:00 -07:00
Mark Otto 6662f62236 remove subnav file, instead add an optional class for .navbar 2012-06-24 21:03:39 -07:00
Mark Otto 71669dda63 tons of docs cleanup in css, adding subnav to official components 2012-06-24 20:26:48 -07:00
Mark Otto 089f42a07f fix html typos 2012-06-20 00:06:05 -07:00
Mark Otto 40298ddbf1 add note to components about nav list nesting 2012-06-19 15:25:35 -07:00
Mark Otto ff92344f0d remove icons example of nav list--doesn't really add anything useful 2012-06-19 14:46:14 -07:00
Mark Otto b54264cde0 add basic vertical button group support 2012-06-19 14:42:46 -07:00
Mark Otto 64ba423b6d #2764: add disabled styles to navs and dropdowns 2012-06-19 13:52:07 -07:00
Purwandi c7ffe6edc8 Add space on navbar button 2012-06-12 12:17:10 +07:00
Mark Otto f453909f39 add a dropdowns section to Components (still needs work) and reformat much of the js docs 2012-06-11 21:48:41 -07:00
Mark Otto a0cd886c56 rewrite the rest of the nav section 2012-06-10 21:24:13 -07:00
Mark Otto c90c66e61f rewrite the split button dropdowns section 2012-06-10 21:00:20 -07:00
Mark Otto 081a07c168 updated button groups section 2012-06-10 20:50:49 -07:00
Mark Otto 017b7cb804 rewrite the navbar section 2012-06-10 20:39:00 -07:00
Mark Otto 0c817bf5e2 redo pagination and breadcrumbs 2012-06-10 16:46:46 -07:00
Mark Otto 3985379cca rearrange hero unit section 2012-06-10 15:14:21 -07:00
Mark Otto f2e39233f5 rewrite alerts and progress bars sections 2012-06-10 15:12:02 -07:00
Mark Otto 550e375af0 restore scrollspy to body 2012-06-08 16:35:04 -07:00
Mark Otto bba0b34c36 restore top navs entirely 2012-06-07 22:10:36 -07:00
Mark Otto c1c7528dd9 drop the side nav, restore topbar 2012-06-07 21:48:03 -07:00
Mark Otto df869f1eb0 fix grids 2012-06-07 21:45:37 -07:00
Mark Otto ff6dd0cf56 nav and content tweaks 2012-06-07 14:01:03 -07:00
Mark Otto a1aa2b188a more content changes to docs 2012-06-07 10:20:52 -07:00
Mark Otto 2ecbd36cbf add back left rail nav, tweak colors 2012-06-06 00:48:31 -07:00
Mark Otto 5a614fb86d remove sidenav 2012-06-05 19:53:54 -07:00
Mark Otto 8ee0679522 updated javascripts for first pass at single column 2012-06-05 18:25:46 -07:00
Mark Otto 22918f8f92 more tweaks to layouts and some docs styles 2012-06-05 17:16:17 -07:00
Mark Otto dd127611e1 two col scaffolding rev 2012-06-05 00:46:16 -07:00
Mark Otto de53f62a04 more changes to js and components, playing with new docs subnav 2012-06-04 23:57:48 -07:00
Mark Otto 47e2c43401 navs tabs pills to single column 2012-06-04 23:37:18 -07:00
Mark Otto b8d8704f90 button groups and dropdowns to single column 2012-06-04 23:34:02 -07:00
Mark Otto 446f9199c6 updated index page and footer 2012-06-04 23:31:26 -07:00
Mark Otto c44bd1edf4 revamp docs to have new width, start realigning the base css page to match 2012-06-04 21:08:31 -07:00
Mark Otto 348668ec13 add misc helper classes to components css docs 2012-06-04 20:25:57 -07:00
Mark Otto 589242604f document large and small well classes 2012-06-04 18:56:50 -07:00
Mark Otto cc8b260ed8 adding google analytics tracking to docs 2012-05-26 16:35:28 -07:00
Mark Otto 7dbcd0be9a fix navbar button for mobile tapping (turn to button instead of adding href=#), streamline less docs page 2012-05-24 21:30:43 -07:00
Mark Otto 67f81a2ed5 clarify button type on dismiss icons 2012-05-15 09:41:06 -07:00
Mark Otto 7de65e0a62 #3465 part 2: add mention to docs of type button issue 2012-05-13 14:03:32 -07:00
Mark Otto d09db29039 #3465 part 1: add type="button" to all dismiss buttons in docs 2012-05-13 14:01:57 -07:00
Mark Otto b6b354ceaa #3255: typo in components for tabbable tabs 2012-04-30 15:42:55 -07:00
Mark Otto fd009597b6 mention responsive css in navbar responsive section 2012-04-19 09:28:40 -07:00
ctalkington 0e6f12af86 add 's' to 'classe' in components docs. thanks mishmosh. 2012-04-12 15:14:54 -05:00
Mark Otto 93d42ca80e fix #2832: clarify docs on use of .tabbable and add mention of .fade 2012-03-28 17:35:06 -07:00
Andreas Cederström 5d2062a3cc Finish of close conversion from a to button 2012-03-27 08:36:34 +02:00
Mark Otto d4914f47c3 fix #2799, mention of text in the navbar 2012-03-26 09:25:31 -07:00
Mark Otto 4449c4e9e0 update docs messaging around alerts and buttons 2012-03-25 20:44:01 -07:00
Mark Otto 473e5714f7 change all anchor alert closes to buttons 2012-03-25 20:41:59 -07:00
Mark Otto ea437351ed add heads up note for required href on alert dismiss actions 2012-03-25 19:47:13 -07:00
Mark Otto 4893928310 add back href for alerts in components docs to make close work on iphone 2012-03-25 18:03:30 -07:00
Mark Otto 8d52e6d458 change arrows in one pagination example because opera janks it up, per #2697 2012-03-25 14:51:54 -07:00
Jacob Thornton a62810918f fix responsive navbar 2012-03-25 13:33:36 -07:00
Mark Otto d1864b3608 adding 144x144 ipad touch icon 2012-03-25 00:46:03 -07:00
Andreas Cederström eb4f708b91 badge-error => badge-important 2012-03-23 13:35:46 +01:00
Mark Otto ac64d9405b Dropdowns overhaul:
1. Removed broken and unused dropup examples from the navs/pills docs
2. New defaults for dropdown menus: all corners are rounded and always 1px offset from top unless otherwise specified
3. Refined active and open states for button dropdowns by adding a darker background color for each button variation when opened; also changed the opened dropdown-toggle's inset shadow to match that of an :active button
4. Generalized .dropdown.open to just .open, thus removing a few lines from button-groups.less.
5. Annnnnnnnnd I think that's it.
2012-03-22 23:09:31 -07:00
Mark Otto 42f636032c fix #2716, incorrect required markup for navbar search form 2012-03-22 17:22:19 -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
Mark ffa0d2f180 Some Doc Typos
Fixed doc typos in Components and Scaffolding.
2012-03-13 10:35:08 -06:00
Mark Otto 7f3a2b3813 button group sizes for ie7 fixes 2012-03-12 12:44:47 -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 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 f4ac080f9e fix #2510, docs typo 2012-03-10 16:06:56 -08:00
Mark Otto 95a3cd8732 simplify notes around using button dropdowns 2012-03-10 15:41:41 -08:00
Mark Otto 9c1d8e032b change title attr to re-include twitter 2012-03-10 15:14:54 -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 9ebc6b4c97 simplify buttons docs section by changing a buttons to button elements 2012-03-10 11:37:34 -08:00
Jacob Thornton 426feeef6a give pages custom titles based on names 2012-03-08 11:09:33 -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 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 cb9234ba46 fix warning button issue per #2392 and add warning buttons to components 2012-03-05 00:47:13 -08:00
Mark Otto bd55824827 .progress-warning mention in docs 2012-02-28 08:52:59 -08:00
Mark Otto ca9588c896 manually resolve #2266, typo in example HTML for breadcrumbs 2012-02-27 19:47:21 -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 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 bb16b9bef2 fix second part of #1962 2012-02-21 13:52:02 -08:00
Mark Otto 06d4756114 adding basic badges support 2012-02-20 21:20:06 -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 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 29e6ef7c70 clarify forms in navbar per #2072 2012-02-18 15:23:38 -08:00
Mark Otto 1a1816b5bd clarify misc components subhead 2012-02-18 15:17:25 -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 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
Mark Otto 0369c1fcfc add mention of navbar vertical divider in docs 2012-02-16 21:04:16 -08:00
Jacob Thornton 1520ec446c rebuild bro 2012-02-16 20:30:18 -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 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 ac9ac4ddae add note to button dropdowns about js plugin dependency per #1746 2012-02-12 15:49:04 -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 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
Mark Otto c720d951be add best practices and re-org the button groups 2012-02-10 23:50:45 -08:00
Mark Otto d92523f329 fix for #1658 to give .label-success proper text 2012-02-05 01:57:09 -08:00
Mark Otto 0336f1e644 #1695: manually fix broken primary button instances 2012-02-05 00:27:08 -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