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.

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

update deployment version #87

Merged
merged 103 commits into from
May 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
103 commits
Select commit Hold shift + click to select a range
b972c68
Merge pull request #52 from digbmc/main
gforesman Aug 4, 2023
6fff8a8
Update landing.md
amills1bmc Jan 30, 2024
df49c19
Update disoriented.md
amills1bmc Jan 30, 2024
3a96b6f
Merge pull request #57 from digbmc/main
gforesman Apr 24, 2024
d1853ec
Merge pull request #58 from digbmc/wbbm-grace
gforesman Apr 24, 2024
4d7620a
add disoriented directory
cboucher01 May 2, 2024
baf331d
add pages for disoriented
cboucher01 May 2, 2024
8260f6b
intro
gforesman May 2, 2024
2f33179
Merge pull request #59 from digbmc/wbbm-grace
gforesman May 2, 2024
9548089
Merge pull request #60 from digbmc/main
gforesman May 2, 2024
b311868
update
gforesman May 2, 2024
61cd0a7
Merge pull request #61 from digbmc/wbbm-grace
gforesman May 2, 2024
9b45919
japanese chinese scholarship page
gforesman May 2, 2024
9a81206
Merge pull request #62 from digbmc/wbbm-grace
gforesman May 2, 2024
d482b64
japanese chinese scholarship page edits
gforesman May 2, 2024
32fe124
Merge pull request #63 from digbmc/wbbm-grace
gforesman May 2, 2024
329a4a9
edits
gforesman May 2, 2024
f608478
Merge pull request #64 from digbmc/wbbm-grace
gforesman May 2, 2024
c935c69
edits
gforesman May 2, 2024
663a6ee
Merge pull request #65 from digbmc/wbbm-grace
gforesman May 2, 2024
ea28d80
deanery + edits
gforesman May 2, 2024
84cd919
Merge pull request #66 from digbmc/wbbm-grace
gforesman May 2, 2024
75ac550
edits
gforesman May 2, 2024
c0a93f9
Merge pull request #67 from digbmc/wbbm-grace
gforesman May 2, 2024
76dc57d
added image of buddha statue
gforesman May 2, 2024
4f875b3
Merge pull request #68 from digbmc/wbbm-grace
gforesman May 2, 2024
d3c7fbe
edits
gforesman May 2, 2024
3bf1050
Merge pull request #69 from digbmc/wbbm-grace
gforesman May 2, 2024
f9ad10f
edits
gforesman May 8, 2024
9f149f8
Merge pull request #70 from digbmc/wbbm-grace
gforesman May 8, 2024
4137c25
scholarship recipients
gforesman May 8, 2024
dad5529
Merge pull request #71 from digbmc/wbbm-grace
gforesman May 8, 2024
38f5062
edits
gforesman May 8, 2024
d4e8de6
Merge pull request #72 from digbmc/wbbm-grace
gforesman May 8, 2024
57cccb2
edit
gforesman May 8, 2024
51f1dfc
Merge pull request #73 from digbmc/wbbm-grace
gforesman May 8, 2024
a3d361f
editing photos
gforesman May 8, 2024
9ce5cb6
Merge pull request #74 from digbmc/wbbm-grace
gforesman May 8, 2024
eb6cc77
editing photo placement
gforesman May 8, 2024
1487e4f
Merge pull request #75 from digbmc/wbbm-grace
gforesman May 8, 2024
9324ef5
adding images
gforesman May 8, 2024
e9b8075
Merge pull request #76 from digbmc/wbbm-grace
gforesman May 8, 2024
50cdbe8
photos to deanery
gforesman May 9, 2024
d728638
Merge pull request #77 from digbmc/wbbm-grace
gforesman May 9, 2024
a648231
edits
gforesman May 9, 2024
0870148
Merge pull request #78 from digbmc/wbbm-grace
gforesman May 9, 2024
2796980
photos added
gforesman May 9, 2024
c7a7551
Merge pull request #79 from digbmc/wbbm-grace
gforesman May 9, 2024
3e8472a
edits
gforesman May 9, 2024
65cc1ca
Merge pull request #80 from digbmc/wbbm-grace
gforesman May 9, 2024
65800b0
edits
gforesman May 9, 2024
c50b000
Merge pull request #81 from digbmc/wbbm-grace
gforesman May 9, 2024
86a0589
stoddard book
gforesman May 9, 2024
d3b5df8
Merge pull request #82 from digbmc/wbbm-grace
gforesman May 9, 2024
695ee1b
another stoddard book
gforesman May 9, 2024
0f028ea
Merge pull request #83 from digbmc/wbbm-grace
gforesman May 9, 2024
5d81b55
swapped photo
gforesman May 9, 2024
490a1b5
Merge pull request #84 from digbmc/wbbm-grace
gforesman May 9, 2024
d9e041a
edit
gforesman May 9, 2024
618740e
Merge pull request #85 from digbmc/wbbm-grace
gforesman May 9, 2024
d9517a2
edit
gforesman May 9, 2024
5f94bd9
Merge pull request #86 from digbmc/wbbm-grace
gforesman May 9, 2024
5762b44
remove blog links and reformat disoriented pages
cboucher01 May 17, 2024
750443a
test broken images
cboucher01 May 17, 2024
2340a1a
try another fix for broken images
cboucher01 May 17, 2024
be66381
try to fix broken links on cards
cboucher01 May 17, 2024
46d64d2
fix cards
cboucher01 May 17, 2024
e2bf0f5
implement new look for cards
cboucher01 May 17, 2024
7196328
edit card styles
cboucher01 May 17, 2024
6f8cc6f
adjust styles on cards
cboucher01 May 17, 2024
1c250bd
update card styles
cboucher01 May 17, 2024
e5a873c
move porcelain section to deanery page
cboucher01 May 17, 2024
b02efbe
try reformatting orientalism definition
cboucher01 May 17, 2024
96c4f92
edit css
cboucher01 May 17, 2024
2c36651
adjust orientalism card
cboucher01 May 17, 2024
1963797
change color of heading in orientalism card
cboucher01 May 17, 2024
43ef633
add navigation to bottom of disoriented subpages
cboucher01 May 20, 2024
f268675
remove emphasis on navigation buttons and fix links
cboucher01 May 20, 2024
14cae06
fix nav link formatting on orientalism at deanery
cboucher01 May 20, 2024
c136fad
undo attempted fix
cboucher01 May 20, 2024
7d1350d
change bottom nav
cboucher01 May 20, 2024
8b387ee
update bottom nav
cboucher01 May 20, 2024
9848cdd
add bottom margin to list items in bottom nav
cboucher01 May 20, 2024
00a5876
update blockquote styles and fix orientalism at deanery page
cboucher01 May 20, 2024
1b8e755
fix blockquotes
cboucher01 May 20, 2024
22e574d
remove mention of blog from home page
cboucher01 May 20, 2024
47f1158
add higher res images and images from exhibition
cboucher01 May 20, 2024
36b5948
add carousel with installation images to disoriented home
cboucher01 May 20, 2024
c24f3a6
update images on disoriented landing
cboucher01 May 20, 2024
7c84b31
fix image paths on disoriented landing
cboucher01 May 20, 2024
caee575
add javascript for carousel
cboucher01 May 20, 2024
3b43c97
remove js
cboucher01 May 20, 2024
5101ab8
comment out carousel for now
cboucher01 May 20, 2024
a1e760e
add carousel to disoriented page
cboucher01 May 22, 2024
e4d15a4
remove extra "---" in disoriented.md
cboucher01 May 22, 2024
e7f1753
change "gallery" to "carousel"
cboucher01 May 22, 2024
1bf1104
fix stylesheet reference in carousel.html
cboucher01 May 22, 2024
9c9a579
fix missing css bracket
cboucher01 May 22, 2024
753574c
update carousel
cboucher01 May 22, 2024
2ac1f1c
make carousel dimensions responsive
cboucher01 May 22, 2024
8592656
adjust height of carousel images
cboucher01 May 22, 2024
c428b40
remove old carousel comment
cboucher01 May 22, 2024
8681d62
made corrections on scholarship recipients page
cboucher01 May 24, 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
118 changes: 114 additions & 4 deletions _data/media.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@

