From 33c92f801052d2b9c19debaa5c61df23a516b635 Mon Sep 17 00:00:00 2001 From: Tierney Cyren Date: Sat, 16 May 2020 18:32:32 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=95=20Add=20markdown=20linting=20(#139?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * test: add markdownlint-cli dependency + npm script * test: add .markdownlint.json * docs: update markdown to align with linting rules Co-authored-by: Tatiana Mac --- .markdownlint.json | 6 + 11ty/definitions/-misia.md | 2 +- 11ty/definitions/ableism.md | 2 +- 11ty/definitions/asian-american.md | 2 + 11ty/definitions/bisexual.md | 2 +- 11ty/definitions/east-asian.md | 1 + 11ty/definitions/fatphobia.md | 2 +- 11ty/definitions/gender-pronouns.md | 2 +- 11ty/definitions/hispanic.md | 3 +- 11ty/definitions/latino.md | 3 +- 11ty/definitions/latinx.md | 4 +- 11ty/definitions/minorities.md | 2 +- 11ty/definitions/minoritised.md | 3 - 11ty/definitions/neopronouns.md | 3 +- 11ty/definitions/oriental.md | 3 +- 11ty/definitions/overrepresented-majority.md | 2 +- 11ty/definitions/pow-wow.md | 4 +- 11ty/definitions/preferred-pronoun.md | 2 + 11ty/definitions/pronouns.md | 9 +- 11ty/definitions/sane.md | 2 +- 11ty/definitions/south-asian.md | 1 + 11ty/definitions/southeast-asian.md | 2 + 11ty/definitions/tone-deaf.md | 2 +- 11ty/definitions/tribe.md | 1 + 11ty/definitions/underrepresented-minority.md | 2 +- 11ty/definitions/white-feminism.md | 3 +- CODE-OF-CONDUCT.md | 30 ++--- CONTRIBUTING.md | 2 +- README.md | 15 ++- package-lock.json | 111 ++++++++++++++++++ package.json | 4 +- 31 files changed, 191 insertions(+), 41 deletions(-) create mode 100644 .markdownlint.json diff --git a/.markdownlint.json b/.markdownlint.json new file mode 100644 index 00000000..dd40ae70 --- /dev/null +++ b/.markdownlint.json @@ -0,0 +1,6 @@ +{ + "MD004": {"style": "dash"}, + "MD013": false, + "MD024": false, + "MD033": false +} \ No newline at end of file diff --git a/11ty/definitions/-misia.md b/11ty/definitions/-misia.md index 1334c67d..3c92f8e7 100644 --- a/11ty/definitions/-misia.md +++ b/11ty/definitions/-misia.md @@ -41,4 +41,4 @@ Meanwhile, people exhibiting prejudice and discrimination are given excuses for ## Preferable To --phobia \ No newline at end of file +-phobia diff --git a/11ty/definitions/ableism.md b/11ty/definitions/ableism.md index f6b12ba3..833b932d 100644 --- a/11ty/definitions/ableism.md +++ b/11ty/definitions/ableism.md @@ -19,4 +19,4 @@ a system that places value on people’s bodies and minds based on societally co ## Impact -To paraphrase Lewis, ableism "leads to people and society determining who is valuable and worthy based on a person’s appearance and/or their ability to [...] produce, excel, and 'behave.'" You do not have to be disabled to experience ableism, and Disabled people can also reinforce ableism internally (manifesting as harm to themselves) and externally (harm to other disabled people). \ No newline at end of file +To paraphrase Lewis, ableism "leads to people and society determining who is valuable and worthy based on a person’s appearance and/or their ability to [...] produce, excel, and 'behave.'" You do not have to be disabled to experience ableism, and Disabled people can also reinforce ableism internally (manifesting as harm to themselves) and externally (harm to other disabled people). diff --git a/11ty/definitions/asian-american.md b/11ty/definitions/asian-american.md index c7df7702..bb663a0e 100644 --- a/11ty/definitions/asian-american.md +++ b/11ty/definitions/asian-american.md @@ -8,7 +8,9 @@ skip_in_table_of_content: true umbrella term for people of Asian descent (immigrant or natural born) who live in and/or are from the United States. ## Considerations + As many countries and cultures are enveloped within this umbrella term, try to be as specific as possible. When speaking of Vietnamese-Americans or Chinese-Americans, use those terms instead. Be careful to not assume that every English-speaking Asian person you meet in the U.S. is necessarily Asian-American. (For one, they could be Asian-Canadian or have any other number of nationalities. In general, be mindful of accuracy and confirm with relevant parties. ## Note + Can be shortened to AsAm or AA by those who identify as Asian American. Be mindful of context and always spell out on first reference. If you aren't Asian-American, it's best to keep it spelled out. diff --git a/11ty/definitions/bisexual.md b/11ty/definitions/bisexual.md index 50b7499d..baf14f9b 100644 --- a/11ty/definitions/bisexual.md +++ b/11ty/definitions/bisexual.md @@ -16,4 +16,4 @@ Bisexuality does not preclude attraction to [non-binary](/definitions/non-binary ## Other languages -[Nederlands](/definitions/nl_NL/biseksueel) \ No newline at end of file +[Nederlands](/definitions/nl_NL/biseksueel) diff --git a/11ty/definitions/east-asian.md b/11ty/definitions/east-asian.md index 79867ea9..009e7bd3 100644 --- a/11ty/definitions/east-asian.md +++ b/11ty/definitions/east-asian.md @@ -8,6 +8,7 @@ skip_in_table_of_content: true umbrella term for people of East Asian descent. East Asian countries include China, Hong Kong, Macau, Mongolia, North Korea, South Korea, Japan, and Taiwan ## Considerations + As many countries and cultures are enveloped within this umbrella term, try to be as specific as possible. If you know or can ask someone if they are Japanese, for example, that's better as it's more specific. Do not assume someone is East Asian because of certain physical characteristics or language knowledge. diff --git a/11ty/definitions/fatphobia.md b/11ty/definitions/fatphobia.md index 1da5cfea..cf9700c5 100644 --- a/11ty/definitions/fatphobia.md +++ b/11ty/definitions/fatphobia.md @@ -30,4 +30,4 @@ Law enforcement officers are less likely to believe fat people reporting sexual ## Note -While fatphobia is a more widely known term, many prefer fatmisia, as [-misia] means hate or hatred of, which more accurately describes the prejudice and discrimination. \ No newline at end of file +While fatphobia is a more widely known term, many prefer fatmisia, as [-misia] means hate or hatred of, which more accurately describes the prejudice and discrimination. diff --git a/11ty/definitions/gender-pronouns.md b/11ty/definitions/gender-pronouns.md index f0c53a38..3c78e2a7 100644 --- a/11ty/definitions/gender-pronouns.md +++ b/11ty/definitions/gender-pronouns.md @@ -14,4 +14,4 @@ Reiterating "gender pronouns" enforces the idea that there is necessarily a rela ## Impact -By connecting gender and perpetuating unnecessary gender norms and expectations, we are perpetuating violence against gender minoritised people. Using this language perpetuates those systems and language of harm, regardless of our intent. \ No newline at end of file +By connecting gender and perpetuating unnecessary gender norms and expectations, we are perpetuating violence against gender minoritised people. Using this language perpetuates those systems and language of harm, regardless of our intent. diff --git a/11ty/definitions/hispanic.md b/11ty/definitions/hispanic.md index df7531b3..df5ea46c 100644 --- a/11ty/definitions/hispanic.md +++ b/11ty/definitions/hispanic.md @@ -10,4 +10,5 @@ reading: 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 + +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. diff --git a/11ty/definitions/latino.md b/11ty/definitions/latino.md index 3d7b5faf..e275d067 100644 --- a/11ty/definitions/latino.md +++ b/11ty/definitions/latino.md @@ -12,4 +12,5 @@ Serves as an umbrella term for people of Latin American ancestry. Latino (and La 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 + +People who self-identify as Latin American or Latino/Latina may also self-identify as Chicano/Chicana, [Hispanic](#/hispanic), or [Latinx](#/latinx). diff --git a/11ty/definitions/latinx.md b/11ty/definitions/latinx.md index d63ee943..f8738d36 100644 --- a/11ty/definitions/latinx.md +++ b/11ty/definitions/latinx.md @@ -9,10 +9,10 @@ reading: 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. +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) +People who self-identify as Latinx may also self-identify as Chicano/Chicana, [Hispanic](#/hispanic), or [Latin American](/#latino) diff --git a/11ty/definitions/minorities.md b/11ty/definitions/minorities.md index c8227241..c5dcac28 100644 --- a/11ty/definitions/minorities.md +++ b/11ty/definitions/minorities.md @@ -26,4 +26,4 @@ By repeatedly referring to groups as "minorities," they are being infantised to - [minoritised](/definitions/minoritised) - [overrepresented majority](/definitions/overrepresented-majority) -- [underrepresented majority](/definitions/underrepresented-minority) \ No newline at end of file +- [underrepresented majority](/definitions/underrepresented-minority) diff --git a/11ty/definitions/minoritised.md b/11ty/definitions/minoritised.md index 9b99a40c..b10f6224 100644 --- a/11ty/definitions/minoritised.md +++ b/11ty/definitions/minoritised.md @@ -25,11 +25,8 @@ Minoritised places the emphasis on the power struggle, and on the systemic issue It removes the pejorative nature of "minorities", illuminating that this is an effect upon the individual or group, rather than the singular way to identify the group. -<<<<<<< HEAD ## Read also - [minorities](/definitions/minorities) - [overrepresented majority](/definitions/overrepresented-majority) - [underrepresented majority](/definitions/underrepresented-minority) -======= ->>>>>>> ➕ Add misia, update fatphobia diff --git a/11ty/definitions/neopronouns.md b/11ty/definitions/neopronouns.md index 47431bb5..faba3e63 100644 --- a/11ty/definitions/neopronouns.md +++ b/11ty/definitions/neopronouns.md @@ -11,4 +11,5 @@ reading: a set of words that go alongside traditional third-person pronouns (he/she/they) such as ze/zir, ze/hir, xe/xem. ## Note -Some people find using neopronouns helpful to disrupting the gender binary, as traditional pronouns he and she usually carry connotations of male/masculine and female/feminine and they can carry connotations of being non-binary. Neopronouns are not recognised "officially" in the English language and tend to be less known as a result of their newness and lack of institutional support. \ No newline at end of file + +Some people find using neopronouns helpful to disrupting the gender binary, as traditional pronouns he and she usually carry connotations of male/masculine and female/feminine and they can carry connotations of being non-binary. Neopronouns are not recognised "officially" in the English language and tend to be less known as a result of their newness and lack of institutional support. diff --git a/11ty/definitions/oriental.md b/11ty/definitions/oriental.md index 32f1c450..be7955de 100644 --- a/11ty/definitions/oriental.md +++ b/11ty/definitions/oriental.md @@ -16,10 +16,11 @@ reading: --- ## Issues + The word Oriental is rooted in the concept of Orientalism, which is strongly articulated by Edward Said in eponymous book, _Orientalism_. In his book, Said illustrates the Orient as being the observed "other" or "foreigner," whereas the Occident (or the West) is centred as the default. All Eastern culture is prescribed through this imperialist, pejorative lens, where it is deemed as strange, exotic, dirty, effeminate, and weak. By presenting Eastern culture through this lens, Western culture may present set itself up for dominance through cultural hegemony and colonisation. Calling someone Oriental reinforces those hegemonic ideas even if you're unaware of its historical context. ## Impact -By continuing use of this term, we are perpetuating anti-Asian sentiments and the centralisation of Western (i.e., Occidental) imperialism. Diverse Asian people, nations, and cultures are flattened into one caricature of itself, which is dehumanising. \ No newline at end of file +By continuing use of this term, we are perpetuating anti-Asian sentiments and the centralisation of Western (i.e., Occidental) imperialism. Diverse Asian people, nations, and cultures are flattened into one caricature of itself, which is dehumanising. diff --git a/11ty/definitions/overrepresented-majority.md b/11ty/definitions/overrepresented-majority.md index c82a2a80..76189e4d 100644 --- a/11ty/definitions/overrepresented-majority.md +++ b/11ty/definitions/overrepresented-majority.md @@ -40,4 +40,4 @@ The term overrepresented majority allows us to discuss the holistic systems and - [minorities](/definitions/minorities) - [minoritised](/definitions/minoritised) -- [underrepresented majority](/definitions/underrepresented-minority) \ No newline at end of file +- [underrepresented majority](/definitions/underrepresented-minority) diff --git a/11ty/definitions/pow-wow.md b/11ty/definitions/pow-wow.md index d72a9594..fbe0f3fd 100644 --- a/11ty/definitions/pow-wow.md +++ b/11ty/definitions/pow-wow.md @@ -26,11 +26,13 @@ reading: comes from the Narragansett word _powwaw_, meaning "spiritual leader; (also spelled powwow, powaw, pawaw, powah, pauwau and pawau); social gathering, ceremony, or celebrations held in different Native American communities that can be spiritually symbolic in nature, involve dancing and regalia, and involve months of planning with hundreds of people in attendance; colloquially is culturally appropriated and used to mean "to meet" (verb) or meeting, working session, or gathering (noun). ## Issue + Non-Native/non-Indigenous people using pow-wow outside of the context of its Native American meaning and significance is culturally appropriation through terminology. Using culturally appropriative language while Native American and Indigenous people are systematically harmed reinforces settler colonial oppression. ## Impact + Cultural appropriation is problematic because it robs the culture from the people without their consent, while the people behind the culture are left behind and systemically excluded from the spaces using their culture. -Using Native and Indigenous culture outside of its intended meaning also demeans its value to the culture. Connoting that your five-person meeting about making an app is somehow the same as culturally significant event minimises what powwows are. \ No newline at end of file +Using Native and Indigenous culture outside of its intended meaning also demeans its value to the culture. Connoting that your five-person meeting about making an app is somehow the same as culturally significant event minimises what powwows are. diff --git a/11ty/definitions/preferred-pronoun.md b/11ty/definitions/preferred-pronoun.md index 41d1f829..ef0436ae 100644 --- a/11ty/definitions/preferred-pronoun.md +++ b/11ty/definitions/preferred-pronoun.md @@ -13,9 +13,11 @@ alt_words: a word that substitutes for a noun, in particular, a person's name; a person's pronouns does not necessarily align with their gender presentation or their gender identity; a person gets to say what pronouns they and others use to refer to them; pronouns can be fluid based on context and presentation and change over time. ## Issues + Preferred pronoun can imply that this is merely what is _preferred_ rather than what is _real_. Using this can reinforce the idea that someone's pronouns are a choice rather than what is true for them or it's merely a preference and that you can use whatever pronouns you'd like for them. ## Impact + Preferred pronouns can delegitimise pronouns of trans and non-binary people in particular, especially when their pronouns are wrongly assumed to be different than they are or [neopronouns](definitions/neopronouns) that are less commonly known. Delegitimising their pronouns delegitimes aspects of their identity, reinforces transmisia and non-binary erasure, and leads to harm against them. ## Usage Tip diff --git a/11ty/definitions/pronouns.md b/11ty/definitions/pronouns.md index 39bf391c..6e58abb5 100644 --- a/11ty/definitions/pronouns.md +++ b/11ty/definitions/pronouns.md @@ -12,6 +12,7 @@ reading: a word that substitutes for a noun, in particular, a person's name; a person's pronouns does not necessarily align with their gender presentation or their gender identity; a person gets to say what pronouns they and others use to refer to them; pronouns can be fluid based on context and presentation and change over time. ## Usage + **If you're in a group setting, it's best to lead by example by sharing your own pronouns if you feel comfortable.** "I'm Jack, my pronouns are they/them." **When referring to someone's pronouns, it's best to follow their lead.** People will say "My pronoun(s) is/are..." @@ -25,6 +26,7 @@ a word that substitutes for a noun, in particular, a person's name; a person's p If it seems complicated, it is because it is. Pronouns can be really important to people as they can represent a lot to a person about their identity. It's best to try your hardest then course-correct as needed. ## Tips for Asking + Keeping your question simple usually is best: "What pronoun(s) should I use for you [add context if it's beyond one on one usage, including who might see it]?" @@ -32,6 +34,7 @@ Keeping your question simple usually is best: Avoid adding extra words, like, "[preferred pronoun](/definitions/preferred-pronoun)" or "[gender pronoun](/definitions/gender-pronouns)" ## Tips for Correction + **If you get someone's pronouns wrong and you're alerted of it or realise, correct the pronoun, apologise swiftly, and move on.** Avoid dwelling on it (providing long back story or berating yourself and expecting them to console you). It can be very uncomfortable for whom you used the wrong pronoun, as it can often mean misgendering them. When you dwell on your mistake, you're asking someone who just had an uncomfortable, potentially oppressive experience, to then console you. Gross. @@ -39,6 +42,7 @@ It can be very uncomfortable for whom you used the wrong pronoun, as it can ofte **If you notice someone use the wrong pronouns for someone, correct the pronoun.** "Jack uses they/them pronouns." Be certain that you are sure that the person would want you to use these pronouns in this setting, as you can accidentally "out" somebody if you're not careful. ## Considerations + - Usually people will list the pronouns as they/them or they/them/theirs. - Some people use multiple pronouns, such as she/they or they/he. Sometimes the order of these can imply which pronoun they use more frequently or if there is a slight preference to one over the other. It can also sometimes imply that they are in transition between using one pronoun to another. It can also imply none of these things, so it is best not to assume. - Some people change their pronouns based on settings. For example, if someone is transitioning and does not want to be outed in one setting, they may use different pronouns in that setting. Hence, why it is important to follow someone's lead and to confirm usage based on context. @@ -46,9 +50,11 @@ It can be very uncomfortable for whom you used the wrong pronoun, as it can ofte - Some plural people will refer to themselves as "we" to represent their plural identities. ## Places to Put Pronouns + Generally speaking, whereever your name appears, including your pronouns is a good place to do so. The website [pronoun.is](https://pronoun.is) is helpful as it appends someone's pronouns to a link, and gives explanation to pronoun usage. You may see people include this in their various bios. Some ideas of places to put pronouns include: + - Conference talks/webinars - Email signatures - Introductions (If you're introducing two or more people, make sure you confirm their pronouns if you're not certain) @@ -58,11 +64,12 @@ Some ideas of places to put pronouns include: - Websites ## Impact + By respecting others' pronouns, asking them for consent, and sharing our own pronouns, we can normalise this step in socialisation. Doing so causes us to pause before presuming someone's pronouns. When people presume pronouns, it can lead to misgendering, which causes harm toward people, particularly trans and non-binary folks. It is particularly important for people whose gender presentation and identity aligns with their pronouns to take this step, as they have the most power to influence society. - ## Read Also + [gender pronouns](/definitions/gender-pronouns) [preferred pronoun](/definitions/preferred-pronoun) diff --git a/11ty/definitions/sane.md b/11ty/definitions/sane.md index 1a41ce4d..6d9db4ca 100644 --- a/11ty/definitions/sane.md +++ b/11ty/definitions/sane.md @@ -40,4 +40,4 @@ Be more specific. Typically we can find an alternate definition by taking time t ## Read also -- [sanity check](/definitions/sanity-check) \ No newline at end of file +- [sanity check](/definitions/sanity-check) diff --git a/11ty/definitions/south-asian.md b/11ty/definitions/south-asian.md index ae3608d8..3943b808 100644 --- a/11ty/definitions/south-asian.md +++ b/11ty/definitions/south-asian.md @@ -8,6 +8,7 @@ skip_in_table_of_content: true umbrella term for people of South Asian descent. South Asian countries include Afghanistan, Bangladesh, Bhutan, Maldives, Nepal, India, Pakistan, and Sri Lanka. ## Considerations + As many countries and cultures are enveloped within this umbrella term, try to be as specific as possible. If you know or can ask someone if they are Nepalese, for example, that's better as it's more specific. Do not assume someone is South Asian because of certain physical characteristics or language knowledge. diff --git a/11ty/definitions/southeast-asian.md b/11ty/definitions/southeast-asian.md index 1ed79828..31fd0840 100644 --- a/11ty/definitions/southeast-asian.md +++ b/11ty/definitions/southeast-asian.md @@ -6,10 +6,12 @@ speech: noun skip_in_table_of_content: true --- umbrella term for people of Southeast Asian descent. South Asian countries include two sub-regions: + - **Mainland Southeast Asia:** Cambodia, Laos, Myanmar, Peninsular Malaysia, Thailand and Vietnam. - **Maritime Southeast Asia:** Andaman and Nicobar Islands (India), Ashmore and Cartier Islands (Australia), Brunei, Christmas Island (Australia), the Cocos (Keeling) Islands (Australia), East Malaysia, East Timor, Indonesia (except Western New Guinea, which is considered a part of the Australian continent), the Philippines and Singapore. ## Considerations + As many countries and cultures are enveloped within this umbrella term, try to be as specific as possible. If you know or can ask someone if they are Laotian, for example, that's better as it's more specific. Do not assume someone is Southeast Asian because of certain physical characteristics or language knowledge. diff --git a/11ty/definitions/tone-deaf.md b/11ty/definitions/tone-deaf.md index 15f4ec21..bb7fe87a 100644 --- a/11ty/definitions/tone-deaf.md +++ b/11ty/definitions/tone-deaf.md @@ -43,4 +43,4 @@ By using ableist language, we are perpetuating violence against people who exper ## Usage Tip -Be mindful if you're referring to the medical condition or using it as a literary metaphor. If the latter, substitute by being more specific. Typically we can find an alternate definition by taking time to reflect on what emotion we're really feeling. \ No newline at end of file +Be mindful if you're referring to the medical condition or using it as a literary metaphor. If the latter, substitute by being more specific. Typically we can find an alternate definition by taking time to reflect on what emotion we're really feeling. diff --git a/11ty/definitions/tribe.md b/11ty/definitions/tribe.md index 78accb51..42c372ec 100644 --- a/11ty/definitions/tribe.md +++ b/11ty/definitions/tribe.md @@ -5,3 +5,4 @@ defined: false flag: level: avoid text: cultural appropriation +--- diff --git a/11ty/definitions/underrepresented-minority.md b/11ty/definitions/underrepresented-minority.md index ff4573f0..9aa8130b 100644 --- a/11ty/definitions/underrepresented-minority.md +++ b/11ty/definitions/underrepresented-minority.md @@ -44,4 +44,4 @@ Additionally, it's important to examine the context of the usage: - [minorities](/definitions/minorities) - [minoritised](/definitions/minoritised) -- [overrepresented majority](/definitions/overrepresented-majority) \ No newline at end of file +- [overrepresented majority](/definitions/overrepresented-majority) diff --git a/11ty/definitions/white-feminism.md b/11ty/definitions/white-feminism.md index 22285337..3c39cd8b 100644 --- a/11ty/definitions/white-feminism.md +++ b/11ty/definitions/white-feminism.md @@ -58,6 +58,7 @@ If you suspect you might be a white feminist, examine your brand of feminism. If you are white, examine your own [white fragility](/definitions/white-fragility). Reading Black feminist and womanist texts by authors like Angela Davis, bell hooks, and Audre Lorde is a good place to start. ## Editor's Notes + [Non-binary](/definitions/non-binary), agender, gender non-conforming, and other gender minoritised people are often neglected in traditional feminist rhetoric. In this entry, we've explicitly not conflated and used the term "non-binary people and women" as many non-binary people do not like being lumped in with women. Exploring the nuance between even Black/brown women and Black/brown non-binary people, as one example, requires separate subtext beyond the scope of this singular definition. -In our definition of women, we include trans women, because trans women are women. \ No newline at end of file +In our definition of women, we include trans women, because trans women are women. diff --git a/CODE-OF-CONDUCT.md b/CODE-OF-CONDUCT.md index a485f184..fd6895c1 100644 --- a/CODE-OF-CONDUCT.md +++ b/CODE-OF-CONDUCT.md @@ -10,20 +10,21 @@ We pledge to act and interact in ways that contribute to an open, welcoming, div Examples of behavior that contributes to a positive environment for our community include: -* Demonstrating compassion and kindness toward other people -* Being respectful of differing opinions, viewpoints, and experiences -* Giving and gracefully accepting constructive feedback -* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience -* Focusing on what is best not just for us as individuals, but for the overall community +- Demonstrating compassion and kindness toward other people +- Being respectful of differing opinions, viewpoints, and experiences +- Giving and gracefully accepting constructive feedback +- Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience +- Focusing on what is best not just for us as individuals, but for the overall community Examples of unacceptable behavior include: -* Refusal to respect and to use someone's methods of self-identification, (e.g., using someone's pronouns) -* The use of any terms deemed in the dictionary (but not limited to) as words to avoid as slurs -* The use of sexualized language or imagery, and sexual attention or advances of any kind -* Trolling, insulting or derogatory comments, and personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or email address, without their explicit permission -* Other conduct which could reasonably be considered inappropriate in a professional setting + +- Refusal to respect and to use someone's methods of self-identification, (e.g., using someone's pronouns) +- The use of any terms deemed in the dictionary (but not limited to) as words to avoid as slurs +- The use of sexualized language or imagery, and sexual attention or advances of any kind +- Trolling, insulting or derogatory comments, and personal or political attacks +- Public or private harassment +- Publishing others' private information, such as a physical or email address, without their explicit permission +- Other conduct which could reasonably be considered inappropriate in a professional setting ## Enforcement Responsibilities @@ -72,12 +73,11 @@ Community leaders will follow these Community Impact Guidelines in determining t ## Attribution This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.0, -available at https://www.contributor-covenant.org/version/2/0/code_of_conduct.html. +available at Community Impact Guidelines were inspired by [Mozilla's code of conduct enforcement ladder](https://github.com/mozilla/diversity). [homepage]: https://www.contributor-covenant.org For answers to common questions about this code of conduct, see the FAQ at -https://www.contributor-covenant.org/faq. Translations are available at https://www.contributor-covenant.org/translations. - + Translations are available at diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 75a8b2e2..69b4efda 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -37,7 +37,7 @@ You got a definition and want to define it. That’s awesome. Let’s go. Curren #### Working on Words -After you’ve forked the repo, you will need to write a definition. Good times. Hopefully. +After you’ve forked the repo, you will need to write a definition. Good times. Hopefully. Always remember that if you are unsure, you can first open an issue or create a PR with «WIP» in the title («WIP» stands for «work in progress») and ask for early feedback. For example, it might be called *«\[WIP\] Propose definition for spirit animal»*. diff --git a/README.md b/README.md index b7cc76ab..c2691e41 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # 📕 [Self-Defined Dictionary](https://www.selfdefined.app) + [![Netlify Status](https://api.netlify.com/api/v1/badges/82274e91-8f6a-474e-9b2a-fca29bb72d75/deploy-status)](https://app.netlify.com/sites/selfdefined/deploys) [Contributing Guidelines](https://github.com/tatianamac/selfdefined/blob/master/CONTRIBUTING.md) · [Documentation](https://www.selfdefined.app/documentation/) · [Code of Conduct](https://github.com/tatianamac/selfdefined/blob/master/CODE-OF-CONDUCT.md) @@ -10,41 +11,51 @@ Self-Defined seeks to provide more inclusive, holistic, and fluid definitions to Self-Defined is proud to be built on [Eleventy](https://github.com/11ty/eleventy), a static-site generator. *Why build a dictionary when they already exist?* -- Dictionary definitions, which are written by centred and majority people, are often weaponised to refute marginalised and minoritised people. If I had a dollar for every time I got pasted the definition of "racism." + +- Dictionary definitions, which are written by centred and majority people, are often weaponised to refute marginalised and minoritised people. If I had a dollar for every time I got pasted the definition of "racism." - Marginalised people do an extraordinary burden to define words for people. My hope is to minimise that emotional labour and place it onto a robot. - Words help to materialise concepts, which allow people to be perceived in their identities. Words also create policies, which can define infrastructure. ## Contributing + We want to create and to foster a welcoming, inclusive, and safer environment where contributors of many backgrounds and talents can contribute to Self-Defined, in particular, first-time contributors from "non-technical" backgrounds. Our hope is that people can truly self-define and write about the words that they identify as. We are grateful for the community contributions. ### Code of Conduct + We have adapted the [Contributor Convenent](https://github.com/tatianamac/selfdefined/blob/master/CODE-OF-CONDUCT.md) and expect any contributors to adhere to it. We as maintainers reserve the right to ban anyone's participation who does not foster the welcoming, inclusive, and safer environment we seek to maintain. ### Contributing Guide + Please read our [Contributing Guidelines](https://github.com/tatianamac/selfdefined/blob/master/CONTRIBUTING.md) to get started. ### Documentation + Please see our [Documentation](https://www.selfdefined.app/documentation/). #### First-Time Contributors + We love encouraging first-time contributors and have labelled [good first issues](https://github.com/tatianamac/selfdefined/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) that tend to be isolated and require less knowledge of our codebase. ### Additional Ways to Support + 💰 Support this OSS project by [sponsoring me](https://github.com/users/tatianamac/sponsorship). 🐦 Follow [Self-Defined on Twitter](https://twitter.com/selfdefinedapp). ## Future Roadmap/Intention + 1. **Dictionary site**: Webapp where words can be connected, linking to alternates for bad terms or alternates for definitions with nuance. Create ability to use parameters so someone can connect multiple words they use together, to help clear up how they define themselves. For example, `?disabled+pan+Indigenous`. Creating such a strand easily would allow people to link in email signatures, Twitter bios, etc. 2. **Twitter bot:** Allows someone to tag [@SelfDefinedBot](https://twitter.com/SelfDefinedBot) in order to get automated reply. For example '@SelfDefinedBot define racism'. 3. **Slack bot:** Problematic words could be flagged and alternates could be provided. Could also define words. -4. **Custom API:** Allows dictionary to be adapted and referenced under other large-scale projects. +4. **Custom API:** Allows dictionary to be adapted and referenced under other large-scale projects. ### Design Intention + - Typography at its core, focused on legibility, performance, and future-proofing for translations/non-Roman alphabets. - High-contrast colour palette, again for legibility. - Lack of imagery or ornamentation, given the sensitivity and representation of these communities. Depicting them visually at this time feels reductionist. ### Philosophies + - 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. diff --git a/package-lock.json b/package-lock.json index 3cd1462d..69c66096 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6786,6 +6786,12 @@ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==" }, + "graceful-readlink": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", + "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=", + "dev": true + }, "grapheme-breaker": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/grapheme-breaker/-/grapheme-breaker-0.3.2.tgz", @@ -8135,6 +8141,12 @@ "minimist": "^1.2.0" } }, + "jsonc-parser": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.2.1.tgz", + "integrity": "sha512-o6/yDBYccGvTz1+QFevz6l6OBZ2+fMVu2JZ9CIhzsYRX4mjaK5IyX9eldUdCmga16zlgQxyrj5pt9kzuj2C02w==", + "dev": true + }, "jsonfile": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz", @@ -8806,6 +8818,18 @@ "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", "dev": true }, + "lodash.differencewith": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.differencewith/-/lodash.differencewith-4.5.0.tgz", + "integrity": "sha1-uvr7yRi1UVTheRdqALsK76rIVLc=", + "dev": true + }, + "lodash.flatten": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", + "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=", + "dev": true + }, "lodash.flattendeep": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz", @@ -9030,6 +9054,93 @@ "integrity": "sha512-1RUZVgQlpJSPWYbFSpmudq5nHY1doEIv89gBtF0s4gW1GF2XorxcA/70M5vq7rLv0a6mhOUccRsqkwhwLCIQ2Q==", "dev": true }, + "markdownlint": { + "version": "0.20.3", + "resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.20.3.tgz", + "integrity": "sha512-J93s59tGvSFvAPWVUtEgxqPI0CHayTx1Z8poj1/4UJAquHGPIruWRMurkRldiNbgBiaQ4OOt15rHZbFfU6u05A==", + "dev": true, + "requires": { + "markdown-it": "10.0.0" + }, + "dependencies": { + "entities": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.2.tgz", + "integrity": "sha512-dmD3AvJQBUjKpcNkoqr+x+IF0SdRtPz9Vk0uTy4yWqga9ibB6s4v++QFWNohjiUGoMlF552ZvNyXDxz5iW0qmw==", + "dev": true + }, + "markdown-it": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-10.0.0.tgz", + "integrity": "sha512-YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg==", + "dev": true, + "requires": { + "argparse": "^1.0.7", + "entities": "~2.0.0", + "linkify-it": "^2.0.0", + "mdurl": "^1.0.1", + "uc.micro": "^1.0.5" + } + } + } + }, + "markdownlint-cli": { + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/markdownlint-cli/-/markdownlint-cli-0.23.0.tgz", + "integrity": "sha512-qkr0OB86Q8PTIVUbzninYEhdEsj3h6rELNcyFEo5ejOkMZo55f03NwlWzGMGGWVz/L1GANN/HdidhpjMPv5vUg==", + "dev": true, + "requires": { + "commander": "~2.9.0", + "deep-extend": "~0.5.1", + "get-stdin": "~5.0.1", + "glob": "~7.1.2", + "ignore": "~5.1.4", + "js-yaml": "~3.13.1", + "jsonc-parser": "~2.2.0", + "lodash.differencewith": "~4.5.0", + "lodash.flatten": "~4.4.0", + "markdownlint": "~0.20.2", + "markdownlint-rule-helpers": "~0.9.0", + "minimatch": "~3.0.4", + "minimist": "~1.2.5", + "rc": "~1.2.7" + }, + "dependencies": { + "commander": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", + "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", + "dev": true, + "requires": { + "graceful-readlink": ">= 1.0.0" + } + }, + "deep-extend": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz", + "integrity": "sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==", + "dev": true + }, + "get-stdin": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz", + "integrity": "sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=", + "dev": true + }, + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + } + } + }, + "markdownlint-rule-helpers": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/markdownlint-rule-helpers/-/markdownlint-rule-helpers-0.9.0.tgz", + "integrity": "sha512-ySKvg7tlOAxLzGZyu3J3pKGGNHAQgQNcZOMFRd2b5MrhA00j40XYL1mtAI34NzCbVfvhnPPynh5AsJoL+uRHcw==", + "dev": true + }, "matcher": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/matcher/-/matcher-2.1.0.tgz", diff --git a/package.json b/package.json index 1e744eab..97863f6b 100644 --- a/package.json +++ b/package.json @@ -9,9 +9,10 @@ "build:site": "eleventy", "build": "npm run build:css && npm run build:site", "create-definitions": "bin/create-definitions", - "lint": "npm run lint:css && npm run lint:js", + "lint": "npm run lint:css && npm run lint:js && npm run lint:markdown", "lint:css": "stylelint \"assets/css/**/*.scss\"", "lint:js": "eslint \"11ty/**/*.js\"", + "lint:markdown": "markdownlint '**/*.md' --ignore node_modules", "serve": "concurrently \"npm run serve:site\" \"npm run watch:css\"", "serve:site": "eleventy --serve", "test": "ava", @@ -63,6 +64,7 @@ "esm": "^3.2.25", "husky": "^4.2.3", "lint-staged": "^10.0.7", + "markdownlint-cli": "^0.23.0", "parcel-bundler": "^1.12.4", "prettier": "^1.19.1", "sass": "^1.23.7",