Contributor merge

This commit is contained in:
tatianamac 2019-11-01 14:59:00 -07:00
parent fe09f8e8c3
commit 920e44e25f
5 changed files with 32 additions and 14 deletions

View File

@ -33,7 +33,7 @@ h1 {
} }
.title__thicc { .title__thicc {
font-size: 10vh; font-size: 8vh;
line-height: 0.75; line-height: 0.75;
padding: 0; padding: 0;
margin: 0.5rem 0rem; margin: 0.5rem 0rem;
@ -260,4 +260,14 @@ p {
padding-left: 1rem; padding-left: 1rem;
} }
.flag__red {
background-color: pink;
color: black;
font-size: 0.9rem;
font-weight: bold;
border-radius: 1rem;
padding: 0.45rem 0.65rem;
margin: 0 0.75rem;
}
/*# sourceMappingURL=base.css.map */ /*# sourceMappingURL=base.css.map */

View File

@ -1 +1 @@
{"version":3,"sourceRoot":"","sources":["../scss/base.scss"],"names":[],"mappings":";AACU;AAIV;EACE;;;AA2BF;EACE;EACA,aAba;EAcb;EACA;EAAe;;;AAGjB;EACE,aAjBW;EAkBX,aAXO;;;AAcT;EACE,aAtBW;EAuBX,aAlBU;EAmBV;EACA;;;AAGF;EACE;;;AAGF;EACI;;;AAGJ;EACE;EACA;EACA;EACA;EACA;;;AAKA;EACE;;AACF;EACE;;;AAMJ;EACE;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGA;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;;;AAKF;EACE;EACA;;AAGF;EACE;EACA;EACA;;AACA;EACA;;AAGA;EACA;;AAGA;EACA;EACA;;;AAKN;EACE;EACA;EACA;EACA;;;AAGF;EACA;EACA;EACA;;;AAGA;EACA;EACA;;;AAGA;EACA;;;AAIE;EACA,aAnIQ;EAoIR;EACA;EACA;;AAGA;EACA,aA3Ia;EA4Ib;;AAGA;EACA;EACA,aAjJa;;AAoJb;EACA;EAEA;EACA,aAtJW;EAuJX;EACA;EACA;EACA;;AAEA;EACE;;AAEA;EACE;EACA;;AAIJ;EACA;;AAEE;EACE;EACA;;AAIJ;EACE;;AAEA;EACE;EACA;;AAMJ;EACE;EACA;EACA;EACA,aA7LS;;;AAkMb;EACE;EACA;EACA;EACA;;;AAGF;EACA;EACA;EACA;;;AAGA;EACA;EACA;EACA;EACA;;;AAGA;EACA;EACA;EACA;;;AAGA;EACA;;;AAIA;EACA,aAnOU;EAoOV;EACA;EACA;;AAGA;EACA,aA3Oe;EA4Of;;AAGA;EACA;EACA,aAjPe;;AAoPf;EACA;EAEA;EACA,aAtPa;EAuPb;EACA;EACA;EACA;;AAEE;EACE;;AAEA;EACE;EACA;;AAIJ;EACA;;AAEA;EACE;EACA;;;AAMJ;EACE;EACA;EACA;;;AAGF;EACA;EACA;EACA,aAxRa;EAyRb;EACA;;;AAGA;EACA;EACA;EACA;EACA,aAlSa;;;AAqSb;EACA,aAxSe;EAySf;EACA","file":"base.css"} {"version":3,"sourceRoot":"","sources":["../scss/base.scss"],"names":[],"mappings":";AACU;AAIV;EACE;;;AA2BF;EACE;EACA,aAba;EAcb;EACA;EAAe;;;AAGjB;EACE,aAjBW;EAkBX,aAXO;;;AAcT;EACE,aAtBW;EAuBX,aAlBU;EAmBV;EACA;;;AAGF;EACE;;;AAGF;EACI;;;AAGJ;EACE;EACA;EACA;EACA;EACA;;;AAKA;EACE;;AACF;EACE;;;AAMJ;EACE;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGA;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;;;AAKF;EACE;EACA;;AAGF;EACE;EACA;EACA;;AACA;EACA;;AAGA;EACA;;AAGA;EACA;EACA;;;AAKN;EACE;EACA;EACA;EACA;;;AAGF;EACA;EACA;EACA;;;AAGA;EACA;EACA;;;AAGA;EACA;;;AAIE;EACA,aAnIQ;EAoIR;EACA;EACA;;AAGA;EACA,aA3Ia;EA4Ib;;AAGA;EACA;EACA,aAjJa;;AAoJb;EACA;EAEA;EACA,aAtJW;EAuJX;EACA;EACA;EACA;;AAEA;EACE;;AAEA;EACE;EACA;;AAIJ;EACA;;AAEE;EACE;EACA;;AAIJ;EACE;;AAEA;EACE;EACA;;AAMJ;EACE;EACA;EACA;EACA,aA7LS;;;AAkMb;EACE;EACA;EACA;EACA;;;AAGF;EACA;EACA;EACA;;;AAGA;EACA;EACA;EACA;EACA;;;AAGA;EACA;EACA;EACA;;;AAGA;EACA;;;AAIA;EACA,aAnOU;EAoOV;EACA;EACA;;AAGA;EACA,aA3Oe;EA4Of;;AAGA;EACA;EACA,aAjPe;;AAoPf;EACA;EAEA;EACA,aAtPa;EAuPb;EACA;EACA;EACA;;AAEE;EACE;;AAEA;EACE;EACA;;AAIJ;EACA;;AAEA;EACE;EACA;;;AAMJ;EACE;EACA;EACA;;;AAGF;EACA;EACA;EACA,aAxRa;EAyRb;EACA;;;AAGA;EACA;EACA;EACA;EACA,aAlSa;;;AAqSb;EACA,aAxSe;EAySf;EACA;;;AAGA;EACE;EACA;EACA;EACA;EACA;EACA;EACA","file":"base.css"}

View File

@ -11,14 +11,13 @@
<body> <body>
<main> <main>
<section id="introduction" class="auto-grid"> <section id="introduction" class="auto-grid">
<div id="title" class="title__thicc"> <div id="title">
<h1>Self-Defined</h1> <h1 class="title__thicc">Self-Defined</h1>
<p class="subtitle">A modern dictionary about us. We define our words, but they don't define us.</p>
</div> </div>
<div> <div>
<p class="summary"> <p class="summary">
<span class="subtitle">A modern dictionary about us. We define our words, but they don't define us.</span><br><br>
</p>
<p>
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 the diverse perspectives of the modern world.
</p> </p>
<p> <p>
@ -50,7 +49,7 @@
<li>Anti-blackness</li> <li>Anti-blackness</li>
<li>Anxiety disorders</li> <li>Anxiety disorders</li>
<li>aromantic</li> <li>aromantic</li>
<li class="subterm">Asian</li> <li>Asian</li>
<li class="subterm">East</li> <li class="subterm">East</li>
<li class="subterm">South</li> <li class="subterm">South</li>
<li class="subterm">Southeast</li> <li class="subterm">Southeast</li>
@ -83,7 +82,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></li> <li><a class="word__link" href=#crazy>crazy</a><span class="flag__red">ableist slur</span></li>
<li>Demi</li> <li>Demi</li>
<li class="subterm">-boy</li> <li class="subterm">-boy</li>
<li class="subterm">-girl</li> <li class="subterm">-girl</li>
@ -164,7 +163,7 @@
<li>Neurodivergent</li> <li>Neurodivergent</li>
<li>Neurotypical</li> <li>Neurotypical</li>
<li>non binary</li> <li>non binary</li>
<li>-Normative</li> <li>Normative</li>
<li class="subterm">cis</li> <li class="subterm">cis</li>
<li class="subterm">hetero</li> <li class="subterm">hetero</li>
<li>Oppression</li> <li>Oppression</li>

View File

@ -59,7 +59,7 @@ h1 {
} }
.title__thicc { .title__thicc {
font-size: 10vh; font-size: 8vh;
line-height: .75; line-height: .75;
padding: 0; padding: 0;
margin: 0.5rem 0rem; margin: 0.5rem 0rem;
@ -320,3 +320,13 @@ font-family: $sans-serif;
border-left: .1rem solid lightgrey; border-left: .1rem solid lightgrey;
padding-left: 1rem; padding-left: 1rem;
} }
.flag__red {
background-color: pink;
color: black;
font-size: .9rem;
font-weight: bold;
border-radius: 1rem;
padding: .45rem .65rem;
margin: 0 .75rem;
}

View File

@ -13,12 +13,11 @@
<section id="introduction" class="auto-grid"> <section id="introduction" class="auto-grid">
<div id="title" class="title__thicc"> <div id="title" class="title__thicc">
<h1>Self-Defined</h1> <h1>Self-Defined</h1>
<span class="subtitle">A modern dictionary about us. We define our words, but they don't define us.</span>
</div> </div>
<div> <div>
<p class="summary"> <p class="summary">
<span class="subtitle">A modern dictionary about us. We define our words, but they don't define us.</span><br><br>
</p>
<p>
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 the diverse perspectives of the modern world.
</p> </p>
<p> <p>