From 3348592a568aae9aa1c3c09d5b12ed7dc02c11c9 Mon Sep 17 00:00:00 2001 From: chomik Date: Sun, 2 Jun 2019 19:29:25 +0200 Subject: [PATCH] navbar fixes --- pages/_data/menu.yml | 11 +++++--- pages/_includes/layout/sidenav.html | 2 +- pages/_layouts/default.html | 28 ++++++++++--------- pages/layout-dark-mode.html | 4 +++ ...ader-dark.html => layout-header-dark.html} | 0 pages/navbar-all.html | 25 ----------------- pages/navbar-left.html | 5 ---- pages/navbar-right.html | 5 ---- pages/navbar-top.html | 3 -- scss/layout/_navbar.scss | 10 +++++-- 10 files changed, 35 insertions(+), 58 deletions(-) create mode 100644 pages/layout-dark-mode.html rename pages/{header-dark.html => layout-header-dark.html} (100%) delete mode 100644 pages/navbar-all.html delete mode 100644 pages/navbar-left.html delete mode 100644 pages/navbar-right.html delete mode 100644 pages/navbar-top.html diff --git a/pages/_data/menu.yml b/pages/_data/menu.yml index d9387751..01cb5d4f 100644 --- a/pages/_data/menu.yml +++ b/pages/_data/menu.yml @@ -20,16 +20,19 @@ layout: children: sidebar-left: title: Left sidebar - url: navbar-left.html + url: layout-navbar-left.html sidebar-right: title: Right sidebar - url: navbar-right.html + url: layout-navbar-right.html navbar-top: title: Navbar top - url: navbar-top.html + url: layout-navbar-top.html header-dark: title: Dark header - url: header-dark.html + url: layout-header-dark.html + dark-mode: + title: Dark mode + url: layout-dark-mode.html docs: title: Documentation diff --git a/pages/_includes/layout/sidenav.html b/pages/_includes/layout/sidenav.html index 295610aa..32331338 100644 --- a/pages/_includes/layout/sidenav.html +++ b/pages/_includes/layout/sidenav.html @@ -1,4 +1,4 @@ {% assign menu = page.menu | default: layout.menu %} -
+
{% include layout/sidenav-content.html menu=menu %}
diff --git a/pages/_layouts/default.html b/pages/_layouts/default.html index ab0f1538..e4363181 100644 --- a/pages/_layouts/default.html +++ b/pages/_layouts/default.html @@ -2,25 +2,27 @@ layout: base --- -
+
+
+ {% if page.nav-position == "left" or page.nav-position == "right" or page.nav-position == "all" %} + {% include layout/sidenav.html dark=true %} + {% endif %} - {% if page.nav-position == "left" or page.nav-position == "right" or page.nav-position == "all" %} - {% include layout/sidenav.html %} - {% endif %} +
+ {% include layout/topnav.html dark=page.header-dark %} - {% include layout/topnav.html dark=page.header-dark %} +
-
+
+
+ {% include layout/page-title.html %} -
- -
-
- {% include layout/page-title.html %} - - {{ content }} + {{ content }} +
+ +
diff --git a/pages/layout-dark-mode.html b/pages/layout-dark-mode.html new file mode 100644 index 00000000..45ced955 --- /dev/null +++ b/pages/layout-dark-mode.html @@ -0,0 +1,4 @@ +--- +title: Dark mode +dark-theme: true +--- diff --git a/pages/header-dark.html b/pages/layout-header-dark.html similarity index 100% rename from pages/header-dark.html rename to pages/layout-header-dark.html diff --git a/pages/navbar-all.html b/pages/navbar-all.html deleted file mode 100644 index ff91ed62..00000000 --- a/pages/navbar-all.html +++ /dev/null @@ -1,25 +0,0 @@ ---- -nav-position: all ---- - -

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.

- -

Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.

- -

Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.

- -

Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.

- -

Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis.

- -

At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, At accusam aliquyam diam diam dolore dolores duo eirmod eos erat, et nonumy sed tempor et et invidunt justo labore Stet clita ea et gubergren, kasd magna no rebum. sanctus sea sed takimata ut vero voluptua. est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat.

- -

Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.

- -

Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.

- -

Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.

- -

Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis.

- -

At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, At accusam aliquyam diam diam dolore dolores duo eirmod eos erat, et nonumy sed tempor et et invidunt justo labore Stet clita ea et gubergren, kasd magna no rebum. sanctus sea sed takimata ut vero voluptua. est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat.

diff --git a/pages/navbar-left.html b/pages/navbar-left.html deleted file mode 100644 index f3fa0309..00000000 --- a/pages/navbar-left.html +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Sidebar left -menu: layout.sidebar-left -nav-position: left ---- diff --git a/pages/navbar-right.html b/pages/navbar-right.html deleted file mode 100644 index 6777193b..00000000 --- a/pages/navbar-right.html +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Sidebar right -menu: layout.sidebar-right -nav-position: right ---- diff --git a/pages/navbar-top.html b/pages/navbar-top.html deleted file mode 100644 index aaac9108..00000000 --- a/pages/navbar-top.html +++ /dev/null @@ -1,3 +0,0 @@ ---- -title: Navbar top ---- diff --git a/scss/layout/_navbar.scss b/scss/layout/_navbar.scss index 48bb7ff1..39f606ce 100644 --- a/scss/layout/_navbar.scss +++ b/scss/layout/_navbar.scss @@ -5,7 +5,7 @@ border-bottom: 1px solid $border-color; display: flex; min-height: 3.5rem; - padding: .75rem 1rem; + padding: .75rem .75rem; width: 100%; .nav-link { @@ -42,7 +42,7 @@ } } -.navbar-subnav { +.navbar:not(.navbar-side) .navbar-subnav { position: absolute; top: 100%; left: 0; @@ -122,6 +122,12 @@ Sidebar background: $sidenav-bg; border-right: 1px solid $sidenav-border-color; user-select: none; + flex-direction: column; + align-items: inherit; + + .nav { + flex-direction: column; + } .nav-link { display: flex; -- GitLab