RerissonHRS · RerissonHRS · Feb 27, 2024 · Feb 27, 2024 · Feb 27, 2024 · Feb 27, 2024
diff --git a/.gitignore b/.gitignore
diff --git a/README.md b/README.md
@@ -13,4 +13,30 @@ Informação de alteração
 - git pull (puxar / trazer alterações do Git para sua máquina)
 
 ## GitFlow
-Fluxo do Git
+Fluxo do Git
+
+### Branchs
+São ramificações / versões paralelas
+
+- main / master (vai pra produção, quando o projeto é publicado)
+- develop
+- DOD Definition of Done: critérios de aceite
+- versionamento 1.0.0
+
+git checkout -b dev (cria uma branch)
+git checkout master (cria uma branch)
+
+### Merge
+Mescla de branchs
+Você pode precisar resolver conflios manualmente
+
+git merge main
+
+### Pull Requests
+Mesclar de branchs no repositório
+Permite code review
+O respositório resolve os conflitos automaticamente
+
+### configura o GitFlow
+git flow init
+git flow feature start {nome-da-feature}
diff --git a/html/01-introducao.html → html-css/01-introducao.html b/html/01-introducao.html → html-css/01-introducao.html
@@ -1,6 +1,8 @@
 <!DOCTYPE html>
 <html lang="=pt-BR">
 	<head>
+		<meta charset="UTF-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<title>Título da página exibido no navegador</title>
 	</head>
 	<body>

diff --git a/html/02-listas-e-links.html → html-css/02-listas-e-links.html b/html/02-listas-e-links.html → html-css/02-listas-e-links.html
@@ -3,6 +3,7 @@
 	<head>
 		<title>HTML - Listas e Links</title>
 		<meta charset="UTF-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	</head>
 	<body>
 		<h1>Listas e Links</h1>

diff --git a/html/03-formatacao-de-texto.html → html-css/03-formatacao-de-texto.html b/html/03-formatacao-de-texto.html → html-css/03-formatacao-de-texto.html
@@ -3,6 +3,7 @@
 	<head>
 		<title>HTML - Formatação de Texto</title>
 		<meta charset="UTF-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	</head>
 	<body>
 		<h1>Formatação de Texto</h1>

diff --git a/html/04-tabelas.html → html-css/04-tabelas.html b/html/04-tabelas.html → html-css/04-tabelas.html
@@ -3,6 +3,7 @@
 	<head>
 		<title>HTML - Tabelas</title>
 		<meta charset="UTF-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	</head>
 	<body>
 

diff --git a/html/05-layouts.html → html-css/05-layouts.html b/html/05-layouts.html → html-css/05-layouts.html
diff --git a/html/06-formularios.html → html-css/06-formularios.html b/html/06-formularios.html → html-css/06-formularios.html
diff --git a/html/07-Fundamentos-css.html → html-css/07-Fundamentos-css.html b/html/07-Fundamentos-css.html → html-css/07-Fundamentos-css.html
diff --git a/html/08-layouts-fluidos.html → html-css/08-layouts-fluidos.html b/html/08-layouts-fluidos.html → html-css/08-layouts-fluidos.html
diff --git a/html/09-elementos-graficos.html → html-css/09-elementos-graficos.html b/html/09-elementos-graficos.html → html-css/09-elementos-graficos.html
diff --git a/html/10-layouts-web.html → html-css/10-layouts-web.html b/html/10-layouts-web.html → html-css/10-layouts-web.html
@@ -4,28 +4,21 @@
 		<title>Layouts Web</title>
 		<meta charset="UTF-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
-
 		<!--RESET-->	
 		<link rel="stylesheet" type="text/css" href="./css/reset.css">
-
 		<!--google fonts-->
-
 		<link rel="preconnect" href="https://fonts.gstatic.com">
 		<link href="https://fonts.googleapis.com/css2?family=Limelight&display=swap" rel="stylesheet">
