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

Merge pull request #315 from pydanny/bootstrap-4

Browse Source 
Upgrade to Bootstrap 4 alpha
This commit is contained in:
Daniel Greenfeld 2015-08-30 15:45:09 -07:00
commit 86239af98f
3 changed files with 37 additions and 34 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; background-color: #f2dede;
border-color: #eed3d7; 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; background-color: #f2dede;
border-color: #eed3d7; border-color: #eed3d7;
} }
// Give header a nice bottom margin
.navbar-header {
margin-bottom: 3rem;
}

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

@ -15,10 +15,7 @@
{% block css %} {% block css %}
<!-- Latest compiled and minified CSS --> <!-- Latest compiled and minified CSS -->
<link rel="stylesheet" href="https://netdna.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css"> <link rel="stylesheet" href="https://cdn.rawgit.com/twbs/bootstrap/v4-dev/dist/css/bootstrap.css">
<!-- Optional theme -->
<link rel="stylesheet" href="https://netdna.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap-theme.min.css">
<!-- Your stuff: Third-party css libraries go here --> <!-- Your stuff: Third-party css libraries go here -->
@ -34,37 +31,33 @@
<body> <body>
<div class="navbar navbar-default"> <div class="navbar-header">
<div class="container-fluid"> <nav class="navbar navbar-dark navbar-static-top bg-inverse">
<!-- Brand and toggle get grouped for better mobile display --> <div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-navbar-collapse-1" aria-expanded="false">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/">{% endraw %}{{ cookiecutter.project_name }}{% raw %}</a> <a class="navbar-brand" href="/">{% endraw %}{{ cookiecutter.project_name }}{% raw %}</a>
</div> <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 --> <!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-navbar-collapse-1"> <div class="collapse navbar-toggleable-xs" id="bs-navbar-collapse-1">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li><a href="{% url 'home' %}">Home</a></li> <li class="nav-item"><a class="nav-link" href="{% url 'home' %}">Home</a></li>
<li><a href="{% url 'about' %}">About</a></li> <li class="nav-item"><a class="nav-link" href="{% url 'about' %}">About</a></li>
</ul> </ul>
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav pull-right">
{% if request.user.is_authenticated %} {% if request.user.is_authenticated %}
<li><a href="{% url 'users:detail' request.user.username %}">{% trans "My Profile" %}</a></li> <li class="nav-item"><a class="nav-link" href="{% url 'users:detail' request.user.username %}">{% trans "My Profile" %}</a></li>
<li><a href="{% url 'account_logout' %}">{% trans "Logout" %}</a></li> <li class="nav-item"><a class="nav-link" href="{% url 'account_logout' %}">{% trans "Logout" %}</a></li>
{% else %} {% else %}
<li><a href="{% url 'account_signup' %}">{% trans "Sign Up" %}</a></li> <li class="nav-item"><a class="nav-link" href="{% url 'account_signup' %}">{% trans "Sign Up" %}</a></li>
<li><a href="{% url 'account_login' %}">{% trans "Log In" %}</a></li> <li class="nav-item"><a class="nav-link" href="{% url 'account_login' %}">{% trans "Log In" %}</a></li>
{% endif %} {% endif %}
</ul> </ul>
</div>
</div> </div>
</div> </nav>
</div> </div>
<div class="container"> <div class="container">
@ -88,10 +81,10 @@
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
{% block javascript %} {% block javascript %}
<!-- Latest JQuery --> <!-- Latest JQuery -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
<!-- Latest compiled and minified JavaScript --> <!-- Latest compiled and minified JavaScript -->
<script src="https://netdna.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script> <script src="https://cdn.rawgit.com/twbs/bootstrap/v4-dev/dist/js/bootstrap.js"></script>
<!-- Your stuff: Third-party javascript libraries go here --> <!-- Your stuff: Third-party javascript libraries go here -->