diff options
| author | Mark Otto <[email protected]> | 2015-06-13 14:05:25 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-06-13 14:05:25 -0700 |
| commit | e615ae053c816fa477d158562e20ecaf2609128d (patch) | |
| tree | ac3f31f94e9dd82a2fd51af185aa66ad68e0a24a | |
| parent | ea803e55ffed3e75d1049b14e448c05235229f94 (diff) | |
| download | bootstrap-e615ae053c816fa477d158562e20ecaf2609128d.tar.xz bootstrap-e615ae053c816fa477d158562e20ecaf2609128d.zip | |
overhaul nav and shit again
- drop the index pages save for examples
- comment out the extend section for now
- fix up spacing fix on team list
| -rw-r--r-- | docs/_data/nav.yml | 120 | ||||
| -rw-r--r-- | docs/_includes/nav-docs.html | 6 | ||||
| -rw-r--r-- | docs/_includes/nav-home.html | 2 | ||||
| -rw-r--r-- | docs/about/index.md | 6 | ||||
| -rw-r--r-- | docs/assets/scss/_team.scss | 5 | ||||
| -rw-r--r-- | docs/components/index.md | 57 | ||||
| -rw-r--r-- | docs/getting-started/overview.md (renamed from docs/getting-started/index.md) | 0 | ||||
| -rw-r--r-- | docs/layout/index.md | 6 |
8 files changed, 16 insertions, 186 deletions
diff --git a/docs/_data/nav.yml b/docs/_data/nav.yml index 00d59969c..aeaa57157 100644 --- a/docs/_data/nav.yml +++ b/docs/_data/nav.yml @@ -1,18 +1,13 @@ - title: Getting started pages: + - title: Overview - title: Download - sections: - - title: Precompiled - - title: Source - - title: Bower - - title: npm - title: Contents - title: JavaScript - title: Compiling - title: Customize - title: Flexbox - title: Support - # - title: Third party support - title: Accessibility - title: Layout @@ -21,117 +16,27 @@ - title: Media queries - title: Containers - title: Grid - sections: - - title: Introduction - - title: Media queries - - title: Grid options - - title: Semantic mixins - - title: Ex Stacked to horizontal - - title: Ex Fluid container - - title: Ex Mobile and desktop - - title: Ex Mobile tablet desktops - - title: Ex Column wrapping - - title: Ex Responsive column resets - - title: Ex Offsetting columns - - title: Ex Nesting columns - - title: Ex Column ordering - title: Media - title: Responsive utilities - sections: - - title: Viewports - - title: Print - - title: Test cases - title: Components pages: - title: Reboot - sections: - - title: Approach - - title: Page defaults - - title: Headings and paragraphs - - title: Lists - - title: Preformatted text - - title: Tables - - title: Forms - - title: Misc elements - title: Typography - sections: - # - title: Scale - - title: Global settings - - title: Headings - - title: Lead - - title: Inline text elements - - title: Abbreviations - - title: Blockquotes - - title: Lists - title: Images - title: Code - sections: - - title: Inline code - - title: Preformatted text - - title: Variables - - title: User input - - title: Sample output - title: Tables - title: Buttons - sections: - - title: Examples - - title: Button tags - - title: Sizes - - title: Active state - - title: Disabled state - # - title: JavaScript behavior - - title: Custom states - - title: Single toggle - - title: Checkbox and radio - - title: Methods - title: Button group - title: Button dropdown - title: Forms - sections: - - title: Form controls - - title: Form groups - - title: Inline forms - - title: Using the Grid - - title: Checkboxes and radios - - title: Static controls - - title: Focus state - - title: Disabled state - - title: Readonly inputs - - title: Validation - - title: Control sizing - - title: Column sizing - - title: Help text - - title: Custom forms - # - title: Checkboxes and radios - # - title: Select menu - # - title: File browser - title: Input group - sections: - - title: Basic example - - title: Sizing - - title: Checkboes and radio buttons - - title: Button addons - - title: Buttons with dropdowns - - title: Segmented buttons - - title: Accessibility - title: Dropdowns - title: Jumbotron - title: Badges - title: Label - title: Alerts - title: Card - sections: - - title: Basic example - - title: Text alignment - - title: Header and footer - - title: Image caps - - title: Image overlays - - title: Inverted text - - title: Background variants - - title: Groups - - title: Sets - - title: Columns - title: Navs - title: Navbar - title: Breadcrumb @@ -145,19 +50,6 @@ - title: Collapse - title: Carousel - title: Utilities - sections: - - title: Text alignment - - title: Text transform - - title: Contextual colors - - title: Contextual backgrounds - - title: Close icon - - title: Floats - - title: Center content - - title: Hidden content - - title: Invisible content - - title: Screen readers - - title: Image replacement - - title: Responsive embed - title: Examples pages: @@ -179,11 +71,10 @@ - title: Sticky footer with navbar - title: Offcanvas -- title: Extend - pages: - - title: Approach - - title: Icon fonts - # - title: Accessibility +# - title: Extend +# pages: +# - title: Approach +# - title: Icon fonts - title: About pages: @@ -192,6 +83,5 @@ - title: Brand - title: License - title: Translations - # - title: Credits - title: Migration diff --git a/docs/_includes/nav-docs.html b/docs/_includes/nav-docs.html index 166117315..e87c182da 100644 --- a/docs/_includes/nav-docs.html +++ b/docs/_includes/nav-docs.html @@ -23,7 +23,11 @@ {% endif %} <div class="bd-toc-item {{ active }}"> - <a class="bd-toc-link" href="{{ site.baseurl }}/{{ group.title | downcase | replace: ' ', '-' }}/"> + {% if slug == "examples" %} + <a class="bd-toc-link" href="{{ site.baseurl }}/{{ group.title | downcase | replace: ' ', '-' }}/"> + {% else %} + <a class="bd-toc-link" href="{{ site.baseurl }}/{{ group.title | downcase | replace: ' ', '-' }}/{{ link.title | downcase | replace: ' ', '-' || page.title | downcase | replace: ' ', '-' }}"> + {% endif %} {{ group.title }} </a> diff --git a/docs/_includes/nav-home.html b/docs/_includes/nav-home.html index 084746d10..2cc5820c3 100644 --- a/docs/_includes/nav-home.html +++ b/docs/_includes/nav-home.html @@ -2,7 +2,7 @@ <a class="bd-header-mark hidden-xs-down" href="{{ site.baseurl }}">Bootstrap 4 Alpha</a> <nav class="nav nav-pills bd-header-nav"> - <a class="nav-link" href="{{ site.baseurl }}/getting-started/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Docs');">Documentation</a> + <a class="nav-link" href="{{ site.baseurl }}/getting-started/overview/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Docs');">Documentation</a> <a class="nav-link" href="{{ site.expo }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Expo');">Expo</a> <a class="nav-link" href="{{ site.blog }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Blog');">Blog</a> </nav> diff --git a/docs/about/index.md b/docs/about/index.md deleted file mode 100644 index 12b1c5fa5..000000000 --- a/docs/about/index.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -layout: page -title: About ---- - -todo: this entire page
\ No newline at end of file diff --git a/docs/assets/scss/_team.scss b/docs/assets/scss/_team.scss index fe51424c1..d42bd0778 100644 --- a/docs/assets/scss/_team.scss +++ b/docs/assets/scss/_team.scss @@ -3,20 +3,25 @@ // .bd-team { + margin-bottom: 1.5rem; + .team-member { line-height: 2rem; color: #555; } + .team-member:hover { color: #333; text-decoration: none; } + .github-btn { float: right; width: 180px; height: 1.25rem; margin-top: .25rem; } + img { float: left; width: 2rem; diff --git a/docs/components/index.md b/docs/components/index.md deleted file mode 100644 index 9eb06b29d..000000000 --- a/docs/components/index.md +++ /dev/null @@ -1,57 +0,0 @@ ---- -layout: page -title: Components ---- - -## Reboot - -- <a href="{{ site.baseurl }}/components/reboot">Reboot</a> - -## Type - -- <a href="{{ site.baseurl }}/components/typography">Typography</a> -- <a href="{{ site.baseurl }}/components/code">Code</a> -- <a href="{{ site.baseurl }}/components/tables">Tables</a> -- <a href="{{ site.baseurl }}/components/images">Images</a> -- <a href="{{ site.baseurl }}/components/jumbotron">Jumbotron</a> - -## Buttons - -- <a href="{{ site.baseurl }}/components/buttons">Buttons</a> -- <a href="{{ site.baseurl }}/components/button-group">Button group</a> -- <a href="{{ site.baseurl }}/components/button-dropdown">Button dropdown</a> - -## Forms - -- <a href="{{ site.baseurl }}/components/forms">Forms</a> -- <a href="{{ site.baseurl }}/components/input-groups">Input group</a> -- <a href="{{ site.baseurl }}/components/progress">Progress</a> - -## Navigation - -- <a href="{{ site.baseurl }}/components/navs">Navs</a> -- <a href="{{ site.baseurl }}/components/navbar">Navbar</a> -- <a href="{{ site.baseurl }}/components/breadcrumb">Breadcrumb</a> -- <a href="{{ site.baseurl }}/components/pagination">Pagination</a> - -## Components - -- <a href="{{ site.baseurl }}/components/label">Label</a> -- <a href="{{ site.baseurl }}/components/badges">Badges</a> -- <a href="{{ site.baseurl }}/components/dropdowns">Dropdowns</a> -- <a href="{{ site.baseurl }}/components/alerts">Alerts</a> -- <a href="{{ site.baseurl }}/components/card">Card</a> -- <a href="{{ site.baseurl }}/components/list-group">List group</a> - -## JavaScript - -- <a href="{{ site.baseurl }}/components/modal">Modal</a> -- <a href="{{ site.baseurl }}/components/scrollspy">Scrollspy</a> -- <a href="{{ site.baseurl }}/components/tooltips">Tooltips</a> -- <a href="{{ site.baseurl }}/components/popovers">Popovers</a> -- <a href="{{ site.baseurl }}/components/collapse">Collapse</a> -- <a href="{{ site.baseurl }}/components/carousel">Carousel</a> - -## Utilities - -- <a href="{{ site.baseurl }}/components/utilities">Utilities</a> diff --git a/docs/getting-started/index.md b/docs/getting-started/overview.md index 6127f3873..6127f3873 100644 --- a/docs/getting-started/index.md +++ b/docs/getting-started/overview.md diff --git a/docs/layout/index.md b/docs/layout/index.md deleted file mode 100644 index 96a817e7e..000000000 --- a/docs/layout/index.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -layout: page -title: Layout ---- - -todo: this entire page
\ No newline at end of file |
