Compare commits
No commits in common. "d138c57b223da795d25d6dca00bd8dae2ba169c7" and "c20e9c866dc95e46c16334433ce7bc667d97d385" have entirely different histories.
d138c57b22
...
c20e9c866d
@ -6,15 +6,6 @@
|
|||||||
font-family: Montserrat;
|
font-family: Montserrat;
|
||||||
src: url("fonts/Montserrat/Montserrat-Regular.otf"), url("fonts/Montserrat/Montserrat-Bold.otf"), url("fonts/Montserrat/Montserrat-Italic.otf"); }
|
src: url("fonts/Montserrat/Montserrat-Regular.otf"), url("fonts/Montserrat/Montserrat-Bold.otf"), url("fonts/Montserrat/Montserrat-Italic.otf"); }
|
||||||
|
|
||||||
html {
|
|
||||||
height: 100%;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0; }
|
|
||||||
|
|
||||||
body {
|
|
||||||
height: 100%;
|
|
||||||
margin: 0; }
|
|
||||||
|
|
||||||
.LP-Link {
|
.LP-Link {
|
||||||
color: #565656;
|
color: #565656;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
@ -262,11 +253,12 @@ body {
|
|||||||
color: #76323F; }
|
color: #76323F; }
|
||||||
.LP-Menu--sidebar {
|
.LP-Menu--sidebar {
|
||||||
border: none;
|
border: none;
|
||||||
min-width: 60px; }
|
min-width: 80px; }
|
||||||
.LP-Menu--sidebar .LP-Menu__List {
|
.LP-Menu--sidebar .LP-Menu__List {
|
||||||
flex-direction: column; }
|
flex-direction: column; }
|
||||||
.LP-Menu--sidebar .LP-Menu__List .LP-Menu__Item {
|
.LP-Menu--sidebar .LP-Menu__List .LP-Menu__Item {
|
||||||
text-align: left;
|
text-align: left;
|
||||||
|
border-left: 1px solid #C09F80;
|
||||||
margin-bottom: 10px; }
|
margin-bottom: 10px; }
|
||||||
.LP-Menu--sidebar .LP-Menu__List .LP-Menu__Item:last-child {
|
.LP-Menu--sidebar .LP-Menu__List .LP-Menu__Item:last-child {
|
||||||
margin-bottom: 0; }
|
margin-bottom: 0; }
|
||||||
@ -289,19 +281,19 @@ body {
|
|||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
height: 60px;
|
margin-bottom: 70px;
|
||||||
border-bottom: 1px solid #C09F80; }
|
height: 60px; }
|
||||||
.LP-Header__Navigation {
|
.LP-Header__Navigation {
|
||||||
flex-grow: 2; }
|
flex-grow: 2; }
|
||||||
.LP-Header__Logo {
|
.LP-Header__Logo {
|
||||||
height: 45px;
|
height: 60px;
|
||||||
margin: 25px;
|
margin: 25px;
|
||||||
object-fit: cover;
|
object-fit: cover;
|
||||||
max-height: 100%;
|
max-height: 100%;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
flex-shrink: 0; }
|
flex-shrink: 0; }
|
||||||
.LP-Header__Logo .LP-Image {
|
.LP-Header__Logo .LP-Image {
|
||||||
height: 100%; }
|
height: 60px; }
|
||||||
|
|
||||||
.LP-Header__UserInformation {
|
.LP-Header__UserInformation {
|
||||||
margin-right: 3%; }
|
margin-right: 3%; }
|
||||||
@ -314,7 +306,7 @@ body {
|
|||||||
|
|
||||||
@media (max-width: 750px) {
|
@media (max-width: 750px) {
|
||||||
.LP-Header__Logo {
|
.LP-Header__Logo {
|
||||||
width: 45px; }
|
width: 60px; }
|
||||||
.LP-Header__Logo .LP-Image {
|
.LP-Header__Logo .LP-Image {
|
||||||
object-position: 0 0;
|
object-position: 0 0;
|
||||||
object-fit: cover; } }
|
object-fit: cover; } }
|
||||||
@ -504,18 +496,3 @@ body {
|
|||||||
height: auto;
|
height: auto;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
padding: 0; } }
|
padding: 0; } }
|
||||||
|
|
||||||
.LP-Main {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: row-reverse;
|
|
||||||
height: calc(100% - 61px); }
|
|
||||||
.LP-Main .LP-Main__Content {
|
|
||||||
flex-grow: 1;
|
|
||||||
width: calc(100% -300px);
|
|
||||||
min-height: 1px; }
|
|
||||||
.LP-Main .LP-Main__Navigation {
|
|
||||||
flex-shrink: 0;
|
|
||||||
width: 200px;
|
|
||||||
flex-grow: 0;
|
|
||||||
height: 100%;
|
|
||||||
border-right: 1px solid #C09F80; }
|
|
||||||
|
|||||||
@ -5,13 +5,12 @@
|
|||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<link rel="stylesheet" href="{% static 'main.css' %}">
|
<link rel="stylesheet" href="{% static 'main.css' %}">
|
||||||
<link rel="stylesheet" href="{% static 'fonts.css' %}">
|
|
||||||
<link rel="icon" type="image/png" href="{% static 'favicon.ico' %}">
|
<link rel="icon" type="image/png" href="{% static 'favicon.ico' %}">
|
||||||
<title>
|
<title>
|
||||||
{% block title %}Urban Exploration{% endblock %}
|
{% block title %}Urban Exploration{% endblock %}
|
||||||
</title>
|
</title>
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<header class="LP-Header">
|
<header class="LP-Header">
|
||||||
<div class="LP-Header__Logo">
|
<div class="LP-Header__Logo">
|
||||||
@ -23,9 +22,9 @@
|
|||||||
<span class="LP-Paragraph">
|
<span class="LP-Paragraph">
|
||||||
{% if user.is_authenticated %}
|
{% if user.is_authenticated %}
|
||||||
Hi {{ user.username }}!
|
Hi {{ user.username }}!
|
||||||
<a class="LP-Link" href="{% url 'logout' %}"><span class="LP-Link__Text">logout</span></a>
|
<a class="LP-Link" href="{% url 'logout' %}"><span class="LP-Link__Text">logout</span></a></p>
|
||||||
{% else %}
|
{% else %}
|
||||||
Du bist nicht eingeloggt.
|
<p>Du bist nicht eingeloggt.</p>
|
||||||
<a class="LP-Link" href="{% url 'login' %}"><span class="LP-Link__Text">login</span></a> |
|
<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>
|
<a class="LP-Link" href="{% url 'signup' %}"><span class="LP-Link__Text">signup</span></a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|||||||
@ -11,7 +11,7 @@ from .views import (
|
|||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
path('hello_world/', hello_world), # You know what this is :P
|
path('hello_world/', hello_world), # You know what this is :P
|
||||||
path('', HomeView.as_view(), name='home'),
|
path('/', HomeView.as_view(), name='home'),
|
||||||
path('signup/', SignUpView.as_view(), name='signup'),
|
path('signup/', SignUpView.as_view(), name='signup'),
|
||||||
path('place/<int:pk>/', place_detail_view, name='place_detail'),
|
path('place/<int:pk>/', place_detail_view, name='place_detail'),
|
||||||
path('place/create/', PlaceCreateView.as_view(), name='place_create'),
|
path('place/create/', PlaceCreateView.as_view(), name='place_create'),
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user