Skip to content

M
mymusiclist
Commit 0fd357a9 authored by Brian Guadalupe's avatar Brian Guadalupe
Browse files
Options

Merge branch 'test' into 'master' 

Design changes

Closes #1

See merge request brian/mymusiclist!3
parents 342fb7d9 5e367cfd
Show whitespace changes
Inline Side-by-side
Showing with 23 additions and 24 deletions
.gitignore
View file @ 0fd357a9
.DS_Store .DS_Store
*.pyc *.pyc
*.sqlite *.sqlite
*.sqlite3
desktop.ini
db.sqlite3 deleted 100644 → 0
View file @ 342fb7d9
File deleted
files/css/mymusiclist.css
View file @ 0fd357a9
...@@ -2,9 +2,11 @@ ...@@ -2,9 +2,11 @@
} }
.login_form{
#login_submit{
background-color: black;
color: white;
margin-left: 6vw;
} }
...@@ -12,11 +14,11 @@ ...@@ -12,11 +14,11 @@
margin: 0 auto; margin: 0 auto;
margin-bottom: 30px; margin-bottom: 30px;
text-align: left; text-align: left;
width: 800px; width: 65vw;
padding: 50px; padding: 50px;
font-size: 15px; font-size: 15px;
background-color: rgba(0,0,0,0.90); background-color: rgba(0,0,0,0.6);
border-radius: 10px; border-radius: 10px;
} }
...@@ -45,10 +47,10 @@ src: url('../fonts/PalanquinDark-Regular.ttf'); ...@@ -45,10 +47,10 @@ src: url('../fonts/PalanquinDark-Regular.ttf');
margin : -15px; margin : -15px;
margin-top: -70px; margin-top: -70px;
padding: 0px; padding: 0px;
height : 55px; height : 58px;
} }
#nav_bar_items { #nav_bar li, #nav_bar li a {
float: left; float: left;
display: block; display: block;
color: white; color: white;
...@@ -57,7 +59,7 @@ src: url('../fonts/PalanquinDark-Regular.ttf'); ...@@ -57,7 +59,7 @@ src: url('../fonts/PalanquinDark-Regular.ttf');
text-decoration: none; text-decoration: none;
} }
#nav_bar_items.home{ .nav_bar_home{
background-color: #424949; background-color: #424949;
font-size: 30px; font-size: 30px;
letter-spacing: 5px; letter-spacing: 5px;
...@@ -65,7 +67,7 @@ src: url('../fonts/PalanquinDark-Regular.ttf'); ...@@ -65,7 +67,7 @@ src: url('../fonts/PalanquinDark-Regular.ttf');
padding-top: 0px; padding-top: 0px;
} }
#nav_bar_items.tab { .nav_bar_tab{
float: left; float: left;
display: block; display: block;
color: white; color: white;
...@@ -76,8 +78,8 @@ src: url('../fonts/PalanquinDark-Regular.ttf'); ...@@ -76,8 +78,8 @@ src: url('../fonts/PalanquinDark-Regular.ttf');
text-decoration: none; text-decoration: none;
} }
li a:hover, .active{ .nav_bar_tab:hover{
background-color: #282544; background-color: blue;
} }
...@@ -86,7 +88,6 @@ body { ...@@ -86,7 +88,6 @@ body {
font-family: helvetica; font-family: helvetica;
margin: 15px; margin: 15px;
margin-top: 70px; margin-top: 70px;
background-image: url(/files/images/background.jpg); background: url(/files/images/background.jpg) no-repeat center fixed;
background-position: left top;
background-size: cover; background-size: cover;
} }
templates/base.html
View file @ 0fd357a9
{% load static %}
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>{% block title %}MyMusicList{% endblock %}</title> <title>{% block title %}MyMusicList{% endblock %}</title>
<link rel="stylesheet" href="{% static 'css/mymusiclist.css' %}"> <link rel="stylesheet" href="/files/css/mymusiclist.css">
</head> </head>
<body> <body>
<header> <header>
{% if user.is_authenticated %} {% if user.is_authenticated %}
<ul id='nav_bar'> <ul id='nav_bar'>
<li id='nav_bar_items'><a id='nav_bar_items' href="/">MyMusicList</a></li> <li><a class="nav_bar_home" href="/">MyMusicList</a></li>
<li id='nav_bar_items'><a id='nav_bar_items' href="/profile/{{user.username}}">Hi, {{user.username}}</a></li> <li><a class="nav_bar_tab" href="/profile/{{user.username}}">Hi, {{user.username}}</a></li>
<li id='nav_bar_items' style="float:right"><a id='nav_bar_items' href="{% url 'logout' %}">Logout</a></li> <li style="float:right"><a class="nav_bar_tab" href="{% url 'logout' %}">Logout</a></li>
</ul> </ul>
{% else %} {% else %}
<ul id='nav_bar'> <ul id='nav_bar'>
<li id='nav_bar_items'><a id='nav_bar_items' class="home" href="/">MyMusicList</a></li> <li><a class="nav_bar_home" href="/">MyMusicList</a></li>
<li id='nav_bar_items'><a id='nav_bar_items' class="tab" href="{% url 'login' %}">LOGIN</a></li> <li><a class="nav_bar_tab" href="{% url 'login' %}">LOGIN</a></li>
<li id='nav_bar_items'><a id='nav_bar_items' class="tab" href="{% url 'signup' %}">SIGN UP</a></li> <li><a class="nav_bar_tab" href="{% url 'signup' %}">SIGN UP</a></li>
</ul> </ul>
{% endif %} {% endif %}
</header> </header>
......
templates/home.html
View file @ 0fd357a9
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
{% block title %}MyMusicList{% endblock %} {% block title %}MyMusicList{% endblock %}
{% block content %} {% block content %}
<h2>Home</h2>
<div > <div >
......
templates/signup.html
View file @ 0fd357a9
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<div class='signup_form centered'> <div class='signup_form centered'>
<h2>Create your account</h2> <h2>Create your account</h2>
<p> <p>
Sign up now to start building your music collection with us. <br/> Already have an account? <a href="{% url 'login' %}">Log in</a> Sign up now to start building your music collection with us. <br/> Already have an account? Login
</p> </p>
<form method="post"> <form method="post">
{% csrf_token %} {% csrf_token %}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment