Skip to content

Commit

Permalink
Merge branch 'hotfix/3395-add-20-yrs'
Browse files Browse the repository at this point in the history
  • Loading branch information
Steven-Eardley committed Mar 7, 2023
2 parents f114fb6 + 54ff0d4 commit c029b1b
Show file tree
Hide file tree
Showing 11 changed files with 63 additions and 16 deletions.
Binary file added cms/assets/img/20yrs-stacked.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified cms/assets/img/opengraph/img.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions cms/sass/base/_utils.scss
Expand Up @@ -182,6 +182,13 @@
margin: 0;
}

// Hiding content for smaller screens
.hidden-sm {
@media (max-width: 768px) {
display: none;
}
}

// For content that overflows outside of its container
.bleed {
z-index: 10;
Expand Down
5 changes: 3 additions & 2 deletions cms/sass/pages/_homepage.scss
Expand Up @@ -72,12 +72,13 @@
}

&__background {
background: url("data:image/svg+xml,%3Csvg width='673' height='1723' viewBox='0 0 673 1723' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M159.5 1022V1022.5H160C248.642 1022.5 320.5 950.642 320.5 862C320.5 773.358 248.642 701.5 160 701.5C71.3589 701.5 -0.5 773.358 -0.5 862V862.5H0H159.5V1022Z' fill='%23F9D950' stroke='%23F9D950'/%3E%3Cpath d='M352.5 862V862.5H352.501C352.77 950.912 424.525 1022.5 513 1022.5H673H673.5V1022C673.5 937.654 608.438 868.504 525.763 862C608.438 855.496 673.5 786.346 673.5 702V701.5H673H513C424.525 701.5 352.77 773.088 352.501 861.5H352.5V862Z' fill='%23F9D950' stroke='%23F9D950'/%3E%3Cpath d='M320.5 160V160.5H320H160C71.3579 160.5 -0.5 88.6421 -0.5 0V-0.5H0H160C248.642 -0.5 320.5 71.3579 320.5 160Z' fill='%23282624' stroke='%23282624'/%3E%3Cpath d='M320 159.5H320.5V160C320.5 248.642 248.642 320.5 160 320.5H0H-0.5V320C-0.5 231.358 71.3579 159.5 160 159.5H320Z' fill='%23282624' stroke='%23282624'/%3E%3Cpath d='M673.5 0V-0.5H673H353H352.5V0C352.5 82.5511 414.822 150.545 494.983 159.5H353H352.5V160C352.5 248.642 424.358 320.5 513 320.5C601.642 320.5 673.5 248.642 673.5 160V159.5H673H531.017C611.178 150.545 673.5 82.5511 673.5 0Z' fill='%23282624' stroke='%23282624'/%3E%3Cpath d='M-0.5 1564V1564.5H0H159.5H160H160.5H320H320.5V1564C320.5 1475.52 248.912 1403.77 160.5 1403.5V1403.5H160H159.5V1403.5C71.0878 1403.77 -0.5 1475.52 -0.5 1564Z' fill='%233A5959' stroke='%233A5959'/%3E%3Cpath d='M0 1724.5C84.3464 1724.5 153.496 1659.44 160 1576.76C166.504 1659.44 235.654 1724.5 320 1724.5H320.5V1724V1564V1563.5H320H160.5H160H159.5H0H-0.5V1564V1724V1724.5H0Z' fill='%2347A178' stroke='%2347A178'/%3E%3Cpath d='M353 1563.5H352.5V1564C352.5 1652.65 424.358 1724.5 513 1724.5C601.642 1724.5 673.5 1652.65 673.5 1564C673.5 1475.35 601.642 1403.5 513 1403.5H512.5V1404V1563.5H353Z' fill='%23A3C386' stroke='%23A3C386'/%3E%3Cpath d='M320 1373.5H320.5V1373C320.5 1288.66 255.438 1219.5 172.762 1213C255.438 1206.5 320.5 1137.35 320.5 1053V1052.5H320H0H-0.5V1053C-0.5 1137.35 64.5621 1206.5 147.238 1213C64.562 1219.5 -0.5 1288.66 -0.5 1373V1373.5H0H320Z' fill='%233A5959' stroke='%233A5959'/%3E%3Cpath d='M673.5 1213V1212.5H673H513H512.5V1213V1373V1373.5H513C601.642 1373.5 673.5 1301.65 673.5 1213Z' fill='%2347A178' stroke='%2347A178'/%3E%3Cpath d='M352.5 1373V1373.5H353H513H513.5V1373V1213V1212.5H513C424.358 1212.5 352.5 1284.36 352.5 1373Z' fill='%233A5959' stroke='%233A5959'/%3E%3Cpath d='M673.5 1053V1052.5H673H513H512.5V1053V1213V1213.5H513C601.642 1213.5 673.5 1141.65 673.5 1053Z' fill='%2347A178' stroke='%2347A178'/%3E%3Cpath d='M352.5 1213V1213.5H353H513H513.5V1213V1053V1052.5H513C424.358 1052.5 352.5 1124.36 352.5 1213Z' fill='%233A5959' stroke='%233A5959'/%3E%3Cpath d='M320.5 511C320.5 422.358 248.642 350.5 160 350.5C71.3579 350.5 -0.5 422.358 -0.5 511C-0.5 599.642 71.3579 671.5 160 671.5C248.642 671.5 320.5 599.642 320.5 511Z' fill='%23FD5A3B' stroke='%23FD5A3B'/%3E%3Cpath d='M352.5 351V350.5H353C441.642 350.5 513.5 422.358 513.5 511C513.5 599.642 441.642 671.5 353 671.5H352.5V671V351Z' fill='%23FD5A3B' stroke='%23FD5A3B'/%3E%3Cpath d='M673 671.5H673.5V671V351V350.5H673C584.358 350.5 512.5 422.358 512.5 511C512.5 599.642 584.358 671.5 673 671.5Z' fill='%23982E0A' stroke='%23982E0A'/%3E%3C/svg%3E%0A") no-repeat right top;
background-size: auto 100%;
background: url("data:image/svg+xml,%3Csvg width='444' height='248' viewBox='0 0 444 248' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M443.072 123.775C443.072 55.4159 387.656 -2.42231e-06 319.297 -5.41038e-06L319.297 247.55C387.656 247.55 443.072 192.134 443.072 123.775Z' fill='%233A5959'/%3E%3Cpath d='M195.522 123.775C195.522 55.4159 250.938 -2.42231e-06 319.297 -5.41038e-06L319.297 247.55C250.938 247.55 195.522 192.134 195.522 123.775Z' fill='%2347A178'/%3E%3Cpath d='M139.705 176.17C103.331 176.17 73.8433 205.815 73.8433 242.384H205.567C205.567 205.815 176.08 176.17 139.705 176.17Z' fill='%23A3C386'/%3E%3Crect x='16.082' y='5' width='82.4154' height='72.5537' fill='%23A3C386'/%3E%3Crect x='18.8994' y='176.17' width='118.34' height='66.2141' fill='%2347A178'/%3E%3Cpath d='M173.869 80.3713C173.869 38.7449 140.124 5 98.4973 5L98.4973 155.743C140.124 155.743 173.869 121.998 173.869 80.3713Z' fill='%233A5959'/%3E%3Cpath d='M18.0156 155.563C-6.0052 179.584 -6.00519 218.529 18.0156 242.55L105.003 155.563C80.9818 131.542 42.0364 131.542 18.0156 155.563Z' fill='%233A5959'/%3E%3Cpath d='M112.586 80.0191C112.586 106.668 90.9825 128.271 64.3338 128.271C37.6851 128.271 16.082 106.668 16.082 80.0191C16.082 53.3704 37.6851 31.7674 64.3338 31.7674C90.9825 31.7674 112.586 53.3704 112.586 80.0191Z' fill='%2347A178'/%3E%3C/svg%3E") no-repeat right bottom;
background-size: 50% auto;
}

