From 2f09751eb159a8637d0463ba239d2131d2d34084 Mon Sep 17 00:00:00 2001
From: codecalm <codecalm@gmail.com>
Date: Tue, 7 Jan 2020 22:56:50 +0100
Subject: [PATCH] new layouts

---
 _config.yml                            | 8 ++++----
 pages/_data/menu.yml                   | 6 ++----
 pages/_includes/layout/menu-aside.html | 2 +-
 pages/_includes/layout/menu.html       | 8 +++++++-
 pages/index.html                       | 2 --
 pages/layout-test.html                 | 1 -
 6 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/_config.yml b/_config.yml
index a591934ea..11b4a1bb1 100644
--- a/_config.yml
+++ b/_config.yml
@@ -55,25 +55,25 @@ defaults:
       path: "*.md"
     values:
       layout: markdown
-      menu-layout: vertical
+      menu-layout: horizontal
 
   - scope:
       type: "pages"
     values:
       layout: default
-      menu-layout: vertical
+      menu-layout: horizontal
   -
     scope:
       type: "docs"
     values:
       layout: docs
-      menu-layout: vertical
+      menu-layout: horizontal
   -
     scope:
       type: "components"
     values:
       layout: component
-      menu-layout: vertical
+      menu-layout: horizontal
 
 
 colors:
diff --git a/pages/_data/menu.yml b/pages/_data/menu.yml
index 4c4dca6f8..8366097d4 100644
--- a/pages/_data/menu.yml
+++ b/pages/_data/menu.yml
@@ -2,15 +2,11 @@ home:
   url: index.html
   title: Dashboard
   icon: home
-  badge: ''
-  badge-color: blue
 
 forms:
   url: form-elements.html
   title: Form elements
   icon: check-square
-  badge: New
-  badge-color: red
 
 base:
   title: Base
@@ -94,6 +90,8 @@ layouts:
   title: Layouts
   icon: layout
   url: layouts.html
+  badge: New
+  badge-color: green
 
 extra:
   title: Extra
diff --git a/pages/_includes/layout/menu-aside.html b/pages/_includes/layout/menu-aside.html
index 1af54818e..44a0bafdb 100644
--- a/pages/_includes/layout/menu-aside.html
+++ b/pages/_includes/layout/menu-aside.html
@@ -15,7 +15,7 @@
 
 			{% if level-1[1].badge %}
 			{% assign badge = level-1[1].badge %}
-			{% assign badge-color = level-1[1].badge-color | default: 'green' %}
+			{% assign badge-color = level-1[1].badge-color | default: "green" %}
 			{% include ui/badge.html text=badge color=badge-color %}
 			{% endif %}
 
diff --git a/pages/_includes/layout/menu.html b/pages/_includes/layout/menu.html
index 64803dce8..b66287b47 100644
--- a/pages/_includes/layout/menu.html
+++ b/pages/_includes/layout/menu.html
@@ -13,6 +13,12 @@
 			</span>
 
 			{{ level-1[1].title }}
+
+			{% if level-1[1].badge %}
+			{% assign badge = level-1[1].badge %}
+			{% assign badge-color = level-1[1].badge-color | default: "green" %}
+			{% include ui/badge.html text=badge color=badge-color class="ml-2" %}
+			{% endif %}
 		</a>
 
 		{% if level-1[1].children %}
@@ -24,7 +30,7 @@
 
 					{% if level-2[1].badge %}
 					{% assign badge = level-2[1].badge %}
-					{% assign badge-color = level-2[1].badge-color | default: 'green' %}
+					{% assign badge-color = level-2[1].badge-color | default: "green" %}
 					{% include ui/badge.html text=badge color=badge-color class="ml-auto" %}
 					{% endif %}
 				</a>
diff --git a/pages/index.html b/pages/index.html
index ad2cc82de..401f49f16 100644
--- a/pages/index.html
+++ b/pages/index.html
@@ -3,8 +3,6 @@ title: Dashboard
 page-title: Dashboard
 page-pretitle: Overview
 page-title-actions: buttons
-site-layout: layout-collapsed-md
-menu-layout: vertical
 menu: home
 ---
 
diff --git a/pages/layout-test.html b/pages/layout-test.html
index d299777a6..697015e6a 100644
--- a/pages/layout-test.html
+++ b/pages/layout-test.html
@@ -4,7 +4,6 @@ sidenav: true
 sidenav-dark: true
 page-title: Layout test
 page-title-actions: breadcrumb
-menu-layout: vertical
 menu: base.buttons
 ---