Merge branch 'master' of https://github.com/tatianamac/selfdefined

.eleventy.js

@@ -27,10 +27,10 @@ module.exports = function(config) {
     if (existingDefinition) {
       return `<a href="${definitionPermalink(
         existingDefinition.data.slug
-      )}" aria-label="${subTermData.full_title}">${subTermData.text}</a>`;
+      )}">${subTermData.text}</a>`;
     }
 
-    return `<span aria-label="${subTermData.full_title}">${subTermData.text}</span>`;
+    return `<span>${subTermData.text}</span>`;
   });
 
   // just a debug filter to lazily inspect the content of anything in a template

.tool-versions

@@ -0,0 +1 @@
+nodejs 12.16.1

11ty/_includes/components/table-of-content-item.njk

@@ -7,7 +7,7 @@
     <span class="flag__red">{{ definition.data.flag.text }}</span>
   {% endif %}
   {%- if definition.data.sub_terms -%}
-    <ul class="sub-terms">
+    <ul class="sub-terms" role="list" aria-label="{{definition.data.title}}">
       {% for term in definition.data.sub_terms %}
         <li
           class="subterm"

11ty/_includes/components/table-of-content.njk

@@ -1,10 +1,11 @@
 <section>
-  <nav class="" aria-label="Definitions">
+  <h2 id="terms-heading" class="visually-hidden">Terms</h2>
+  <nav class="" aria-labelledby="terms-heading">
     <ol class="multi-column u-no-padding-left list">
       {% for section in collections.tableOfContent %}
         <li>
-          <span class="sub-headline">{{ section.title }}</span>
-          <ol class="toc__list">
+          <h3 class="sub-headline" id="list{{loop.index}}">{{ section.title }}</h3>
+          <ol class="toc__list" role="list" aria-labelledby="list{{loop.index}}">
             {% for definition in section.definitions %}
               {% include 'components/table-of-content-item.njk' %}
             {% endfor %}

11ty/definitions/american.md

@@ -9,6 +9,10 @@ sub_terms:
     full_title: Asian American
   - text: Black
     full_title: Black American
+  - text: Hispanic
+    full_title: Hispanic American
   - text: Indigenous
     full_title: Indigenous American
+  - text: Latin
+    full_title: Latin American
 ---

11ty/definitions/hispanic.md

@@ -1,5 +1,13 @@
 ---
 title: Hispanic
 slug: hispanic
