mirror of
https://github.com/fooflington/selfdefined.git
synced 2025-04-20 16:39:09 +00:00
merge conflict
This commit is contained in:
tatianamac
parent
069cb53ea7
commit
892e358d40
228
_site/index.html
228
_site/index.html
@ -7,7 +7,6 @@
|
|||||||
<title>Self-Defined · A modern dictionary about us. We define our words, but they don't define us.</title>
|
<title>Self-Defined · A modern dictionary about us. We define our words, but they don't define us.</title>
|
||||||
<link rel="stylesheet" href="css/base.css">
|
<link rel="stylesheet" href="css/base.css">
|
||||||
<link href="https://afeld.github.io/emoji-css/emoji.css" rel="stylesheet">
|
<link href="https://afeld.github.io/emoji-css/emoji.css" rel="stylesheet">
|
||||||
<<<<<<< HEAD
|
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<main>
|
<main>
|
||||||
@ -28,13 +27,13 @@
|
|||||||
<div class="box">
|
<div class="box">
|
||||||
<p class="subtitle">Ways to help</p>
|
<p class="subtitle">Ways to help</p>
|
||||||
<ol class="help">
|
<ol class="help">
|
||||||
<li> Submit words and definitions through <a href="https://github.com/tatianamac/selfdefined/pulls" rel="noreferral">pull requests</a>.</li>
|
<li> Submit words and definitions through <a href="https://github.com/tatianamac/selfdefined/pulls" rel="noreferrer">pull requests</a>.</li>
|
||||||
<li>Sponsor this work through <a href="https://github.com/sponsors/tatianamac">GitHub Sponsors</a>.</li>
|
<li>Sponsor this work through <a href="https://github.com/sponsors/tatianamac" rel="noreferrer">GitHub Sponsors</a>.</li>
|
||||||
<li>Volunteer writing, design, dev help by <a href="http://www.twitter.com/tatianatmac">DMing me @tatianatmac on Twitter</a>.</li>
|
<li>Volunteer writing, design, dev help by <a href="http://www.twitter.com/tatianatmac" rel="noreferrer">DMing me @tatianatmac on Twitter</a>.</li>
|
||||||
</ol>
|
</ol>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
</div>
|
|
||||||
<div class="auto-grid">
|
<div class="auto-grid">
|
||||||
<section class="list">
|
<section class="list">
|
||||||
<h3>A-E</h3>
|
<h3>A-E</h3>
|
||||||
@ -150,146 +149,6 @@
|
|||||||
<li>Latinx</li>
|
<li>Latinx</li>
|
||||||
</ul>
|
</ul>
|
||||||
</section>
|
</section>
|
||||||
=======
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body>
|
|
||||||
<main>
|
|
||||||
<section id="title">
|
|
||||||
<h1 class="title__thicc">Self-Defined</h1>
|
|
||||||
</section>
|
|
||||||
>>>>>>> 19b6dcb9cd3f4d660043fa171b091a3af0db5247
|
|
||||||
|
|
||||||
<section class="auto-grid">
|
|
||||||
<p class="summary">
|
|
||||||
<span class="subtitle">A modern dictionary about us. We define our words, but they don't define us.</span><br>Self-Defined seeks to provide more inclusive, holistic, and fluid definitions to reflect the modern world.<br>
|
|
||||||
</p>
|
|
||||||
<div class="box">
|
|
||||||
<span class="subtitle">Ways to help</span>
|
|
||||||
<ol>
|
|
||||||
<li> Submit words and definitions through <a href="https://github.com/tatianamac/selfdefined/pulls" rel="noreferral">pull requests</a>.</li>
|
|
||||||
<li>Sponsor this work through <a href="https://github.com/sponsors/tatianamac">GitHub Sponsors</a>.</li>
|
|
||||||
<li>Volunteer writing, design, dev help by <a href="http://www.twitter.com/tatianatmac">DMing me @tatianatmac on Twitter</a>.</li>
|
|
||||||
</ol>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<div class="grid">
|
|
||||||
<section class="list">
|
|
||||||
<h3>A-E</h3>
|
|
||||||
<ul>
|
|
||||||
<li>Ablelism</li>
|
|
||||||
<li>American</li>
|
|
||||||
<li class="subterm">African</li>
|
|
||||||
<li class="subterm">Asian</li>
|
|
||||||
<li class="subterm">Black</li>
|
|
||||||
<li class="subterm">Indigenous</li>
|
|
||||||
<li>Ambulatory Wheelchair</li>
|
|
||||||
<li>Ancestors</li>
|
|
||||||
<li>Anti-blackness</li>
|
|
||||||
<li>Anxiety disorders</li>
|
|
||||||
<li>aromantic</li>
|
|
||||||
<li class="subterm">Asian</li>
|
|
||||||
<li class="subterm">East</li>
|
|
||||||
<li class="subterm">South</li>
|
|
||||||
<li class="subterm">Southeast</li>
|
|
||||||
<li>asexual</li>
|
|
||||||
<li>Acquired Immune Deficiency Syndrome (AIDS)</li>
|
|
||||||
<li>assigned at birth</li>
|
|
||||||
<li>Attraction</li>
|
|
||||||
<li class="subterm">Aesthetic</li>
|
|
||||||
<li class="subterm">Platonic</li>
|
|
||||||
<li class="subterm">Sexual</li>
|
|
||||||
<li>Autism spectrum</li>
|
|
||||||
<li>Bias</li>
|
|
||||||
<li>bierasure</li>
|
|
||||||
<li>bipolar</li>
|
|
||||||
<li>Bisexual</li>
|
|
||||||
<li>Black Asian Minority Ethnic (BAME)</li>
|
|
||||||
<li>Black Indigenous People of Color (BIPOC)</li>
|
|
||||||
<li>Black</li>
|
|
||||||
<li class="subterm">men (BM)</li>
|
|
||||||
<li class="subterm">people (BP)</li>
|
|
||||||
<li class="subterm">women (BW)</li>
|
|
||||||
<li>Brown</li>
|
|
||||||
<li>Bropropriating</li>
|
|
||||||
<li>Burka</li>
|
|
||||||
<li>Child of a Deaf Adult (CODA)</li>
|
|
||||||
<li>cisgender</li>
|
|
||||||
<li>Climate change</li>
|
|
||||||
<li>Colonial narrative</li>
|
|
||||||
<li>Colonialism</li>
|
|
||||||
<li>colorism</li>
|
|
||||||
<li>Complex Post-Traumatic Stress Disorder (PTSD)</li>
|
|
||||||
<li>cultural appropriation</li>
|
|
||||||
<li><a class="word__link" href="#crazy">crazy</a></li>
|
|
||||||
<li>Demi</li>
|
|
||||||
<li class="subterm">-boy</li>
|
|
||||||
<li class="subterm">-girl</li>
|
|
||||||
<li class="subterm">-romantic</li>
|
|
||||||
<li class="subterm">-sexual</li>
|
|
||||||
<li>deaf and Deaf</li>
|
|
||||||
<li>Disability</li>
|
|
||||||
<li>disabled</li>
|
|
||||||
<li>discordant couples</li>
|
|
||||||
<li>Discrimination</li>
|
|
||||||
<li>Dominant culture</li>
|
|
||||||
<li>Dominant culture habits</li>
|
|
||||||
<li>Ehlers-Danlos Syndromes (EDS)</li>
|
|
||||||
<li>Egalitarian</li>
|
|
||||||
<li>Empathy</li>
|
|
||||||
<li>enby</li>
|
|
||||||
<li><a class="word__link" href="#esl">English as a Second Language (ESL)</a></li>
|
|
||||||
<li>Entitlement</li>
|
|
||||||
<li>Equality</li>
|
|
||||||
<li>Equity</li>
|
|
||||||
<li>Ethnicity</li>
|
|
||||||
</ul>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<section class="list">
|
|
||||||
<h3>F-L</h3>
|
|
||||||
<ul>
|
|
||||||
<li>Fem</li>
|
|
||||||
<li>Femme</li>
|
|
||||||
<li>Gaslighting</li>
|
|
||||||
<li>Gender</li>
|
|
||||||
<li class="subterm">Cis</li>
|
|
||||||
<li class="subterm">-Fluid</li>
|
|
||||||
<li class="subterm">Non-conforming</li>
|
|
||||||
<li class="subterm">Trans</li>
|
|
||||||
<li class="subterm">Queer</li>
|
|
||||||
<li>Gender confirmation surgery (GCS)</li>
|
|
||||||
<li>Genocide</li>
|
|
||||||
<li>Governmentality</li>
|
|
||||||
<li>gray ace</li>
|
|
||||||
<li>Gray asexuality</li>
|
|
||||||
<li>Hard of Hearing (HOH)</li>
|
|
||||||
<li>hegemonic</li>
|
|
||||||
<li>Hermaphrodite</li>
|
|
||||||
<li class="subterm">pseudo, male and female</li>
|
|
||||||
<li>High-Functioning</li>
|
|
||||||
<li>Hijab</li>
|
|
||||||
<li>Hispanic</li>
|
|
||||||
<li>Human Immunodeficiency Virus (HIV)</li>
|
|
||||||
<li>Homophobia</li>
|
|
||||||
<li>hormone Replacement therapy (HRT)</li>
|
|
||||||
<li>Illness</li>
|
|
||||||
<li class="subterm">Chronic</li>
|
|
||||||
<li>Immigrant</li>
|
|
||||||
<li>Impact</li>
|
|
||||||
<li>Implicit bias</li>
|
|
||||||
<li>Indigenous</li>
|
|
||||||
<li>Inherent</li>
|
|
||||||
<li>Intent</li>
|
|
||||||
<li>internalized oppression</li>
|
|
||||||
<li>Intersectionality</li>
|
|
||||||
<li>intersex</li>
|
|
||||||
<li>invisible disabilities</li>
|
|
||||||
<li>Jihad</li>
|
|
||||||
<li>Latinx</li>
|
|
||||||
</ul>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<section class="list">
|
<section class="list">
|
||||||
<h3>M-S</h3>
|
<h3>M-S</h3>
|
||||||
@ -493,9 +352,7 @@
|
|||||||
</span>
|
</span>
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
<div class="block__type">
|
<div class="block__type">
|
||||||
<p class="word__type">
|
<p class="word__type">
|
||||||
Further Reading
|
Further Reading
|
||||||
@ -549,84 +406,9 @@
|
|||||||
</p>
|
</p>
|
||||||
<p class="word__breakdown">
|
<p class="word__breakdown">
|
||||||
<span class="word__alt">
|
<span class="word__alt">
|
||||||
minoritised genders; people of minoritised genders; people of colour and white women; people of colour, white non-binary people, and white women</a>; or omit</span></p>
|
minoritised genders; people of minoritised genders; people of colour and white women; people of colour, white non-binary people, and white women; or omit</span></p>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
=======
|
|
||||||
<section class="block__word list">
|
|
||||||
<p class="word__signal word__signal__avoid">
|
|
||||||
avoid
|
|
||||||
</p>
|
|
||||||
<p class="word__title" id="minorities">
|
|
||||||
minorities
|
|
||||||
<span class="word__speech">
|
|
||||||
noun
|
|
||||||
</span>
|
|
||||||
</p>
|
|
||||||
<p class="word__definition">
|
|
||||||
the smaller in number of two groups constituting a whole
|
|
||||||
</p>
|
|
||||||
<div class="block__type">
|
|
||||||
<p class="word__type">
|
|
||||||
Issues
|
|
||||||
</p>
|
|
||||||
<p class="word__breakdown"> Minorities is not always accurate. As it deals with numbers, often the insinuation of racial minorities is inaccurate, as communities of colour often outnumber white communities.</p>
|
|
||||||
</div>
|
|
||||||
<div class="block__type">
|
|
||||||
<p class="word__type">
|
|
||||||
Impact
|
|
||||||
</p>
|
|
||||||
<p class="word__breakdown">By repeatedly referring to groups as "minorities," they are being infantised and made to feel minor.</p>
|
|
||||||
</div>
|
|
||||||
<div class="block__type">
|
|
||||||
<p class="word__type">
|
|
||||||
Alt Words
|
|
||||||
</p>
|
|
||||||
<p class="word__breakdown">
|
|
||||||
<span class="word__alt">
|
|
||||||
<a class="word__link" href="#minoritised">minoritised</a>, or omit
|
|
||||||
</span>
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<section class="block__word list">
|
|
||||||
<p class="word__signal word__signal__better">
|
|
||||||
Better Alternate
|
|
||||||
</p>
|
|
||||||
<p id="minoritised" class="word__title">
|
|
||||||
minoritised
|
|
||||||
<span class="word__speech">
|
|
||||||
adj
|
|
||||||
</span>
|
|
||||||
</p>
|
|
||||||
<p class="word__definition">
|
|
||||||
groups resulting from social constructs have grant less power or representation compared to other members or groups in society
|
|
||||||
</p>
|
|
||||||
<div class="block__type">
|
|
||||||
<p class="word__type">
|
|
||||||
Benefits
|
|
||||||
</p>
|
|
||||||
<p class="word__breakdown"> Minoritised places the emphasis on the power struggle, and on the systemic issues at play. It's also an adjective, which requires you to add "group" or "people" so it's people-first language</p>
|
|
||||||
</div>
|
|
||||||
<div class="block__type">
|
|
||||||
<p class="word__type">
|
|
||||||
Impact
|
|
||||||
</p>
|
|
||||||
<p class="word__breakdown">It removes the pejorative nature of "minorities".</p>
|
|
||||||
</div>
|
|
||||||
<div class="block__type">
|
|
||||||
<p class="word__type">
|
|
||||||
Alt Words
|
|
||||||
</p>
|
|
||||||
<p class="word__breakdown">
|
|
||||||
<span class="word__alt">
|
|
||||||
<a class="word__link" href="#minorities">minorities</a>, or omit
|
|
||||||
</span>
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
>>>>>>> 19b6dcb9cd3f4d660043fa171b091a3af0db5247
|
|
||||||
|
|
||||||
<section class="block__word list">
|
<section class="block__word list">
|
||||||
<p class="word__signal word__signal__avoid">
|
<p class="word__signal word__signal__avoid">
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user