Commander1024/lostplaces-backend
Commander1024/lostplaces-backend
1
0
Fork 0
Code Issues 14 Pull Requests Releases Wiki Activity

Compare commits

base: Commander1024:805363eac53ed87d7645e1378e4fc5069a35d06a
Branches Tags
Commander1024:master
Commander1024:develop
Commander1024:update/django-4.1.1
Commander1024:feature/50-Linktypes
Commander1024:feature/33-been-there-done-that
Commander1024:feature/30-user-profile-fields
Commander1024:27-Favorite-System
Commander1024:feature/localization
Commander1024:feature/authorized_tag
Commander1024:0.1.4
Commander1024:0.1.3
Commander1024:0.1.2
Commander1024:0.1.a2
Commander1024:0.1
..
compare: Commander1024:985ab2ed7571bbf3a13c4865252c39ebd018975a
Branches Tags
Commander1024:develop
Commander1024:update/django-4.1.1
Commander1024:master
Commander1024:feature/50-Linktypes
Commander1024:feature/33-been-there-done-that
Commander1024:feature/30-user-profile-fields
Commander1024:27-Favorite-System
Commander1024:feature/localization
Commander1024:feature/authorized_tag
Commander1024:0.1.4
Commander1024:0.1.3
Commander1024:0.1.2
Commander1024:0.1.a2
Commander1024:0.1

No commits in common. "805363eac53ed87d7645e1378e4fc5069a35d06a" and "985ab2ed7571bbf3a13c4865252c39ebd018975a" have entirely different histories.
805363eac5 ... 985ab2ed75

2 changed files with 21 additions and 20 deletions
Show Stats Expand all files Collapse all files

12
lostplaces/lostplaces_app/static/main.css
View File

@ -280,8 +280,7 @@ body {
.LP-Menu--sidebar .LP-Menu__List .LP-Menu__Item:hover {
border-right: 2px solid #C09F80;
position: relative;
background-color: #D7CEC7;
color: #76323F; }
background-color: #D7CEC7; }
@media (max-width: 750px) {
.LP-Menu:not(.LP-Menu--sidebar) .LP-Menu__List {
@ -517,16 +516,15 @@ body {
padding: 0; } }
.LP-Main {
display: table;
display: flex;
flex-direction: row-reverse;
height: calc(100% - 61px); }
.LP-Main .LP-Main__Content {
display: table-cell;
flex-grow: 1;
width: calc(100% -300px);
min-height: 1px;
padding: 25px; }
min-height: 1px; }
.LP-Main .LP-Main__Sidebar {
display: table-cell;
flex-shrink: 0;
width: 250px;
flex-grow: 0;
height: 100%; }

29
lostplaces/lostplaces_app/templates/global.html
View File

@ -25,27 +25,30 @@
Hi {{ user.username }}!
<a class="LP-Link" href="{% url 'logout' %}"><span class="LP-Link__Text">logout</span></a>
{% else %}
You are not logged in.
Du bist nicht eingeloggt.
<a class="LP-Link" href="{% url 'login' %}"><span class="LP-Link__Text">login</span></a> |
<a class="LP-Link" href="{% url 'signup' %}"><span class="LP-Link__Text">signup</span></a>
{% endif %}
</span>
</div>
</header>
<article class="LP-Main">
<section class="LP-Main__Sidebar">
<nav class="LP-Menu LP-Menu--sidebar">
<div class="LP-Header__Navigation">
<nav class="LP-Menu LP-Menu">
<ul class="LP-Menu__List">
<li class="LP-Menu__Item"><a href="/" class="LP-Link"><span class="LP-Link__Text">Home</span></a></li>
<li class="LP-Menu__Item"><a href="" class="LP-Link"><span class="LP-Link__Text">About</span></a></li>
<li class="LP-Menu__Item"><a href="" class="LP-Link"><span class="LP-Link__Text">Contact</span></a></li>
<li class="LP-Menu__Item"><a href="/" class="LP-Link">
<span class="LP-Link__Text">Home</span></a></li>
<li class="LP-Menu__Item"><a href="" class="LP-Link">
<span class="LP-Link__Text">About</span></a></li>
<li class="LP-Menu__Item"><a href="" class="LP-Link">
<span class="LP-Link__Text">Contact</span></a></li>
</ul>
</nav>
</section>
<section class="LP-Main__Content">
{% block maincontent %}
{% endblock maincontent %}
</section>
</div>
</header>
<article class="LP-MainContainer">
{% block maincontent %}
{% endblock maincontent %}
</article>
</body>
</html>