cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2025-02-03 21:24:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #455 from jvanbrug/master

Browse Source 
Replace pull-right (broken) with pull-xs-right
This commit is contained in:
Jannis Gebauer 2015-12-30 20:55:44 +01:00
commit e33f05a153
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,7 @@
margin-left: 0; margin-left: 0;
} }
.nav.navbar-nav.pull-right { .nav.navbar-nav.pull-xs-right {
float: none !important; float: none !important;
} }
} }

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

@ -37,7 +37,7 @@ $red: #b94a48;
margin-left: 0; margin-left: 0;
} }
.nav.navbar-nav.pull-right { .nav.navbar-nav.pull-xs-right {
float: none !important; float: none !important;
} }
} }

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

@ -35,7 +35,7 @@
<nav class="navbar navbar-dark navbar-static-top bg-inverse"> <nav class="navbar navbar-dark navbar-static-top bg-inverse">
<div class="container"> <div class="container">
<a class="navbar-brand" href="/">{% endraw %}{{ cookiecutter.project_name }}{% raw %}</a> <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"> <button type="button" class="navbar-toggler hidden-sm-up pull-xs-right" data-toggle="collapse" data-target="#bs-navbar-collapse-1">
&#9776; &#9776;
</button> </button>
@ -50,7 +50,7 @@
</li> </li>
</ul> </ul>
<ul class="nav navbar-nav pull-right"> <ul class="nav navbar-nav pull-xs-right">
{% if request.user.is_authenticated %} {% if request.user.is_authenticated %}
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="{% url 'users:detail' request.user.username %}">{% trans "My Profile" %}</a> <a class="nav-link" href="{% url 'users:detail' request.user.username %}">{% trans "My Profile" %}</a>