Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Align footer with Vocabulary current design system #208

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
Open

Align footer with Vocabulary current design system #208

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6b068bb
Align footer with Vocabulary design system requirement
Dev-JoyA Oct 10, 2024
11e531f
Ensures the Pr contains only implementation for vocabulary design sys…
Dev-JoyA Oct 15, 2024
783d11d
syncing branch with changes from main
Dev-JoyA Oct 17, 2024
5175861
Update .gitignore ,remove tracked unwanted files and resolved conflicts
Dev-JoyA Oct 22, 2024
aeb390a
resolved issue that might affect the layout of the page
Dev-JoyA Oct 22, 2024
8bdc963
resolved conflicts in footer.html
Dev-JoyA Oct 22, 2024
71545ff
Align footer with Vocabulary design system requirement
Dev-JoyA Oct 10, 2024
6d7d1d9
Ensures the Pr contains only implementation for vocabulary design sys…
Dev-JoyA Oct 15, 2024
6b70a75
resolved issue that might affect the layout of the page
Dev-JoyA Oct 22, 2024
4a20da9
resolved conflicts in footer.html
Dev-JoyA Oct 22, 2024
67c8fab
complete merge
Dev-JoyA Oct 22, 2024
41298dc
Merge branch 'main' into feature/fix-footer-inconsistency-vocabulary-…
Dev-JoyA Oct 22, 2024
5509001
removed changes from vocabulary
Dev-JoyA Oct 22, 2024
cb2e44e
removed vocabulary from the branch
Dev-JoyA Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
View file
Open in desktop
Dev-JoyA marked this conversation as resolved.
Show resolved Hide resolved
Dev-JoyA marked this conversation as resolved.
Show resolved Hide resolved
Binary file not shown.
Binary file added legal_db/.DS_Store
View file
Open in desktop
Dev-JoyA marked this conversation as resolved.
Show resolved Hide resolved
Dev-JoyA marked this conversation as resolved.
Show resolved Hide resolved
Binary file not shown.
Binary file added legal_db/static/.DS_Store
View file
Open in desktop
Dev-JoyA marked this conversation as resolved.
Show resolved Hide resolved
Dev-JoyA marked this conversation as resolved.
Show resolved Hide resolved
Binary file not shown.
1 change: 1 addition & 0 deletions legal_db/templates/legal_db/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<title>CC Legal Database</title>
<link rel="icon" href="{% static 'favicon.ico' %}"/>
<link rel="stylesheet" href="{% static 'webpack_files/css/index.css' %}" type="text/css">
<link rel="stylesheet" href="{% static 'vocabulary/css/vocabulary.css' %}" type="text/css">
</head>
<body>
{% include 'legal_db/partials/_header.html' %}
Expand Down
159 changes: 70 additions & 89 deletions legal_db/templates/legal_db/partials/_footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,91 +1,72 @@
<footer class="main-footer">
<div class="container">
<div class="columns">
<div class="column is-one-third-tablet-only is-one-quarter-desktop">
<a href="https://creativecommons.org" class="main-logo margin-bottom-bigger">
<span class="has-text-white"><svg
xmlns="http://www.w3.org/2000/svg"
preserveAspectRatio="xMidYMid meet"
viewBox="0 0 304 73">
<use href="#logomark"></use>
</svg></span>
</a>
<div>
<address class="margin-bottom-normal">Creative Commons<br/>PO Box 1866, Mountain View CA 94042</address>
<a href="mailto:[email protected]" class="mail">[email protected]</a><br/>
<a href="tel://+1-415-429-6753" class="phone">+1-415-429-6753</a>
</div>
<div class="margin-vertical-large">
<a href="https://www.instagram.com/creativecommons" class="social has-text-white" target="_blank" rel="noopener">
<i class="icon margin-right-small is-size-4">instagram</i>
</a>
<a href="https://www.twitter.com/creativecommons" class="social has-text-white" target="_blank" rel="noopener">
<i class="icon margin-right-small is-size-4">twitter</i>
</a>
<a href="https://www.facebook.com/creativecommons" class="social has-text-white" target="_blank" rel="noopener">
<i class="icon margin-right-small is-size-4">facebook</i>
</a>
<a href="https://www.linkedin.com/company/creative-commons/" class="social has-text-white" target="_blank" rel="noopener">
<i class="icon margin-right-small is-size-4">linkedin</i>
</a>
</div>
</div>
<div class="column is-two-third-tablet-only is-three-quarters-desktop">
<div class="columns">
<div class="column is-full">
<nav class="footer-navigation">
<ul class="menu">
<li><a href="{% url 'home' %}" class="menu-item">Home</a></li>
<li><a href="{% url 'case_index' %}" class="menu-item">Cases</a></li>
<li><a href="{% url 'scholarship_index' %}" class="menu-item">Scholarship</a></li>
<li><a href="{% url 'faq' %}" class="menu-item">FAQ</a></li>
{% if request.user.is_authenticated %}
<li><a href="{% url 'admin:index' %}" class="menu-item">Admin</a></li>
{% else %}
<li><a href="{% url 'admin:login' %}" class="menu-item">Login</a></li>
{% endif %}
</ul>
</nav>
</div>
</div>
<div class="columns">
<div class="column is-two-thirds">
<div class="subscription">
<h5 class="b-header">Subscribe to our newsletter</h5>
<form class="newsletter">
<label for="email" class="is-sr-only">Email</label>
<input id="email" type="text" class="input" placeholder="Your email">
<input type="submit" value="subscribe" class="button small">
</form>
</div>
<div class="attribution margin-top-bigger">
<p class="caption">
Except where otherwise
<a href="https://creativecommons.org/policies#license" target="_blank" rel="noopener">noted</a>,
content on this site is licensed under a
<a href="https://creativecommons.org/licenses/by/4.0/" target="_blank" rel="noopener">Creative Commons Attribution 4.0 International license</a>.
<a href="https://creativecommons.org/website-icons" target="_blank" rel="noopener">Icons</a>
by
<a href="https://fontawesome.com/" target="_blank" rel="noopener">Font Awesome</a>.
</p>
<div class="margin-top-smaller">
<i class="icon margin-right-small is-size-4">cclogo</i>
<i class="icon margin-right-small is-size-4">ccby</i>
</div>
</div>
</div>
<div class="column is-one-third">
<aside class="donate-section">
<h5>Our work relies on you!</h5>
<p>Help us keep the internet free and open.</p>
<a class="button small donate" href="http://creativecommons.org/donate">
<i class="icon cc-letterheart margin-right-small is-size-5 padding-top-smaller"></i>
Donate now
</a>
</aside>
</div>
</div>
<footer>
<a class="identity-logo" href="#">Creative Commons</a>

