From 46b5547a4227ec29e0b71e2138a2ebade39724ca Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 28 Apr 2016 17:29:39 +0100 Subject: [PATCH] Some basic css to make it halfway legible --- res/templates/mail.css | 35 +++++++++++++++++++++++++++++++++++ res/templates/notif_mail.html | 25 ++++++++++++++++--------- res/templates/room.html | 14 +++++++------- 3 files changed, 58 insertions(+), 16 deletions(-) create mode 100644 res/templates/mail.css diff --git a/res/templates/mail.css b/res/templates/mail.css new file mode 100644 index 0000000000..be63b8c337 --- /dev/null +++ b/res/templates/mail.css @@ -0,0 +1,35 @@ +body { + font-family: "Open Sans", Helvetica, Arial, sans-serif; + font-size: 12pt; + margin: 1em; +} + +#page { + margin: auto; + width: 640px; + padding: 1em; + border: 1px solid #76cfa6; + border-radius: 5px; +} + +.room_avatar { + width: 48px; + height: 48px; + float: left; +} + +.room_content { + clear: left; +} + +.historical { + color: #888; +} + +.sender_name { + display: inline; +} + +.message_time { + display: inline; +} diff --git a/res/templates/notif_mail.html b/res/templates/notif_mail.html index fbfb0a767c..cc3573e65a 100644 --- a/res/templates/notif_mail.html +++ b/res/templates/notif_mail.html @@ -1,15 +1,22 @@ + + + -
Hi {{ user_display_name }},
-
{{ summary_text }}
-
- {% for room in rooms %} - {% include 'room.html' with context %} - {% endfor %} -
-
- Unsubscribe +
+
Hi {{ user_display_name }},
+
{{ summary_text }}
+
+ {% for room in rooms %} + {% include 'room.html' with context %} + {% endfor %} +
+
+ Unsubscribe +
diff --git a/res/templates/room.html b/res/templates/room.html index 6c68ee1fdc..3c0a4607b3 100644 --- a/res/templates/room.html +++ b/res/templates/room.html @@ -1,5 +1,4 @@
-

{{ room.title }}

{% if room.avatar_url %} @@ -13,13 +12,14 @@ {% endif %} {% endif %}
- {% if room.invite %} - Join the conversation. - {% else %} -
+

{{ room.title }}

+
+ {% if room.invite %} + Join the conversation. + {% else %} {% for notif in room.notifs %} {% include 'notif.html' with context %} {% endfor %} -
- {% endif %} + {% endif %} +