Commit Graph

473 Commits

Author SHA1 Message Date
Mark Otto f6ec2c5dac Drop the recently added .counter class for .badge 2013-02-17 21:06:20 -08:00
Mark Otto 4cbb663d9d Update some links and rename #gridsystem to #grid-system 2013-02-17 18:10:29 -08:00
Mark Otto 6ccf588a8e Restore submenu support 2013-02-17 13:35:14 -08:00
Mark Otto ce21926704 All Glyphicons now require a base class, e.g. .glyphicon.glyphicon-star 2013-02-16 01:26:43 -08:00
Mark Otto 37becbab8c convert components code examples to pygments 2013-02-14 21:42:33 -08:00
Mark Otto e45f12ad42 rearrange jekyll and docs 2013-02-12 12:44:41 -08:00
Mark Otto 8b9733b288 nuke what we don't need for jekyll 2013-02-12 12:25:05 -08:00
Mark Otto 0b4668368b Merge branch '2.3.0-wip' into 3.0.0-wip 2013-02-05 22:47:00 -08:00
Mark Otto 2fa77bf197 Update link to changelog 2013-02-05 22:46:45 -08:00
Mark Otto e4a74607b0 simplify media docs 2013-02-05 01:12:39 -08:00
Mark Otto b65293dec0 reorganize progress bars docs 2013-02-05 01:11:41 -08:00
Mark Otto 3949623eee simpler alerts docs 2013-02-05 01:07:43 -08:00
Mark Otto 238566b445 mo betta thumbnails docs 2013-02-05 01:01:23 -08:00
Mark Otto 2576e6d1d6 reorder counters docs 2013-02-05 00:59:22 -08:00
Mark Otto cf78f4b010 pagination docs cleanup 2013-02-05 00:54:48 -08:00
Mark Otto 1f673b77bb simpler breadcrumbs docs 2013-02-05 00:51:19 -08:00
Mark Otto 74c8a5611d Increase margins and line-height on h3; overhaul button dropdown docs 2013-02-05 00:49:54 -08:00
Mark Otto c09b994eea Add justified button groups for link buttons; reorganize dropdowns and button groups docs sections 2013-02-05 00:30:03 -08:00
Mark Otto 94e256c016 Refactor navbar dividers
* Instead of .divider-vertical, use .divider
* Makes use of .nav-divider mixin
* Dividers are horizontal to start, matching the default state of navbar nav links
* Dividers become vertical above 768px via media queries
2013-02-01 22:56:09 -08:00
Mark Otto d53af49afe Refactor colors and progress bars
* Buttons and progress bars now make use of more semantic global @brand- colors
* Progress bars have been rewritten to reduce the number of possible selectors
* Instead of .progress .bar, it's .progress-bar for individual bars of color, ultimately making for less CSS
2013-02-01 16:21:38 -08:00
Mark Otto 5e5670a1b4 Remove gallery link from navbar; add to homepage examples section instead 2013-01-31 18:00:11 -08:00
Mark Otto 83e5c01856 Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
	docs/assets/css/docs.css
	docs/assets/js/application.js
	docs/components.html
	docs/templates/pages/components.mustache
	less/sprites.less
2013-01-31 17:57:31 -08:00
Mark Otto f20c3368e4 Update pagination example HTML to match examples 2013-01-30 17:42:03 -08:00
Mark Otto d30f47efb2 Tighten up badges docs; less bottom margin on h3 2013-01-19 18:53:41 -08:00
Mark Otto c21c3f101b Merge branch '3.0.0-wip-badges-to-counters' of https://github.com/vickash/bootstrap into vickash-3.0.0-wip-badges-to-counters 2013-01-19 17:06:40 -08:00
Vickash Mahabir 67ec13a44c Counters example doesn't need to be a table 2013-01-18 18:03:43 -04:00
Vickash Mahabir 964cb77383 Make the counter example more meaningful 2013-01-18 17:50:58 -04:00
Vickash Mahabir 665de0455c Change .badge to .counter, make appearance more OSX-ish, and remove colors 2013-01-18 17:35:23 -04:00
Mark Otto 1b128b3431 comment tweaks and updating starter template 2013-01-17 20:28:05 -08:00
Mark Otto fd89531f6a Update commenting and structure of layout.mustache 2013-01-17 20:26:17 -08:00
Mark Otto d9b35c2602 Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/css.html
	docs/customize.html
	docs/examples/fluid.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/layout.mustache
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	less/navbar.less
2013-01-17 20:23:33 -08:00
Mark Otto b30b8c2c12 Restore nav tabs, pills, justified variation, disabled links, and a few more things. Still need to add the dropdowns back though. 2013-01-17 17:02:35 -08:00
Mark Otto 97975c5fcf Readd focused example of inputs to docs; clean up alerts section 2013-01-17 15:36:36 -08:00
Mark Otto f6226c9b91 Update Getting Started page to include mention of Respond 2013-01-17 14:49:52 -08:00
Mark Otto 5c76518f7d Add respond.js to main docs pages, but only for IE8 and down 2013-01-17 14:00:03 -08:00
Mark Otto 7c23d889bb Change subheading of alerts page 2013-01-17 12:13:37 -08:00
Mark Otto 7e46b6f636 Update nav and add bounds for tablet container 2013-01-17 00:58:34 -08:00
Mark Otto 9ba14cfb7c More navbar derping 2013-01-16 16:14:41 -08:00
Yohn 60bb95e611 adding class to example code 2013-01-16 07:45:31 -05:00
Mark Otto f9ee99cf6f Upgrade to newest HTML5 shiv, and make it a local dependency rather than CDNing 2013-01-14 00:11:55 -08:00
Mark Otto 7d8d5c7838 Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	Makefile
	README.md
	component.json
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap-affix.js
	docs/assets/js/bootstrap-alert.js
	docs/assets/js/bootstrap-button.js
	docs/assets/js/bootstrap-carousel.js
	docs/assets/js/bootstrap-collapse.js
	docs/assets/js/bootstrap-dropdown.js
	docs/assets/js/bootstrap-modal.js
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap-scrollspy.js
	docs/assets/js/bootstrap-tab.js
	docs/assets/js/bootstrap-tooltip.js
	docs/assets/js/bootstrap-transition.js
	docs/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.js
	docs/components.html
	docs/css.html
	docs/examples/fluid.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/extend.mustache
	docs/templates/pages/getting-started.mustache
	docs/templates/pages/index.mustache
	docs/templates/pages/javascript.mustache
	js/bootstrap-affix.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-popover.js
	js/bootstrap-scrollspy.js
	js/bootstrap-tab.js
	js/bootstrap-tooltip.js
	js/bootstrap-transition.js
	js/bootstrap-typeahead.js
	less/bootstrap.less
	less/buttons.less
	less/forms.less
	less/navbar.less
	less/popovers.less
	less/responsive-767px-max.less
	less/responsive.less
	less/tables.less
	less/tooltip.less
	less/type.less
	less/variables.less
	package.json
2013-01-13 04:26:52 -08:00
Mark Otto 583fc4b962 buttons and button group flattening improvements 2013-01-12 18:52:06 -08:00
Mark Otto a33d45f308 Merge branch '3.0.0-wip' into bs3-flatten 2013-01-12 14:16:49 -08:00
Mark Otto 7a3f078fb4 Remove parent div from pagination component
* No more div.pagination; it's now just ul.pagination
* No more .pagination-right or .pagination-centered
* Sizes remain
* Any further customization, such as alignment, should be done on the individual application or site level.
2013-01-12 13:15:19 -08:00
Mark Otto a7231854c9 Address #6459 and add mention of disabled links in dropdowns to le docs 2013-01-12 00:33:12 -08:00
Mark Otto 88e816956a Fixes #6552: example fix for button group 2013-01-11 20:52:39 -08:00
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