Skip to content
Snippets Groups Projects
Commit a23a1dfa authored by dcz's avatar dcz
Browse files

Remove spacing between menu items. 

Remove the beta info from the application title.
parent 68bbd3e5
No related merge requests found
Hide whitespace changes
Inline Side-by-side
common/templates/base.html
+ 8
− 8
View file @ a23a1dfa
......@@ -10,7 +10,7 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>{% block title %}{% endblock %} – Val Unifier [BETA]</title>
<title>{% block title %}{% endblock %} – Val Unifier</title>
<link rel="icon" href="{% static 'common/favicon.ico' %}">
<link rel="stylesheet" type="text/css" href="https://bootswatch.com/4/lux/bootstrap.min.css">
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@300;400;700&display=swap">
......@@ -44,8 +44,8 @@
<div class="container-fluid h-100 d-flex flex-column p-0">
<!--z-index 2 above sticky-top-->
<nav id="page-nav" class="navbar navbar-expand-lg sticky-top navbar-dark bg-dark font-weight-bold p-2" style="z-index: 1022;">
<a class="navbar-brand" href="{% url 'dash' %}">Val Unifier [BETA]</a>
<nav id="page-nav" class="navbar navbar-expand-custom sticky-top navbar-dark bg-dark font-weight-bold p-2" style="z-index: 1022;">
<a class="navbar-brand" href="{% url 'dash' %}">Val Unifier</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
......@@ -53,30 +53,30 @@
<div class="collapse navbar-collapse" id="navbarNav">
{% if request.user.is_authenticated %}
<ul class="navbar-nav mr-auto">
<li class="nav-item" id="nav-entries">
<li class="nav-item mr-1" id="nav-entries">
<a class="nav-link text-light" href="{% url 'entries:entries' %}">
{% trans "Hasła" %}
</a>
</li>
{% block additional-nav-items %}{% endblock %}
<li class="nav-item" id="nav-phrases">
<li class="nav-item mr-1" id="nav-phrases">
<a class="nav-link text-light" href="{% url 'phrase_expansions:phrase_expansions' %}">
{% trans "Typy fraz" %}
</a>
</li>
<li class="nav-item" id="nav-statistics">
<li class="nav-item mr-1" id="nav-statistics">
<a class="nav-link text-light" href="{% url 'dictionary_statistics:dictionary_statistics' %}">
{% trans "Statystyki" %}
</a>
</li>
{% if perms.users.view_user %}
<li class="nav-item" id="nav-users">
<li class="nav-item mr-1" id="nav-users">
<a class="nav-link text-light" href="{% url 'users:user_list' %}">
{% trans "Użytkownicy" %}
</a>
</li>
{% endif %}
<li class="nav-item" id="nav-fin-statements">
<li class="nav-item mr-1" id="nav-fin-statements">
<a class="nav-link text-light" href="{% url 'financial_settlement:statement_list' %}">
{% trans "Umowy" %}
</a>
......
entries/static/entries/css/entries.css
+ 29
− 0
View file @ a23a1dfa
......@@ -318,3 +318,32 @@ legend {
.is-hide{
display:none;
}
@media (min-width: 1500px){
.navbar-expand-custom {
flex-direction: row;
flex-wrap: nowrap;
justify-content: flex-start;
}
.navbar-expand-custom .navbar-nav {
flex-direction: row;
}
.navbar-expand-custom .dropdown-menu {
position: absolute;
}
.navbar-expand-custom .nav-link {
padding-right: .5rem;
padding-left: .5rem;
}
.navbar-expand-custom > .container {
flex-wrap: nowrap;
}
.navbar-expand-custom .navbar-collapse {
display: flex!important;
flex-basis: auto;
}
.navbar-expand-custom .navbar-toggler {
display: none;
}
}
entries/templates/entries_base.html
+ 13
− 13
View file @ a23a1dfa
......@@ -29,39 +29,39 @@
{% block additional-nav-items %}
{% if request.user.is_authenticated %}
<li class="nav-item"><a href="{% url 'entries:unification' %}" class="nav-link">{% trans "Unifikacja" %}</a></li>
<li class="nav-item"><a
<li class="nav-item mr-1"><a href="{% url 'entries:unification' %}" class="nav-link">{% trans "Unifikacja" %}</a></li>
<li class="nav-item mr-1"><a
onclick='window.location.replace(window.currUnifiedFrameId ? "/pl/entries/hierarchy/?unified_frame_id="+window.currUnifiedFrameId : "/pl/entries/hierarchy")'
class="nav-link cursor-pointer">{% trans "Hierarchia" %}</a></li>
{% endif %}
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="nav-filters" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<li class="nav-item dropdown mr-1">
<a class="nav-link dropdown-toggle mr-1" href="#" id="nav-filters" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{% trans "Filtrowanie" %}
</a>
<div class="dropdown-menu" id="filters-visited-dropdown" aria-labelledby="nav-filters">
<a href="#" class="dropdown-item font-weight-bold text-dark text-uppercase" id="filter-button" data-toggle="modal" data-target="#entry-filters">
<div class="dropdown-menu mr-1" id="filters-visited-dropdown" aria-labelledby="nav-filters">
<a href="#" class="dropdown-item mr-1 font-weight-bold text-dark text-uppercase" id="filter-button" data-toggle="modal" data-target="#entry-filters">
{% trans "Hasła" %}
</a>
<a href="#" class="dropdown-item font-weight-bold text-dark text-uppercase" id="filter-unified-frames-button" data-toggle="modal" data-target="#unified-frame-filters">
<a href="#" class="dropdown-item mr-1 font-weight-bold text-dark text-uppercase" id="filter-unified-frames-button" data-toggle="modal" data-target="#unified-frame-filters">
{% trans "Ramy zunifikowane" %}
</a>
</div>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="nav-filters-local" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<li class="nav-item dropdown mr-1">
<a class="nav-link dropdown-toggle mr-1" href="#" id="nav-filters-local" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{% trans "Filtrowanie lokalne" %}
</a>
<div class="dropdown-menu" id="filters-local-visited-dropdown" aria-labelledby="nav-filters-local">
<a href="#" class="dropdown-item font-weight-bold text-dark text-uppercase" id="filter-local-frames-button" data-toggle="modal" data-target="#frame-filters-local">
<a href="#" class="dropdown-item mr-1 font-weight-bold text-dark text-uppercase" id="filter-local-frames-button" data-toggle="modal" data-target="#frame-filters-local">
{% trans "Ramy" %}
</a>
<a href="#" class="dropdown-item font-weight-bold text-dark text-uppercase" id="filter-local-schemata-button" data-toggle="modal" data-target="#schema-filters-local">
<a href="#" class="dropdown-item mr-1 font-weight-bold text-dark text-uppercase" id="filter-local-schemata-button" data-toggle="modal" data-target="#schema-filters-local">
{% trans "Schematy" %}
</a>
</div>
</li>
<li class="nav-item dropdown">
<li class="nav-item dropdown mr-1">
<a class="nav-link dropdown-toggle" href="#" id="nav-last" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{% trans "Ostatnio oglądane" %}
</a>
......@@ -71,7 +71,7 @@
{% endfor %}
</div>
</li>
<li class="nav-item dropdown">
<li class="nav-item dropdown mr-1">
<a class="nav-link dropdown-toggle" href="#" id="nav-options" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{% trans "Opcje" %}
</a>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment