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

Civil rights video #2856

Closed
wants to merge 7 commits into from
Closed

Civil rights video #2856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9830c2c
Update exhibit.rb
ekemeyer Oct 4, 2024
0c43216
Update exhibits.css.scss
ekemeyer Oct 4, 2024
d1386ec
Update civil-rights.md
ekemeyer Oct 4, 2024
e259e08
'add civil rights iframe to civil rights exhibit'
foglabs Oct 9, 2024
bc5ff45
Update exhibit.rb
ekemeyer Oct 9, 2024
0655409
Update exhibits.css.scss
ekemeyer Oct 9, 2024
fa4112d
Update black-power.md
ekemeyer Oct 9, 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
12 changes: 11 additions & 1 deletion app/assets/stylesheets/globals/exhibits.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,23 @@
height: 97vh;
}

#exhibit-main iframe.exhibit-small-iframe, #collection-main iframe.exhibit-small-iframe {
#exhibit-main iframe.exhibit-small-iframe, #collection-main iframe.exhibit-small-iframe, #exgal-main iframe.exhibit-small-iframe {
width: 100%;
height: auto;
min-height: auto;
aspect-ratio: 16 / 9;
}

#exgal-main iframe.exhibit-small-iframe {
margin-top: 2vh;
}

#exgal-modal-viewer iframe.exhibit-small-iframe {
width: 100%;
min-height: 68vh;
height: 68vh;
}

#exhibit-main iframe.exhibit-small-iframe.four-three, #collection-main iframe.exhibit-small-iframe.four-three {
aspect-ratio: 4 / 3;
}
Expand Down
2 changes: 1 addition & 1 deletion app/models/exhibit.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ def uri
%(/exhibits/#{path})
end

def cover
def cover
@cover ||= begin
img = Nokogiri::HTML(cover_html).css('img').first
%(<a href='#{uri}'>
Expand Down
2 changes: 1 addition & 1 deletion app/views/exhibits/_gallery_player.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

<% elsif media_info[:type] == 'iframe' %>
<div class="exgal-player-container exgal-modal-height">
<iframe src="<%= media_info[:url] %>"></iframe>
<iframe style="border: 0;" class="exhibit-small-iframe" src="<%= media_info[:url] %>"></iframe>
</div>
<% end %>

Expand Down
9 changes: 4 additions & 5 deletions app/views/exhibits/civil-rights.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,10 @@ NAEB began operations in 1934 from a precursor organization that had been formed

## Gallery

- <a class="type">image</a>
<img alt="Black and White photograph from the March on Washington for Jobs and Freedom" src="https://s3.amazonaws.com/americanarchive.org/exhibits/CivilRights_SignatureImage.jpg">
<a class="caption-text">Warren K. Leffler, photographer. Participants in the March on Washington for Jobs and Freedom, August 28, 1963.</a>
<a class="credit-link" href="https://www.loc.gov/rr/print/">Courtesy of U.S. News & World Report Magazine Photograph Collection, Prints and Photographs Division, Library of Congress.</a>

- <a class="type">iframe</a>
<a href="https://player.vimeo.com/video/983252534?h=0e726a503d" class="media-url"></a>
<a class="asset-url" href="https://player.vimeo.com/video/983252534?h=0e726a503d" class="media-url"></a>
<a class="caption-text">Voices from the Southern Civil Rights Movement</a>

## Records
[](/cpb-aacip-28-kw57d2qp45)
Expand Down
Loading