-
 		<!--Estilos Personalizado, importado das minhas aulas anteriores-->
 		<link rel="stylesheet" type="text/css" href="./css/reset.css">
 		<link rel="stylesheet" type="text/css" href="./css/layout.css">
 		<link rel="stylesheet" type="text/css" href="./css/graficos.css">
 	</head>
 	<body>
-
 		<header>
 			<h2>Front-end</h2>
-		</header>
-
+		</header>	
 		<Section>
-
 			<nav>
 				<h3>Aulas</h3>
 				<ul class="navegacao">
@@ -43,47 +36,30 @@ <h3>Aulas</h3>
 					<li><a href="https://ebaconline.com.br" target="_blank">EBAC</a></li>
 				</ul>
 			</nav>
-			<article>
-
-				<h1>Design Responsivo</h1>
-
-
-				<div class="coluna">
-
-					<h3>layouts de Colunas</h3>
-
+			<article>			
+				<h1>Design Responsivo</h1>				  
+				<div class="coluna">					
+					<h3>layouts de Colunas</h3>	
 					<iframe width="560" height="315" src="https://www.youtube.com/embed/XimR74IlCxk?si=HyYI9kmCY5XPLOU-" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
-
-				</div>
-
-				<div class="coluna">
-
+				</div>			
+				<div class="coluna">				
 						<div id="grafico-01">
 							<img class="filtro" src="./images//coffee-square.jpg" alt="café">
-						  </div>
-
-				</div>
-
-				<div class="coluna coluna-3">
-
+						  </div>		  
+				</div>	
+				<div class="coluna coluna-3">			
 					Lorem ipsum, dolor sit amet consectetur adipisicing elit. Exercitationem omnis numquam quibusdam aperiam harum enim. Quaerat, iste cum iure voluptatum consequatur sunt animi vel, itaque laudantium saepe libero fugiat similique.
 					Lorem ipsum, dolor sit amet consectetur adipisicing elit. Exercitationem omnis numquam quibusdam aperiam harum enim. Quaerat, iste cum iure voluptatum consequatur sunt animi vel, itaque laudantium saepe libero fugiat similique.
 					Lorem ipsum, dolor sit amet consectetur adipisicing elit. Exercitationem omnis numquam quibusdam aperiam harum enim. Quaerat, iste cum iure voluptatum consequatur sunt animi vel, itaque laudantium saepe libero fugiat similique.
-
-				</div>
-
+				</div>			
 				<div class="coluna">
-
 				<!--Cria uma moldura para navegar uma página dentro de outra-->
 				<iframe src="02-listas-e-links.html" width="100%" height="400px" name="meu_iframe"></iframe>
 				</div>
-
 				<div class="coluna coluna-100w">
 					<iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d3660.9280461809285!2d-51.98258132628494!3d-23.426966256665448!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x94ecd6556b58f071%3A0xb0c2b335fcdd9050!2sDistribuidora%20de%20Bebidas%20Virginia%20-%20Ambev!5e0!3m2!1spt-BR!2sbr!4v1708871667593!5m2!1spt-BR!2sbr" width="100%" height="450" style="border:0;" allowfullscreen="" loading="lazy" referrerpolicy="no-referrer-when-downgrade"></iframe>
 				</div>
-
 			</article>
-
 		</Section>
 		<footer>Desenvolvido no curso Full Stack Python / EBAC - por Rerisson </footer>
 	</body>

