From 40fd302d4cf9380fb36109e29c13da69630c358e Mon Sep 17 00:00:00 2001 From: Kevin Garcia Date: Thu, 30 Apr 2020 13:33:11 -0700 Subject: [PATCH 1/5] =?UTF-8?q?=E2=9E=95=20Add=20definitions=20for=20Hispa?= =?UTF-8?q?nic,=20Latino=20and=20Latinx=20(#89)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add definitions for Hispanic, Latino and Latinx * Update hispanic, latino and latinx definitions to indicate their pan-ethnic connotations. --- 11ty/definitions/american.md | 4 ++++ 11ty/definitions/hispanic.md | 12 ++++++++++-- 11ty/definitions/latino.md | 15 +++++++++++++++ 11ty/definitions/latinx.md | 17 +++++++++++++++-- 4 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 11ty/definitions/latino.md diff --git a/11ty/definitions/american.md b/11ty/definitions/american.md index 099c3692..9d5fdf68 100644 --- a/11ty/definitions/american.md +++ b/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 --- diff --git a/11ty/definitions/hispanic.md b/11ty/definitions/hispanic.md index 5eaa6bd8..df7531b3 100644 --- a/11ty/definitions/hispanic.md +++ b/11ty/definitions/hispanic.md @@ -1,5 +1,13 @@ --- title: Hispanic slug: hispanic -defined: false ---- \ No newline at end of file +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. \ No newline at end of file diff --git a/11ty/definitions/latino.md b/11ty/definitions/latino.md new file mode 100644 index 00000000..3d7b5faf --- /dev/null +++ b/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). \ No newline at end of file diff --git a/11ty/definitions/latinx.md b/11ty/definitions/latinx.md index 07dc93a4..d63ee943 100644 --- a/11ty/definitions/latinx.md +++ b/11ty/definitions/latinx.md @@ -1,5 +1,18 @@ --- title: Latinx slug: latinx -defined: false ---- \ No newline at end of file +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) + From beb2f5db69d81fffa92b294f5663624f12783de0 Mon Sep 17 00:00:00 2001 From: Conlin Durbin Date: Fri, 1 May 2020 22:06:27 -0400 Subject: [PATCH 2/5] =?UTF-8?q?=F0=9F=8E=A8=20Enhance=20:focus=20style=20f?= =?UTF-8?q?or=20a11y?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Adding link changes with text-decoration and background * Update assets/css/base/_a.scss Co-Authored-By: EJ Mason * Add SCSS variable Co-authored-by: Conlin Durbin Co-authored-by: EJ Mason Co-authored-by: Tatiana Mac --- .tool-versions | 1 + assets/css/abstracts/_variables.scss | 2 ++ assets/css/base/_a.scss | 12 +++++++----- assets/css/structures/_grid.scss | 5 +++++ 4 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 .tool-versions diff --git a/.tool-versions b/.tool-versions new file mode 100644 index 00000000..47f71e70 --- /dev/null +++ b/.tool-versions @@ -0,0 +1 @@ +nodejs 12.16.1 diff --git a/assets/css/abstracts/_variables.scss b/assets/css/abstracts/_variables.scss index a6d802d5..ba8ea795 100644 --- a/assets/css/abstracts/_variables.scss +++ b/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; + diff --git a/assets/css/base/_a.scss b/assets/css/base/_a.scss index 58460314..b475a7d8 100644 --- a/assets/css/base/_a.scss +++ b/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; } } diff --git a/assets/css/structures/_grid.scss b/assets/css/structures/_grid.scss index 3c775725..d8a394ad 100644 --- a/assets/css/structures/_grid.scss +++ b/assets/css/structures/_grid.scss @@ -64,5 +64,10 @@ a { color: white; + + &:focus { + background-color: $lt-background-color; + color: $black; + } } } From 48ebe70b991df1c2f3dcad5325d150ed0e3dd358 Mon Sep 17 00:00:00 2001 From: Sarah Higley Date: Fri, 1 May 2020 19:12:17 -0700 Subject: [PATCH 3/5] =?UTF-8?q?=F0=9F=90=9B=20Add=20headings,=20label=20li?= =?UTF-8?q?sts,=20remove=20aria-labels=20for=20a11y=20(#109)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Tatiana Mac --- .eleventy.js | 4 ++-- 11ty/_includes/components/table-of-content-item.njk | 2 +- 11ty/_includes/components/table-of-content.njk | 7 ++++--- 11ty/index.njk | 2 +- assets/css/base/_typography.scss | 2 ++ 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.eleventy.js b/.eleventy.js index 3eabd905..25f8c61f 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -27,10 +27,10 @@ module.exports = function(config) { if (existingDefinition) { return `${subTermData.text}`; + )}">${subTermData.text}`; } - return `${subTermData.text}`; + return `${subTermData.text}`; }); // just a debug filter to lazily inspect the content of anything in a template diff --git a/11ty/_includes/components/table-of-content-item.njk b/11ty/_includes/components/table-of-content-item.njk index 6359c1e6..f9136784 100644 --- a/11ty/_includes/components/table-of-content-item.njk +++ b/11ty/_includes/components/table-of-content-item.njk @@ -7,7 +7,7 @@ {{ definition.data.flag.text }} {% endif %} {%- if definition.data.sub_terms -%} -
    +
      {% for term in definition.data.sub_terms %}
    • -