Merge branch 'redo' of github.com:erpnext/foundation into redo

foundation/public/build.json

@@ -1,5 +1,5 @@
 {
-    "css/frappe-css.css": [
+    "css/frappe-css-bak.css": [
         "node_modules/frappe-css/dist/frappe-css.css"
     ],
     "foundation/css/erpnext-org-theme.css": [

foundation/templates/includes/navbar/navbar.html

@@ -1,5 +1,5 @@
 <nav class="navbar" role="navigation">
-	<div class="container flex space-between align-item-center border ph4">
+	<div class="container flex space-between align-item-center border ph4 pv1">
 		<div class="left">
 			<a class="logo flex align-item-center" href="{{ url_prefix }}{{ home_page or "/"}}">
 				<img class="logo-img mr1" src="/assets/foundation/img/erpnext-logo.svg" alt="Open Source ERP Software">

foundation/templates/includes/sidebar/sidebar.html

@@ -0,0 +1,9 @@
+<nav class="pv1">
+    <ul class="list-unstyled m0 p0">
+        {% for list_item in ['Service Providers', 'Chapters', 'Fellowship', 'Blog'] %}
+        <li class="ph4 pv1">
+            <a href="">{{ list_item }}</a>
+        </li>
+        {% endfor %}
+    </ul>
+</nav>

foundation/templates/web.html

@@ -2,10 +2,10 @@
 {% block hero %}{% endblock %}
 {% block content %}
 <main class="page">
-	<div class="page-container" id="page-{{ name or route }}"
+	<div class="page-container flex" id="page-{{ name or route }}"
 		data-path="{{ pathname }}" {%- if page_or_generator=="Generator" %} data-doctype="{{ doctype }}"{% endif %}>
-		<div class="page-sidebar">
-			{% include "templates/includes/web_sidebar.html" %}
+		<div class="page-sidebar flex-1 border-right">
+			{% include "foundation/templates/includes/sidebar/sidebar.html" %}
 		</div>
 		<div class="page-main">
 			{% include "foundation/templates/includes/page-head.html" %}