Skip to content

Commit

Permalink
homepage update (#1144)
Browse files Browse the repository at this point in the history
* homepage update

* fix: close anchor tag in homepage banner

* fix cashin collection link

* tinified images

* fix: delete ursus_collections.cy.js

This test ensured that the collection pages linked from the homepage "featured collections" grid load successfully. It isn't useful because the data used on our test Docker image is different from the data on the production server. The new collections we will be featuring are present in production but not on the test image. Adding them to the test image is a not insignificant amount of work, and would do nothing to ensure that they are present in production.
  • Loading branch information
sourcefilter authored Mar 21, 2024
1 parent efb26ff commit ada3266
Show file tree
Hide file tree
Showing 23 changed files with 50 additions and 275 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/home-collection-grid/cashin.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
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.
Binary file removed app/assets/images/home-grid-old/chavez.jpg
Binary file not shown.
Binary file removed app/assets/images/home-grid-old/primary.jpg
Binary file not shown.
Binary file removed app/assets/images/home-grid-old/swan.jpg
Binary file not shown.
Binary file removed app/assets/images/home-grid-old/tombstone.jpg
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -74,27 +74,41 @@
}

.grid-item-one {
background-image: image-url('home-collection-grid/ladnn_collection.jpg');
background-image: image-url('home-collection-grid/la-times.jpg');
}

.grid-item-two {
background-image: image-url('home-collection-grid/bennett_collection.jpg');
background-image: image-url('home-collection-grid/carteles-de-cine.jpg');
}

.grid-item-three {
background-image: image-url('home-collection-grid/connell_collection.jpg');
background-image: image-url('home-collection-grid/ramakatane.jpg');
}

.grid-item-four {
background-image: image-url('home-collection-grid/california_postcards.jpg');
background-image: image-url('home-collection-grid/tule-lake.jpg');
}

.grid-item-five {
background-image: image-url('home-collection-grid/ethiopic_manuscripts.jpg');
background-image: image-url('home-collection-grid/cashin.jpg');
}

.grid-item-six {
background-image: image-url('home-collection-grid/arkatov_collection.jpg');
background-image: image-url('home-collection-grid/trade-cards.jpg');
}

.collection-grid__item-content {
.grid-summary {

// truncate to 3 lines - mostly but not universally supported
display: -webkit-box;
overflow: hidden;

// fallback for browsers that don't support line-clamp; won't have ellipsis
max-height: 100px;
-webkit-line-clamp: 3;
-webkit-box-orient: vertical;
}
}

.collection-grid__item-title {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
@include banner;

background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.3)),
image-url('home-header/student-protesters_n4wr2000zz-89112.jpg');
// image-url('home-header/student-protesters_n4wr2000zz-89112.jpg');
image-url('home-header/brazil-abolition_n4wr2000zz-89112.jpg');
height: 500px;
max-height: 500px;
}
Expand Down Expand Up @@ -43,8 +44,7 @@
position: absolute;
bottom: 5px;
left: 50px;
width: 100%;
max-width: 550px;
width: calc(100% - 51rem); // leave room for title ( which seems to be about 40rem), plus margins/padding/gaps
font-size: $text-14;
color: $white;
font-style: italic;
Expand Down
42 changes: 22 additions & 20 deletions app/views/catalog/_image_grid.html.erb
Original file line number Diff line number Diff line change
@@ -1,63 +1,65 @@
<div class='collection-grid__wrapper'>
<!-- Grid One -->
<a class="collection-grid__item-wrapper" href="<%= solr_document_path('ark:/21198/zz00294nz8') %>">
<a class="collection-grid__item-wrapper" href="<%= solr_document_path('ark:/21198/zz0002np7z') %>">
<div class="collection-grid__item-image grid-item-one"></div>
<div class="collection-grid__item-content">
<h3 class="collection-grid__item-title">Los Angeles Daily News Negatives</h3>
<h3 class="collection-grid__item-title">Los Angeles Times Photographic Collection</h3>
<hr class="collection-grid__item-liner align-item-start">
<p class="collection-grid__item-desc">
Selected news photographs from 1920s, 30s, and 40s.
</p>
<p class="collection-grid__item-desc">Collection of photonegatives and prints documenting events and people in So. CA, the US, and the world. The material originates from the Los Angeles Times. </p>
<p class="collection-grid__item-link">More about this collection</p>
</div>
</a>
<!-- Grid Two -->
<a class="collection-grid__item-wrapper" href="<%= solr_document_path('ark:/21198/zz00011f8m') %>">
<a class="collection-grid__item-wrapper" href="<%= solr_document_path('ark:/21198/z1db9vb9') %>">
<div class="collection-grid__item-image grid-item-two"></div>
<div class="collection-grid__item-content">
<h3 class="collection-grid__item-title">Walter E. Bennett Photographic Collection, 1937-1983</h3>
<h3 class="collection-grid__item-title">Carteles de Cine</h3>
<hr class="collection-grid__item-liner align-item-start">
<p class="grid-summary">News photographs related to American Presidents 1960s, 70s, and 80s.</p>
<p class="grid-summary">Over 1300 posters from 1960s-2016 designed by Cuban artists for both Cuban and foreign films, film festivals, and film related special events. Posters were commissioned by Cinemateca de Cuba, part of Instituto Cubano del Arte e Industria Cinematográficos.

