From e2d23998ed7d62186930ce6ce52f3c48965bbc39 Mon Sep 17 00:00:00 2001 From: Anna Philips Date: Aug 05 2018 04:51:08 +0000 Subject: [PATCH 1/3] Add link to for feedback --- diff --git a/templates/base.html b/templates/base.html index 8f9e496..ea37ee8 100644 --- a/templates/base.html +++ b/templates/base.html @@ -80,6 +80,8 @@ Need help? fedora.happinesspackets@gmail.com 💌
+ Got feedback? File an issue here +
  From f76d206e3367d0d520d7f1283652dce9f8dec7f4 Mon Sep 17 00:00:00 2001 From: Anna Philips Date: Aug 05 2018 05:21:35 +0000 Subject: [PATCH 2/3] Update fonts --- diff --git a/assets/css/custom.css b/assets/css/custom.css index c118c49..d6b2e6f 100644 --- a/assets/css/custom.css +++ b/assets/css/custom.css @@ -1,12 +1,11 @@ body { - font-family: 'Roboto', sans-serif; + font-family: 'Open Sans'; line-height: 1.8em; font-size: 16px; } h1, h2, h3, h4, h5, h6 { - font-family: 'Lora', serif; - font-style: italic; + font-family: 'Montserrat'; margin-top: 1.4em; } @@ -27,7 +26,7 @@ aside .sidebar { aside .sidebar a { color: white; - font-family: Lora, sans-serif; + font-family: Montserrat; font-size: 18px; } @@ -54,7 +53,7 @@ fieldset { } fieldset legend { - font-family: 'Lora', serif; + font-family: 'Montserrat'; font-style: italic; border-bottom: 0px; } diff --git a/templates/base.html b/templates/base.html index ea37ee8..5f97d8e 100644 --- a/templates/base.html +++ b/templates/base.html @@ -6,7 +6,6 @@ - diff --git a/templates/base_email.html b/templates/base_email.html index 5b87e57..8f7c3a5 100644 --- a/templates/base_email.html +++ b/templates/base_email.html @@ -5,10 +5,9 @@ - - +
Open-source Happiness Packets
From 69d03c4d160995b98cb7e4143b4ba21072e5d040 Mon Sep 17 00:00:00 2001 From: Anna Philips Date: Aug 05 2018 05:29:41 +0000 Subject: [PATCH 3/3] Update background colors --- diff --git a/assets/css/custom.css b/assets/css/custom.css index d6b2e6f..d2ef280 100644 --- a/assets/css/custom.css +++ b/assets/css/custom.css @@ -14,7 +14,7 @@ a, a:hover { } aside { - background: #F64747; + background: #3c6eb4; margin: -20px 0 0 0; } diff --git a/templates/base_email.html b/templates/base_email.html index 8f7c3a5..59bdeb1 100644 --- a/templates/base_email.html +++ b/templates/base_email.html @@ -17,13 +17,13 @@

Open-source happiness packets is an - open-source project + open-source project
- Need help? fedora.happinesspackets@gmail.com + Need help? fedora.happinesspackets@gmail.com

Never want to receive email from us again?
- Block {{ recipient }} + Block {{ recipient }}

diff --git a/templates/messaging/recipient_mail.html b/templates/messaging/recipient_mail.html index 5062e63..9675e5a 100644 --- a/templates/messaging/recipient_mail.html +++ b/templates/messaging/recipient_mail.html @@ -11,7 +11,7 @@

If this is the first time you've heard about Happiness Packets, check out - our website. + our website. In short, Happiness Packets are positivity messages that open-source contributors can send to each other anonymously and confidentially. By sending Happiness Packets, we hope to create an atmosphere where positive feedback is amplified and accepted more than negative feedback. @@ -23,12 +23,12 @@

If you and the sender of the Happiness Packet both agree, we'd love to publish the message to our - Happiness Archive + Happiness Archive to inspire others from the community.

- Set publishing permissions + Set publishing permissions

This is entirely optional, we respect your privacy and only publish messages if both the sender and recipient agree.

diff --git a/templates/messaging/sender_confirmation_mail.html b/templates/messaging/sender_confirmation_mail.html index 14b9217..6a20d9a 100644 --- a/templates/messaging/sender_confirmation_mail.html +++ b/templates/messaging/sender_confirmation_mail.html @@ -9,7 +9,7 @@

- Your message reads: + Your message reads:

{{ message.message|linebreaksbr }}

@@ -19,7 +19,7 @@

- Yes! Please send my happiness packet + Yes! Please send my happiness packet