From 22469fcf7cd398ae1476fc850102e517b146b0d5 Mon Sep 17 00:00:00 2001
From: Bryan Brancotte <bryan.brancotte@pasteur.fr>
Date: Wed, 28 Aug 2019 16:40:59 +0200
Subject: [PATCH] moving form_in_nav_bar, bugfix for form-control WIP #2
---
.../static/css/basetheme_bootstrap4_pasteur.css | 1 +
.../templates/basetheme_bootstrap/basePasteur.html | 12 ++++++------
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/basetheme_bootstrap/static/css/basetheme_bootstrap4_pasteur.css b/basetheme_bootstrap/static/css/basetheme_bootstrap4_pasteur.css
index f5a5d0b..0f1e127 100644
--- a/basetheme_bootstrap/static/css/basetheme_bootstrap4_pasteur.css
+++ b/basetheme_bootstrap/static/css/basetheme_bootstrap4_pasteur.css
@@ -207,6 +207,7 @@ main a {
.form-group {
}
+.form-control,
.form-group textarea,
.form-group input,
.form-group select{
diff --git a/basetheme_bootstrap/templates/basetheme_bootstrap/basePasteur.html b/basetheme_bootstrap/templates/basetheme_bootstrap/basePasteur.html
index c51b02a..8312c5c 100644
--- a/basetheme_bootstrap/templates/basetheme_bootstrap/basePasteur.html
+++ b/basetheme_bootstrap/templates/basetheme_bootstrap/basePasteur.html
@@ -38,6 +38,12 @@
<ul class="navbar-nav mr-auto">
{% include_if_exists "nav_bar.html"|localize_template "basetheme_bootstrap/nav_bar.example.html" %}
</ul>
+ {% block form_in_nav_bar %}
+ <!--<form class="form-inline mt-2 mt-md-0">-->
+ <!--<input class="form-control mr-sm-2" type="text" placeholder="Search" aria-label="Search">-->
+ <!--<button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>-->
+ <!--</form>-->
+ {% endblock %}
<ul class="nav navbar-nav navbar-right">
{% block extra_li_dropdown_right %}{% endblock %}
{%if not request.user.is_authenticated %}
@@ -62,12 +68,6 @@
</li>
{%endif%}
</ul>
- {% block form_in_nav_bar %}
- <!--<form class="form-inline mt-2 mt-md-0">-->
- <!--<input class="form-control mr-sm-2" type="text" placeholder="Search" aria-label="Search">-->
- <!--<button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>-->
- <!--</form>-->
- {% endblock %}
</div>
</nav>
</header>
--
GitLab