diff --git a/html/css/graficos.css → html-css/css/graficos.css b/html/css/graficos.css → html-css/css/graficos.css
diff --git a/html/css/layout.css → html-css/css/layout.css b/html/css/layout.css → html-css/css/layout.css
diff --git a/html/css/layouts-fluidos.css → html-css/css/layouts-fluidos.css b/html/css/layouts-fluidos.css → html-css/css/layouts-fluidos.css
diff --git a/html/css/modulo-07.css → html-css/css/modulo-07.css b/html/css/modulo-07.css → html-css/css/modulo-07.css
diff --git a/html/css/reset-meyer.css → html-css/css/reset-meyer.css b/html/css/reset-meyer.css → html-css/css/reset-meyer.css
diff --git a/html/css/reset.css → html-css/css/reset.css b/html/css/reset.css → html-css/css/reset.css
diff --git a/html/css/style.css → html-css/css/style.css b/html/css/style.css → html-css/css/style.css
diff --git a/html/css/tabelas.css → html-css/css/tabelas.css b/html/css/tabelas.css → html-css/css/tabelas.css
diff --git a/html/images/coffee-sm.jpg → html-css/images/coffee-sm.jpg b/html/images/coffee-sm.jpg → html-css/images/coffee-sm.jpg
diff --git a/html/images/coffee-square.jpg → html-css/images/coffee-square.jpg b/html/images/coffee-square.jpg → html-css/images/coffee-square.jpg
diff --git a/html/images/coffee.jpg → html-css/images/coffee.jpg b/html/images/coffee.jpg → html-css/images/coffee.jpg
diff --git a/html/images/coffee.svg → html-css/images/coffee.svg b/html/images/coffee.svg → html-css/images/coffee.svg
diff --git a/html/images/exemplo.svg → html-css/images/exemplo.svg b/html/images/exemplo.svg → html-css/images/exemplo.svg
diff --git a/html/images/fundo_homepage.png → html-css/images/fundo_homepage.png b/html/images/fundo_homepage.png → html-css/images/fundo_homepage.png
diff --git a/html/images/matrix.png → html-css/images/matrix.png b/html/images/matrix.png → html-css/images/matrix.png
diff --git a/html/images/opop.png → html-css/images/opop.png b/html/images/opop.png → html-css/images/opop.png
diff --git a/html/images/pattern.png → html-css/images/pattern.png b/html/images/pattern.png → html-css/images/pattern.png
diff --git a/prontocloud/README.md b/prontocloud/README.md
@@ -0,0 +1,32 @@
+# Inbound Marketing
+## Objetivos
+- Construir um experiência completa para atrair leads para um negócio
+- Projeto digno de portfólio
+## Requisitos
+- Codificação HTML e CSS
+- Princípios de design
+- HTML semântico
+- Design responsivo
+- Análise Heurística
+- Visual Studio Code
+- Git
+## Metodologia
+- Explorar conceitos e técnicas
+- Evolução contínua: dividir o projeto em pequenas partes, testes, ciclos incrementais, revisão...
+- AIDA
+
+\\\\   Atenção   /////
+  \\\ Interesse ///
+    \\  Desejo //
+      \  Ação /    call-to-action 4% - 20%
+
+      LEAD (e-mail)
+## Briefing
+- Criar uma campanha de inbound marketing para divulgar seus serviços de criação de sites, landing pages e e-mail marketing
+- Gerar leads qualificados, com real interesse nos serviços oferecidos
+- Criar conteúdo para post (blog), e-mail marketing, landing page (call-to-action: e-mail*)
+- Criar formulários para captação de e-mails
+- Post para redes sociais: texto + foto + url curta
+- Incluir hospedagem (servidor web)
+
+- Git - histórico de evolução (commits detalhados)
diff --git a/prontocloud/css/styles.css b/prontocloud/css/styles.css
@@ -0,0 +1,170 @@
+
+html {
+    font-size: 62.5%;
+}
+
+body {
+    background-color: #f5f5f5; 
+    font-family: 'Open Sans', sans-serif;
+}
+
+.main-container {
+    display: block;
+    width: 100vw;
+    margin: 0 auto;
+}
+
+.container {
+    display: block;
+    float: left;
+    padding: 20px;
+    max-width: 100%;
+    margin: 0 auto;
+    max-width: 1198px;
+}
+
+header {
+    background: #fff;
+    display: block;
+    float: left;
+    padding: 20px;
+    width: 100%;
+    border-bottom: 1px solid #254159;
+}
+
+h1 {
+    font-size: 2.4rem;
+    color: #254159;
+    margin-bottom: 20px;
+}
+
+h2 {
+    font-size: 2rem;
+    color: #254159;
+    margin-bottom: 20px;
+}
+
+h3 {
+    font-size: 1.8rem;
+    color: #254159;
+    margin-bottom: 20px;
+    padding-top: 10px;
+}
+
+h4 {
+    font-size: 1.6rem;
+    color: #385874;
+    margin-bottom: 10px;
+    padding-top: 10px;
+}
+
+p {
+    margin-bottom: 10px;
+    line-height: 1.4;
+    color: #333;
+}
+
+img {
+    max-width: 100%;
+    height: auto;
+}
+
+#tenho-interesse {
+    background-color: #b8c8d6;
+    width: 100%;
+}
+
+#tenho-interesse form,
+.cognito.c-med .c-forms-form,
+.cognito.c-med .c-forms-form div {
+    background-color: #b8c8d6 !important;
+}
+
+#tenho-interesse .cognito .c-forms-form .c-forms-form-title h2,
+#tenho-interesse .cognito label[for], .cognito input[type=radio], .cognito input[type=checkbox] {
+    color: #385874;
+}
+
+ol {
+    margin-left: 30px;
+}
+
+ol li {
+    font-size: 1.4rem;
+    color: #454545;
+}
+
+section {
+    background-color: #fff;
+    display: block;
+    float: left;
+    font-size: 1.5rem; /* equivalente a 15px */ 
+    padding: 20px;
+    width: 100%;
+}
+
+section nav {
+    display: block;
+    float: left;
+    width: 30%;
+}
+
+nav li {
+    background-color: #efefef;
+    margin: 1px 20px 1px 0;
+    padding: 10px;
+}
+
+nav li:hover {
+    background-color: #dfdfdf;
+}
+
+nav a {
+    text-decoration: none;
+    color: #254159;
+}
+
+nav a:hover {
+    color: #385874;
+}
+
+section article {
+    display: block;
+    float: left;
+    width: 70%;
+}
+
+footer {
+    background-color: #254159;  
+    display: block;
+    float: left;
+    padding: 20px;
+    width: 100%;
+}
+
+footer p {
+    color: #ffffff;
+    font-size: 1.4rem;
+}
+
+footer small {
+    font-size: 80%;
+    display: block;
+}
+
+.cognito {
+    height: 350px !important;
+    overflow: hidden !important;
+}
+
+@media (max-width: 425px) {
+    section nav,
+    section article {
+        width: 100%;
+    }  
+
+    .container {
+        padding-left: 1%;
+        padding-right: 1%;
+    }
+}
diff --git a/prontocloud/images/banner.png b/prontocloud/images/banner.png
diff --git a/prontocloud/images/conectado-700x300.jpg b/prontocloud/images/conectado-700x300.jpg
diff --git a/prontocloud/images/favicon.cc b/prontocloud/images/favicon.cc
diff --git a/prontocloud/images/icon-touch-retina-ipad.png b/prontocloud/images/icon-touch-retina-ipad.png
diff --git a/prontocloud/images/icon-touch-retina-iphone.png b/prontocloud/images/icon-touch-retina-iphone.png
diff --git a/prontocloud/images/icon-touch-retina.png b/prontocloud/images/icon-touch-retina.png
diff --git a/prontocloud/images/prontocloud.png b/prontocloud/images/prontocloud.png
diff --git a/prontocloud/images/web-design-planning-700x300.jpg b/prontocloud/images/web-design-planning-700x300.jpg
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ @@
     	<head>
     		<title>HTML - Tabelas</title>
     		<meta charset="UTF-8">
+    		<meta name="viewport" content="width=device-width, initial-scale=1.0">
     	</head>
     	<body>
@@ Expand Down @@