Merge branch 'master' into fatphobia

This commit is contained in:
Tatiana Mac 2019-11-26 14:40:51 -08:00 committed by GitHub
commit bdbde76f95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -18,7 +18,7 @@
</div> </div>
<div> <div>
<p class="summary"> <p class="summary">
Self-Defined seeks to provide more inclusive, holistic, and fluid definitions to reflect the the diverse perspectives of the modern world. Self-Defined seeks to provide more inclusive, holistic, and fluid definitions to reflect the diverse perspectives of the modern world.
</p> </p>
<p> <p>
With the foundation of vocabulary, we can begin to understand lived experiences of people different than us. Words can provide us with a sense of identify and allow us to find kinship through common experiences. With the foundation of vocabulary, we can begin to understand lived experiences of people different than us. Words can provide us with a sense of identify and allow us to find kinship through common experiences.
@ -128,10 +128,10 @@
<li>Femme</li> <li>Femme</li>
<li><a class="word__link" href="#gaslighting">Gaslighting</a></li> <li><a class="word__link" href="#gaslighting">Gaslighting</a></li>
<li>Gender</li> <li>Gender</li>
<li class="subterm">Cis-</li> <li class="subterm"><a class="word__link" href="#cisgender">Cis-</a></li>
<li class="subterm">-Fluid</li> <li class="subterm">-Fluid</li>
<li class="subterm">Non-conforming</li> <li class="subterm">Non-conforming</li>
<li class="subterm">Trans</li> <li class="subterm"><a class="word__link" href="#transgender">Trans</a></li>
<li class="subterm">-Queer</li> <li class="subterm">-Queer</li>
<li>Gender confirmation surgery (GCS)</li> <li>Gender confirmation surgery (GCS)</li>
<li>Gender pronouns</li> <li>Gender pronouns</li>
@ -211,16 +211,20 @@
<li>-phile</li> <li>-phile</li>
<li class="subterm">andro</li> <li class="subterm">andro</li>
<li class="subterm">gyne</li> <li class="subterm">gyne</li>
<li>-phobia</li>
<li class="subterm">Fat</li>
<li class="subterm">Homo</li>
<li class="subterm">Trans</li>
<li>Platonic</li> <li>Platonic</li>
<li class="subterm">Queer</li> <li class="subterm">Queer</li>
<li>Polyamory</li> <li><a class="word__link" href="#polyamory">Polyamory</a></li>
<li>Positivism</li> <li>Positivism</li>
<li>Post-Traumatic Stress Disorder (PTSD)</li> <li>Post-Traumatic Stress Disorder (PTSD)</li>
<li>power</li> <li>power</li>
<li>Poz</li> <li>Poz</li>
<li>Prejudice</li> <li>Prejudice</li>
<li>Pride</li> <li>Pride</li>
<li>Pride, First (Anti-Police Riots)</li> <li class="subterm">First (Anti-Police Riots)</li>
<li>Prophylaxis</li> <li>Prophylaxis</li>
<li class="subterm">Pre-exposure (PreEP)</li> <li class="subterm">Pre-exposure (PreEP)</li>
<li class="subterm">Post-exposure (PEP)</li> <li class="subterm">Post-exposure (PEP)</li>
@ -253,6 +257,7 @@
<li class="subterm"> orientation</li> <li class="subterm"> orientation</li>
<li>Socially constructed</li> <li>Socially constructed</li>
<li>Solidarity</li> <li>Solidarity</li>
<li>Spaz <span class="flag__red">ableist slur</span></li>
<li>-Splaining</li> <li>-Splaining</li>
<li class="subterm">cis</li> <li class="subterm">cis</li>
<li class="subterm">man</li> <li class="subterm">man</li>
@ -274,7 +279,7 @@
<li>Tranny <span class="flag__red">anti-trans slur</span></li> <li>Tranny <span class="flag__red">anti-trans slur</span></li>
<li>Trans</li> <li>Trans</li>
<li class="subterm">femme</li> <li class="subterm">femme</li>
<li class="subterm"><a class="word__link" href="#transgender">gender</a></li> <li class="subterm"><a class="word__link" href="#transgender">-gender</a></li>
<li class="subterm">man</li> <li class="subterm">man</li>
<li class="subterm">masculine</li> <li class="subterm">masculine</li>
<li class="subterm">phobia</li> <li class="subterm">phobia</li>
@ -366,7 +371,7 @@
</p> </p>
<p class="word__definition"> <p class="word__definition">
of, relating to, or characterized by being sexually attracted to more than one gender. of, relating to, or characterised by being sexually attracted to more than one gender.
</p> </p>
<div class="block__type"> <div class="block__type">
@ -400,7 +405,7 @@
</p> </p>
<p class="word__definition"> <p class="word__definition">
of, relating to, or characterized by being a gender that matches the gender they were assigned at birth.<br><br> of, relating to, or characterised by being a gender that matches the gender they were assigned at birth.<br><br>
The opposite of <a class="word__link" href="#transgender">transgender</a>. The opposite of <a class="word__link" href="#transgender">transgender</a>.
</p> </p>
@ -508,7 +513,7 @@
</p> </p>
<p class="word__definition"> <p class="word__definition">
the fear, hatred, and stigmitazation of fat people.<br><br> the fear, hatred, and stigmitasation of fat people.<br><br>
</p> </p>
<div class="block__type"> <div class="block__type">
<p class="word__type"> <p class="word__type">
@ -643,7 +648,7 @@
</p> </p>
<p class="word__breakdown"> <p class="word__breakdown">
<span class="word__alt"> <span class="word__alt">
<a class="word__link" href="https://www.theodysseyonline.com/minority-vs-minoritize">Minority vs minoritze</a> <a class="word__link" href="https://www.theodysseyonline.com/minority-vs-minoritize">Minority vs minoritize</a>
</span> </span>
</p> </p>
</div> </div>
@ -659,7 +664,7 @@
</p> </p>
<p class="word__definition"> <p class="word__definition">
of, relating to, or characterized by being any gender that does not fit into the male-female gender binary; an umbrella term.<br><br> of, relating to, or characterised by being any gender that does not fit into the male-female gender binary; an umbrella term.<br><br>
For example, a non-binary person may have some gender between male and female, have multiple genders, no gender, a culturally-specific gender (e.g., two-spirit). For example, a non-binary person may have some gender between male and female, have multiple genders, no gender, a culturally-specific gender (e.g., two-spirit).
@ -751,6 +756,46 @@
</div> </div>
</section> </section>
<section class="block__word list">
<p class="word__signal"></p>
<p class="word__title" id="polyamory">
Polyamory
<span class="word__speech">
noun
</span>
</p>
<p class="word__definition">
belief that romantic and/or sexual exclusivity is not necessary for a happy, committed relationship;
an umbrella term for various types of relationships where all partners involved consent to non-monogamy,
such as open relationships, polycules, throuples, group marriages, etc.
</p>
<div class="block__type">
<p class="word__type">
Note
</p>
<p class="word__breakdown">
<span class="word__alt">
One can be polyamorous despite currently being single or in a monogamous relationship.
</span>
</p>
</div>
<div class="block__type">
<p class="word__type">
Further Reading
</p>
<ul class="word__breakdown">
<li>
<a class="word__link" href="https://avris.it/blog/my-definition-of-polyamory" rel="noreferrer">My definition of polyamory</a>;
<a class="word__link" href="https://www.polymatchmaker.com/main.mvc?Screen=HTML&Page=polyglossary" rel="noreferrer">Poly Glossary</a>;
<a class="word__link" href="http://polyliving.net/" rel="noreferrer">A Quick Look at Polyamory</a>
</li>
</ul>
</div>
</section>
<section class="block__word list"> <section class="block__word list">
<p class="word__signal word__signal__tool"> <p class="word__signal word__signal__tool">
White Supremacy Tool White Supremacy Tool
@ -795,7 +840,7 @@
</p> </p>
<p class="word__definition"> <p class="word__definition">
of, relating to, or characterized by a gender that does not match the gender they were assigned at birth.<br><br> of, relating to, or characterised by a gender that does not match the gender they were assigned at birth.<br><br>
The opposite of <a class="word__link" href="#cisgender">cisgender</a>. The opposite of <a class="word__link" href="#cisgender">cisgender</a>.
</p> </p>
@ -864,6 +909,53 @@
</p> </p>
</div> </div>
</section> </section>
<section class="block__word list">
<p class="word__signal word__signal__avoid">
avoid—Ableist slur
</p>
<p class="word__title" id="spaz">
spaz
<span class="word__speech">
noun
</span>
</p>
<p class="word__definition">
irrationally nervous person; hyperactive
</p>
<div class="block__type">
<p class="word__type">
Issues
</p>
<p class="word__breakdown">The origin of the word “Spaz” is a shortened version of “Spastic.” Spastic refers to an alteration in muscle tone affected by the medical condition spasticity, which is seen in spastic diplegia and many other forms of cerebral palsy.</p>
</div>
<div class="block__type">
<p class="word__type">
Impact
</p>
<p class="word__breakdown">By using ableist language, we are perpetuating violence against people who experience
mental or psychological disabilities. Using this language perpetuates those systems and language of harm,
regardless of our intent.</p>
</div>
<div class="block__type">
<p class="word__type">
Usage Tip
</p>
<p class="word__breakdown">
Be more specific. Typically we can find an alternate definition by simply reflecting on what emotion we're really feeling.
</p>
</div>
<div class="block__type">
<p class="word__type">
Alt Words
</p>
<p class="word__breakdown">
<span class="word__alt">
hyper, anxious, jumpy, unable to focus
</span>
</p>
</div>
</section>
</div> </div>
</main> </main>
</body> </body>