Skip to content

Commit

Permalink
Merge pull request #122 from JohnMulligan/washu_logos
Browse files Browse the repository at this point in the history
wash u logos integrated
  • Loading branch information
derekjkeller authored Jun 13, 2022
2 parents 3830fd7 + 086ceb2 commit df6fa05
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 12 deletions.
6 changes: 3 additions & 3 deletions docker/django/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ FROM ubuntu:18.04 AS base
RUN apt-get update -y \
&& apt-get install --yes --no-upgrade --no-install-recommends \
gettext=0.19.8.1-6ubuntu0.3 \
mysql-client=5.7.37-0ubuntu0.18.04.1 \
libmysqlclient-dev=5.7.37-0ubuntu0.18.04.1 \
mysql-client=5.7.38-0ubuntu0.18.04.1 \
libmysqlclient-dev=5.7.38-0ubuntu0.18.04.1 \
python3=3.6.7-1~18.04 \
python3-pip=9.0.1-2.3~ubuntu1.18.04.5 \
python3-future=0.15.2-4ubuntu2 \
Expand All @@ -30,7 +30,7 @@ FROM base AS build
RUN apt-get update \
&& apt-get install --yes --no-upgrade --no-install-recommends \
gcc=4:7.4.0-1ubuntu2.3 \
libxml2-dev=2.9.4+dfsg1-6.1ubuntu1.5 \
libxml2-dev=2.9.4+dfsg1-6.1ubuntu1.6 \
libxslt1-dev=1.1.29-5ubuntu0.2 \
python3-dev=3.6.7-1~18.04 \
&& apt-get clean \
Expand Down
23 changes: 14 additions & 9 deletions voyages/apps/static_content/templates/static_content/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,13 @@ <h4 class="sv-card-title card-title-color "> {% trans 'vessels' %} </h4>
alt="National Museum of African American History and Culture">
</div>
</a>



<a href="https://oieahc.wm.edu/" target="_blank" rel="noopener" alt="Omohundro Institute">
<div class="logo-grid-item fade-in" style="width:180px">
<img class="card-img sponsor-card-img block lazy" data-src="{{ STATIC_URL }}images/site/logos/oi_white_686_528.svg" alt="Omohundro Institute">
</div>
</a>



Expand All @@ -404,12 +410,6 @@ <h4 class="sv-card-title card-title-color "> {% trans 'vessels' %} </h4>
<!-- Row2: UC -->

<div class="logo-grid">

<a href="https://oieahc.wm.edu/" target="_blank" rel="noopener" alt="Omohundro Institute">
<div class="logo-grid-item fade-in" style="width:180px">
<img class="card-img sponsor-card-img block lazy" data-src="{{ STATIC_URL }}images/site/logos/oi_white_686_528.svg" alt="Omohundro Institute">
</div>
</a>

<div class="logo-grid-item fade-in" style="width: 130px">
<img class="card-img sponsor-card-img block lazy" data-src="{{ STATIC_URL }}images/site/logos/ucshield_white_250_250.svg"
Expand All @@ -435,7 +435,12 @@ <h4 class="sv-card-title card-title-color "> {% trans 'vessels' %} </h4>
alt="University of California, Santa Cruz">
</div>
</a>

<a href="https://cre2.wustl.edu/" target="_blank" rel="noopener" alt="Washington University Center for the Study of Race, Ethnicity, and Equity">
<div class="logo-grid-item fade-in" style="width:280px">
<img class="card-img sponsor-card-img block lazy" data-src="{{ STATIC_URL }}images/site/logos/washu_white_stacked_1280_836.png"
alt="Washington University Center for the Study of Race, Ethnicity, and Equity">
</div>
</a>
<a href="https://www.cavehill.uwi.edu/home" target="_blank" rel="noopener" alt="University of the West Indies at Cave Hill, Barbados (UWI)">
<div class="logo-grid-item fade-in" style="width: 260px">
<img class="card-img sponsor-card-img block lazy" data-src="{{ STATIC_URL }}images/site/logos/uwi_white_crest.png"
Expand All @@ -444,7 +449,7 @@ <h4 class="sv-card-title card-title-color "> {% trans 'vessels' %} </h4>
</a>






Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
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 df6fa05

Please sign in to comment.