Skip to content

CIRCLE / cloud

Go to a project
Commit 742019bf by Bach Dániel
Options

dashboard: fix navbar-brand blocks

parent 9cea6473
Showing with 6 additions and 14 deletions
circle/dashboard/templates/base.html
...@@ -27,7 +27,12 @@ ...@@ -27,7 +27,12 @@
<body> <body>
<div class="navbar navbar-inverse navbar-fixed-top"> <div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-header"> <div class="navbar-header">
{% block navbar-brand %}{% endblock %} {% block navbar-brand %}
<a class="navbar-brand" href="{% url "dashboard.index" %}" style="padding: 10px 15px;">
{% include "branding.html" %}
</a>
{% endblock %}
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
......
circle/dashboard/templates/dashboard/base.html
...@@ -10,12 +10,6 @@ ...@@ -10,12 +10,6 @@
{% endblock %} {% endblock %}
{% block navbar-brand %}
<a class="navbar-brand" href="{% url "dashboard.index" %}" style="padding: 10px 15px;">
{% include "branding.html" %}
</a>
{% endblock %}
{% block navbar %} {% block navbar %}
{% if user.is_authenticated and user.pk and not request.token_user %} {% if user.is_authenticated and user.pk and not request.token_user %}
<ul class="nav navbar-nav navbar-right" id="dashboard-menu"> <ul class="nav navbar-nav navbar-right" id="dashboard-menu">
......
circle/templates/registration/base.html
...@@ -74,13 +74,6 @@ ...@@ -74,13 +74,6 @@
{% endblock %} {% endblock %}
{% block navbar-brand %}
<a class="navbar-brand" href="{% url "dashboard.index" %}" style="padding: 10px 15px;">
<img src="{% static "dashboard/img/logo.png" %}" style="height: 25px;" alt="circle logo"/>
</a>
{% endblock %}
{% block content %} {% block content %}
<div class="content"> <div class="content">
{% block content_box %}{% endblock %} {% block content_box %}{% endblock %}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment