PR#120: Improving the footer - fedora-commops/fedora-happiness-packets

fedora-commops / fedora-happiness-packets

#120 Improving the footer

Merged 5 years ago by jflory7. Opened 5 years ago by alishapapun.

fedora-commops/ alishapapun/fedora-happiness-packets footer into master

Improving the design of Footer

Alisha Mohanty • 5 years ago

084675b

assets/css/custom.css

file modified

+32 -10

		`@@ -40,12 +40,11 @@`
		`margin: 30px 0;`
		`}`

		`- main {`
		`- margin-bottom: 30px;`
		`- }`
		`-`
		`footer {`
		`- text-align: right;`
		`+ text-align: center;`
		`+ padding:0 7vw;`
		`+ box-shadow: 0px -4px 5px 0px rgba(60, 110, 180, 0.27);`
		`+ background-color: #3c6eb421;`
		`}`

		`fieldset {`
		`@@ -101,10 +100,6 @@`
		`display: none;`
		`}`

		`- .text-center.col-md-10{`
		`- padding: 0;`
		`- }`
		`-`
		`#div_id_hp {`
		`display: none;`
		`}`
		`@@ -224,4 +219,31 @@`
		`aside .sidebar .logo {`
		`width: 100%;`
		`}`
		`- }`
		`\ No newline at end of file`
		`+ }`
		`+ .wearefedora {`
		`+ color: #3c6eb4;`
		`+ font-weight: 600;`
		`+ font-size:2.3rem;`
		`+ }`
		`+ .footer-msg {`
		`+ padding-top: 0.5rem;`
		`+ }`
		`+ .footer-msg p {`
		`+ font-size: 2rem;`
		`+ }`
		`+ .footer-msg a {`
		`+ font-weight: 600;`
		`+ }`
		`+ .row p {`
		`+ font-size: 2rem;`
		`+ }`
		`+ .footer-share p{`
		`+ font-size: 2rem;`
		`+ }`
		`+ .socio-buttons {`
		`+ padding: 1rem;`
		`+ font-size: 2rem;`
		`+ }`
		`+ .socio-buttons a {`
		`+ padding: 0.9rem;`
		`+ }`

templates/base.html

file modified

+23 -21

		`@@ -69,26 +69,28 @@`
		`{% block content %}{% endblock %}`
		`</div>`
		`</div>`
		`- <footer class="text-center col-md-10"><small>`
		`- <hr>`
		`- {% block footer %}`
		`- {% include "follow.html" %}`
		`- <br>`
		`- {% endblock %}`
		`- Fedora Happiness Packets is a fork of <a href="https://github.com/mxsasha/happinesspackets/">Happiness Packets</a> and part of GSoC 2018.`
		`- <br>`
		`- 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>`
		`-  `
		`- <a href="https://plus.google.com/112917221531140868607"><i class="fab fa-google-plus-g fa-lg"></i></a>`
		`- </small></footer>`
		`</div>`
		`- </main>`
		`- </body>`
		`+ <footer class="footer">`
		`+ <small>`
		`+ <hr>`
		`+ {% block footer %}`
		`+ {% include "follow.html" %}`
		`+ <div class="footer-msg">`
		`+ {% endblock %}`
		`+ Fedora Happiness Packets is a fork of <a href="https://github.com/mxsasha/happinesspackets/">Happiness Packets</a> and part of GSoC 2018.`
		`+ <br>`
		`+ 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>`
		`+ </div>`
		`+ <div class="socio-buttons">`
		`+ <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>`
		`+ <a href="https://plus.google.com/112917221531140868607"><i class="fab fa-google-plus-g fa-lg"></i></a>`
		`+ </div>`
		`+ </small>`
		`+ </footer>`
		`+ </main>`
		`+ </body>`
		`</html>`

templates/follow.html

file modified

+6 -3

		`@@ -1,8 +1,11 @@`
		`+ <div class="footer-msg">`
		`+ <p>Share <span class="wearefedora">#WeAreFedora </span> </p>`
		`+ </div>`
		`<div class="row">`
		`- <a class="g-interactivepost sharebutton google" data-contenturl="https://happinesspackets.fedorainfracloud.org/" data-clientid="427442962349-biuc5ks65luss5h3v5oqtj15jigaqoib.apps.googleusercontent.com" data-cookiepolicy="single_host_origin" data-prefilltext="#WeAreFedora" data-calltoactionurl="http://plus.google.com/pages/create"><i class="fab fa-google-plus-g fa-lg"></i> Share #WeAreFedora</a>`
		`+ <a class="g-interactivepost sharebutton google" data-contenturl="https://happinesspackets.fedorainfracloud.org/" data-clientid="427442962349-biuc5ks65luss5h3v5oqtj15jigaqoib.apps.googleusercontent.com" data-cookiepolicy="single_host_origin" data-prefilltext="#WeAreFedora" data-calltoactionurl="http://plus.google.com/pages/create"><i class="fab fa-google-plus-g fa-lg"></i> Share </a>`
		`<script type="text/javascript">(function() {var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true; po.src = 'https://apis.google.com/js/client:plusone.js'; var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);})();</script>`
		`- <a id="fb" class="sharebutton"><i class="fab fa-facebook fa-lg"></i> Share #WeAreFedora</a>`
		`+ <a id="fb" class="sharebutton"><i class="fab fa-facebook fa-lg"></i> Share </a>`
		`<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" class="sharebutton twitter" data-size="large" data-dnt="true"><i class="fab fa-twitter fa-lg"></i>Tweet #WeAreFedora</a>`
		`+ <a href="https://twitter.com/intent/tweet?button_hashtag=WeAreFedora" class="sharebutton twitter" data-size="large" data-dnt="true"><i class="fab fa-twitter fa-lg"></i> Tweet </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>`
		`</div>`

alishapapun commented 5 years ago

This Pull Request is regarding the issue #81.

Metadata Update from @jflory7:
- Pull-request tagged with: PASSED, improvement, needs changes, type - frontend, type - summer coding
- Request assigned

5 years ago

jflory7 commented 5 years ago

Hi @alishapapun, the changes look good. :thumbsup: I'm happy to merge this!

Before we do, could you please rebase and squash your commits into one commit? This helps keep the git changelog tidy. If you have never rebased before, see these two articles for help:

If you need additional guidance, don't hesitate to ask for help.

rebased onto ef0f0cc189e1e83614e74f48d125aea0aca7927c

5 years ago

alishapapun commented 5 years ago

Hey @jflory7 I have made the changes that you have asked for. Hope its what you expected. :)

Metadata Update from @jflory7:
- Pull-request untagged with: needs changes

5 years ago

alishapapun commented 5 years ago

@jflory7 I will update the changes which is causing merge conflict and let you know.

Metadata Update from @jflory7:
- Pull-request tagged with: needs changes

5 years ago

rebased onto 084675b

5 years ago

alishapapun commented 5 years ago

Hey @jflory7 , I have made the changes to no longer have the merge conflict. Could you please review it? I have the after image in #81 's last comment.