<nav class="footer-menu">
<ul>
<!-- <li><a href="/about/contact">Contact</a></li>
<li><a href="https://mail.creativecommons.org/subscribe" target="_blank">Newsletter</a></li>
<li><a href="/privacy">Privacy</a></li>
<li><a href="/policies">Policies</a></li>
<li><a href="/terms">Terms</a></li> -->
<li><a href="{% url 'home' %}" class="menu-item">Home</a></li>
<li><a href="{% url 'case_index' %}" class="menu-item">Cases</a></li>
<li><a href="{% url 'scholarship_index' %}" class="menu-item">Scholarship</a></li>
<li><a href="{% url 'faq' %}" class="menu-item">FAQ</a></li>
{% if request.user.is_authenticated %}
<li><a href="{% url 'admin:index' %}" class="menu-item">Admin</a></li>
{% else %}
<li><a href="{% url 'admin:login' %}" class="menu-item">Login</a></li>
{% endif %}

</ul>
</nav>

<div class="contact">
<!-- this area lacks a heading? -->
<h2>Contact Us</h2>
<p>Creative Commons <br> PO Box 1866, Mountain View, CA 94042</p>
<p><a href="mailto:[email protected]">[email protected]</a></p>
<p><a href="tel:+14154296753">+1-415-429-6753</a></p>

<nav class="social-menu">
<ul>
<!-- <li><a class="icon-replace fa-instagram" href="#">Instagram</a></li> -->
<li><a class="icon-replace fa-twitter" href="https://twitter.com/creativecommons" target="_blank">Twitter</a></li>
<li><a class="icon-replace fa-mastodon" href="https://mastodon.social/@creativecommons" target="_blank">Mastodon</a></li>
<li><a class="icon-replace fa-facebook" href="https://www.facebook.com/creativecommons" target="_blank">Facebook</a></li>
<li><a class="icon-replace fa-linkedin" href="https://www.linkedin.com/company/creative-commons/" target="_blank">LinkedIn</a></li>
</ul>
</nav>
</div>

<div class="subscribe">
<h2>Subscribe to our Newsletter</h2>
<form action="https://creativecommons.us4.list-manage.com/subscribe/post?u=fd30364b6577b471373d6076c&amp;id=4603fe102a" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate newsletter" target="_blank" novalidate="">
<input type="email" value="" name="EMAIL" class="email input" id="mce-EMAIL" placeholder="Your email" required="">
<!-- real people should not fill this in and expect good things - do not remove this or risk form bot signups-->
<div style="position: absolute; left: -5000px" aria-hidden="true">
<input type="text" name="b_fd30364b6577b471373d6076c_4603fe102a" tabindex="-1" value="">
</div>
</div>
<input type="submit" value="subscribe" id="mc-embedded-subscribe" class="button small">
</form>
</div>

<div class="donate">
<h2>Our work relies on you!</h2>
<p>Help us keep the internet free and open</p>
<a class="donate icon-attach cc-heart-filled" href="https://www.classy.org/give/313412/#!/donation/checkout?c_src=website&amp;c_src2=top-of-page-banner" target="_blank">Donate Now</a>
</div>


<div class="license">
<p>Except where otherwise <a href="/policies/#license">noted</a>, content on this site is licensed under a <a href="/licenses/by/4.0/">Creative Commons Attribution 4.0 International license</a>. Icons by <a href="https://fontawesome.com/" target="_blank">Font Awesome</a>.</p>

<svg>
<use href="/vocabulary/svg/cc/icons/cc-icons.svg#cc-logo"></use>
</svg>
<svg>
<use href="/vocabulary/svg/cc/icons/cc-icons.svg#cc-by"></use>
</svg>
</div>
</footer>

</footer>
Dev-JoyA marked this conversation as resolved.
Show resolved Hide resolved