Skip to content

Commit 20fb69e

Browse files
committed
added essays and fixed subpage menu
1 parent 96ec481 commit 20fb69e

File tree

3 files changed

+56
-3
lines changed

3 files changed

+56
-3
lines changed

essays.html

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
<meta name="og:type" content="website">
1414
<meta name="theme-color" content="#222">
1515
<!-- Styles -->
16+
<link href="./css/subpages.css" rel="stylesheet">
1617
<link href="./css/crumple.css" rel="stylesheet">
1718
<link href="./css/font.css" rel="stylesheet">
1819
<link href="./css/mobile.css" rel="stylesheet">
19-
<link href="./css/subpages.css" rel="stylesheet">
2020
<!-- Webpage Icon -->
2121
<link rel="shortcut icon" href="./assets/images/icon.png" type="image/png">
2222
<!-- Fonts -->
@@ -44,6 +44,38 @@ <h1>meredith hoo - essays</h1>
4444
<p> feel free to leave comments in the links </p>
4545

4646
<dl class="list">
47+
<dt> A Select Herstory of Western Civilization:<br> Renaissance to Present Day </dt>
48+
<dd class="list__item">
49+
<p>
50+
Visual art depicts the past, and in this paper I want to further
51+
inform the audience of the works that women artist produced, and
52+
how it shaped the cultures of their time. The pictures I’ve chosen
53+
are feminist. They reveal a part of the female experience that
54+
went undocumented by their male counterparts, that changed gender
55+
conformity, fought oppression and question the expectations of
56+
women as artists and as individuals.
57+
</p>
58+
<a class="list__link"
59+
href="https://docs.google.com/document/d/1gG4apFC9yTtJMtSwt15UstohIDvXsmBkb4RmF9NbqIs/edit?usp=sharing"
60+
target="_blank" rel="noopener noreferrer">read more here</a>
61+
</dd>
62+
63+
<dt> Investigating Bauermeister's Rainbow </dt>
64+
<dd class="list__item">
65+
<p>
66+
Although Rainbow creates a relationship between the human experience,
67+
the cellular and celestale, it does not project Bauermeister’s own
68+
spirituality and experience. Rainbow is valuable in that it is made
69+
shortly after her artistic voice in the Fluxus movement and the start
70+
of her lense boxes. It culminates her use of art as a way to change
71+
our perception of reality, and deviate from absolute truth, adding
72+
humanity to her intellectualization of her mother’s illness.
73+
</p>
74+
<a class="list__link"
75+
href="https://docs.google.com/document/d/1-sC-ZLWPw1PrTHkUXT0JH0kvb9_8xWkAzcrGF2Vegao/edit?usp=sharing"
76+
target="_blank" rel="noopener noreferrer">read more here</a>
77+
</dd>
78+
4779
<dt> Dear Young Programmer, </dt>
4880
<dd class="list__item">
4981
<p>

js/main.js

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,3 +130,25 @@
130130
const init = (() => items.forEach(item => new ImgItem(item)))();
131131
setTimeout(() => document.body.classList.remove('loading'), 5000);
132132
};
133+
134+
$(window).scroll(function() {
135+
var isMobile = window.matchMedia("only screen and (max-width: 850px)").matches ||
136+
/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
137+
var isOtherMediaQuery = window.matchMedia("only screen and (min-width:1080px)").matches;
138+
if(isMobile && !isOtherMediaQuery) {
139+
// some code..
140+
} else {
141+
var hT = $('#menu').offset().top,
142+
hH = $('#menu').outerHeight(),
143+
wH = $(window).height(),
144+
wS = $(this).scrollTop();
145+
146+
if (wS > (hT+hH-wH)){
147+
$('#footer').addClass("menu-footer");
148+
$('#footer').removeClass("hero-footer");
149+
} else {
150+
$('#footer').addClass("hero-footer");
151+
$('#footer').removeClass("menu-footer");
152+
}
153+
}
154+
});

poems.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,10 @@
1313
<meta name="og:type" content="website">
1414
<meta name="theme-color" content="#222">
1515
<!-- Styles -->
16-
<link href="./css/main.css" rel="stylesheet">
16+
<link href="./css/subpages.css" rel="stylesheet">
1717
<link href="./css/crumple.css" rel="stylesheet">
1818
<link href="./css/font.css" rel="stylesheet">
1919
<link href="./css/mobile.css" rel="stylesheet">
20-
<link href="./css/subpages.css" rel="stylesheet">
2120
<!-- Webpage Icon -->
2221
<link rel="shortcut icon" href="./assets/images/icon.png" type="image/png">
2322
<!-- Fonts -->

0 commit comments

Comments
 (0)