cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2024-11-27 03:54:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Put <nav> into a div with a nicer-displaying bottom margin.

Browse Source
This commit is contained in:
Audrey Roy Greenfeld 2015-08-30 15:41:46 -07:00
parent 243e823a2e
commit 139deaf6b8
3 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/css/project.css
View File

@ -32,3 +32,8 @@
background-color: #f2dede;
border-color: #eed3d7;
}
/* line 36, ../sass/project.scss */
.navbar-header {
margin-bottom: 3rem;
}

5
{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/sass/project.scss
View File

@ -31,3 +31,8 @@
background-color: #f2dede;
border-color: #eed3d7;
}
// Give header a nice bottom margin
.navbar-header {
margin-bottom: 3rem;
}

50
{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/base.html
View File

@ -30,33 +30,35 @@
</head>
<body>
<nav class="navbar navbar-dark navbar-static-top bg-inverse">
<div class="container">
<a class="navbar-brand" href="/">{% endraw %}{{ cookiecutter.project_name }}{% raw %}</a>
<button type="button" class="navbar-toggler hidden-sm-up pull-right" data-toggle="collapse" data-target="#bs-navbar-collapse-1">
&#9776;
</button>
<div class="navbar-header">
<nav class="navbar navbar-dark navbar-static-top bg-inverse">
<div class="container">
<a class="navbar-brand" href="/">{% endraw %}{{ cookiecutter.project_name }}{% raw %}</a>
<button type="button" class="navbar-toggler hidden-sm-up pull-right" data-toggle="collapse" data-target="#bs-navbar-collapse-1">
&#9776;
</button>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-toggleable-xs" id="bs-navbar-collapse-1">
<ul class="nav navbar-nav">
<li class="nav-item"><a class="nav-link" href="{% url 'home' %}">Home</a></li>
<li class="nav-item"><a class="nav-link" href="{% url 'about' %}">About</a></li>
</ul>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-toggleable-xs" id="bs-navbar-collapse-1">
<ul class="nav navbar-nav">
<li class="nav-item"><a class="nav-link" href="{% url 'home' %}">Home</a></li>
<li class="nav-item"><a class="nav-link" href="{% url 'about' %}">About</a></li>
</ul>
<ul class="nav navbar-nav pull-right">
{% if request.user.is_authenticated %}
<li class="nav-item"><a class="nav-link" href="{% url 'users:detail' request.user.username %}">{% trans "My Profile" %}</a></li>
<li class="nav-item"><a class="nav-link" href="{% url 'account_logout' %}">{% trans "Logout" %}</a></li>
{% else %}
<li class="nav-item"><a class="nav-link" href="{% url 'account_signup' %}">{% trans "Sign Up" %}</a></li>
<li class="nav-item"><a class="nav-link" href="{% url 'account_login' %}">{% trans "Log In" %}</a></li>
{% endif %}
</ul>
<ul class="nav navbar-nav pull-right">
{% if request.user.is_authenticated %}
<li class="nav-item"><a class="nav-link" href="{% url 'users:detail' request.user.username %}">{% trans "My Profile" %}</a></li>
<li class="nav-item"><a class="nav-link" href="{% url 'account_logout' %}">{% trans "Logout" %}</a></li>
{% else %}
<li class="nav-item"><a class="nav-link" href="{% url 'account_signup' %}">{% trans "Sign Up" %}</a></li>
<li class="nav-item"><a class="nav-link" href="{% url 'account_login' %}">{% trans "Log In" %}</a></li>
{% endif %}
</ul>
</div>
</div>
</div>
</nav>
</nav>
</div>
<div class="container">