- item_id: media_014
item_type: image
item_location: https://upload.wikimedia.org/wikipedia/commons/thumb/6/6a/Dust_jacket%2C_first_edition_of_The_Rising_Tide_of_Color_Against_White_World-Supremacy.jpg/440px-Dust_jacket%2C_first_edition_of_The_Rising_Tide_of_Color_Against_White_World-Supremacy.jpg
item_location: /assets/images/media_014.jpg
title: The Rising Tide of Color by Lothrop Stoddard
creator: Lothrop Stoddard
description: Image of the cover of The Rising Tide of Color by Lothrop Stoddard. It is black and red with silhouettes of stereotypical/racist images of BIPOC people marching across the globe
Expand All @@ -144,7 +144,7 @@
item_location: /assets/images/media_015.jpg # path or src/url
title: Helen Chapin's business card, with her Chinese name at the center
creator: unknown
description: The pronunciation of Chapin's Chinese name is similar
description: The pronunciation of Helen Chapin's Chinese name is similar
source: Archive 12H Chapin, Bryn Mawr College
accession_number:

Expand Down Expand Up @@ -267,7 +267,7 @@
creator: Grace Foresman
date: 6 June 2023
description: Photo of stone guardian lions on steps of Deanery guardian with a red circle around both lions. Left lion labeled male and right lion labeled female
source: Bryn Mawr special collections
source: Bryn Mawr Special Collections
accession_number:

- item_id: media_029
Expand Down Expand Up @@ -420,4 +420,114 @@
date: August 4 2023
description: Photo of the Chinese screen displayed in the Fong Reading Room in Carpenter Library. The screen is black with gold painting
source:
accession_number:
accession_number:

- item_id: media_044
item_type: image
item_location: /assets/images/media_044.jpg
title: Canton Ware
creator: Bryn Mawr Special Collections
date: 1935
description: Photo of a 20th century Caton ware plate. The ceramic plate is white with dark blue detailing depicting a trees and a fence.
source: Bryn Mawr Special Collections
accession_number: W.406

- item_id: media_045
item_type: image
item_location: /assets/images/media_045.jpg
title: Clerical Script Calligraphy on Vermillion Silver-flecked Paper
creator: Shi Yandao
date: 1925
description: A transcription of a Chinese poem gifted to Helen Chapin.
source: Bryn Mawr Special Collections
accession_number: 2011.27.45

- item_id: media_046
item_type: image
item_location: /assets/images/media_046.jpg
title: Opium Pipe
creator:
date: 19th century - early 20th century
description: A small opium pipe from Helen Chapin's collection donated to the college.
source: Bryn Mawr Special Collections
accession_number: TN.168

- item_id: media_047
item_type: image
item_location: /assets/images/media_047.jpg
title: Shoe for Lady's Bound Foot
creator: Bryn Mawr Special Collections
date: Late 19th century - early 20th century
description: A small shoe for a bound foot. Part of Helen Chapin's colelction donated to the college.
source:
accession_number: TN.180

- item_id: media_048
item_type: image
item_location: /assets/images/media_048.jpg
title: Buddha Statue
creator: Bryn Mawr Special Collections
date: Early 20th century
description: Buddha statue from the Deanery
source:
accession_number: 2007.3.16

- item_id: media_049
item_type: image
item_location: /assets/images/media_049.jpg
title: Plant Stand
creator: A. A. Vantine & Co.
date:
description: Teakwood plant stand from A. A. Vantine that Thomas used to decorate the Deanery
source: Bryn Mawr Special Collections
accession_number: F.211

- item_id: media_050
item_type: image
item_location: /assets/images/media_050.jpg
title: A. A. Vantine 1917 Catalogue Page
creator: A. A. Vantine & Co.
date: 1917
description: Catalogue page showing different Asian-inspired plant stands.
source: Internet Archive
accession_number:

- item_id: media_051
item_type: image
item_location: /assets/images/media_051.jpg
title: Japanese Garden Seat
creator: Unknown
date:
description: This ceramic seat was one of many that Thomas usesd to decorate the Deanery garden (Taft Garden)
source: Bryn Mawr Special Collections
accession_number: Deanery.184

- item_id: media_052
item_type: image
item_location: /assets/images/media_052.jpg
title: Student production of The Mikado
creator:
date: 1916
description: White Bryn Mawr students dressed up in Japanese attire for the Glee Club's prodcution of The Mikado, a satirical play mocking Japanese people.
source: Bryn Mawr Special Collections
accession_number: PAE Plays 3 folder

- item_id: media_053
item_type: image
item_location: /assets/images/media_053.jpg
title: Playbook from Bryn Mawr's Chinese Lantern production
creator:
date: 1915
description: The sophomore class put on a production of the Chinese Lantern by Laurence Housman, which mocked Chinese people and culture.
source: Bryn Mawr Special Collections
accession_number:

- item_id: media_054
item_type: image
item_location: /assets/images/media_054.jpg
title: The Revolt Against Civilization
creator: Lothrop Stoddard
date: 1922
description: Book cover
source: Internet Archive
accession_number:
2 changes: 0 additions & 2 deletions _data/menu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,5 @@
navigation:
- title: Disoriented
url: /current/disoriented/
- title: Blog
url: /current/blog/
- title: Team
url: /current/team/
84 changes: 84 additions & 0 deletions _includes/carousel.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
<head>
<link
rel="stylesheet"
href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css"
integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm"
crossorigin="anonymous"
/>
<link rel="stylesheet" href="{{ site.baseurl }}/assets/css/style.css" />
<script
src="https://code.jquery.com/jquery-3.2.1.slim.min.js"
integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN"
crossorigin="anonymous"
></script>
<script
src="https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js"
integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q"
crossorigin="anonymous"
></script>
<script
src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js"
integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl"
crossorigin="anonymous"
></script>
</head>

<div
id="carouselControls"
class="carousel slide"
data-ride="carousel"
data-interval="0"
>

<div class="carousel-inner">
{% for item in page.carousel %}

<div class="{{ item.class | default: carousel-item }}">
<img
class="d-block w-100"
src="{{ item.path | relative_url }}"
alt="{{ item.alt }}"
/>
{% if item.caption %}
<div class="carousel-caption d-none d-md-block">
<p style="margin:.75rem">{{ item.caption }}</p>
</div>
{% endif %}
</div>

{% endfor %}

<a
class="carousel-control-prev"
href="#carouselControls"
role="button"
data-slide="prev"
>
<span class="carousel-control-prev-icon" aria-hidden="true"></span>
<span class="sr-only">Previous</span>
</a>
<a
class="carousel-control-next"
href="#carouselControls"
role="button"
data-slide="next"
>
<span class="carousel-control-next-icon" aria-hidden="true"></span>
<span class="sr-only">Next</span>
</a>
</div>
<ol class="carousel-indicators">
<!--adds an indicator for every slide-->
{% for item in page.carousel %}
{% if forloop.first %}
<li
data-target="#carouselControls"
data-slide-to="0"
class="active"
></li>
{% else %}
<li data-target="#carouselControls" data-slide-to="{{ forloop.index0 }}"></li>
{% endif %}
{% endfor %}
</ol>
</div>
2 changes: 1 addition & 1 deletion _includes/phase-grid.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</div>
<div class="col-md-7">
<h3><a href="{{ '/current/' | relative_url}}">Who Built Bryn Mawr, current</a></h3>
<p>Exhibit on campus and blog</p>
<p>Exhibit on campus</p>
<a class="link-button" style="font-size: 1rem;" href="{{ '/current/' | relative_url}}">Explore</a>
</div>
</div>
Expand Down
98 changes: 97 additions & 1 deletion _sass/wbbm.scss
Original file line number Diff line number Diff line change
Expand Up @@ -169,4 +169,100 @@ h1 {

.media-container .metadata-container td {
color: white;
}
}

/* ----- Cards ----- */

.card.wide-card {
width: 100%;
height: 10rem;
margin-bottom: 1rem;

.card-img {
height: 100%;
object-fit: cover;
}

a {
width: 100%;
height: 100%;

.card-img-overlay {
background-color: #0000009f;
text-align: center;

h2 {
color: white;
margin: 0;
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}
}

.card-img-overlay:hover {
background-color: #00000062;
}
}
}

/* ----- Bottom Nav ----- */
ul.bottom-nav {
list-style-type: none;
display: inline;
margin-bottom: 1rem;

li {
margin-bottom: 1rem;
}
}

/* ----- Blockquote ----- */
blockquote {
font-size: larger;
}


/* ----- Carousel ----- */

.carousel {
margin-bottom: 1.5em;
background-color: black;
}

.carousel-control-next, .carousel-control-prev {
background-color: transparent !important;
}

.carousel-indicators {
position: absolute;
right: 0;
bottom: -20px;
left: 0;
margin: 0 !important;
}

.carousel-item {
img {
margin: 0;
height: 40vh;
object-fit: cover;
object-position: 50% 50%;
}
}

.carousel-caption {
position: absolute;
bottom: 0;
right: 0;
left: 0;
width: 100%;
z-index: 10;
padding-top: 5px;
padding-bottom: 5px;
color: #fff;
background-color: rgba(0, 0, 0, 0.499);
text-align: center;
display: block !important;
}
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.
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.
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.
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.
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 added assets/images/media_014.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 added assets/images/media_044.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 added assets/images/media_045.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 added assets/images/media_046.jpg
Binary file added assets/images/media_047.jpg
Binary file added assets/images/media_048.jpg
Binary file added assets/images/media_049.jpg
Binary file added assets/images/media_050.jpg
Binary file added assets/images/media_051.jpg
Binary file added assets/images/media_052.jpg
Binary file added assets/images/media_053.jpg
Binary file added assets/images/media_054.jpg
Loading