From 248b3a512ad994ff92154d1cfd2808255d17b667 Mon Sep 17 00:00:00 2001 From: nathaniel smith Date: Mon, 19 Dec 2016 22:52:08 -0800 Subject: [PATCH] share CSS --- ttadmin/common/static/common/form.css | 32 +++++++++++++ ttadmin/common/static/common/main.css | 3 ++ .../templates/guestbook/guestbook.html | 36 ++++----------- ttadmin/help/templates/help/tickets.html | 42 ++--------------- ttadmin/settings.py | 4 ++ ttadmin/users/templates/users/signup.html | 46 ++----------------- 6 files changed, 56 insertions(+), 107 deletions(-) create mode 100644 ttadmin/common/static/common/form.css create mode 100644 ttadmin/common/static/common/main.css diff --git a/ttadmin/common/static/common/form.css b/ttadmin/common/static/common/form.css new file mode 100644 index 0000000..eb40b0c --- /dev/null +++ b/ttadmin/common/static/common/form.css @@ -0,0 +1,32 @@ +form.tilde { + border-collapse: collapse; + border: 1px solid #ff1ac6; +} +form.tilde th { + text-align:left; +} +form.tilde th,td { + border: 1px solid #ff1ac6; + padding:1em; +} +form.tilde input[type=submit] { + font-size:200%; +} +form.tilde ul.errorlist { + list-style: none; + margin-left: 0; + padding-left:0; +} +form.tilde .helptext { + font-style:oblique; +} +form.tilde ul.errorlist li:before { + content: "~! "; +} +form.tilde ul.errorlist li { + background-color:black; + color:white; + border: .5em dashed red; + font-family:arial; + padding:2px; +} \ No newline at end of file diff --git a/ttadmin/common/static/common/main.css b/ttadmin/common/static/common/main.css new file mode 100644 index 0000000..af777b9 --- /dev/null +++ b/ttadmin/common/static/common/main.css @@ -0,0 +1,3 @@ +body { + background-color: #E0B0FF; +} \ No newline at end of file diff --git a/ttadmin/guestbook/templates/guestbook/guestbook.html b/ttadmin/guestbook/templates/guestbook/guestbook.html index 03cfba0..1fdf453 100644 --- a/ttadmin/guestbook/templates/guestbook/guestbook.html +++ b/ttadmin/guestbook/templates/guestbook/guestbook.html @@ -1,45 +1,27 @@ +{% load static %} tilde.town guestbook + +

tilde.town guestbook

~*~*~*~*say hello*~*~*~*~ -
+ {% csrf_token %} {{form.as_table}} diff --git a/ttadmin/help/templates/help/tickets.html b/ttadmin/help/templates/help/tickets.html index c5f4b3a..e6852b9 100644 --- a/ttadmin/help/templates/help/tickets.html +++ b/ttadmin/help/templates/help/tickets.html @@ -1,45 +1,11 @@ +{% load static %} tilde.town help desk - + +

tilde.town help desk

@@ -60,7 +26,7 @@

{{ error_message }}

{% endif %} - + {% csrf_token %}
{{ form.as_table }} diff --git a/ttadmin/settings.py b/ttadmin/settings.py index d912b38..2212071 100644 --- a/ttadmin/settings.py +++ b/ttadmin/settings.py @@ -24,6 +24,7 @@ INSTALLED_APPS = [ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', + 'common', 'users', 'help', 'guestbook' @@ -95,3 +96,6 @@ USE_TZ = True # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/1.10/howto/static-files/ STATIC_URL = '/static/' + +# Not used during local development, but used in staging+live environments +STATIC_ROOT = 'static' diff --git a/ttadmin/users/templates/users/signup.html b/ttadmin/users/templates/users/signup.html index 334138c..3ba1497 100644 --- a/ttadmin/users/templates/users/signup.html +++ b/ttadmin/users/templates/users/signup.html @@ -1,55 +1,17 @@ +{% load static %} tilde.town signup page - + +

sign up for a tilde.town account

{% if error_message %}

{{ error_message }}

{% endif %} - + {% csrf_token %}