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.

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

Mesclando main com minha branch #16

Merged
merged 13 commits into from
Jun 8, 2024
Binary file added assets/img-quem-somos.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 21 additions & 3 deletions global.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

:root {
--white: #fff;
--white-light: #f8fbfb;
--black: #333;
--blue: #0b5cf4;
--blue-light: #01c2ff;
Expand All @@ -19,6 +20,13 @@
body {
background-color: var(--white);
color: var(--black);
min-height: 100vh;
display: flex;
flex-direction: column;
}

main {
flex: 1;
}

button {
Expand Down Expand Up @@ -76,11 +84,21 @@ header {

footer {
bottom: 0;
position: fixed;
left: 0;
width: 100%;
padding: 1rem;
padding: 0.5rem;
text-align: center;
background-color: var(--blue);
color: var(--white);
}

main #s-hero {
max-width: 1440px;
height: 669px;
}

main #s-hero .grid-layout {
max-width: 1140px;
height: 395px;
background-color: grey;
margin: 137px auto;
}
19 changes: 18 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@
<header></header>

<main>
<div class="home">
<section id="home">
<section id="text">
<img src="/assets/circle-hero.png" alt="circulos" id="circle">

<h1>
Oferecendo Esperança e <br />
Oportunidade
Expand All @@ -39,7 +41,22 @@ <h1>
<section id="s-hero">
<img src="/assets/img-hero.png" alt="Criança com boneco" />
</section>
</section>

<div id="s-mouse">
<img src="/assets/icon-mouse.png" alt="mouse se mexendo" id="mouse">
</div>

<section id="quem-somos">
<h1>QUEM SOMOS</h1>

<span>
Lorem ipsum dolor sit amet, consectetur adipisicing elit. Similique, expedita cum. In odit optio voluptatibus amet
pariatur saepe accusamus necessitatibus aut, libero vitae! Dicta officiis perspiciatis nam voluptatem laudantium quaerat.
</span>

<img src="/assets/img-quem-somos.png" alt="Crianças do projeto">
</section>
</main>

<footer></footer>
Expand Down
10 changes: 9 additions & 1 deletion pages/contato/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />

<title>Contatos</title>
<link rel="stylesheet" href="./style.css" />
<link rel="stylesheet" href="../../global.css" />
Expand All @@ -12,7 +13,14 @@
</head>
<body>
<header></header>

<main>
<section id="s-hero">
<div class="grid-layout">

</div>
</section>
</main>
<footer></footer>

</body>
</html>
9 changes: 7 additions & 2 deletions pages/doacoes/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,18 @@
<title>Doações</title>
<link rel="stylesheet" href="./style.css" />
<link rel="stylesheet" href="../../global.css" />

<script src="/scripts/loaders/header.js" type="module"></script>
<script src="/scripts/loaders/footer.js" type="module"></script>
</head>
<body>
<header></header>

<main>
<section id="s-hero">
<div class="grid-layout">

</div>
</section>
</main>
<footer></footer>
</body>
</html>
1 change: 1 addition & 0 deletions pages/doacoes/style.css
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

4 changes: 2 additions & 2 deletions pages/seja-colaborador/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
<body>
<header></header>

<div class="main">
<main>
<section id="s-hero">
<div class="grid-layout">

</div>
</section>
</div>
</main>

<footer></footer>
</div>
Expand Down
10 changes: 0 additions & 10 deletions pages/seja-colaborador/style.css
Original file line number Diff line number Diff line change
@@ -1,11 +1 @@
.main #s-hero {
max-width: 1440px;
height: 669px;
}

.main #s-hero .grid-layout {
max-width: 1140px;
height: 395px;
background-color: grey;
margin: 137px auto;
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,21 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Centro de Crianças e Adolescentes</title>
<title>Centro de Educação Infantil e Centro de Crianças e Adolescentes</title>
<link rel="stylesheet" href="./style.css" />
<link rel="stylesheet" href="../../../global.css" />

<script src="/scripts/loaders/header.js" type="module"></script>
<script src="/scripts/loaders/footer.js" type="module"></script>
</head>
<body>
<header></header>

<main>
<section id="s-hero">
<div class="grid-layout">

</div>
</section>
</main>
<footer></footer>
</body>
</html>
File renamed without changes.
17 changes: 0 additions & 17 deletions pages/servicos/CEI/index.html

This file was deleted.

Empty file removed pages/servicos/CEI/style.css
Empty file.
11 changes: 9 additions & 2 deletions pages/servicos/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,22 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Serviços</title>
<link rel="stylesheet" href="./style.css">

<link rel="stylesheet" href="./style.css">
<link rel="stylesheet" href="../../../global.css"> </head>

<script src="/scripts/loaders/header.js" type="module" ></script>
<script src="/scripts/loaders/footer.js" type="module" ></script>
</head>
<body>
<header></header>

<main>
<section id="s-hero">
<div class="grid-layout">

</div>
</section>
</main>
<footer></footer>
</body>
</html>
9 changes: 7 additions & 2 deletions pages/sobre/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,18 @@
<title>Sobre</title>
<link rel="stylesheet" href="./style.css" />
<link rel="stylesheet" href="../../global.css" />

<script src="/scripts/loaders/header.js" type="module"></script>
<script src="/scripts/loaders/footer.js" type="module"></script>
</head>
<body>
<header></header>

<main>
<section id="s-hero">
<div class="grid-layout">

</div>
</section>
</main>
<footer></footer>
</body>
</html>
2 changes: 1 addition & 1 deletion scripts/loaders/footer.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import loader from './index.js'

function loadFooter() {
const url = '../../components/footer.html'
const url = '/components/footer.html'

loader(url, function (response) {
const footer = document.querySelector('footer')
Expand Down
2 changes: 1 addition & 1 deletion scripts/loaders/header.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import loader from './index.js'

function loadHeader() {
const url = '../../components/header.html'
const url = '/components/header.html'

loader(url, function (response) {
const header = document.querySelector('header')
Expand Down
5 changes: 4 additions & 1 deletion scripts/loaders/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
export default async (url, callback) => {
try {
const response = await fetch(url);
const baseUrl = window.location.origin;
const absoluteUrl = new URL(url, baseUrl).href;

const response = await fetch(absoluteUrl);

const data = await response.text();

Expand Down
55 changes: 52 additions & 3 deletions style.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
.home {
main {
display: flex;
flex-direction: column;
}

#home {
display: flex;
justify-content: space-around;
align-items: center;
padding-top: 3rem;
height: 70vh;
}

.home #text {
#home #text {
width: 50%;
display: flex;
flex-direction: column;
Expand All @@ -23,3 +28,47 @@
#acoes {
width: 50%;
}

#circle {
position: absolute;
left: -1rem;
}

#s-mouse {
text-align: center;
height: 30vh;
}

#mouse {
animation: go-up 1s infinite alternate;
margin: 50px;
}

@keyframes go-up {
from {
transform: translateY(20px);
}
to {
transform: translateY(0);
}
}

#quem-somos {
display: flex;
flex-direction: column;
text-align: center;
padding: 0 100px;
height: 100vh;
background-color: var(--white-light);

span {
margin: 20px 0;
width: 80%;
}

img,
span {
width: 80%;
align-self: center;
}
}