From 1d3810c1d7c084e456745d2013421265a00e5feb Mon Sep 17 00:00:00 2001 From: Talita Oliveira Date: Sun, 13 Oct 2019 22:42:35 -0300 Subject: [PATCH 1/8] Following the proposed layout - Header: - Name AfroPython in orange - Text in yellow - Link to email in white - Removing extra space between title and text --- src/_scss/1.config/_variables.scss | 1 + src/_scss/4.components/_intro.scss | 10 ++++++++-- src/index.html | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/_scss/1.config/_variables.scss b/src/_scss/1.config/_variables.scss index 92e9ce1..d5df487 100644 --- a/src/_scss/1.config/_variables.scss +++ b/src/_scss/1.config/_variables.scss @@ -1,6 +1,7 @@ // Colors $brand-primary: #913a0d; $brand-secondary: #da691a; +$dominant-color: #efa206; $gray-light: #f6f3f3; $gray-medium: #ddd; diff --git a/src/_scss/4.components/_intro.scss b/src/_scss/4.components/_intro.scss index b0871e8..2153829 100644 --- a/src/_scss/4.components/_intro.scss +++ b/src/_scss/4.components/_intro.scss @@ -7,8 +7,9 @@ display: table; &__title { - color: $white; + color: $dominant-color; font-size: 70px; + margin: 0; @media (max-width: $screen-xs-max) { font-size: 35px; @@ -32,7 +33,12 @@ } &__text { - color: $white; + color: $dominant-color; + + &__email{ + color: $white; + font-weight: bold; + } @media (max-width: $screen-sm) { font-size: 2em; diff --git a/src/index.html b/src/index.html index fd63595..41e0e1c 100644 --- a/src/index.html +++ b/src/index.html @@ -75,8 +75,9 @@

Nos envie um email para

