mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-15 11:09:17 +00:00
Merge branch 'master' of github.com:webnotes/erpnext into customer-login
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
<hr />
|
||||
{% if categories %}
|
||||
<h5>Explore posts by categories</h5>
|
||||
<ul class="breadcrumb" style="background-color: transparent; padding-left: 0px;">
|
||||
<ul class="breadcrumb" style="background-color: transparent; padding-left: 20px;">
|
||||
{% for category in categories %}
|
||||
<li><a href="blog?category={{ category }}">{{ category }}</a>
|
||||
{% endfor %}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{% extends "lib/templates/base.html" %}
|
||||
|
||||
{% block body %}
|
||||
{% include "app/website/templates/html/navbar.html" %}
|
||||
<div class="container">
|
||||
<div class="pull-right" style="margin:4px;" id="user-tools">
|
||||
{% if shopping_cart_enabled -%}
|
||||
@@ -22,7 +23,6 @@
|
||||
<div class="col-md-12">{{ banner_html }}</div>
|
||||
</div>{% endif %}
|
||||
<div class="outer">
|
||||
{% include "app/website/templates/html/navbar.html" %}
|
||||
<div class="content row" id="page-{{ name }}" style="display: block;">
|
||||
{%- block content -%}
|
||||
{%- endblock -%}
|
||||
|
||||
Reference in New Issue
Block a user