Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Nav fixes

Browse source
This commit is contained in:
Tobias 2018-10-07 09:42:47 +13:00
parent 9604001a4f
commit 53c9f80514
3 changed files with 6 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pinaxcon/templates/nav.html
View file

@ -9,14 +9,14 @@
<img src="{% static 'assets/LCA_logo.svg' %}" alt="LCA2019 Logo"> <img src="{% static 'assets/LCA_logo.svg' %}" alt="LCA2019 Logo">
{% endif %} {% endif %}
</a> </a>
<button class="navbar-toggler {% if color == 'green' %}white{% else %}green{% endif %}-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation"> <button class="navbar-toggler {% if color == 'green' %}white{% else %}green{% endif %}-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>
{% sitetree_menu from "main" include "trunk" template "sitetree_header.html" %} {% sitetree_menu from "main" include "trunk" template "sitetree_header.html" %}
<!-- <ul class="navbar-nav flex-row ml-md-auto d-none d-md-flex"> <ul class="navbar-nav flex-row ml-md-auto d-none d-md-flex ml-3">
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="https://twitter.com/linuxconfau2019" target="_blank" rel="noopener" aria-label="Twitter"> <a class="nav-link" href="https://twitter.com/linuxconfau2019" target="_blank" rel="noopener" aria-label="Twitter">
<svg class="navbar-nav-svg {% if color == 'green' %} text-white{% endif %}" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 416.32" focusable="false"><title>Twitter</title> <svg class="navbar-nav-svg {% if color == 'green' %} text-white{% endif %}" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 416.32" focusable="false"><title>Twitter</title>
@ -24,14 +24,5 @@
</svg> </svg>
</a> </a>
</li> </li>
<li class="nav-item"> </ul>
<a class="nav-link" href="https://twitter.com/linuxconfau2019" target="_blank" rel="noopener" aria-label="Twitter">
{% if color == 'green' %}
<img src="{% static 'assets/tux_white.svg' %}" alt="Tux" class="navbar-nav-svg">
{% else %}
<img src="{% static 'assets/tux.svg' %}" alt="Tux" class="navbar-nav-svg">
{% endif %}
</a>
</li>
</ul> -->
</nav> </nav>

2
pinaxcon/templates/sitetree_header.html
View file

@ -20,7 +20,7 @@
</a> </a>
</li> </li>
{% endif %} {% endif %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>

7
static/src/scss/app.scss
View file

@ -21,7 +21,6 @@ body {
} }
.text-page { .text-page {
h2 { h2 {
padding-top: 3rem; padding-top: 3rem;
@ -37,10 +36,6 @@ body {
text-transform: uppercase; text-transform: uppercase;
} }
.navbar-collapse {
margin-left: $padding-left-default;
}
.navbar-toggler { .navbar-toggler {
border: 0 !important; border: 0 !important;
@ -110,7 +105,7 @@ footer {
} }
li.nav-item { li.nav-item {
height: 2.75rem; min-height: 2.75rem;
&.active > a.nav-link { &.active > a.nav-link {
font-weight: 700; font-weight: 700;