From cb9bc9e06b2476d3b54fedaf1b90ac9c8650a1a1 Mon Sep 17 00:00:00 2001
From: Ana Sustic <ana@sustic.com>
Date: Mar 19 2019 21:11:59 +0000
Subject: [PATCH 1/5] Merge branch 'master' of https://pagure.io/fedora-commops/fedora-happiness-packets


---

diff --git a/assets/css/custom.css b/assets/css/custom.css
index eb6f723..1130691 100644
--- a/assets/css/custom.css
+++ b/assets/css/custom.css
@@ -3,10 +3,25 @@
     --secondary-color: #294172;
 }
 
+*{
+    box-sizing: border-box;
+}
+
+*:before, *:after{
+    box-sizing: border-box;
+}
+
+html{
+    height: 100%;
+}
+
 body {
     font-family: 'Open Sans';
     line-height: 1.8em;
     font-size: 16px;
+    height: 100%;
+    position: relative;
+    margin: 0;
 }
 
 h1, h2, h3, h4, h5, h6 {
@@ -14,6 +29,15 @@ h1, h2, h3, h4, h5, h6 {
     margin-top: 1.4em;
 }
 
+main{
+    min-height: 100vh;
+    display: block;
+    overflow: hidden;
+    position: relative;
+    padding-bottom: 300px;
+    width: 100%;
+}
+
 a, a:hover {
     color: var(--secondary-color);
 }
@@ -66,7 +90,9 @@ footer {
     text-align: center;
     padding:0 7vw;
     background-color: #3c6eb421;
-    position: relative;
+    position: absolute;
+    bottom: 0;
+    width: 100%;
 }
 
 fieldset {
@@ -178,12 +204,12 @@ blockquote {
     }
 
     main {
-        margin-left: 25%;
+        margin-left: 350px;
+        width: 75%;
     }
 
     main .container {
         padding: 0px 50px;
-        width: 100%;
     }
 
     blockquote {
@@ -210,6 +236,11 @@ blockquote {
     blockquote {
         min-height: 170px;
     }
+
+    main{
+        margin-left: 450px;
+        width: 75%;
+    }
 }
 
 .emoji {
diff --git a/templates/messaging/message_sender_confirmation_sent.html b/templates/messaging/message_sender_confirmation_sent.html
index fe259b5..9fa8415 100644
--- a/templates/messaging/message_sender_confirmation_sent.html
+++ b/templates/messaging/message_sender_confirmation_sent.html
@@ -15,6 +15,9 @@
     <script>document.getElementById('fb').onclick = function() {FB.ui({method: 'share', mobile_iframe: true, hashtag: '#WeAreFedora', href: 'https://happinesspackets.fedorainfracloud.org/',}, function(response){});}</script>
     <a href="https://twitter.com/intent/tweet?button_hashtag=WeAreFedora&text=I%20just%20sent%20a%20happiness%20packet%20to%20thank%20a%20@fedora%20community%20member" class="twitter-hashtag-button" data-size="large" data-dnt="true">Tweet #WeAreFedora</a>
     <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
-    {% block footer %}{% endblock %}
 
 {% endblock content %}
+
+{% block footer %}
+    {% include "follow.html" %}
+{% endblock %}
\ No newline at end of file

From e3d6d6af8da612717d27353d84fbedb234d17db2 Mon Sep 17 00:00:00 2001
From: Ana Sustic <ana@sustic.com>
Date: Mar 19 2019 22:04:03 +0000
Subject: [PATCH 2/5] Rebase and resolve merge errors


Add question regarding logged in user membership

Register models to Django Admin

Revert "Merge branch 'master' of ssh://pagure.io/forks/anasustic/fedora-commops/fedora-happiness-packets"

This reverts commit 2f198d890974a9c5c377bbfcb285ec8539e47594, reversing
changes made to 5e3403fef50cc75bc5bfdd815d06e647caa745a7.

Add new line at the eof

Add question regarding logged in user membership

Register models to Django Admin

Revert "Merge branch 'master' of ssh://pagure.io/forks/anasustic/fedora-commops/fedora-happiness-packets"

This reverts commit 2f198d890974a9c5c377bbfcb285ec8539e47594, reversing
changes made to 5e3403fef50cc75bc5bfdd815d06e647caa745a7.

Add new line at the eof

Fix merge conflict in docs/setup/development_windows.rst

---

diff --git a/docs/faq.rst b/docs/faq.rst
old mode 100644
new mode 100755
index da31069..d4e2107
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -10,11 +10,11 @@ ERROR: Couldn't connect to Docker deamon at http+docker://localhost-is it runnin
     Verify the logged in user is member of the docker group.
     To verify logged in user run::
 
- 	sudo usermod -aG docker ${USER}
+ 	    sudo usermod -aG docker ${USER}
 
     If logged in user is not member of the docker group add it using::
 
-	sudo gpasswd -a${USER}
+	    sudo gpasswd -a${USER}
 
 No sample messages on the main page and no messages in Archives, even though both sender and receiver approved to display message publicily.
 
diff --git a/docs/setup/development_windows.rst b/docs/setup/development_windows.rst
old mode 100644
new mode 100755

From 8577c73057b281bccf3458d28aa067a398068a27 Mon Sep 17 00:00:00 2001
From: Ana Sustic <ana@sustic.com>
Date: Mar 19 2019 22:04:03 +0000
Subject: [PATCH 3/5] Remove tab in line 5 and 11 of faq.rst


---

diff --git a/docs/faq.rst b/docs/faq.rst
index d4e2107..da31069 100755
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -10,11 +10,11 @@ ERROR: Couldn't connect to Docker deamon at http+docker://localhost-is it runnin
     Verify the logged in user is member of the docker group.
     To verify logged in user run::
 
- 	    sudo usermod -aG docker ${USER}
+ 	sudo usermod -aG docker ${USER}
 
     If logged in user is not member of the docker group add it using::
 
-	    sudo gpasswd -a${USER}
+	sudo gpasswd -a${USER}
 
 No sample messages on the main page and no messages in Archives, even though both sender and receiver approved to display message publicily.
 

From f4fac071850f25c4f553f7bb2961457456cfc85a Mon Sep 17 00:00:00 2001
From: Ana Sustic <ana@sustic.com>
Date: Mar 19 2019 22:04:03 +0000
Subject: [PATCH 4/5] Fixed merge errors in development_windows.rst


---

diff --git a/docs/setup/development_windows.rst b/docs/setup/development_windows.rst
index 7b2f60c..99267ad 100755
--- a/docs/setup/development_windows.rst
+++ b/docs/setup/development_windows.rst
@@ -83,11 +83,14 @@ In order to run tests, make sure to execute ``docker-compose up`` command. Now i
     docker-compose exec web sh
 
 Then the terminal will show a ``#`` symbol.
-Simply type in ``t`` to initiate the test suite.
+Simply type in ``./t`` (or ``t``) to initiate the test suite.
 
-(The test suite are run by running the ``t`` script, which runs the tests with the appropriate testing settings and provides a coverage report.)
+(The test suite are run by running the ``./t`` script, which runs the tests with the appropriate testing settings and provides a coverage report.)
 
 Integration tests are run via the following command::
 
-    manage.py test -v 2 -p integration_test*.py --settings=happinesspackets.settings.tsting
+    docker-compose exec web ./manage.py test -v 2 -p integration_test*.py --settings=happinesspackets.settings.tsting
+
+If a ``file not found`` error occurs, try removing the ``./`` from the command and try again.
+
 

From 35d58d722f2b18b08d7b044cb743d1275fe850a5 Mon Sep 17 00:00:00 2001
From: Ana Sustic <ana@sustic.com>
Date: Mar 19 2019 22:04:03 +0000
Subject: [PATCH 5/5] Removed two new lines at the end of development_windows.rst


---

diff --git a/docs/setup/development_windows.rst b/docs/setup/development_windows.rst
index 99267ad..996d19d 100755
--- a/docs/setup/development_windows.rst
+++ b/docs/setup/development_windows.rst
@@ -92,5 +92,3 @@ Integration tests are run via the following command::
     docker-compose exec web ./manage.py test -v 2 -p integration_test*.py --settings=happinesspackets.settings.tsting
 
 If a ``file not found`` error occurs, try removing the ``./`` from the command and try again.
-
-