From fe09f8e8c3c94337218edd6d24e8c3a44faf8dd9 Mon Sep 17 00:00:00 2001 From: tatianamac Date: Mon, 21 Oct 2019 15:17:24 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A1=20Typographic=20changes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _site/css/base.css | 114 ++++++++------------------------------ _site/css/base.css.map | 2 +- _site/index.html | 64 +++++++++++++-------- _site/scss/base.scss | 123 ++++++++--------------------------------- index.html | 64 +++++++++++++-------- 5 files changed, 129 insertions(+), 238 deletions(-) diff --git a/_site/css/base.css b/_site/css/base.css index 8df249e4..a28f5301 100644 --- a/_site/css/base.css +++ b/_site/css/base.css @@ -8,7 +8,7 @@ body { border-top: 1rem solid red; font-family: monotype-grotesque, "Lucida Sans", sans-serif; font-size: 20px; - padding: 0; + padding: 2rem; margin: 0; } @@ -28,6 +28,25 @@ h1 { grid-column: span 2; } +.small { + font-size: 0.75em; +} + +.title__thicc { + font-size: 10vh; + line-height: 0.75; + padding: 0; + margin: 0.5rem 0rem; + grid-column: span 2; +} + +.help { + margin: 1rem 0; +} +.help li { + margin: 0.75rem 0; +} + .grid { display: grid; grid-template-columns: repeat(4, [col] 1fr [col]); @@ -43,11 +62,11 @@ h1 { } .box { - grid-column: span 2; background: black; color: white; padding: 1rem; margin: 2rem; + height: auto; } .box a { color: white; @@ -73,96 +92,6 @@ h1 { padding-right: 5px; } -@media screen and (min-width: 200px) { - #title, #description, #summary { - grid-column: span 4; - } - - body { - padding: 1em; - } - - .list, .item { - grid-column: span 4; - } - - .list { - padding: 0 auto; - margin: 0; - } - - .title__thicc { - font-size: 9vw; - line-height: 0.75; - padding: 0; - margin: 0.5rem 0rem; - } - - h2 { - font-size: 1.25em; - } -} -@media screen and (min-width: 600px) { - body { - padding: 2em; - } - - .grid { - grid-row-gap: 1em; - } - - #title { - grid-column: 1/span 2; - grid-row: 1; - } - - #summary { - grid-column: 3/span 2; - grid-row: 1; - } - - #description { - grid-column: span 4; - grid-row: 2; - } - - .item { - grid-column: span 2; - } - - h1 { - font-size: 3.5em; - } - - h2 { - font-size: 1.3em; - } -} -.small { - font-size: 0.75em; -} - -@media screen and (min-width: 1024px) { - #title { - grid-column: 1/span 1; - grid-row: 1; - } - - #description { - grid-column: 2/span 1; - grid-row: 1; - } - - #summary { - grid-column: 1/span 1; - grid-row: 2; - } - - .list { - grid-row: span 3; - grid-column: span 1; - } -} .block__dictionary { max-width: 50rem; margin-left: auto; @@ -259,6 +188,7 @@ p { p { margin: 0.75rem 0; font-size: 1.25rem; + line-height: 1.25; } .style__italics { diff --git a/_site/css/base.css.map b/_site/css/base.css.map index eb989e19..6a1f4dd9 100644 --- a/_site/css/base.css.map +++ b/_site/css/base.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["../scss/base.scss"],"names":[],"mappings":";AACU;AAIV;EACE;;;AA2BF;EACE;EACA,aAba;EAcb;EACA;EAAY;;;AAGd;EACE,aAjBW;EAkBX,aAXO;;;AAcT;EACE,aAtBW;EAuBX,aAlBU;EAmBV;EACA;;;AAGF;EACE;;;AAKF;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;;;AAON;EAEE;IACA;;;EAGA;IACA;;;EAGA;IACA;;;EAGA;IACE;IACA;;;EAGJ;IACI;IACA;IACA;IACA;;;EAGF;IACE;;;AAIJ;EACE;IACA;;;EAGA;IACE;;;EAGF;IACE;IACA;;;EAGF;IACA;IACA;;;EAGA;IACE;IACA;;;EAGF;IACA;;;EAGA;IACE;;;EAGF;IACE;;;AAIJ;EACE;;;AAGF;EAEE;IACE;IACA;;;EAGD;IACC;IACA;;;EAGD;IACC;IACA;;;EAGF;IACA;IACA;;;AAIF;EACE;EACA;EACA;EACA;;;AAGF;EACA;EACA;EACA;;;AAGA;EACA;EACA;;;AAGA;EACA;;;AAIE;EACA,aA/MQ;EAgNR;EACA;EACA;;AAGA;EACA,aAvNa;EAwNb;;AAGA;EACA;EACA,aA7Na;;AAgOb;EACA;EAEA;EACA,aAlOW;EAmOX;EACA;EACA;EACA;;AAEA;EACE;;AAEA;EACE;EACA;;AAIJ;EACA;;AAEE;EACE;EACA;;AAIJ;EACE;;AAEA;EACE;EACA;;AAMJ;EACE;EACA;EACA;EACA,aAzQS;;;AA8Qb;EACE;EACA;EACA;EACA;;;AAGF;EACA;EACA;EACA;;;AAGA;EACA;EACA;EACA;EACA;;;AAGA;EACA;EACA;;;AAGA;EACA;;;AAIA;EACA,aA9SU;EA+SV;EACA;EACA;;AAGA;EACA,aAtTe;EAuTf;;AAGA;EACA;EACA,aA5Te;;AA+Tf;EACA;EAEA;EACA,aAjUa;EAkUb;EACA;EACA;EACA;;AAEE;EACE;;AAEA;EACE;EACA;;AAIJ;EACA;;AAEA;EACE;EACA;;;AAMJ;EACE;EACA;EACA;;;AAGF;EACA;EACA;EACA,aAnWa;EAoWb;EACA;;;AAGA;EACA;EACA;EACA;EACA,aA7Wa;;;AAgXb;EACA,aAnXe;EAoXf;EACA","file":"base.css"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/_site/index.html b/_site/index.html index 38f92eba..7b9473ac 100644 --- a/_site/index.html +++ b/_site/index.html @@ -10,25 +10,32 @@
-
-

Self-Defined

-
-
-

- A modern dictionary about us. We define our words, but they don't define us.
Self-Defined seeks to provide more inclusive, holistic, and fluid definitions to reflect the modern world.
-

-
- Ways to help -
    -
  1. Submit words and definitions through pull requests.
    2. -
  2. Sponsor this work through GitHub Sponsors.
    3. -
  3. Volunteer writing, design, dev help by DMing me @tatianatmac on Twitter.
    4. -
-

-
+
+
+

Self-Defined

+
+
+

+ A modern dictionary about us. We define our words, but they don't define us.

+

+

+ Self-Defined seeks to provide more inclusive, holistic, and fluid definitions to reflect the the diverse perspectives of the modern world. +

+

+ With the foundation of vocabulary, we can begin to understand lived experiences of people different than us. Words can provide us with a sense of identify and allow us to find kinship through common experiences. +

+
+
+

Ways to help

+
    +
  1. Submit words and definitions through pull requests.
    2. +
  2. Sponsor this work through GitHub Sponsors.
    3. +
  3. Volunteer writing, design, dev help by DMing me @tatianatmac on Twitter.
    4. +
+
- -
+
+

A-E

@@ -478,22 +488,30 @@

Issues

-

What happens to women of colour? As a woman of colour, I am split between both women and people of colour.

+

What happens to women of colour? Women of colour are conceptually split between their identies as both women and as people of colour.

Impact

-

As such, it elicits feelings of erasure for women of colour. It also neglects non-binary individuals.

+

The term can elicit feelings of erasure for women of colour. It also neglects non-binary individuals.

- +
+

+ Usage Tips +

+

+ + Before determining which term to use, consider the purpose of identifying this aggregate group of people. If you mean "women" and are including "non-binary people" without taking actions to truly include them, then you should reconsider your usage.

+
+

Alt Words

- people of colour and white women or minoritised genders, people of minoritised genders, people of colour, white non-binary people, and white women, find ways to reframe why this dynamic exists, or omit

+ minoritised genders; people of minoritised genders; people of colour and white women; people of colour, white non-binary people, and white women; or omit

diff --git a/_site/scss/base.scss b/_site/scss/base.scss index 07a1647e..04e786d9 100644 --- a/_site/scss/base.scss +++ b/_site/scss/base.scss @@ -35,7 +35,7 @@ body { border-top: 1rem solid red; font-family: $sans-serif; font-size: 20px; - padding: 0; margin:0; + padding: 2rem; margin:0; } h1 { @@ -54,6 +54,27 @@ h1 { grid-column: span 2; } +.small { + font-size: .75em; + } + +.title__thicc { + font-size: 10vh; + line-height: .75; + padding: 0; + margin: 0.5rem 0rem; + grid-column: span 2; + // transform: rotateZ(90deg); + // margin: 13rem -7rem; + } + + .help { + margin: 1rem 0; + li { + margin: .75rem 0; + } + } + // GRID // .grid { @@ -71,11 +92,11 @@ h1 { } .box { - grid-column: span 2; background: black; color: white; padding: 1rem; margin: 2rem; + height: auto; a { color: white; @@ -107,103 +128,6 @@ h1 { } } -// MEDIA // - -@media screen and (min-width: 200px) { - - #title, #description, #summary { - grid-column: span 4; - } - - body { - padding: 1em; - } - - .list, .item { - grid-column: span 4; - } - - .list { - padding: 0 auto; - margin: 0; - } - -.title__thicc { - font-size: 9vw; - line-height: .75; - padding: 0; - margin: 0.5rem 0rem; - } - - h2 { - font-size: 1.25em; - } -} - -@media screen and (min-width: 600px) { - body { - padding: 2em; - } - - .grid { - grid-row-gap: 1em; - } - - #title { - grid-column: 1 / span 2; - grid-row: 1; - } - - #summary { - grid-column: 3 / span 2; - grid-row: 1; - } - - #description { - grid-column: span 4; - grid-row: 2; - } - - .item { - grid-column: span 2; - } - - h1 { - font-size: 3.5em; - } - - h2 { - font-size: 1.3em; - } -} - -.small { - font-size: .75em; -} - -@media screen and (min-width: 1024px) { - - #title { - grid-column: 1 / span 1; - grid-row: 1 - } - - #description { - grid-column: 2 / span 1; - grid-row: 1 - } - - #summary { - grid-column: 1 / span 1; - grid-row: 2 - } - - .list { - grid-row: span 3; - grid-column: span 1; - } -} - .block__dictionary { max-width: 50rem; margin-left: auto; @@ -315,6 +239,7 @@ margin: 1rem; p { margin: .75rem 0; font-size: 1.25rem; +line-height: 1.25; } .style__italics { diff --git a/index.html b/index.html index 38f92eba..7b9473ac 100644 --- a/index.html +++ b/index.html @@ -10,25 +10,32 @@
-
-

Self-Defined

-
-
-

- A modern dictionary about us. We define our words, but they don't define us.
Self-Defined seeks to provide more inclusive, holistic, and fluid definitions to reflect the modern world.
-

-
- Ways to help -
    -
  1. Submit words and definitions through pull requests.
    2. -
  2. Sponsor this work through GitHub Sponsors.
    3. -
  3. Volunteer writing, design, dev help by DMing me @tatianatmac on Twitter.
    4. -
-

-
+
+
+

Self-Defined

+
+
+

+ A modern dictionary about us. We define our words, but they don't define us.

+

+

+ Self-Defined seeks to provide more inclusive, holistic, and fluid definitions to reflect the the diverse perspectives of the modern world. +

+

+ With the foundation of vocabulary, we can begin to understand lived experiences of people different than us. Words can provide us with a sense of identify and allow us to find kinship through common experiences. +

+
+
+

Ways to help

+
    +
  1. Submit words and definitions through pull requests.
    2. +
  2. Sponsor this work through GitHub Sponsors.
    3. +
  3. Volunteer writing, design, dev help by DMing me @tatianatmac on Twitter.
    4. +
+
- -
+
+

A-E

@@ -478,22 +488,30 @@

Issues

-

What happens to women of colour? As a woman of colour, I am split between both women and people of colour.

+

What happens to women of colour? Women of colour are conceptually split between their identies as both women and as people of colour.

Impact

-

As such, it elicits feelings of erasure for women of colour. It also neglects non-binary individuals.

+

The term can elicit feelings of erasure for women of colour. It also neglects non-binary individuals.

- +
+

+ Usage Tips +

+

+ + Before determining which term to use, consider the purpose of identifying this aggregate group of people. If you mean "women" and are including "non-binary people" without taking actions to truly include them, then you should reconsider your usage.

+
+

Alt Words

- people of colour and white women or minoritised genders, people of minoritised genders, people of colour, white non-binary people, and white women, find ways to reframe why this dynamic exists, or omit

+ minoritised genders; people of minoritised genders; people of colour and white women; people of colour, white non-binary people, and white women; or omit