Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP to bring api page design in line #149

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

WIP to bring api page design in line #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
605da6b
WIP to bring api page design in line
struan Oct 28, 2021
d1d942b
use bootstrap 4 JS instead of rest frameworks own version
struan Nov 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions caps/static/scss/api.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
ul.breadcrumb {
li + li {
::before {
padding: 0 5px;
color: #ccc;
content: "/\00a0";
}
}
}

.pull-right {
float: right !important;
}
7 changes: 4 additions & 3 deletions caps/static/scss/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@
@import "../bootstrap/forms";
@import "../bootstrap/buttons";
@import "../bootstrap/transitions";
// @import "../bootstrap/dropdown";
// @import "../bootstrap/button-group";
@import "../bootstrap/dropdown";
@import "../bootstrap/button-group";
// @import "../bootstrap/input-group";
// @import "../bootstrap/custom-forms";
@import "../bootstrap/nav";
@import "../bootstrap/navbar";
@import "../bootstrap/card";
// @import "../bootstrap/breadcrumb";
@import "../bootstrap/breadcrumb";
// @import "../bootstrap/pagination";
@import "../bootstrap/badge";
// @import "../bootstrap/jumbotron";
Expand Down Expand Up @@ -83,3 +83,4 @@
@import "homepage";
@import "council-powers";
@import "net-zero-local-hero";
@import "api";
29 changes: 26 additions & 3 deletions templates/rest_framework/api.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,32 @@

{% load static %}
{% load pipeline %}
{% load bootstrap4 %}

{% block title %}CAPS API{% endblock %}
{% block bootstrap_theme %}
{% stylesheet 'main' %}
{% endblock %}

{% block script %}
{% bootstrap_javascript jquery='full' %}
{% endblock %}

{% block title %}Climate Action Plan Explorer API{% endblock %}

{% block branding %}
<a class="navbar-brand" rel="nofollow" href="/">DATA</a> <span class="navbar-brand">&raquo;</span> <a class="navbar-brand" href="{% url 'api-root' %}">API</a>
{% block navbar %}
{% include 'includes/site-header.html' %}
<div class="site-subheader">
<nav class="navbar navbar-expand-md navbar-dark">
<a class="navbar-brand" href="{% url 'home' %}">Climate Action Plan Explorer</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#secondaryNav" aria-controls="secondaryNav" aria-expanded="false" aria-label="Toggle secondary navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="secondaryNav">
<div class="navbar-nav">
<a class="nav-link" href="{% url 'council_list' %}">All councils</a>
<a class="nav-link" href="{% url 'about' %}">About</a>
</div>
</div>
</nav>
</div>
{% endblock %}