diff options
| author | Sam Wenham <sam@wenhams.co.uk> | 2020-02-22 15:45:20 +0000 |
|---|---|---|
| committer | Sam Wenham <sam@wenhams.co.uk> | 2020-02-22 15:45:20 +0000 |
| commit | 656ddcfe93061f2f82160ff8cc45b98d27e28bd3 (patch) | |
| tree | 5e22bb56363ad7e28e2902bc7637b018706e83e0 /templates | |
| parent | 505bc48331035b6fdc9d3ca5f9de77e5a98ba267 (diff) | |
| parent | 92b273e45f96ac20fb182b9166b9f0a96f16eba3 (diff) | |
| download | troggle-656ddcfe93061f2f82160ff8cc45b98d27e28bd3.tar.gz troggle-656ddcfe93061f2f82160ff8cc45b98d27e28bd3.tar.bz2 troggle-656ddcfe93061f2f82160ff8cc45b98d27e28bd3.zip | |
Merge branch 'django-1.10' of ssh://expo.survex.com/~/troggle into django-1.10
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/base.html | 12 | ||||
| -rw-r--r-- | templates/cave.html | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/templates/base.html b/templates/base.html index e160b76..c5943d5 100644 --- a/templates/base.html +++ b/templates/base.html @@ -2,14 +2,14 @@ <html lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> -<link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/main3.css" title="eyeCandy"/> -<link rel="alternate stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/mainplain.css" title="plain"/> -<link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/dropdownNavStyle.css" /> +<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/main3.css" title="eyeCandy"/> +<link rel="alternate stylesheet" type="text/css" href="{{ MEDIA_URL }}css/mainplain.css" title="plain"/> +<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/dropdownNavStyle.css" /> <title>{% block title %}Troggle{% endblock %}</title> <!-- <script src="{{ settings.JSLIB_URL }}jquery/jquery.min.js" type="text/javascript"></script> --> -<script src="{{ settings.MEDIA_URL }}js/jquery.quicksearch.js" type="text/javascript"></script> -<script src="{{ settings.MEDIA_URL }}js/base.js" type="text/javascript"></script> -<script src="{{ settings.MEDIA_URL }}js/jquery.dropdownPlain.js" type="text/javascript"></script> +<script src="{{ MEDIA_URL }}js/jquery.quicksearch.js" type="text/javascript"></script> +<script src="{{ MEDIA_URL }}js/base.js" type="text/javascript"></script> +<script src="{{ MEDIA_URL }}js/jquery.dropdownPlain.js" type="text/javascript"></script> {% block head %}{% endblock %} </head> diff --git a/templates/cave.html b/templates/cave.html index 9fbca0d..5965082 100644 --- a/templates/cave.html +++ b/templates/cave.html @@ -17,7 +17,7 @@ div.cv-panel { } div.cv-compass, div.cv-ahi { - position: absolute; + position: absolute; bottom: 95px; right: 5px; margin: 0; @@ -31,7 +31,7 @@ div.cv-compass, div.cv-ahi { background-color: black; color: white; } - + div.cv-ahi { right: 95px; } @@ -152,7 +152,7 @@ div.linear-scale-caption { position: absolute; top: 64px; left: 0px; - height: auto; + height: auto; margin-top:0; bottom: 44px; background-color: #222222; @@ -526,7 +526,7 @@ div#scene { {% endif %} {{ ent.entrance.other_location.y|safe }}, {{ ent.entrance.other_location.x|safe }}, {{ ent.entrance.other_location.z|safe }}m </dd> {% endif %} - </dl> + </dl> </li> {% endfor %} </ul> |