PR#38: Add link for feedback - fedora-commops/fedora-happiness-packets

fedora-commops / fedora-happiness-packets

#38 Add link for feedback

Merged 5 years ago by jonatoni. Opened 5 years ago by algogator.

fedora-commops/ algogator/fedora-happiness-packets link into master

Update background colors

Anna Philips • 5 years ago

69d03c4

Update fonts

Anna Philips • 5 years ago

f76d206

Add link to for feedback

Anna Philips • 5 years ago

e2d2399

assets/css/custom.css

file modified

+5 -6

		`@@ -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;`
		`}`

		`@@ -15,7 +14,7 @@`
		`}`

		`aside {`
		`- background: #F64747;`
		`+ background: #3c6eb4;`
		`margin: -20px 0 0 0;`
		`}`

		`@@ -27,7 +26,7 @@`

		`aside .sidebar a {`
		`color: white;`
		`- font-family: Lora, sans-serif;`
		`+ font-family: Montserrat;`
		`font-size: 18px;`
		`}`

		`@@ -54,7 +53,7 @@`
		`}`

		`fieldset legend {`
		`- font-family: 'Lora', serif;`
		`+ font-family: 'Montserrat';`
		`font-style: italic;`
		`border-bottom: 0px;`
		`}`

templates/base.html

file modified

+2 -1

		`@@ -6,7 +6,6 @@`
		`<meta http-equiv="Content-Type" content="text/html; charset=utf-8">`

		`<meta name="viewport" content="width=device-width, initial-scale=1.0">`
		`- <link href="https://fonts.googleapis.com/css?family=Lora:400,400italic,700,700italic\|Roboto:400,300,300italic,400italic,700,700italic&subset=latin,latin-ext" rel="stylesheet" type="text/css">`
		`<link href="{% static 'bootstrap/css/bootstrap.min.css' %}" rel="stylesheet">`
		`<link href="{% static 'css/all.css' %}" rel="stylesheet">`
		`<link href="{% static 'css/datepicker.css' %}" rel="stylesheet">`
		`@@ -80,6 +79,8 @@`
		`Need help? <a href="mailto:fedora.happinesspackets@gmail.com">fedora.happinesspackets@gmail.com</a>`
		`<img class="emoji" src="{% static 'images/emoji/loveletter.png' %}" alt="💌" title="Love letter" aria-label="Emoji: Love letter" style="vertical-align: text-bottom">`
		`<br>`
		`+ Got feedback? File an issue <a href="https://pagure.io/fedora-commops/fedora-happiness-packets/new_issue">here</a>`
		`+ <br>`
		`<a href="https://www.facebook.com/TheFedoraProject"><i class="fab fa-facebook-f fa-lg"></i></a>`
		` `
		`<a href="https://twitter.com/fedora"><i class="fab fa-twitter fa-lg"></i></a>`

templates/base_email.html

file modified

