diff --git a/homepage/jinja2/homepage/index.html b/homepage/jinja2/homepage/index.html index 6eb4013..881e95e 100644 --- a/homepage/jinja2/homepage/index.html +++ b/homepage/jinja2/homepage/index.html @@ -1,5 +1,8 @@ {% extends "base.html" %} {% block title %}Index{% endblock %} +{% block head %} + +{% endblock %} {% block content %}

Quests 'n Shiet

diff --git a/homepage/static/homepage.css b/homepage/static/homepage.css new file mode 100644 index 0000000..2c784cb --- /dev/null +++ b/homepage/static/homepage.css @@ -0,0 +1,3 @@ +#content { + padding-left: 5%; +} diff --git a/quest/jinja2/quest/edit_quest.html b/quest/jinja2/quest/edit_quest.html index 1827dde..a1168d5 100644 --- a/quest/jinja2/quest/edit_quest.html +++ b/quest/jinja2/quest/edit_quest.html @@ -1,6 +1,7 @@ {% extends "base.html" %} {% block title %}Edit {{ quest.title }}{% endblock %} {% block head %} + diff --git a/quest/jinja2/quest/quest_homepage.html b/quest/jinja2/quest/quest_homepage.html index 3d473ba..f72bab3 100644 --- a/quest/jinja2/quest/quest_homepage.html +++ b/quest/jinja2/quest/quest_homepage.html @@ -47,12 +47,13 @@ {% block content %}

{{ quest.title }}

- Tags: {% for tag in quest.tags.names() %}{{ tag }}{% if not loop.last %}, {% endif %}{% endfor %} +
+ Tags: {% for tag in quest.tags.names() %}{{ tag }}{% if not loop.last %}, {% endif %}{% endfor %} +
{% if request.user == quest.owner %} {{ csrf_input }} - {% endif %} diff --git a/quest/migrations/0005_auto_20181003_1217.py b/quest/migrations/0005_auto_20181003_1217.py new file mode 100644 index 0000000..0bfc315 --- /dev/null +++ b/quest/migrations/0005_auto_20181003_1217.py @@ -0,0 +1,18 @@ +# Generated by Django 2.1.1 on 2018-10-03 16:17 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('quest', '0004_quest_tags'), + ] + + operations = [ + migrations.AlterField( + model_name='quest', + name='title', + field=models.CharField(max_length=100), + ), + ] diff --git a/quest/models.py b/quest/models.py index c1064e8..3506df8 100644 --- a/quest/models.py +++ b/quest/models.py @@ -11,7 +11,7 @@ class Quest(models.Model): """ The meta quest object. Contains general information about the quest. """ - title = models.CharField(max_length=200) + title = models.CharField(max_length=100) owner = models.ForeignKey( settings.AUTH_USER_MODEL, on_delete=models.CASCADE) diff --git a/quest/static/edit_quest.css b/quest/static/edit_quest.css new file mode 100644 index 0000000..c209340 --- /dev/null +++ b/quest/static/edit_quest.css @@ -0,0 +1,3 @@ +form { + padding-left: 10%; +} diff --git a/quest/static/quest.css b/quest/static/quest.css index d9864d6..4757a8c 100644 --- a/quest/static/quest.css +++ b/quest/static/quest.css @@ -26,6 +26,10 @@ h3 { width: 70%; } +#tags { + padding-bottom: 0.25em; +} + .questPost { display: flex; } @@ -36,7 +40,6 @@ h3 { } .questPostData { - word-wrap: break-word; min-width: 0; width: 100%; } @@ -64,7 +67,6 @@ h3 { .poll td { padding: 0.5em; - word-wrap: break-word; border-bottom: 1px solid #ddd; } @@ -138,7 +140,6 @@ h3 { .messageContent { width: 100%; - word-wrap: break-word; } .msgSrvHr { @@ -167,7 +168,6 @@ h3 { display: block; position: fixed; background: white; - word-wrap: break-word; border: 1px solid #ccc; padding: 0.25em; } @@ -178,4 +178,9 @@ h3 { .quotelink { color: red; + text-decoration: underline;; +} + +.quotelink:hover { + color: red; } diff --git a/search/jinja2/search/index.html b/search/jinja2/search/index.html index e07a041..1f04adf 100644 --- a/search/jinja2/search/index.html +++ b/search/jinja2/search/index.html @@ -1,5 +1,8 @@ {% extends "base.html" %} {% block title %}Search{% endblock %} +{% block head %} + +{% endblock %} {% block content %}
Author:
@@ -8,10 +11,12 @@
{% if results %} - +
{% for quest in results %} - + + + {% endfor %}
{{ quest.title }}{{ quest.title }}{{ quest.owner.username }}
diff --git a/search/static/search.css b/search/static/search.css new file mode 100644 index 0000000..7a89537 --- /dev/null +++ b/search/static/search.css @@ -0,0 +1,23 @@ +#content { + padding-left: 5%; + padding-right: 5%; +} + +#results { + width: 100%; + table-layout: fixed; + border-collapse: collapse; + border: 1px solid #ccc; +} + +tr:nth-child(even) { + background-color: #DDDDDD; +} + +.title { + width: 20%; +} + +.author { + width: 20%; +} diff --git a/static/base.css b/static/base.css index 6b0c37a..99b8fc4 100644 --- a/static/base.css +++ b/static/base.css @@ -1,5 +1,31 @@ body { margin: 0; + background-color: #FAFAFA; + color: #111111; + font-family: Tahoma, Helvetica, sans-serif; +} + +input { + font-family: Tahoma, Helvetica, sans-serif; +} + +select { + font-family: Tahoma, Helvetica, sans-serif; + background-color: #FAFAFA; +} + +textarea { + background-color: #FAFAFA; + border-bottom: 1px solid #ccc; +} + +a { + text-decoration: none; + color: #004070; +} + +a:hover { + color: #B44444; } #globalWrapper { @@ -11,14 +37,12 @@ body { .header { position: sticky; top: 0; - margin: 0; - padding: 0; width: 100%; height: 2em; - list-style-type: none; - background-color: #dddddd; + background-color: #FAFAFA; display: flex; align-items: center; + border-bottom: 1px solid #ccc; } .header span { @@ -31,12 +55,9 @@ body { padding-left: 0; } -.header a { - text-decoration: none; -} - #headerHidden { width: 1em; + border-right: 1px solid #ccc; } #alerts { @@ -46,4 +67,5 @@ body { #content { flex: auto; overflow: auto; + overflow-wrap: break-word; } diff --git a/todo b/todo index b5e4d00..349c053 100644 --- a/todo +++ b/todo @@ -6,7 +6,6 @@ Webm posting (you) counter Account managament Display profile link in header bar -Tagging system Quote backlinks Improvements: