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

Replace pull-right (broken) with pull-xs-right

Browse Source 
twbs/bootstrap#18340 removed `.pull-left` and `.pull-right`
since they're redundant with `.pull-xs-left` and `.pull-xs-right`.

This solves the styling bug explained in
pydanny/cookiecutter-django#452.
This commit is contained in:
Jan Van Bruggen 2015-12-29 12:09:41 -08:00
parent 91f223d7bd
commit db4e3deeab
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,7 @@
margin-left: 0;
}
.nav.navbar-nav.pull-right {
.nav.navbar-nav.pull-xs-right {
float: none !important;
}
}
@ -35,4 +35,4 @@
*/
[hidden][style="display: block;"] {
display: block !important;
}
}

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

@ -37,7 +37,7 @@ $red: #b94a48;
margin-left: 0;
}
.nav.navbar-nav.pull-right {
.nav.navbar-nav.pull-xs-right {
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">
<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">
<button type="button" class="navbar-toggler hidden-sm-up pull-xs-right" data-toggle="collapse" data-target="#bs-navbar-collapse-1">
&#9776;
</button>
@ -50,7 +50,7 @@
</li>
</ul>
<ul class="nav navbar-nav pull-right">
<ul class="nav navbar-nav pull-xs-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>