martin/blechreiz-website
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

URL changes + menu bar layout

Browse Source
This commit is contained in:
Martin Bauer
2026-04-09 07:48:07 +02:00
parent 3683b811df
commit 4fe0b41335
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bootstrapTheme/static/css/theme.css
View File

@@ -396,6 +396,9 @@ header {
color: #fff; color: #fff;
opacity: 0.7; opacity: 0.7;
} }
.nav-collapse .nav.pull-right {
float: none !important;
}
} }
/* Portrait tablet to landscape and desktop */ /* Portrait tablet to landscape and desktop */
@media (min-width: 768px) and (max-width: 979px) { @media (min-width: 768px) and (max-width: 979px) {

2
bootstrapTheme/templates/bootstrapTheme/bootstrapTheme.html
View File

@@ -20,6 +20,8 @@
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]--> <![endif]-->
{% endaddtoblock %} {% addtoblock "js" strip %} {% endaddtoblock %} {% addtoblock "js" strip %}
<script src="{% static 'js/jquery-2.0.3.min.js' %}"></script>
{% endaddtoblock %} {% addtoblock "js" strip %}
<script src="{% static 'js/bootstrap.min.js' %}"></script> <script src="{% static 'js/bootstrap.min.js' %}"></script>
{% endaddtoblock %} {% addtoblock "js" strip %} {% endaddtoblock %} {% addtoblock "js" strip %}
<script src="{% static 'js/jquery.countdown.min.js' %}"></script> <script src="{% static 'js/jquery.countdown.min.js' %}"></script>

2
musicians/templates/musicians/addressbook.html
View File

@@ -137,7 +137,7 @@
> >
<div> <div>
<img <img
src="{{MEDIA_URL}}/user_images/{{m.user}}_thumb.png" src="{{MEDIA_URL}}user_images/{{m.user}}_thumb.png"
class="img-circle picture" class="img-circle picture"
/> />
</div> </div>

8
website/templates/website/base.html
View File

@@ -5,12 +5,10 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>Blechreiz</title> <title>Blechreiz</title></title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
{% render_block "css" %} {% render_block "css" %}
<!-- jQuery must load in head before any form widget media -->
<script src="{% static 'js/jquery-2.0.3.min.js' %}"></script>
</head> </head>
<body class="pull_top"> <body class="pull_top">
@@ -19,18 +17,16 @@
<div class="{% block navbar_options %}navbar navbar-inverse navbar-static-top {% endblock %}"> <div class="{% block navbar_options %}navbar navbar-inverse navbar-static-top {% endblock %}">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container"> <div class="container">
{% if not request.device.android %}
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse" type="button"> <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse" type="button">
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</a> </a>
{% endif %}
<a class="brand" href="/"> <a class="brand" href="/">
<img alt="Blechreiz" src="{% static 'img/blechreiz_logo.png' %}"> <img alt="Blechreiz" src="{% static 'img/blechreiz_logo.png' %}">
</a> </a>
<div {% if not request.device.android %}class="nav-collapse collapse"{% endif %}> <div class="nav-collapse collapse">
<ul class="nav pull-right"> <ul class="nav pull-right">
{% block menu_contents %} {% block menu_contents %}
<li><a href="/">HOME</a></li> <li><a href="/">HOME</a></li>