-defined: false
----
+defined: true
+reading:
+    - text: "Remezcla: Hispanic vs. Latino vs. Latinx: A Brief History of How These Words Originated"
+      href: https://remezcla.com/features/culture/latino-vs-hispanic-vs-latinx-how-these-words-originated/
+---
+
+Serves as an umbrella term for people of Spanish, or Spanish-speaking ancestry. Hispanic is considered a pan-ethnic term, and does not provide context for someone's race or country of origin.
+
+#### Note
+People who self-identify as Hispanic may also self-identify as Chicano/Chicana, [Latino/Latina](#/latino), or [Latinx](#/latinx), but don't assume that they do. When in doubt, ask for individual preferences.

11ty/definitions/latino.md

@@ -0,0 +1,15 @@
+---
+title: Latin American/Latino/Latina
+slug: latino
+defined: true
+reading:
+    - text: "Remezcla: Hispanic vs. Latino vs. Latinx: A Brief History of How These Words Originated"
+      href: https://remezcla.com/features/culture/latino-vs-hispanic-vs-latinx-how-these-words-originated/
+---
+
+Serves as an umbrella term for people of Latin American ancestry. Latino (and Latina) are inherently gendered terms due to Spanish's gendered language. Latino is considered a pan-ethnic term that does not provide context for someone's language, country of origin, or race.
+
+Also can be written in gender neutral forms of [Latinx](#/latinx), or Latin@s. When in doubt, default to Latino, and ask individual parties their preference, if possible.
+
+#### Note
+People who self-identify as Latin American or Latino/Latina may also self-identify as Chicano/Chicana, [Hispanic](#/hispanic), or [Latinx](#/latinx).

11ty/definitions/latinx.md

@@ -1,5 +1,18 @@
 ---
 title: Latinx
 slug: latinx
-defined: false
----
+defined: true
+reading:
+    - text: "Remezcla: Hispanic vs. Latino vs. Latinx: A Brief History of How These Words Originated"
+      href: https://remezcla.com/features/culture/latino-vs-hispanic-vs-latinx-how-these-words-originated/
+    - text: "Latino, Latinx, Latine. The grammatical gender neutral in Spanish"
+      href: https://medium.com/@puentera/latino-latinx-latine-a3b19e0dbc1c
+---
+
+Latinx arose as a gender-neutral alternative to the gendered [Latino](#/latino)/Latina in the United States. 
+
+This is a term that is seeing expanded usage and evolution among academic circles. Latinx is considered a pan-ethnic term that does not provide context for someone's language, country of origin, or race.
+
+#### Note
+People who self-identify as Latinx may also self-identify as Chicano/Chicana, [Hispanic](#/hispanic), or [Latin American](/#latino)
+

11ty/index.njk

@@ -14,7 +14,7 @@ layout: layouts/index.njk
         </p>
       </div>
       <div class="box">
-        <p class="subtitle">Ways to help</p>
+        <h2 class="subtitle">Ways to help</h2>
         <ol class="help">
           <li>Submit words and definitions or contribute to our code base through <a href="https://github.com/tatianamac/selfdefined/pulls" rel="noreferral">pull requests</a> or <a href="https://github.com/tatianamac/selfdefined/issues" rel="noreferral">issues</a>. Start with our <a href="https://github.com/tatianamac/selfdefined/blob/master/CONTRIBUTING.md" rel="noreferral">contributing guidelines</a> and <a href="/documentation/">documentation</a>.</li>
           <li>Sponsor this work through <a href="https://opencollective.com/selfdefined">Open Collective</a> or <a href="https://github.com/sponsors/tatianamac">GitHub Sponsors</a>.</li>

README.md

@@ -48,3 +48,33 @@ We love encouraging first-time contributors and have labelled [good first issues
 - Maintain OSS nature for non-profit and other OSS uses, but charge for corporate uses.
 - Ensure that dictionary includes nuances and expresses that not everyone ascribes to terms exactly as they are; illustrate and articulate those nuances wherever possible.
 - Accessibility, inclusion, and performance are at the core of this project.
+
+## Contributors
+
+### Code Contributors
+
+This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)].
+<a href="https://github.com/tatianamac/SelfDefined/graphs/contributors"><img src="https://opencollective.com/SelfDefined/contributors.svg?width=890&button=false" /></a>
+
+### Financial Contributors
+
+Become a financial contributor and help us sustain our community. [[Contribute](https://opencollective.com/SelfDefined/contribute)]
+
+#### Individuals
+
+<a href="https://opencollective.com/SelfDefined"><img src="https://opencollective.com/SelfDefined/individuals.svg?width=890"></a>
+
+#### Organizations
+
+Support this project with your organization. Your logo will show up here with a link to your website. [[Contribute](https://opencollective.com/SelfDefined/contribute)]
+
+<a href="https://opencollective.com/SelfDefined/organization/0/website"><img src="https://opencollective.com/SelfDefined/organization/0/avatar.svg"></a>
+<a href="https://opencollective.com/SelfDefined/organization/1/website"><img src="https://opencollective.com/SelfDefined/organization/1/avatar.svg"></a>
+<a href="https://opencollective.com/SelfDefined/organization/2/website"><img src="https://opencollective.com/SelfDefined/organization/2/avatar.svg"></a>
+<a href="https://opencollective.com/SelfDefined/organization/3/website"><img src="https://opencollective.com/SelfDefined/organization/3/avatar.svg"></a>
+<a href="https://opencollective.com/SelfDefined/organization/4/website"><img src="https://opencollective.com/SelfDefined/organization/4/avatar.svg"></a>
+<a href="https://opencollective.com/SelfDefined/organization/5/website"><img src="https://opencollective.com/SelfDefined/organization/5/avatar.svg"></a>
+<a href="https://opencollective.com/SelfDefined/organization/6/website"><img src="https://opencollective.com/SelfDefined/organization/6/avatar.svg"></a>
+<a href="https://opencollective.com/SelfDefined/organization/7/website"><img src="https://opencollective.com/SelfDefined/organization/7/avatar.svg"></a>
+<a href="https://opencollective.com/SelfDefined/organization/8/website"><img src="https://opencollective.com/SelfDefined/organization/8/avatar.svg"></a>
+<a href="https://opencollective.com/SelfDefined/organization/9/website"><img src="https://opencollective.com/SelfDefined/organization/9/avatar.svg"></a>

assets/css/abstracts/_variables.scss

@@ -12,3 +12,5 @@ $light-grey: hsl(0, 0%, 93.3%); // for backgrounds only
 
 $browser-context: 16;
 
+$lt-background-color: $pink;
+

assets/css/base/_a.scss

@@ -1,16 +1,18 @@
 a {
-  border-bottom: $dark-grey solid 0.1em;
   color: $black;
   font-family: $ext-sans;
   margin: 1rem 0;
-  text-decoration: none;
+  text-decoration-color: $dark-grey;
+  text-decoration-line: underline;
+  text-decoration-thickness: 0.1em;
 
   &:hover,
   &:focus {
-    border-bottom: $primary-color solid 0.1rem;
+    text-decoration-color: $primary-color;
   }
   &:focus {
-    outline: pxToRem(3) solid $primary-color;
-    outline-offset: pxToRem(5);
+    background-color: $lt-background-color;
+    color: $black;
+    outline: 0;
   }
 }

assets/css/base/_typography.scss

@@ -62,9 +62,11 @@ p {
 
 .subtitle {
   font-family: $ext-sans;
+  font-size: 1.25rem;
   font-weight: $regular;
   grid-column: span 2;
   letter-spacing: 0.1;
+  margin: .75rem 0;
 }
 
 .small {

assets/css/structures/_grid.scss

@@ -64,5 +64,10 @@
 
   a {
     color: white;
+
+    &:focus {
+      background-color: $lt-background-color;
+      color: $black;
+    }
   }
 }