mgoetz/basta-server
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove bottom nav

Browse Source
This commit is contained in:
michigg 2017-12-05 00:32:43 +01:00
parent 3321fd676c
commit 80375597f5
3 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ofu_app/templates/base.jinja
View File

@ -10,21 +10,11 @@
<title>BaStA</title> <title>BaStA</title>
<meta name="author" content="Michael Götz"/> <meta name="author" content="Michael Götz"/>
<script src="{{ static('libs/jquery/jquery-3.2.1.min.js') }}"></script> <script src="{{ static('libs/jquery/jquery-3.2.1.min.js') }}"></script>
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" <script src="{{ static('libs/bootstrap-4.0.0-beta-dist/js/bootstrap.js') }}"></script>
integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN"
crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.3/umd/popper.min.js"
integrity="sha384-vFJXuSJphROIrBnz7yo7oB41mKfc8JzQZiCq4NCceLEaO4IHwicKwpJf9c9IpFgh"
crossorigin="anonymous"></script>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta.2/css/bootstrap.min.css"
integrity="sha384-PsH8R72JQ3SOdhVi3uxftmaW6Vc51MKb0q5P2rRUpPvrszuE4W1povHYgTpBfshb" crossorigin="anonymous">
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta.2/js/bootstrap.min.js"
integrity="sha384-alpBpkh1PFOepccYVYDB4do5UnbKysX5WZXm3XxPqe5iKTfUKjNkCk9SaVuEZflJ"
crossorigin="anonymous"></script>
{% block js_extra %}{% endblock %} {% block js_extra %}{% endblock %}
<!-- Bootstrap CSS --> <!-- Bootstrap CSS -->
<link rel="stylesheet" href="{{ static('libs/font-awesome-4.7.0/css/font-awesome.css') }}"> <link rel="stylesheet" href="{{ static('libs/font-awesome-4.7.0/css/font-awesome.css') }}">
{# <link rel="stylesheet" href="{{ static('libs/bootstrap-4.0.0-beta-dist/css/bootstrap.css') }}">#} <link rel="stylesheet" href="{{ static('libs/bootstrap-4.0.0-beta-dist/css/bootstrap.css') }}">
<link rel="stylesheet" href="{{ static('css/nav.css') }}"> <link rel="stylesheet" href="{{ static('css/nav.css') }}">
{% block css_extra %}{% endblock %} {% block css_extra %}{% endblock %}
<!-- Piwik --> <!-- Piwik -->

6
ofu_app/templates/food/food_wrapper.jinja
View File

@ -9,10 +9,4 @@
<link rel="stylesheet" href="{{ static('css/food/main.css') }}"> <link rel="stylesheet" href="{{ static('css/food/main.css') }}">
{% endblock %} {% endblock %}
{% block bottom_nav %} {% block bottom_nav %}
<nav id="food-nav" class="navbar navbar-default bg-light">
<div class="container-fluid">
<a class="nav-link" href="{{ url('daily-food') }}"> Daily </a>
<a class="nav-link" href="{{ url('weekly-food') }}"> Weekly </a>
</div>
</nav>
{% endblock %} {% endblock %}

2
ofu_app/templates/macros/food_macros.jinja
View File

@ -57,7 +57,7 @@
{% macro get_menu(menu, title="") -%} {% macro get_menu(menu, title="") -%}
<ul class="border media-list"> <ul class="border media-list">
{% for single_food in menu %} {% for single_food in menu %}
<li data-food="{{ single_food.id }}" data-rating="{{ single_food.rating }}" class="food-item media"> <li data-food="{{ single_food.id }}" data-rating="{{ single_food.rating }}" class="food-item media mb-2">
<div class="mr-2 media-left media-middle"> <div class="mr-2 media-left media-middle">
{# TODO: without many to many #} {# TODO: without many to many #}
{% if single_food.image.all() %} {% if single_food.image.all() %}