]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
overhaul nav and shit again
authorMark Otto <markdotto@gmail.com>
Sat, 13 Jun 2015 21:05:25 +0000 (14:05 -0700)
committerMark Otto <markdotto@gmail.com>
Sat, 13 Jun 2015 21:05:25 +0000 (14:05 -0700)
- drop the index pages save for examples
- comment out the extend section for now
- fix up spacing fix on team list

docs/_data/nav.yml
docs/_includes/nav-docs.html
docs/_includes/nav-home.html
docs/about/index.md [deleted file]
docs/assets/scss/_team.scss
docs/components/index.md [deleted file]
docs/getting-started/overview.md [moved from docs/getting-started/index.md with 100% similarity]
docs/layout/index.md [deleted file]

index 00d59969cc3ac9ffbf86f09bdff416d941d64ed3..aeaa571570314574a8eb23509495a96fc6308ee4 100644 (file)
@@ -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
     - 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
     - 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:
     - 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:
     - title: Brand
     - title: License
     - title: Translations
-    # - title: Credits
 
 - title: Migration
index 166117315419d41c5c41c132d18346e8b323b04e..e87c182daf33fd7d460b375db95dc371d5748b2d 100644 (file)
       {% 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>
 
index 084746d10f1d47e12090068e452826e9cf04b52a..2cc5820c332a49c38865b9bd7c103f1d8e1cb55a 100644 (file)
@@ -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 (file)
index 12b1c5f..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
----
-layout: page
-title: About
----
-
-todo: this entire page
\ No newline at end of file
index fe51424c1b1fdda56b93a65474b9890bfb71ee4b..d42bd0778f37be9aa2c32f72fe5720df933a6423 100644 (file)
@@ -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 (file)
index 9eb06b2..0000000
+++ /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/layout/index.md b/docs/layout/index.md
deleted file mode 100644 (file)
index 96a817e..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
----
-layout: page
-title: Layout
----
-
-todo: this entire page
\ No newline at end of file