From b88efdbbc7dd214b7425004c92b4691d0393c47c Mon Sep 17 00:00:00 2001 From: shizuka Date: Thu, 11 Oct 2018 13:40:58 +0200 Subject: [PATCH] navbar changes --- layouts/_default/baseof.html | 4 ++-- layouts/partials/navbar.html | 44 +++++++++++------------------------ layouts/partials/sidebar.html | 18 ++++++++++++++ static/css/labs.css | 40 +++++++++++++++++++++++++------ 4 files changed, 67 insertions(+), 39 deletions(-) diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 019bdba..1896ade 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -12,9 +12,9 @@ -{{ block "navbar" . }} + {{ block "navbar" . }} {{ partial "navbar" . }} -{{ end }} +{{ end }}
diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html index 7b27514..39a1a00 100644 --- a/layouts/partials/navbar.html +++ b/layouts/partials/navbar.html @@ -1,30 +1,14 @@ - + +
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html index e94b13d..a7595b0 100644 --- a/layouts/partials/sidebar.html +++ b/layouts/partials/sidebar.html @@ -1,5 +1,23 @@ {{ $currentPage := . }}
    +
    + + {{ .Site.Title }} + + +
    +
    + + + + + +
    +
    + + {{ range .Site.Menus.main }} {{ if .HasChildren }}
  • {{ .Name }} diff --git a/static/css/labs.css b/static/css/labs.css index ce0ad38..e5c0cc0 100644 --- a/static/css/labs.css +++ b/static/css/labs.css @@ -51,13 +51,19 @@ pre { line-height: 1.7; } +.input-group { + padding-right: 30px; + padding-left: 20px; +} + .navbar { - padding-left: 0px; - padding-right: 20px; + letter-spacing: +.05rem; font-weight: bold; font-size: 1.8rem; + background-color: #292929; + } a:link { @@ -89,15 +95,23 @@ a:hover { /*font-size: 2rem;*/ } +.sidebar-header { + color: #000; + font-size: 3rem; + text-align: center; + letter-spacing: 0.3rem; + font-weight: bold; + padding-bottom: 10px; + background-color: #ba3232; +} + .sidebar-toggle { float: left; margin-left: 15px; } .sidebar { -/*padding-top: 100px;*/ - margin-top: 5px; - /*display: none;*/ + margin-top: -2px; position: fixed; top: 51px; bottom: 0; @@ -122,10 +136,10 @@ a:hover { @media (min-width: 768px) { .sidebar { display: block; + padding-top: 0px; } .navbar a { font-size: 2rem; - } } @@ -136,6 +150,16 @@ a:hover { color: #ccc; } + +.sidebar-header a { + color: #fff; + + font-size: 3rem; + text-align: center; +} + + + .sidebar ul { list-style-type: none; padding: 0; @@ -173,7 +197,6 @@ a:hover { color: #fff; /* background-color: #ba3232; */ font-weight: bold; - } .main { @@ -184,6 +207,9 @@ a:hover { padding-right: 80px; padding-left: 80px; } + .navbar { + display: none; + } } .main .page-header { margin-top: 0;