Nav fixes

This commit is contained in:
Vincent Fiduccia
2018-04-30 12:09:56 -07:00
parent f350061195
commit 81cd32fa07
4 changed files with 28 additions and 16 deletions
+9 -9
View File
@@ -15,7 +15,7 @@ enableRobotsTXT = true
identifier = "what-is-rancher" identifier = "what-is-rancher"
name = "What is Rancher" name = "What is Rancher"
weight = "1" weight = "1"
pre = "<i class='material-icons'>keyboard_arrow_down</i>" pre = "<i class=\"material-icons\">keyboard_arrow_down</i>"
[[menu.main]] [[menu.main]]
name = "Overview" name = "Overview"
@@ -77,7 +77,7 @@ pre = "<i class='material-icons'>keyboard_arrow_down</i>"
identifier = "products" identifier = "products"
name = "Products" name = "Products"
weight = "2" weight = "2"
pre = "<i class='material-icons'>keyboard_arrow_down</i>" pre = "<i class=\"material-icons\">keyboard_arrow_down</i>"
[[menu.main]] [[menu.main]]
name = "Rancher" name = "Rancher"
@@ -100,7 +100,7 @@ pre = "<i class='material-icons'>keyboard_arrow_down</i>"
identifier = "learn" identifier = "learn"
name = "Learn" name = "Learn"
weight = "4" weight = "4"
pre = "<i class='material-icons'>keyboard_arrow_down</i>" pre = "<i class=\"material-icons\">keyboard_arrow_down</i>"
[[menu.main]] [[menu.main]]
name = "Blog" name = "Blog"
@@ -127,7 +127,7 @@ pre = "<i class='material-icons'>keyboard_arrow_down</i>"
name = "Forums" name = "Forums"
url = "https://forums.rancher.com/" url = "https://forums.rancher.com/"
parent = "learn" parent = "learn"
pre = "<i class='material-icons'>launch</i>" pre = "<i class=\"material-icons\">launch</i>"
[[menu.main]] [[menu.main]]
#name = "Learning Resources" #name = "Learning Resources"
@@ -141,7 +141,7 @@ identifier = "about"
name = "About" name = "About"
url = "/about/" url = "/about/"
weight = "5" weight = "5"
pre = "<i class='material-icons'>keyboard_arrow_down</i>" pre = "<i class=\"material-icons\">keyboard_arrow_down</i>"
[[menu.main]] [[menu.main]]
name = "About Us" name = "About Us"
@@ -175,24 +175,24 @@ pre = "<i class='material-icons'>keyboard_arrow_down</i>"
#footer menu# #footer menu#
[[menu.footer]] [[menu.footer]]
identifier = "about" identifier = "about"
pre = "<i class='material-icons'>info_outline</i>" pre = "<i class=\"material-icons\">info_outline</i>"
name = "About" name = "About"
url = "/about/" url = "/about/"
[[menu.footer]] [[menu.footer]]
identifier = "contact" identifier = "contact"
pre = "<i class='material-icons'>chat_bubble_outline</i>" pre = "<i class=\"material-icons\">chat_bubble_outline</i>"
name = "Contact" name = "Contact"
url = "/contact/" url = "/contact/"
[[menu.footer]] [[menu.footer]]
identifier = "privacy" identifier = "privacy"
pre = "<i class='material-icons'>fingerprint</i>" pre = "<i class=\"material-icons\">fingerprint</i>"
name = "Privacy" name = "Privacy"
url = "/privacy/" url = "/privacy/"
[[menu.footer]] [[menu.footer]]
identifier = "careers" identifier = "careers"
pre = "<i class='material-icons'>people_outline</i>" pre = "<i class=\"material-icons\">people_outline</i>"
name = "Careers" name = "Careers"
url = "/careers/" url = "/careers/"
+1 -1
View File
@@ -1,5 +1,5 @@
--- ---
title: Upgrading RancherOS title: Upgrading
weight: 3 weight: 3
--- ---
+9 -3
View File
@@ -8,16 +8,22 @@
{{ define "main" }} {{ define "main" }}
<div class="wrapper"> <div class="wrapper">
{{ partial "docs-nav.html" . }} {{ partial "docs-nav.html" . }}
{{ $showSidebar := (gt (len ($.Scratch.Get "secondLevel").Sections) 0) }} {{ $secondLevel := ($.Scratch.Get "secondLevel") }}
{{ $.Scratch.Set "showSidebar" false }}
{{ with $secondLevel }}
{{ if (gt (len .Sections) 0) }}
{{ $.Scratch.Set "showSidebar" true }}
{{end}}
{{end}}
<div class="row m-t-sm"> <div class="row m-t-sm">
{{ if $showSidebar }} {{ if ($.Scratch.Get "showSidebar") }}
<aside class="col-sm-3 col-xs-12"> <aside class="col-sm-3 col-xs-12">
{{ partial "docs-side-nav.html" . }} {{ partial "docs-side-nav.html" . }}
</aside> </aside>
{{end}} {{end}}
<article class="{{ if $showSidebar }} col-sm-6 {{else}} col-md-9 p-r-lg {{end}} col-xs-12"> <article class="{{ if ($.Scratch.Get "showSidebar") }} col-sm-6 {{else}} col-md-9 p-r-lg {{end}} col-xs-12">
<div class="main-content "> <div class="main-content ">
+9 -3
View File
@@ -1,16 +1,21 @@
{{ $.Scratch.Set "topLevel" . }} {{ $.Scratch.Set "topLevel" . }}
{{ $.Scratch.Set "secondLevel" . }} {{ range .Site.Sections }}
{{if $.CurrentSection}}
{{ if .IsAncestor $.CurrentSection }}
{{ $.Scratch.Set "topLevel" . }}
{{end}}
{{end}}
{{end}}
<nav class="row middle-xs between-xs"> <nav class="row middle-xs between-xs">
<div class="pull-left p-v-xs col-md-2s"> <div class="pull-left p-v-xs col-md-2s">
<ul class="dropdown sub-menu unstyled"> <ul class="dropdown sub-menu unstyled">
<li> <li>
<a href="{{ .URL }}" class="btn bg-link p-a-0"> <a href="{{ ($.Scratch.Get "topLevel").Permalink }}" class="btn bg-link p-a-0">
<span class="p-h-xs"> <span class="p-h-xs">
{{ range .Site.Sections }} {{ range .Site.Sections }}
{{if $.CurrentSection}} {{if $.CurrentSection}}
{{ if .IsAncestor $.CurrentSection }} {{ if .IsAncestor $.CurrentSection }}
{{ $.Scratch.Set "topLevel" . }}
{{ .Params.shortTitle }} {{ .Params.shortTitle }}
{{end}} {{end}}
{{end}} {{end}}
@@ -32,6 +37,7 @@
<!-- tabs --> <!-- tabs -->
<ul class="tabs col-md-10"> <ul class="tabs col-md-10">
{{ $topLevel := .Scratch.Get "topLevel"}} {{ $topLevel := .Scratch.Get "topLevel"}}
<li class="{{if (eq .Permalink $topLevel.Permalink)}}active{{end}}"><a href="{{$topLevel.Permalink}}"><i class="material-icons" style="position: relative; top: -2px;">home</i></a></li>
{{ if $topLevel }} {{ if $topLevel }}
{{ range $topLevel.Sections }} {{ range $topLevel.Sections }}
{{ $isCurrent := .IsAncestor $.CurrentSection }} {{ $isCurrent := .IsAncestor $.CurrentSection }}