Tuning the second menu bar so pasteur face is scaled

Showing the form by default (can be overridden)
WIP #2

basetheme_bootstrap/static/css/basetheme_bootstrap4_pasteur.css

@@ -77,7 +77,16 @@ header nav.navbar nav-item.active{
     background: #FFFFFF30;
 }
 
+header .header__top .form-inline input:not(:focus) {
+    background-color:#000;
+}
+
+header .header__top .form-inline .form-control {
+    height:35px;
+}
+
 header .header__top .dropdown-menu a,
+header .header__top .form-inline .btn,
 header .header__top a {
     display: block;
     color: #fff;
@@ -95,6 +104,8 @@ header {
 header .dropdown-menu a:hover,
 /*header .dropdown-menu>a:hover,
 header .dropdown.show>a ,*/
+header .header__top .form-inline .btn:hover,
+header .header__top .form-inline .btn:focus,
 header a:hover {
     background: #fff;
     color: #2d80e2;
@@ -115,12 +126,17 @@ header .dropdown.show>a {
 }
 .header__logo-wrapper {
     /*float: left;*/
-    margin-right: 20px;
+    /*margin-right: 20px;*/
+    padding: 15px 1rem;
 }
-
-header__face-wrapper {
-    /*float: left;*/
-    margin-right: 20px;
+.header__nav>.main-nav{
+    display: flex;
+}
+.header__nav>.main-nav>*:not(.navbar-right){
+    flex:1 1 auto;
+}
+.header__face {
+    height:105px;
 }
 .header__middle{
     /*padding-right: 1rem;
@@ -156,7 +172,7 @@ header__face-wrapper {
     color: #636060;
     font-size: 1em;
     padding: 5px 0;
-    padding-top: 41px;
+    padding-top: 60px;
 }
 .main-nav a:hover,
 .main-nav a.active {
@@ -189,6 +205,13 @@ header.scrolled .header__logo-wrapper{
     height: 2em;
     /*overflow: hidden;/**/
 }
+header.scrolled .header__face {
+    height: 39px;
+    /*overflow: hidden;/**/
+}
+header.scrolled .header__logo-wrapper {
+    padding: 0;
+}
 header.scrolled .header__logo-wrapper img{
     height: 39px;
     margin-top: 5px;
@@ -198,7 +221,7 @@ header.scrolled .header__middle{
         background-size: auto 39px;
 }
 header .header__logo-wrapper{
-    height: 75px;
+    height: 105px;
     overflow: hidden;/**/
 }
 header .header__logo-wrapper img{
@@ -309,10 +332,11 @@ main a {
 }
 
 .form-control,
+.form-control:focus,
 .form-group textarea,
 .form-group input,
 .form-group select{
-    color: #2d96fa !important;
+    color: #2d96fa;
     border-radius: 0px;
     /*border: 0px;
     background-color: #fff;/**/
@@ -517,4 +541,7 @@ color: #0275e3;
 }
 .input-group>.input-group-append:last-child>.btn:not(:last-child):not(.dropdown-toggle), .input-group>.input-group-append:last-child>.input-group-text:not(:last-child), .input-group>.input-group-append:not(:last-child)>.btn, .input-group>.input-group-append:not(:last-child)>.input-group-text, .input-group>.input-group-prepend>.btn, .input-group>.input-group-prepend>.input-group-text {
     border-radius:0;
+}
+.fork_me{
+    display:none;
 }
\ No newline at end of file

basetheme_bootstrap/static/js/basetheme_bootstrap.js

@@ -92,7 +92,7 @@ function delayed_action(action, instant_action, timeout){
 }
 
 $(window).on("scroll", function() {
-  if ($(document).scrollTop()>20){
+  if ($(document).scrollTop()>30){
     $("header").addClass("scrolled");
   }else{
     $("header").removeClass("scrolled");

basetheme_bootstrap/templates/basetheme_bootstrap/basePasteur.html

@@ -38,13 +38,12 @@
             <ul class="navbar-nav mr-auto">
             </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>-->
+            <form class="form-inline mt-2 mt-md-0" action="search/" method="post">
+                <input class="form-control mr-sm-2" type="text" placeholder="{%trans 'Type your search here'%}" aria-label="Search">
+                <button class="form-control btn 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 %}
                 <li class="nav-item"><a class="nav-link" href="{% url 'basetheme_bootstrap:login'%}?next={{ request.path|urlencode }}">{% block sign_in_word %}{%trans "Login "%}{% endblock %}<i class="fa fa-sign-in"></i></a></li>
                 {%else%}
@@ -80,11 +79,12 @@
                     <ul id="main-menu" class="links inline clearfix main-menu">
                 {% include_if_exists "nav_bar.html"|localize_template "basetheme_bootstrap/nav_bar.example.html" %}
                     </ul>
+                    <ul class="nav navbar-nav navbar-right">
+                        {% block extra_li_dropdown_right %}{% endblock %}
+                    </ul>
                 </nav>
             </div>
-            <div class="header__face-wrapper">
-                <img src="https://www.pasteur.fr//sites/all/themes/custom/pasteur/assets/img/art/pasteur.png">
-            </div>
+            <img class="header__face" src="https://www.pasteur.fr//sites/all/themes/custom/pasteur/assets/img/art/pasteur.png">
         </div>
 </header>
 <!-- Begin page content -->

setup.py

@@ -7,7 +7,7 @@ readme = open('README.rst').read()
 
 setup(
     name='django-basetheme-bootstrap',
-    version='0.2.10',
+    version='0.2.11',
     description='Django Basetheme Bootstrap',
     long_description=readme,
     author='Bryan Brancotte',