Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adaptação do layout final #108

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Adaptação do layout final #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1d3810c
Following the proposed layout - Header:
talitaoliveira Oct 14, 2019
0271ee3
Following the proposed layout - Header/All:
talitaoliveira Oct 14, 2019
8b9085a
Adaptação do layout final - Event:
talitaoliveira Oct 14, 2019
71769fe
Following the proposed layout - Selection:
talitaoliveira Oct 14, 2019
fa97fe6
Following the proposed layout - "Código de Conduta":
talitaoliveira Oct 14, 2019
ec0349b
Following the proposed layout - Footer:
talitaoliveira Oct 14, 2019
ae7ba8f
Following the proposed layout -All:
talitaoliveira Oct 14, 2019
4da6904
- Corretion of margin of code-conduct on mobile
talitaoliveira Oct 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/_scss/1.config/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Colors
$brand-primary: #913a0d;
$brand-secondary: #da691a;
$dominant-color: #fdb431;
$dominant-color-secondary: #f56b09;
$background-color: #eee0d3;

$gray-light: #f6f3f3;
$gray-medium: #ddd;
Expand All @@ -11,7 +14,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;
Expand All @@ -21,6 +24,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;
Expand Down
2 changes: 1 addition & 1 deletion src/_scss/2.base/_scaffold.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ html {
body {
margin: 0;
height: 100%;
background-color: $gray-light;
background-color: $background-color;
}

*,
Expand Down
12 changes: 7 additions & 5 deletions src/_scss/4.components/_about-event.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -27,22 +28,23 @@
}

&__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;

@media (max-width: $screen-sm) {
font-size: 1.3em;
}
}

&__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;
Expand Down
14 changes: 12 additions & 2 deletions src/_scss/4.components/_code-conduct.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -17,16 +18,21 @@
&__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;
margin: 10px 0;
}

@media (max-width: 450px) {
font-size: 1.3em;
text-align: center;
margin: 10px 0;
}
}

Expand Down Expand Up @@ -69,7 +75,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;
Expand Down
4 changes: 3 additions & 1 deletion src/_scss/4.components/_footer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
footer {
position: relative;
margin-top: 20px;
margin-top: 100px;
background-color: $brand-primary;
color: $white;

Expand All @@ -23,6 +23,8 @@ footer {
&__link {
color: $white;
text-decoration: underline;
font-weight: bold;
color: $dominant-color;
}
}

Expand Down
12 changes: 10 additions & 2 deletions src/_scss/4.components/_intro.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@
display: table;

&__title {
color: $white;
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;
Expand All @@ -32,7 +35,12 @@
}

&__text {
color: $white;
color: $dominant-color;

&__email{
color: $white;
font-weight: bold;
}

@media (max-width: $screen-sm) {
font-size: 2em;
Expand Down
8 changes: 3 additions & 5 deletions src/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,7 @@
content="afropython, python, desenvolvimento de software, inclusão, código, afropython.org, negritude"
/>

<link
href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,700"
rel="stylesheet"
/>
<link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,700|Amaranth&display=swap" rel="stylesheet">

<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta charset="utf-8" />
Expand All @@ -75,8 +72,9 @@ <h1 class="c-intro__title">
Nos envie um email para
<a
href="mailto:[email protected]?subject=Email através do site"
class="c-intro__text__email"
>
[email protected]!
[email protected]
</a>
</p>
</div>
Expand Down