</p>
<p class="collection-grid__item-link">More about this collection</p>
</div>
</a>
<!-- Grid Three -->
<a class="collection-grid__item-wrapper" href="<%= solr_document_path('ark:/21198/zz002h2fpt') %>">
<a class="collection-grid__item-wrapper" href="<%= solr_document_path('ark:/21198/z12r5hwv') %>">
<div class="collection-grid__item-image grid-item-three"></div>
<div class="collection-grid__item-content">
<h3 class="collection-grid__item-title">Will Connell Papers</h3>
<h3 class="collection-grid__item-title">Ramakatane Archive</h3>
<hr class="collection-grid__item-liner align-item-start">
<p class="grid-summary">Advertising photographs from the 1920s and 30s.</p>
<p class="grid-summary">The Ramakatane archive provides a unique perspective of Lesotho’s social history and visual culture from a period spanning nearly 55 years, reflecting the evolving identity of a nation. His photographic work is an exemplary portfolio of “vernacular photography.” This project, led by the Photography Legacy Project, digitized photographs and negatives from throughout Ramakatane’s career, focusing primarily on portraits taken in his studio and as the official portraitist of the royal family.

</p>
<p class="collection-grid__item-link">More about this collection</p>
</div>
</a>
<!-- Grid Four -->
<a class="collection-grid__item-wrapper" href="<%= solr_document_path('ark:/21198/zz0008hs73') %>">
<a class="collection-grid__item-wrapper" href="<%= solr_document_path('ark:/21198/z1qv83mc') %>">
<div class="collection-grid__item-image grid-item-four"></div>
<div class="collection-grid__item-content">
<h3 class="collection-grid__item-title">Collection of California Postcards</h3>
<h3 class="collection-grid__item-title">Material Culture of the Tule Lake Japanese Language Library</h3>
<hr class="collection-grid__item-liner align-item-start">
<p class="grid-summary">Sample postcards from our large physical collection.</p>
<p class="grid-summary">The Tule Lake Japanese Language Library (Tsūri Rēki Nihongo Toshokan ツーリレーキ日本語圖書館) was conceptualized, created, and administered by incarcerated Japanese Americans and Japanese immigrants at the Tule Lake Internment Camp in Newell, California (Block 46, Barracks 8) between November 26, 1943 and November 30, 1945 during WWII. It housed roughly 7,000 volumes and at its peak had a circulation of over 17,000 volumes loaned per month and fostered intellectual activity, social engagement, and a quiet space for reflection. The majority of the collection was donated by those who had come to Tule Lake with only what they could carry, with some additional contributions from other incarceration sites. The collection was established and run by a subgroup of the Tsūri Rēki Danjo Seinendan 鶴嶺湖男女青年團 (“Tule Lake Young Men and Women’s Group”). It can be contextualized as both a prison collection and a diaspora collection. Donated by the Japanese Language School Unified System (Kyodo System) in 1999, UCLA has the only known archive of materials from this historic library, currently holding 1,947 volumes. The material culture of these texts can tell us much about the paths the books traveled before their arrival at Tule Lake, logistics of the systems the volunteer librarians developed, innovative wartime preservation methods of well-loved materials, and U.S. governmental monitoring and censorship of Japanese language texts. Many of the volumes also contain the original checkout cards with borrowers’ signatures and barracks addresses; the collection includes 1,205 of these cards. For more information about the collection, please visit the library guide at: https://guides.library.ucla.edu/japanese/tulelake.</p>
<p class="collection-grid__item-link">More about this collection</p>
</div>
</a>
<!-- Grid Five -->
<a class="collection-grid__item-wrapper" href="<%= solr_document_path('ark:/21198/zz0009gx3x') %>">
<a class="collection-grid__item-wrapper" href="<%= solr_document_path('ark:/21198/zz0002bk1c') %>">
<div class="collection-grid__item-image grid-item-five"></div>
<div class="collection-grid__item-content">
<h3 class="collection-grid__item-title">Ethiopic Manuscripts</h3>
<h3 class="collection-grid__item-title">Cashin (Bonnie) Collection of Fashion, Theater and Film Costume Design, 1913-2000</h3>
<hr class="collection-grid__item-liner align-item-start">
<p class="grid-summary">A collection of manuscripts from the 16th-20th centuries in Ge’ez and Amharic.</p>
<p class="grid-summary">The collection contains Bonnie Cashin's personal archive documenting her design career. The collection includes Cashin's design illustrations, writings on design, contractual paperwork, photographs of her clothing designs, and press materials including press releases and editorial coverage of her work. Personal photographs and letters to Cashin are also included.</p>
<p class="collection-grid__item-link">More about this collection</p>
</div>
</a>
<!-- Grid Six -->
<a class="collection-grid__item-wrapper" href="<%= solr_document_path('ark:/21198/zz001dzc12') %>">
<a class="collection-grid__item-wrapper" href="<%= solr_document_path('ark:/21198/zz0002gwzg') %>">
<div class="collection-grid__item-image grid-item-six"></div>
<div class="collection-grid__item-content">
<h3 class="collection-grid__item-title">Arkatov (James) Collection</h3>
<h3 class="collection-grid__item-title">Patent Medicine Trade Cards</h3>
<hr class="collection-grid__item-liner align-item-start">
<p class="grid-summary">Photographs of musicians and fine artists taken by the cellist, James Arkatov.</p>
<p class="grid-summary">A collection of 247 patent medicine trade cards. Patent medicines were medical compounds sold under a variety of names and labels, though they were for the most part actually trademarked medicines, not patented. The trade cards are small, colorfully illustrated advertising cards touting a particular medicine and its many cures. The era of patent medicine began to unravel in the U.S. with the passage of the first Pure Food and Drug Act in 1906.</p>
<p class="collection-grid__item-link">More about this collection</p>
</div>
</a>
Expand Down
8 changes: 5 additions & 3 deletions app/views/catalog/banners/_homepage_banner--ursus.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@
</h1>
</div>

<span class="banner__caption--ursus">
<a href="catalog/n4wr2000zz-89112">UCLA students with signs, one reading "Money for Minds not Bombs" during Veteran's Day teach-in on nuclear weapons in Los Angeles, Calif., 1981</a>
</span>
<span class="banner__caption--ursus"><a href="catalog/ark:/21198/z1x11zvs">
Poster celebrating the 100 years of the legal abolition of three centuries of slavery in Brazil (1888-1988)
<br>
Collections: Soweto Black Organization, Modern Endangered Archives Program
</a></span>
</div>

<% end %>
Expand Down
Loading

0 comments on commit ada3266

Please sign in to comment.