From 0271ee3fdfddaa5dc41de92395375c82638286ed Mon Sep 17 00:00:00 2001 From: Talita Oliveira Date: Sun, 13 Oct 2019 22:55:18 -0300 Subject: [PATCH 2/8] =?UTF-8?q?Following=20the=20proposed=20layout=20-=20H?= =?UTF-8?q?eader/All:=20-=20Link=20to=20the=20Google=20Font=20on=20index.h?= =?UTF-8?q?tml=20-=20Create=20a=20variable=20to=20the=20new=20font=20-=20A?= =?UTF-8?q?pply=20new=20font=20title,=20title=20of=20blocks,=20title=20of?= =?UTF-8?q?=20"c=C3=B3digo=20de=20conduta"=20and=20the=20button=20to=20"c?= =?UTF-8?q?=C3=B3digo=20de=20conduta"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/_scss/1.config/_variables.scss | 2 ++ src/_scss/4.components/_about-event.scss | 1 + src/_scss/4.components/_code-conduct.scss | 3 +++ src/_scss/4.components/_intro.scss | 1 + src/index.html | 5 +---- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/_scss/1.config/_variables.scss b/src/_scss/1.config/_variables.scss index d5df487..e91346e 100644 --- a/src/_scss/1.config/_variables.scss +++ b/src/_scss/1.config/_variables.scss @@ -22,6 +22,8 @@ $border-radius: 10px; // Typography $font-family-base: 'Roboto', sans-serif; +$font-family-featured: 'Amaranth', sans-serif; + $font-weight-light: 300; $font-weight-default: 400; diff --git a/src/_scss/4.components/_about-event.scss b/src/_scss/4.components/_about-event.scss index e6e843b..c1777fc 100644 --- a/src/_scss/4.components/_about-event.scss +++ b/src/_scss/4.components/_about-event.scss @@ -31,6 +31,7 @@ font-weight: 600; margin: 10px 0 0; text-align: center; + font-family: $font-family-featured; @media (max-width: $screen-sm) { font-size: 1.3em; diff --git a/src/_scss/4.components/_code-conduct.scss b/src/_scss/4.components/_code-conduct.scss index d82f6e8..0400ebd 100644 --- a/src/_scss/4.components/_code-conduct.scss +++ b/src/_scss/4.components/_code-conduct.scss @@ -3,6 +3,7 @@ color: $brand-primary; font-weight: 300; margin: 50px 0; + font-family: $font-family-featured; @media (max-width: $screen-sm) { font-size: 2.5em; @@ -70,6 +71,8 @@ &__button { max-width: 350px; + font-family: $font-family-featured; + text-transform: lowercase; @media (max-width: $screen-sm) { font-size: 1.5em; diff --git a/src/_scss/4.components/_intro.scss b/src/_scss/4.components/_intro.scss index 2153829..5aeb455 100644 --- a/src/_scss/4.components/_intro.scss +++ b/src/_scss/4.components/_intro.scss @@ -10,6 +10,7 @@ color: $dominant-color; font-size: 70px; margin: 0; + font-family: $font-family-featured; @media (max-width: $screen-xs-max) { font-size: 35px; diff --git a/src/index.html b/src/index.html index 41e0e1c..e3ee7e1 100644 --- a/src/index.html +++ b/src/index.html @@ -45,10 +45,7 @@ content="afropython, python, desenvolvimento de software, inclusão, código, afropython.org, negritude" /> - + From 8b9085af26f9c1f4be40a87ef5ed271f5602fe0c Mon Sep 17 00:00:00 2001 From: Talita Oliveira Date: Sun, 13 Oct 2019 23:19:14 -0300 Subject: [PATCH 3/8] =?UTF-8?q?Adapta=C3=A7=C3=A3o=20do=20layout=20final?= =?UTF-8?q?=20-=20Event:=20-=20Insert=20new=20color=20on=20variables=20-?= =?UTF-8?q?=20Change=20background=20of=20the=20cards=20-=20Add=20a=20top?= =?UTF-8?q?=20border=20to=20cards=20-=20Adjust=20on=20title=20margin=20and?= =?UTF-8?q?=20text=20fonts=20-=20Change=20text=20colors=20-=20Update=20col?= =?UTF-8?q?or=20of=20the=20title=20and=20add=20some=20shadow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/_scss/1.config/_variables.scss | 3 ++- src/_scss/4.components/_about-event.scss | 11 ++++++----- src/_scss/4.components/_intro.scss | 3 ++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/_scss/1.config/_variables.scss b/src/_scss/1.config/_variables.scss index e91346e..a36f107 100644 --- a/src/_scss/1.config/_variables.scss +++ b/src/_scss/1.config/_variables.scss @@ -1,7 +1,8 @@ // Colors $brand-primary: #913a0d; $brand-secondary: #da691a; -$dominant-color: #efa206; +$dominant-color: #fdb431; +$dominant-color-secondary: #f56b09; $gray-light: #f6f3f3; $gray-medium: #ddd; diff --git a/src/_scss/4.components/_about-event.scss b/src/_scss/4.components/_about-event.scss index c1777fc..5141725 100644 --- a/src/_scss/4.components/_about-event.scss +++ b/src/_scss/4.components/_about-event.scss @@ -13,7 +13,8 @@ [class*="o-col"] { padding: 3% 1.5%; - background-color: $gray-medium; + background-color: $dominant-color; + border-top: 8px solid $brand-secondary; margin: 0 1%; vertical-align: middle; align-items: center; @@ -27,9 +28,9 @@ } &__title { - color: $gray-dark; + color: $brand-primary; font-weight: 600; - margin: 10px 0 0; + margin: 0 0 40px 0; text-align: center; font-family: $font-family-featured; @@ -39,11 +40,11 @@ } &__text { - color: $gray-dark; + color: $brand-primary; font-weight: 300; margin-top: 10px; text-align: center; - font-size: 1em; + font-size: 1.15em; @media (max-width: $screen-sm) { font-size: 1.12em; diff --git a/src/_scss/4.components/_intro.scss b/src/_scss/4.components/_intro.scss index 5aeb455..ed855ae 100644 --- a/src/_scss/4.components/_intro.scss +++ b/src/_scss/4.components/_intro.scss @@ -7,10 +7,11 @@ display: table; &__title { - color: $dominant-color; + color: $dominant-color-secondary; font-size: 70px; margin: 0; font-family: $font-family-featured; + text-shadow: 1px 1px 2px $brand-primary; @media (max-width: $screen-xs-max) { font-size: 35px; From 71769fe6a4519e1f063ee2c9806b5c6c54a27fa8 Mon Sep 17 00:00:00 2001 From: Talita Oliveira Date: Sun, 13 Oct 2019 23:22:59 -0300 Subject: [PATCH 4/8] Following the proposed layout - Selection: - Change selection color of texts --- src/_scss/1.config/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/_scss/1.config/_variables.scss b/src/_scss/1.config/_variables.scss index a36f107..7794eea 100644 --- a/src/_scss/1.config/_variables.scss +++ b/src/_scss/1.config/_variables.scss @@ -13,7 +13,7 @@ $white: #fff; // Objects $text-color: $gray-dark; -$link-color: $brand-primary; +$link-color: $brand-secondary; $link-hover-color: $brand-secondary; $selection-bg-color: $link-color; From fa97fe65ebcfd41d1687aef809683650a4b93e88 Mon Sep 17 00:00:00 2001 From: Talita Oliveira Date: Sun, 13 Oct 2019 23:29:55 -0300 Subject: [PATCH 5/8] =?UTF-8?q?Following=20the=20proposed=20layout=20-=20"?= =?UTF-8?q?C=C3=B3digo=20de=20Conduta":=20-=20Adjust=20on=20font=20size,?= =?UTF-8?q?=20margins=20-=20Adjust=20on=20button=20color,=20size?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/_scss/4.components/_code-conduct.scss | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/_scss/4.components/_code-conduct.scss b/src/_scss/4.components/_code-conduct.scss index 0400ebd..005b78d 100644 --- a/src/_scss/4.components/_code-conduct.scss +++ b/src/_scss/4.components/_code-conduct.scss @@ -18,8 +18,11 @@ &__text { color: $brand-primary; font-weight: 300; - margin-top: 10px; font-family: "Roboto", sans-serif; + font-size: 1.2em; + text-align: center; + margin: 10px 150px 40px; + line-height: 1.5em; @media (max-width: $screen-sm) { font-size: 1.85em; @@ -70,9 +73,11 @@ } &__button { - max-width: 350px; + max-width: 200px; font-family: $font-family-featured; text-transform: lowercase; + border-radius: 100px; + color: $dominant-color; @media (max-width: $screen-sm) { font-size: 1.5em; From ec0349b35c22db802067fc94e8f123e788bb8ac1 Mon Sep 17 00:00:00 2001 From: Talita Oliveira Date: Sun, 13 Oct 2019 23:33:30 -0300 Subject: [PATCH 6/8] Following the proposed layout - Footer: - Adjust on color of email link - Ajust on foot margin --- src/_scss/4.components/_footer.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/_scss/4.components/_footer.scss b/src/_scss/4.components/_footer.scss index 096b1f4..126654c 100644 --- a/src/_scss/4.components/_footer.scss +++ b/src/_scss/4.components/_footer.scss @@ -1,6 +1,6 @@ footer { position: relative; - margin-top: 20px; + margin-top: 100px; background-color: $brand-primary; color: $white; @@ -23,6 +23,8 @@ footer { &__link { color: $white; text-decoration: underline; + font-weight: bold; + color: $dominant-color; } } From ae7ba8f13b2b32ecec231ca5a5325f2d806517ee Mon Sep 17 00:00:00 2001 From: Talita Oliveira Date: Sun, 13 Oct 2019 23:35:11 -0300 Subject: [PATCH 7/8] Following the proposed layout -All: - Create new variable to bg color - Using new color to background --- src/_scss/1.config/_variables.scss | 1 + src/_scss/2.base/_scaffold.scss | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/_scss/1.config/_variables.scss b/src/_scss/1.config/_variables.scss index 7794eea..0e62f9d 100644 --- a/src/_scss/1.config/_variables.scss +++ b/src/_scss/1.config/_variables.scss @@ -3,6 +3,7 @@ $brand-primary: #913a0d; $brand-secondary: #da691a; $dominant-color: #fdb431; $dominant-color-secondary: #f56b09; +$background-color: #eee0d3; $gray-light: #f6f3f3; $gray-medium: #ddd; diff --git a/src/_scss/2.base/_scaffold.scss b/src/_scss/2.base/_scaffold.scss index e7bc79d..9a09b35 100644 --- a/src/_scss/2.base/_scaffold.scss +++ b/src/_scss/2.base/_scaffold.scss @@ -8,7 +8,7 @@ html { body { margin: 0; height: 100%; - background-color: $gray-light; + background-color: $background-color; } *, From 4da690479ac0c11f8584d940f8695986628ae879 Mon Sep 17 00:00:00 2001 From: Talita Oliveira Date: Tue, 15 Oct 2019 05:13:14 -0300 Subject: [PATCH 8/8] - Corretion of margin of code-conduct on mobile --- src/_scss/4.components/_code-conduct.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/_scss/4.components/_code-conduct.scss b/src/_scss/4.components/_code-conduct.scss index 005b78d..cd865e1 100644 --- a/src/_scss/4.components/_code-conduct.scss +++ b/src/_scss/4.components/_code-conduct.scss @@ -26,11 +26,13 @@ @media (max-width: $screen-sm) { font-size: 1.85em; + margin: 10px 0; } @media (max-width: 450px) { font-size: 1.3em; text-align: center; + margin: 10px 0; } }