+4 -5

		`@@ -5,10 +5,9 @@`
		`<meta http-equiv="Content-Type" content="text/html; charset=utf-8">`

		`<meta name="viewport" content="width=device-width, initial-scale=1.0">`
		`- <link href="https://fonts.googleapis.com/css?family=Lora:400,400italic,700,700italic\|Roboto:400,300,300italic,400italic,700,700italic&subset=latin,latin-ext" rel="stylesheet" type="text/css">`
		`</head>`

		`- <body style="background-color: #F23030;font-family: 'Roboto', sans-serif;font-size: 16px;line-height: 1.8em;">`
		`+ <body style="background-color: #F23030;font-family: 'Open Sans', sans-serif;font-size: 16px;line-height: 1.8em;">`
		`<div style="text-align: center;padding: 20px;">`
		`<img src="cid:logo.png@happinesspackets.io" alt="Open-source Happiness Packets" style="max-width: 400px; padding: 30px">`
		`</div>`
		`@@ -18,13 +17,13 @@`
		`<hr>`
		`<p>`
		`Open-source happiness packets is an`
		`- <a href="https://github.com/erikr/happinesspackets/" style="color: #F64747;">open-source project</a>`
		`+ <a href="https://github.com/erikr/happinesspackets/" style="color: #3c6eb4;">open-source project</a>`
		`<br>`
		`- Need help? <a href="mailto:fedora.happinesspackets@gmail.com" style="color: #F64747;">fedora.happinesspackets@gmail.com</a>`
		`+ Need help? <a href="mailto:fedora.happinesspackets@gmail.com" style="color: #3c6eb4;">fedora.happinesspackets@gmail.com</a>`
		`</p>`
		`<p>`
		`Never want to receive email from us again?<br>`
		`- <a href="{{ protocol }}://{{ domain }}{{ blacklist_url }}" style="color: #F64747;">Block {{ recipient }}</a>`
		`+ <a href="{{ protocol }}://{{ domain }}{{ blacklist_url }}" style="color: #3c6eb4;">Block {{ recipient }}</a>`
		`</p>`
		`</small></footer>`
		`</div>`

templates/messaging/recipient_mail.html

file modified

+3 -3

		`@@ -11,7 +11,7 @@`

		`<p>`
		`If this is the first time you've heard about Happiness Packets, check out`
		`- <a href="{{ protocol }}://{{ domain }}/" style="color: #F64747;">our website</a>.`
		`+ <a href="{{ protocol }}://{{ domain }}/" style="color: #3c6eb4;">our website</a>.`
		`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 @@`

		`<p>`
		`If you and the sender of the Happiness Packet both agree, we'd love to publish the message to our`
		`- <a href="{{ protocol }}://{{ domain }}{% url 'messaging:archive' %}" style="color: #F64747;">Happiness Archive</a>`
		`+ <a href="{{ protocol }}://{{ domain }}{% url 'messaging:archive' %}" style="color: #3c6eb4;">Happiness Archive</a>`
		`to inspire others from the community.`
		`</p>`

		`<p>`
		`- <a href="{{ protocol }}://{{ domain }}{% url 'messaging:recipient_message_update' identifier=message.identifier token=message.recipient_email_token %}" role="button" style="display: inline-block; background: #F64747;color: white;text-transform: uppercase;padding: 0.9em 1.3em;text-decoration: none;border-radius: 6px">Set publishing permissions</a>`
		`+ <a href="{{ protocol }}://{{ domain }}{% url 'messaging:recipient_message_update' identifier=message.identifier token=message.recipient_email_token %}" role="button" style="display: inline-block; background: #3c6eb4;color: white;text-transform: uppercase;padding: 0.9em 1.3em;text-decoration: none;border-radius: 6px">Set publishing permissions</a>`
		`</p>`

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

templates/messaging/sender_confirmation_mail.html

file modified

+2 -2

		`@@ -9,7 +9,7 @@`
		`</p>`

		`<p>`
		`- Your message reads:`
		`+ Your message reads:`
		`</p>`

		`<p><em>{{ message.message\|linebreaksbr }}</em></p>`
		`@@ -19,7 +19,7 @@`
		`</p>`

		`<p>`
		`- <a href="{{ protocol }}://{{ domain }}{% url 'messaging:sender_confirm' identifier=message.identifier token=message.sender_email_token %}" role="button" style="display: inline-block; background: #F64747;color: white;text-transform: uppercase;padding: 0.9em 1.3em;text-decoration: none;border-radius: 6px">Yes! Please send my happiness packet</a>`
		`+ <a href="{{ protocol }}://{{ domain }}{% url 'messaging:sender_confirm' identifier=message.identifier token=message.sender_email_token %}" role="button" style="display: inline-block; background: #3c6eb4;color: white;text-transform: uppercase;padding: 0.9em 1.3em;text-decoration: none;border-radius: 6px">Yes! Please send my happiness packet</a>`
		`</p>`

		`<p>`