aboutsummaryrefslogtreecommitdiff
path: root/docs/components.html
AgeCommit message (Collapse)AuthorFilesLines
2014-01-15reassert #12231 & #12232 (merge went badly?)Chris Rebert1-3/+3
2014-01-16Remove popovers from components.html leadJulian Thilo1-1/+1
because they're only really featured on javascript.html Replacement: input groups
2014-01-15Merge branch 'master' into docs_derpMark Otto1-3/+11
Conflicts: docs/components.html docs/css.html
2014-01-14Merge pull request #12232 from twbs/mixing-docsMark Otto1-2/+2
clarify docs regarding non-mixable components
2014-01-14clarify docs regarding non-mixable componentsChris Rebert1-2/+2
2014-01-14upgrade form-group + input-group callout from info to warningChris Rebert1-1/+1
2014-01-14downgrade <label>-related callouts from danger to warningChris Rebert1-1/+1
2014-01-14upgrade tooltip/popover-in-groups callout from info to warningChris Rebert1-2/+2
2014-01-12Formatting and docs changesMark Otto1-1866/+1824
2014-01-11Merge branch 'master' into docs_derpMark Otto1-2/+2
Conflicts: docs/getting-started.html
2014-01-10refer to correct componentChris Rebert1-1/+1
2014-01-10docs mention for #12188Mark Otto1-2/+2
2014-01-09Merge branch 'master' into docs_derpMark Otto1-4/+4
Conflicts: docs/assets/css/docs.css
2014-01-07Fix #12073: Consistent order of variationsJulian Thilo1-4/+4
This changes the order of component variations throughout the repo (code and docs) to be more consistent. The order now used everywhere is the one most frequently found in the repo before: Default, Primary, Success, Info, Warning, Danger
2014-01-05Merge branch 'master' into docs_derpMark Otto1-2/+1
Conflicts: docs/components.html
2014-01-05grammarghhhhhhhhhhhhMark Otto1-1/+1
2014-01-05Merge branch 'master' into docs_derpMark Otto1-2/+4
2014-01-05Merge branch 'master' into docs_derpMark Otto1-165/+179
2014-01-05document single .form-control per .input-group limitation; fixes #12109Chris Rebert1-2/+4
2014-01-05add .container(-fluid) to remaining navbar examples for consistency/accuracyChris Rebert1-163/+177
follow-up to 93a4d6cc5ecdc1cbc09c4b8af2e587f4480b36cf
2014-01-04Fix anchor linksQuy Ton1-2/+2
2014-01-04Use relative URLsQuy Ton1-2/+2
2013-12-31Merge branch 'master' into docs_derpMark Otto1-0/+2989
Conflicts: _config.yml docs/_includes/footer.html docs/_includes/nav-main.html docs/_includes/old-bs-docs.html docs/_layouts/default.html docs/_layouts/home.html docs/getting-started.html docs/index.html
2013-12-28no more page.base_urlMark Otto1-1/+0
2013-12-28Rearrange repository contents because muahahahahahahaMark Otto1-0/+2989
2013-07-18flatten docs dir back into rootMark Otto1-2106/+0
2013-07-17Drop `.nav-header` for `.dropdown-header`Mark Otto1-0/+25
* Since we no longer have `.nav-list`, I've nuked the `.nav-header` * However, dropdowns can still have section headings, so I've kept that around with the addition of `.dropdown-header` * Restyled it a smidge as well
2013-07-17fix broken docs calloutsMark Otto1-1/+1
2013-07-17Merge branch '3.0.0-docs-calloutfam' of ↵Mark Otto1-9/+21
https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-docs-calloutfam Conflicts: docs/components.html docs/css.html docs/customize.html
2013-07-09Dustin the docs againJulian Thilo1-9/+9
* Fix alllll the links! * Change all `*.js` in JS plugin docs (no mo `bootstrap-`) * Fully remove `tr.info` * Bring nav includes up to date
2013-07-05Remove more GlyphiconsMark Otto1-68/+0
2013-07-03use sibling selector instead of pseudo selectorliuyl1-1/+1
2013-06-27remove submenus. for more context: ↵Mark Otto1-89/+0
http://www.youtube.com/watch?v=ggWyUEuGcWY&feature=youtu.be&t=48s
2013-06-27remove glyphicons from demo componentMark Otto1-4/+4
2013-06-27Merge branch '3.0.0-wip' into bs3_remove_iconsMark Otto1-2/+6
Conflicts: docs/components.html
2013-06-27Merge pull request #8307 from cvrebert/8287-docs-patchMark Otto1-0/+5
Fix #8287
2013-06-26Adjust info callout, add callouts to docsJulian Thilo1-13/+30
* Adjust the background-color of bs-callout-info to match danger and warning in tone * Convert all the callouts * Change some callouts to info/warning * Add new callout
2013-06-26typo: match doc text and exampleJames Holland1-1/+1
2013-06-25Fix #8287Chris Rebert1-0/+5
2013-06-24Replaced <i> with <span> for glyphiconKyle1-165/+165
2013-06-20Move Glyphicons into their own repoMark Otto1-314/+0
Removes the icon fonts and associated docs and LESS code from the core repo and into twbs/bootstrap-glyphicons.
2013-06-16components docs: backticks ==> <code>Chris Rebert1-1/+1
2013-06-16upgrade holder to 2.0, update thumbnail examples in docs to fit inside ↵Ivan Malopinsky1-5/+5
containers
2013-06-13Fixmarsuboss1-1/+1
2013-06-03nuke the .colMark Otto1-13/+13
2013-05-16Change up link alertsMark Otto1-0/+28
* No more children selectors to set all links in alerts as a special color because buttons and more wrongly inherited color * Adds .alert-link for easy styling in any alert
2013-05-15Fixes #7898: ensure button typeMark Otto1-24/+24
Sets `type="button"` on all buttons in the docs
2013-05-14Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wipMark Otto1-21/+7
Conflicts: docs/assets/css/docs.css
2013-05-14Overhaul form control and button sizing, and some type stylesMark Otto1-35/+2
* New padding approach with separate horizontal and vertical padding variables * Improved sizing in large and small buttons and form controls * Dropped the `.btn-mini` (since we have no `.input-mini` to match, and holy fuck those were small buttons) * Dropped the `.pagination-mini` as well because once again, to hell with such small components * Changed `@line-height-headings` to `@headings-line-height` * Removed the `@headings-font-family` because it was honestly kind of useless
2013-05-14Merge pull request #7882 from juthilo/3.0.0-wipMark Otto1-21/+7
Cleaning the navbar docs