&__search {
transition: all 0.35s;
background-color: rgba(255, 255, 255, 0.65);

@media screen and (max-width: 1279px) {
background-color: rgba($white, 0.85);
Expand Down
6 changes: 6 additions & 0 deletions portality/static/js/doaj.fieldrender.edges.js
Expand Up @@ -435,6 +435,12 @@ $.extend(true, doaj, {
<ul class="collapse filters__list" id="filters" aria-expanded="false">\
{{FACETS}}\
</ul>\
<aside class="hidden-sm">\
<h2 class="sr-only">Celebrating 20 years of DOAJ</h2>\
<a href="https://blog.doaj.org/2023/02/20/doaj20-open-global-and-trusted-since-2003/" target="_blank" rel="noopener" style="display: block;">\
<img src="/assets/img/20yrs-stacked.png"/>\
</a>\
</aside>\
</aside>\
</div>\
\
Expand Down
5 changes: 5 additions & 0 deletions portality/templates/includes/footer.html
Expand Up @@ -15,12 +15,17 @@ <h2 class="sr-only">
Legal &amp; admin
</h2>
<div>
{# Temporarily removed for the 20th year anniversary, see DOAJ/doajPM#3395
<a href="/" class="logo">
<h2 class="sr-only">The Directory of Open Access Journals</h2>
{% include "includes/svg/logo.svg" %}
<span class="logo__tagline">
Open <br/>Global <br/>Trusted
</span>
</a> #}
<a href="https://blog.doaj.org/2023/02/20/doaj20-open-global-and-trusted-since-2003/" target="_blank" rel="noopener" style="display: block; margin-bottom: 2em; max-width: 90%;">
<h2 class="sr-only">Celebrating 20 years of DOAJ</h2>
{% include "includes/svg/20yrs.svg" %}
</a>
<p>
© DOAJ {{ current_year }} default by all rights reserved <a href="{{ url_for('doaj.terms') }}" style="text-decoration: underline;">unless otherwise specified</a>.
Expand Down
10 changes: 10 additions & 0 deletions portality/templates/includes/svg/20yrs-stacked.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions portality/templates/includes/svg/20yrs.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit c029b1b

Please sign in to comment.