Merge branch 'master' into added-spaz-ableist-slur

This commit is contained in:
Tatiana Mac 2019-11-07 12:14:34 -08:00 committed by GitHub
commit 3163d78a76
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.
@ -90,7 +90,7 @@
<li>colorism</li> <li>colorism</li>
<li>Complex Post-Traumatic Stress Disorder (PTSD)</li> <li>Complex Post-Traumatic Stress Disorder (PTSD)</li>
<li>cultural appropriation</li> <li>cultural appropriation</li>
<li><a class="word__link" href=#crazy>crazy</a><span class="flag__red">ableist slur</span></li> <li><a class="word__link" href="#crazy">crazy</a><span class="flag__red">ableist slur</span></li>
<li>Crippled <span class="flag__red">ableist slur</span></li> <li>Crippled <span class="flag__red">ableist slur</span></li>
<li>Demi</li> <li>Demi</li>
<li class="subterm">-boy</li> <li class="subterm">-boy</li>
@ -119,6 +119,11 @@
<section class="list"> <section class="list">
<h3>F-L</h3> <h3>F-L</h3>
<ul> <ul>
<li>Fat</li>
<li class="subterm"><a class="word__link" href="#fatphobia">-phobia</a></li>
<li class="subterm">Shaming</li>
<li class="subterm">Activism</li>
<li class="subterm">Liberation</li>
<li>Fem</li> <li>Fem</li>
<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>
@ -186,6 +191,7 @@
<li class="subterm">Cis-</li> <li class="subterm">Cis-</li>
<li class="subterm">Hetero-</li> <li class="subterm">Hetero-</li>
<li>nuts <span class="flag__red">ableist slur</span></li> <li>nuts <span class="flag__red">ableist slur</span></li>
<li>Obese <span class="flag__red">anti-fat slur</span></li>
<li><a class="word__link" href="#ocd">Obsessive Compulsive Disorder (OCD)</a><br><span class="flag__red">medical appropriation</span></li> <li><a class="word__link" href="#ocd">Obsessive Compulsive Disorder (OCD)</a><br><span class="flag__red">medical appropriation</span></li>
<li>Oppression</li> <li>Oppression</li>
<li class="subterm">Internalised</li> <li class="subterm">Internalised</li>
@ -309,8 +315,8 @@
<p class="word__signal word__signal__avoid"> <p class="word__signal word__signal__avoid">
avoid—Racist Symbol avoid—Racist Symbol
</p> </p>
<p id="ok-hand"> <p class="word__title" id="ok-hand">
<span class="word__title" role="image" aria-label="ok-hand">👌</span> <span class="word__title">[ok hand]</span> <span role="image" aria-label="ok-hand">👌</span> [ok hand]
<span class="word__speech"> <span class="word__speech">
noun noun
</span> </span>
@ -493,6 +499,32 @@
</div> </div>
</section> </section>
<section class="block__word list">
<p class="word__signal word__signal__tool">Tool of Oppression</p>
<p class="word__title" id="fatphobia">
Fatphobia
<span class="word__speech">
noun
</span>
</p>
<p class="word__definition">
the fear, hatred, and stigmitazation of fat people.<br><br>
</p>
<div class="block__type">
<p class="word__type">
Further Reading
</p>
<p class="word__breakdown">
<span class="word__alt">
<a class="word__link"
href="https://www.srhweek.ca/providers/people-and-communities/sizeism-and-fatphobia/">Sizeism and Fatphobia</a>;
<a class="word__link" href="https://www.huffpost.com/entry/fatphobia-a-guide-for-the_b_5214754">Fatphobia: A Guide for the Disbeliever</a>.
</span>
</p>
</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">
Tool of Oppression Tool of Oppression