From f2ee37bc12af29c0213cd00d2628b2ffaaa9a987 Mon Sep 17 00:00:00 2001 From: Dave Date: Sat, 22 Apr 2017 00:46:12 -0400 Subject: [PATCH] New doc nav (#47) Automate doc nav bar generation. --- .gitignore | 1 + _config.yml | 23 ++++++++ {docs => _docs}/concepts/architecture.md | 10 +++- {docs => _docs}/concepts/attributes.md | 6 +- {docs => _docs}/concepts/goals.md | 6 +- .../concepts/img/architecture/arch.png | Bin .../concepts/img/architecture/arch.svg | 0 .../concepts/img/mixer/adapters.svg | 0 {docs => _docs}/concepts/img/mixer/phases.svg | 0 .../concepts/img/mixer/traffic.svg | 0 {docs => _docs}/concepts/index.md | 6 +- {docs => _docs}/concepts/mixer-config.md | 6 +- {docs => _docs}/concepts/mixer.md | 6 +- _docs/concepts/network-and-auth.md | 6 ++ {docs => _docs}/concepts/overview.md | 10 +++- _docs/concepts/policy.md | 6 ++ {docs => _docs}/concepts/request-routing.md | 6 +- {docs => _docs}/concepts/resiliency.md | 4 ++ {docs => _docs}/concepts/service-model.md | 7 ++- _docs/concepts/traffic-management.md | 6 ++ _docs/concepts/what-is-istio.md | 6 ++ {docs => _docs}/index.md | 5 +- .../reference/attribute-vocabulary.md | 13 +++-- _docs/reference/contribute/contributing.md | 12 ++++ .../contribute/creating-a-pull-request.md | 7 ++- .../reference/contribute/editing.md | 4 ++ .../reference/contribute/overview.md | 6 +- .../contribute/reviewing-doc-issues.md | 4 ++ .../contribute/staging-your-changes.md | 6 +- .../reference/contribute/style-guide.md | 4 ++ .../contribute/using-page-templates.md | 6 +- .../contribute/writing-a-new-topic.md | 7 ++- {docs => _docs}/reference/glossary.md | 2 + {docs => _docs}/reference/index.md | 5 ++ {docs => _docs}/reference/istioctl.md | 5 +- {docs => _docs}/reference/release-notes.md | 3 + {docs => _docs}/reference/release-roadmap.md | 5 +- .../routing-and-traffic-management.md | 3 + {docs => _docs}/reference/writing-config.md | 3 + {docs => _docs}/samples/bookinfo.md | 5 +- .../samples/img/bookinfo/noistio.png | Bin .../samples/img/bookinfo/noistio.svg | 0 .../samples/img/bookinfo/withistio.png | Bin .../samples/img/bookinfo/withistio.svg | 0 {docs => _docs}/samples/index.md | 6 +- {docs => _docs}/tasks/configuring-mixer.md | 8 ++- {docs => _docs}/tasks/fault-injection.md | 7 ++- {docs => _docs}/tasks/httpbin.yaml | 0 {docs => _docs}/tasks/index.md | 7 ++- {docs => _docs}/tasks/ingress-egress-envoy.md | 7 ++- .../tasks/integrating-services-into-istio.md | 6 +- {docs => _docs}/tasks/istio-auth.md | 7 ++- {docs => _docs}/tasks/istio-installation.md | 7 ++- {docs => _docs}/tasks/metrics-logs.md | 7 ++- {docs => _docs}/tasks/nginx-httpbin.yaml | 0 {docs => _docs}/tasks/request-routing.md | 7 ++- {docs => _docs}/tasks/resilience-features.md | 7 ++- {docs => _docs}/tasks/timeout-injection.md | 3 + {docs => _docs}/tutorials/index.md | 6 +- _includes/doc-nav.html | 15 ----- _includes/doc-side-concepts-nav.html | 34 ----------- _includes/doc-side-home-nav.html | 4 -- _includes/doc-side-nav.html | 53 ++++++++++++++++++ _includes/doc-side-reference-nav.html | 23 -------- _includes/doc-side-samples-nav.html | 5 -- _includes/doc-side-tasks-nav.html | 13 ----- _includes/doc-side-tutorials-nav.html | 4 -- _includes/doc-top-nav.html | 17 ++++++ _layouts/docs.html | 6 +- _sass/base/_colors.scss | 6 +- _sass/modules/_doc-nav.scss | 2 +- _sass/modules/_nav.scss | 3 +- 72 files changed, 335 insertions(+), 155 deletions(-) rename {docs => _docs}/concepts/architecture.md (97%) rename {docs => _docs}/concepts/attributes.md (93%) rename {docs => _docs}/concepts/goals.md (97%) rename {docs => _docs}/concepts/img/architecture/arch.png (100%) rename {docs => _docs}/concepts/img/architecture/arch.svg (100%) rename {docs => _docs}/concepts/img/mixer/adapters.svg (100%) rename {docs => _docs}/concepts/img/mixer/phases.svg (100%) rename {docs => _docs}/concepts/img/mixer/traffic.svg (100%) rename {docs => _docs}/concepts/index.md (96%) rename {docs => _docs}/concepts/mixer-config.md (99%) rename {docs => _docs}/concepts/mixer.md (98%) create mode 100644 _docs/concepts/network-and-auth.md rename {docs => _docs}/concepts/overview.md (96%) create mode 100644 _docs/concepts/policy.md rename {docs => _docs}/concepts/request-routing.md (99%) rename {docs => _docs}/concepts/resiliency.md (89%) rename {docs => _docs}/concepts/service-model.md (98%) create mode 100644 _docs/concepts/traffic-management.md create mode 100644 _docs/concepts/what-is-istio.md rename {docs => _docs}/index.md (95%) rename {docs => _docs}/reference/attribute-vocabulary.md (91%) create mode 100644 _docs/reference/contribute/contributing.md rename {docs => _docs}/reference/contribute/creating-a-pull-request.md (95%) rename {docs => _docs}/reference/contribute/editing.md (97%) rename docs/reference/contribute/index.md => _docs/reference/contribute/overview.md (93%) rename {docs => _docs}/reference/contribute/reviewing-doc-issues.md (98%) rename {docs => _docs}/reference/contribute/staging-your-changes.md (95%) rename {docs => _docs}/reference/contribute/style-guide.md (99%) rename {docs => _docs}/reference/contribute/using-page-templates.md (98%) rename {docs => _docs}/reference/contribute/writing-a-new-topic.md (97%) rename {docs => _docs}/reference/glossary.md (99%) rename {docs => _docs}/reference/index.md (96%) rename {docs => _docs}/reference/istioctl.md (98%) rename {docs => _docs}/reference/release-notes.md (81%) rename {docs => _docs}/reference/release-roadmap.md (72%) rename {docs => _docs}/reference/routing-and-traffic-management.md (99%) rename {docs => _docs}/reference/writing-config.md (98%) rename {docs => _docs}/samples/bookinfo.md (99%) rename {docs => _docs}/samples/img/bookinfo/noistio.png (100%) rename {docs => _docs}/samples/img/bookinfo/noistio.svg (100%) rename {docs => _docs}/samples/img/bookinfo/withistio.png (100%) rename {docs => _docs}/samples/img/bookinfo/withistio.svg (100%) rename {docs => _docs}/samples/index.md (84%) rename {docs => _docs}/tasks/configuring-mixer.md (89%) rename {docs => _docs}/tasks/fault-injection.md (89%) rename {docs => _docs}/tasks/httpbin.yaml (100%) rename {docs => _docs}/tasks/index.md (95%) rename {docs => _docs}/tasks/ingress-egress-envoy.md (86%) rename {docs => _docs}/tasks/integrating-services-into-istio.md (87%) rename {docs => _docs}/tasks/istio-auth.md (89%) rename {docs => _docs}/tasks/istio-installation.md (90%) rename {docs => _docs}/tasks/metrics-logs.md (88%) rename {docs => _docs}/tasks/nginx-httpbin.yaml (100%) rename {docs => _docs}/tasks/request-routing.md (88%) rename {docs => _docs}/tasks/resilience-features.md (88%) rename {docs => _docs}/tasks/timeout-injection.md (99%) rename {docs => _docs}/tutorials/index.md (79%) delete mode 100644 _includes/doc-nav.html delete mode 100644 _includes/doc-side-concepts-nav.html delete mode 100644 _includes/doc-side-home-nav.html create mode 100644 _includes/doc-side-nav.html delete mode 100644 _includes/doc-side-reference-nav.html delete mode 100644 _includes/doc-side-samples-nav.html delete mode 100644 _includes/doc-side-tasks-nav.html delete mode 100644 _includes/doc-side-tutorials-nav.html create mode 100644 _includes/doc-top-nav.html diff --git a/.gitignore b/.gitignore index 9598e2cf6c..62fe4356cd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ _site +.bundle # Eclipse artifacts .project diff --git a/_config.yml b/_config.yml index 67c62697e5..cf7a99d6ab 100644 --- a/_config.yml +++ b/_config.yml @@ -4,6 +4,10 @@ kramdown: markdown: kramdown +kramdown: + input: GFM + hard_wrap: false + syntax_highlighter: rouge baseurl: "" @@ -17,3 +21,22 @@ paginate: 2 paginate_path: "/blog/page:num/" excerpt_separator: + +collections: + docs: + output: true + +gems: + - jekyll-redirect-from + - jekyll-sitemap + +exclude: + - README.md + - LICENSE + - Gemfile + - Gemfile.lock + - CNAME + - CONTRIBUTING.md + - .gitignore + - Vagrantfile + - .vagrant diff --git a/docs/concepts/architecture.md b/_docs/concepts/architecture.md similarity index 97% rename from docs/concepts/architecture.md rename to _docs/concepts/architecture.md index f5d246006b..74d661a29a 100644 --- a/docs/concepts/architecture.md +++ b/_docs/concepts/architecture.md @@ -1,10 +1,14 @@ --- -title: What is Istio? -headline: What is Istio? -sidenav: doc-side-concepts-nav.html +title: Architecture +headline: Architecture +sidenav: doc-side-nav.html bodyclass: docs layout: docs type: markdown + +category: Concepts +parent: What is Istio? +order: 30 --- {% capture overview %} diff --git a/docs/concepts/attributes.md b/_docs/concepts/attributes.md similarity index 93% rename from docs/concepts/attributes.md rename to _docs/concepts/attributes.md index 8d430ada9d..d463a16f12 100644 --- a/docs/concepts/attributes.md +++ b/_docs/concepts/attributes.md @@ -1,10 +1,14 @@ --- title: Attributes headline: Attributes -sidenav: doc-side-concepts-nav.html +sidenav: doc-side-nav.html bodyclass: docs layout: docs type: markdown + +category: Concepts +parent: Policies and Control +order: 10 --- {% capture overview %} The page describes Istio attributes, what they are and how they are used. diff --git a/docs/concepts/goals.md b/_docs/concepts/goals.md similarity index 97% rename from docs/concepts/goals.md rename to _docs/concepts/goals.md index 248adc0337..42449afeb7 100644 --- a/docs/concepts/goals.md +++ b/_docs/concepts/goals.md @@ -1,10 +1,14 @@ --- title: Design Goals headline: Design Goals -sidenav: doc-side-concepts-nav.html +sidenav: doc-side-nav.html bodyclass: docs layout: docs type: markdown + +category: Concepts +parent: What is Istio? +order: 20 --- {% capture overview %} diff --git a/docs/concepts/img/architecture/arch.png b/_docs/concepts/img/architecture/arch.png similarity index 100% rename from docs/concepts/img/architecture/arch.png rename to _docs/concepts/img/architecture/arch.png diff --git a/docs/concepts/img/architecture/arch.svg b/_docs/concepts/img/architecture/arch.svg similarity index 100% rename from docs/concepts/img/architecture/arch.svg rename to _docs/concepts/img/architecture/arch.svg diff --git a/docs/concepts/img/mixer/adapters.svg b/_docs/concepts/img/mixer/adapters.svg similarity index 100% rename from docs/concepts/img/mixer/adapters.svg rename to _docs/concepts/img/mixer/adapters.svg diff --git a/docs/concepts/img/mixer/phases.svg b/_docs/concepts/img/mixer/phases.svg similarity index 100% rename from docs/concepts/img/mixer/phases.svg rename to _docs/concepts/img/mixer/phases.svg diff --git a/docs/concepts/img/mixer/traffic.svg b/_docs/concepts/img/mixer/traffic.svg similarity index 100% rename from docs/concepts/img/mixer/traffic.svg rename to _docs/concepts/img/mixer/traffic.svg diff --git a/docs/concepts/index.md b/_docs/concepts/index.md similarity index 96% rename from docs/concepts/index.md rename to _docs/concepts/index.md index a053169ff1..f6d69c60d5 100644 --- a/docs/concepts/index.md +++ b/_docs/concepts/index.md @@ -1,10 +1,14 @@ --- title: Concepts headline: Concepts -sidenav: doc-side-concepts-nav.html +sidenav: doc-side-nav.html bodyclass: docs layout: docs type: markdown + +index: true +category: Concepts +order: 10 --- # Concepts diff --git a/docs/concepts/mixer-config.md b/_docs/concepts/mixer-config.md similarity index 99% rename from docs/concepts/mixer-config.md rename to _docs/concepts/mixer-config.md index dfbaa99735..f3676a4d90 100644 --- a/docs/concepts/mixer-config.md +++ b/_docs/concepts/mixer-config.md @@ -1,10 +1,14 @@ --- title: Mixer Configuration headline: Mixer Configuration Model -sidenav: doc-side-concepts-nav.html +sidenav: doc-side-nav.html bodyclass: docs layout: docs type: markdown + +category: Concepts +parent: Policies and Control +order: 30 --- {% capture overview %} diff --git a/docs/concepts/mixer.md b/_docs/concepts/mixer.md similarity index 98% rename from docs/concepts/mixer.md rename to _docs/concepts/mixer.md index 8fbbfeee4c..a8ef8c2f12 100644 --- a/docs/concepts/mixer.md +++ b/_docs/concepts/mixer.md @@ -1,10 +1,14 @@ --- title: Mixer headline: Mixer -sidenav: doc-side-concepts-nav.html +sidenav: doc-side-nav.html bodyclass: docs layout: docs type: markdown + +category: Concepts +parent: Policies and Control +order: 20 --- {% capture overview %} The page explains Mixer's role and general architecture. diff --git a/_docs/concepts/network-and-auth.md b/_docs/concepts/network-and-auth.md new file mode 100644 index 0000000000..c51b28ea58 --- /dev/null +++ b/_docs/concepts/network-and-auth.md @@ -0,0 +1,6 @@ +--- +title: Network and Auth +category: Concepts +marker: true +order: 30 +--- \ No newline at end of file diff --git a/docs/concepts/overview.md b/_docs/concepts/overview.md similarity index 96% rename from docs/concepts/overview.md rename to _docs/concepts/overview.md index 5cf1c07543..eae985a8af 100644 --- a/docs/concepts/overview.md +++ b/_docs/concepts/overview.md @@ -1,10 +1,14 @@ --- -title: Context and Overview -headline: Context and Overview -sidenav: doc-side-concepts-nav.html +title: Overview +headline: Overview +sidenav: doc-side-nav.html bodyclass: docs layout: docs type: markdown + +category: Concepts +parent: What is Istio? +order: 15 --- {% capture overview %} diff --git a/_docs/concepts/policy.md b/_docs/concepts/policy.md new file mode 100644 index 0000000000..21597ed4f6 --- /dev/null +++ b/_docs/concepts/policy.md @@ -0,0 +1,6 @@ +--- +title: Policies and Control +category: Concepts +marker: true +order: 40 +--- \ No newline at end of file diff --git a/docs/concepts/request-routing.md b/_docs/concepts/request-routing.md similarity index 99% rename from docs/concepts/request-routing.md rename to _docs/concepts/request-routing.md index d7a83d1de1..deaffeaba4 100644 --- a/docs/concepts/request-routing.md +++ b/_docs/concepts/request-routing.md @@ -2,9 +2,13 @@ bodyclass: docs headline: Request Routing layout: docs -sidenav: doc-side-concepts-nav.html +sidenav: doc-side-nav.html title: Request Routing type: markdown + +category: Concepts +parent: Traffic Management +order: 20 --- {% capture overview %} diff --git a/docs/concepts/resiliency.md b/_docs/concepts/resiliency.md similarity index 89% rename from docs/concepts/resiliency.md rename to _docs/concepts/resiliency.md index b6bee695bb..d1b1d377d9 100644 --- a/docs/concepts/resiliency.md +++ b/_docs/concepts/resiliency.md @@ -5,6 +5,10 @@ layout: docs sidenav: doc-side-concepts-nav.html title: Resiliency type: markdown + +category: Concepts +parent: Traffic Management +order: 30 --- {% capture overview %} diff --git a/docs/concepts/service-model.md b/_docs/concepts/service-model.md similarity index 98% rename from docs/concepts/service-model.md rename to _docs/concepts/service-model.md index 09f37f3fbc..c2cbce8101 100644 --- a/docs/concepts/service-model.md +++ b/_docs/concepts/service-model.md @@ -2,11 +2,14 @@ bodyclass: docs headline: Service Model layout: docs -sidenav: doc-side-concepts-nav.html +sidenav: doc-side-nav.html title: Service Model type: markdown ---- +category: Concepts +parent: Traffic Management +order: 0 +--- {% capture overview %} The page explains Istio's overall service model. {% endcapture %} diff --git a/_docs/concepts/traffic-management.md b/_docs/concepts/traffic-management.md new file mode 100644 index 0000000000..311e7b228a --- /dev/null +++ b/_docs/concepts/traffic-management.md @@ -0,0 +1,6 @@ +--- +title: Traffic Management +category: Concepts +marker: true +order: 20 +--- \ No newline at end of file diff --git a/_docs/concepts/what-is-istio.md b/_docs/concepts/what-is-istio.md new file mode 100644 index 0000000000..491e365fa3 --- /dev/null +++ b/_docs/concepts/what-is-istio.md @@ -0,0 +1,6 @@ +--- +title: What is Istio? +category: Concepts +marker: true +order: 10 +--- \ No newline at end of file diff --git a/docs/index.md b/_docs/index.md similarity index 95% rename from docs/index.md rename to _docs/index.md index 5006b6f885..af01c6e8e0 100644 --- a/docs/index.md +++ b/_docs/index.md @@ -1,10 +1,13 @@ --- -title: Docs +title: Welcome headline: Welcome sidenav: doc-side-home-nav.html bodyclass: docs layout: docs type: markdown + +index: true +order: 0 --- # Welcome diff --git a/docs/reference/attribute-vocabulary.md b/_docs/reference/attribute-vocabulary.md similarity index 91% rename from docs/reference/attribute-vocabulary.md rename to _docs/reference/attribute-vocabulary.md index a62299d98a..77f2b804b4 100644 --- a/docs/reference/attribute-vocabulary.md +++ b/_docs/reference/attribute-vocabulary.md @@ -5,6 +5,9 @@ sidenav: doc-side-reference-nav.html bodyclass: docs layout: docs type: markdown + +category: Reference +order: 30 --- Attributes are a central concept used throughout Istio. You can find a description of what attributes are @@ -23,11 +26,11 @@ deployments will have agents (Envoy or Mixer adapters) that produce these attrib |------|------|-------------|--------------------| | source.ip | ip_address | The IP address of the client that sent the request. | 10.0.0.117 | | source.port | int64 | The port on the client that sent the request. | 9284 | -| source.name | string | The fully qualified name of the application that sent the request. | redis-master.my-namespace.svc.cluster.local | -| source.uid | string | A unique identifier for the particular instance of the application that sent the request. | kubernetes://redis-master-2353460263-1ecey.my-namespace | -| source.namespace | string | The namespace of the sender of the request. | my-namespace | +| source.name | string | The fully qualified name of the application that sent the request. | redis-master.namespace.deps.cluster.local | +| source.uid | string | A unique identifier for the particular instance of the application that sent the request. | redis-master-2353460263-1ecey.namespace.pods.cluster.local | +| source.namespace | string | The namespace of the sender of the request. | namespace.cluster.local | | source.labels | map | A map of key-value pairs attached to the source. | | -| source.user | string | The user running the target application. | service-account | +| source.user | string | The user running the target application. | service-account@namespace.cluster.local | | target.ip | ip_address | The IP address the request was sent to. | 10.0.0.104 | | target.port | int64 | The port the request was sent to. | 8080 | | target.service | dns_name | The hostname that was the target of the request. | my-svc.my-namespace.svc.cluster.local | @@ -35,7 +38,7 @@ deployments will have agents (Envoy or Mixer adapters) that produce these attrib | target.uid | string | A unique identifier for the particular instance of the application that received the request. | | | target.namespace | string | The namespace of the receiver of the request. | | | target.labels | map | A map of key-value pairs attached to the target. | | -| target.user | string | The user running the target application. | service-account | +| target.user | string | The user running the target application. | service-account@namespace.cluster.local | | request.headers | map | A map of HTTP headers attached to the request. | | | request.id | string | A unique ID for the request, which can be propagated to downstream systems. This should be a guid or a psuedo-guid with a low probability of collision in a temporal window measured in days or weeks. | | | request.path | string | The HTTP URL path including query string | | diff --git a/_docs/reference/contribute/contributing.md b/_docs/reference/contribute/contributing.md new file mode 100644 index 0000000000..84176b01f9 --- /dev/null +++ b/_docs/reference/contribute/contributing.md @@ -0,0 +1,12 @@ +--- +title: Contributing to the Docs +headline: Contributing to the Docs +sidenav: doc-side-reference-nav.html +bodyclass: docs +layout: docs +type: markdown + +category: Reference +marker: true +order: 100 +--- \ No newline at end of file diff --git a/docs/reference/contribute/creating-a-pull-request.md b/_docs/reference/contribute/creating-a-pull-request.md similarity index 95% rename from docs/reference/contribute/creating-a-pull-request.md rename to _docs/reference/contribute/creating-a-pull-request.md index a2fbf9aeda..3a86231095 100644 --- a/docs/reference/contribute/creating-a-pull-request.md +++ b/_docs/reference/contribute/creating-a-pull-request.md @@ -1,10 +1,15 @@ --- -title: Doc Pull Requests +title: Creating a Pull Request headline: Creating a Doc Pull Request sidenav: doc-side-reference-nav.html bodyclass: docs layout: docs type: markdown + +category: Reference +parent: Contributing to the Docs +order: 20 + --- To contribute to Istio documentation, create a pull request against the diff --git a/docs/reference/contribute/editing.md b/_docs/reference/contribute/editing.md similarity index 97% rename from docs/reference/contribute/editing.md rename to _docs/reference/contribute/editing.md index 4b985d3a7c..25d0551b28 100644 --- a/docs/reference/contribute/editing.md +++ b/_docs/reference/contribute/editing.md @@ -5,6 +5,10 @@ sidenav: doc-side-reference-nav.html bodyclass: docs layout: docs type: markdown + +category: Reference +parent: Contributing to the Docs +order: 10 --- \ No newline at end of file diff --git a/_includes/doc-side-reference-nav.html b/_includes/doc-side-reference-nav.html deleted file mode 100644 index fe70a0c404..0000000000 --- a/_includes/doc-side-reference-nav.html +++ /dev/null @@ -1,23 +0,0 @@ - diff --git a/_includes/doc-side-samples-nav.html b/_includes/doc-side-samples-nav.html deleted file mode 100644 index fbc99e6335..0000000000 --- a/_includes/doc-side-samples-nav.html +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/_includes/doc-side-tasks-nav.html b/_includes/doc-side-tasks-nav.html deleted file mode 100644 index 561fcc56bb..0000000000 --- a/_includes/doc-side-tasks-nav.html +++ /dev/null @@ -1,13 +0,0 @@ - diff --git a/_includes/doc-side-tutorials-nav.html b/_includes/doc-side-tutorials-nav.html deleted file mode 100644 index c4337af085..0000000000 --- a/_includes/doc-side-tutorials-nav.html +++ /dev/null @@ -1,4 +0,0 @@ - diff --git a/_includes/doc-top-nav.html b/_includes/doc-top-nav.html new file mode 100644 index 0000000000..4ed2fb48ca --- /dev/null +++ b/_includes/doc-top-nav.html @@ -0,0 +1,17 @@ +
+
+
+
    + {% assign cats = site.docs | where:"index","true" | sort:"order" %} + {% for cat in cats %} + {% assign active = cat.url | downcase | split: '/' %} + {% assign cat_name = cat.title | default: "EMPTY" %} + {% if cat.url contains "index" && cat_name != "EMPTY" %} +
  • {{ cat_name }}
    • + {% endif %} + {% endfor %} +
+ {% include contribute-links.html %} +
+
+
diff --git a/_layouts/docs.html b/_layouts/docs.html index 00de023b9b..1cb3ce9071 100644 --- a/_layouts/docs.html +++ b/_layouts/docs.html @@ -4,15 +4,15 @@ layout: default bodyclass: docs --- -{% include doc-nav.html %} +{% include doc-top-nav.html %} {% assign current = page.url | downcase | split: '/' %} - {% if current[1] == 'docs' and page.sidenav != null %} + {% if current[1] == 'docs' %}
- {% include {{page.sidenav}} %} + {% include doc-side-nav.html %}
{{ content }} diff --git a/_sass/base/_colors.scss b/_sass/base/_colors.scss index 48a911ffbe..176ebbe51a 100644 --- a/_sass/base/_colors.scss +++ b/_sass/base/_colors.scss @@ -1,7 +1,7 @@ // Brand Colors -$mainBrandColor: #466BB0; -$secondBrandColor: #286AC7; -$thirdBrandColor: #98B2E0; +$mainBrandColor: #466BB0; //#2DA6B0; +$secondBrandColor: #286AC7; //#01959f; +$thirdBrandColor: #98B2E0; //#E7F3F4; $inverseBrandColor: #FFFFFF; // Use as an accent color in small quantities to balance out the main theme. diff --git a/_sass/modules/_doc-nav.scss b/_sass/modules/_doc-nav.scss index 2fa0c375e6..4ebb005ff9 100644 --- a/_sass/modules/_doc-nav.scss +++ b/_sass/modules/_doc-nav.scss @@ -76,7 +76,7 @@ // Add caret to current page .current:before{ content: '> '; - background-color: $gray; + //background-color: $gray; } .doc-side-nav-title { diff --git a/_sass/modules/_nav.scss b/_sass/modules/_nav.scss index 578eb0d0fd..e70c507ced 100644 --- a/_sass/modules/_nav.scss +++ b/_sass/modules/_nav.scss @@ -2,6 +2,7 @@ #common-nav{ background-color: transparent; padding-top: $spacing--xs; + padding-bottom: $spacing--xs; .nav { display: none; @@ -204,7 +205,7 @@ width: 100%; z-index: 9000; top: -61px; - padding-bottom: 10px; + padding-bottom: $spacing--xs; transition: $transition--secondary; &.on-page { top: 0;