From 7645e512eacd66278e94ba0035c2e0c3ceb3dbe9 Mon Sep 17 00:00:00 2001
From: Jefferson <jeffersonss999@gmail.com>
Date: Thu, 28 Mar 2019 15:09:42 -0300
Subject: [PATCH 01/42] =?UTF-8?q?Corre=C3=A7=C3=A3o=20dos=20links?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 css/estilo_layout.css | 11 ++++-------
 pages/equipe.html     | 28 ++++++++++++++--------------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/css/estilo_layout.css b/css/estilo_layout.css
index 756d130..d874704 100644
--- a/css/estilo_layout.css
+++ b/css/estilo_layout.css
@@ -102,11 +102,6 @@ main h3 {
 }
 
 
-.formatacao-link a h3 {
-    color: black;
-    font-weight: bold;
-
-
 .formatacao-link a h3 {
     color: black;
     font-weight: bold;
@@ -124,7 +119,6 @@ main h3 {
         font-size: 0.81rem;
         text-align: center;
     }
-
     #botao-entre-em-contato {
         width: 100%
     }
@@ -135,7 +129,6 @@ main h3 {
         font-size: 1.01rem;
         text-align: center;
     }
-
     #botao-entre-em-contato {
         width: 100%
     }
@@ -147,4 +140,8 @@ main h3 {
         text-align: center;
     }
 
+}
+
+.formatacao-link a:hover{
+    text-decoration: none;
 }
\ No newline at end of file
diff --git a/pages/equipe.html b/pages/equipe.html
index efa6e9f..491ca42 100644
--- a/pages/equipe.html
+++ b/pages/equipe.html
@@ -77,7 +77,7 @@ <h2>Cordenação</h2>
       <div class="row">
         <div class="col-md-3 col-sm-6">
           <div class="text-center">
-            <img src="../images/icone.png" class="img-fluid rounded-circle">
+            <a href="#"><img src="../images/icone.png" class="img-fluid rounded-circle"></a>
             <a href="#">
               <h3>Lorem ipsum dolor</h3>
             </a>
@@ -86,7 +86,7 @@ <h3>Professor do IFSP</h3>
         </div>
         <div class="col-md-3 col-sm-6">
           <div class="text-center">
-            <img src="../images/icone.png" class="img-fluid rounded-circle">
+            <a href="#"><img src="../images/icone.png" class="img-fluid rounded-circle"></a>
             <a href="#">
               <h3>Lorem ipsum dolor</h3>
             </a>
@@ -95,7 +95,7 @@ <h3>Professor do IFSP</h3>
         </div>
         <div class="col-md-3 col-sm-6">
           <div class="text-center">
-            <img src="../images/icone.png" class="img-fluid rounded-circle">
+            <a href="#"><img src="../images/icone.png" class="img-fluid rounded-circle"></a>
             <a href="#">
               <h3>Lorem ipsum dolor</h3>
             </a>
@@ -107,7 +107,7 @@ <h2>Estudantes</h2>
       <div id="quebra-line" class="row">
         <div class="col-md-3 col-sm-6">
           <div class="text-center">
-            <img src="../images/icone.png" class="img-fluid rounded-circle">
+            <a href="#"><img src="../images/icone.png" class="img-fluid rounded-circle"></a>
             <a href="#">
               <h3>Lorem ipsum dolor</h3>
             </a>
@@ -116,7 +116,7 @@ <h3>Aluno do IFSP</h3>
         </div>
         <div class="col-md-3 col-sm-6">
           <div class="text-center">
-            <img src="../images/icone.png" class="img-fluid rounded-circle">
+            <a href="#"><img src="../images/icone.png" class="img-fluid rounded-circle"></a>
             <a href="#">
               <h3>Lorem ipsum dolor</h3>
             </a>
@@ -125,8 +125,8 @@ <h3>Aluno do IFSP</h3>
         </div>
         <div class="col-md-3 col-sm-6">
           <div class="text-center">
-            <img src="../images/icone.png" class="img-fluid rounded-circle">
-            <a href="#">
+            <a href="#"><img src="../images/icone.png" class="img-fluid rounded-circle"></a>
+            <a href="#"></a><a href="#">
               <h3>Lorem ipsum dolor</h3>
             </a>
             <h3>Aluno do IFSP</h3>
@@ -134,7 +134,7 @@ <h3>Aluno do IFSP</h3>
         </div>
         <div class="col-md-3 col-sm-6">
           <div class="text-center">
-            <img src="../images/icone.png" class="img-fluid rounded-circle">
+            <a href="#"><img src="../images/icone.png" class="img-fluid rounded-circle"></a>
             <a href="#">
               <h3>Lorem ipsum dolor</h3>
             </a>
@@ -146,7 +146,7 @@ <h2>Colaboradores</h2>
       <div class="row">
         <div class="col-md-3 col-sm-6">
           <div class="text-center">
-            <img src="../images/icone.png" class="img-fluid rounded-circle">
+            <a href="#"><img src="../images/icone.png" class="img-fluid rounded-circle"></a>
             <a href="#">
               <h3>Lorem ipsum dolor</h3>
             </a>
@@ -155,7 +155,7 @@ <h3>Aluno do IFSP</h3>
         </div>
         <div class="col-md-3 col-sm-6">
           <div class="text-center">
-            <img src="../images/icone.png" class="img-fluid rounded-circle">
+            <a href="#"><img src="../images/icone.png" class="img-fluid rounded-circle"></a>
             <a href="#">
               <h3>Lorem ipsum dolor</h3>
             </a>
@@ -167,7 +167,7 @@ <h2>Ex-Integrantes</h2>
       <div class="row">
         <div class="col-md-3 col-sm-6">
           <div class="text-center">
-            <img src="../images/icone.png" class="img-fluid rounded-circle">
+            <a href="#"><img src="../images/icone.png" class="img-fluid rounded-circle"></a>
             <a href="#">
               <h3>Lorem ipsum dolor</h3>
             </a>
@@ -176,7 +176,7 @@ <h3>Aluno do IFSP</h3>
         </div>
         <div class="col-md-3 col-sm-6">
           <div class="text-center">
-            <img src="../images/icone.png" class="img-fluid rounded-circle">
+            <a href="#"><img src="../images/icone.png" class="img-fluid rounded-circle"></a>
             <a href="#">
               <h3>Lorem ipsum dolor</h3>
             </a>
@@ -185,7 +185,7 @@ <h3>Aluno do IFSP</h3>
         </div>
         <div class="col-md-3 col-sm-6">
           <div class="text-center">
-            <img src="../images/icone.png" class="img-fluid rounded-circle">
+            <a href="#"><img src="../images/icone.png" class="img-fluid rounded-circle"></a>
             <a href="#">
               <h3>Lorem ipsum dolor</h3>
             </a>
@@ -194,7 +194,7 @@ <h3>Aluno do IFSP</h3>
         </div>
         <div class="col-md-3 col-sm-6">
           <div class="text-center">
-            <img src="../images/icone.png" class="img-fluid rounded-circle">
+            <a href="#"><img src="../images/icone.png" class="img-fluid rounded-circle"></a>
             <a href="#">
               <h3>Lorem ipsum dolor</h3>
             </a>

From 1ce45bcfef5867896d0dc09f698ff16e55d3f5a3 Mon Sep 17 00:00:00 2001
From: Vinicius Eustaquio Cortez <viniciusecortez@outlook.com>
Date: Tue, 2 Apr 2019 16:40:16 -0300
Subject: [PATCH 02/42] =?UTF-8?q?Corre=C3=A7=C3=B5es=20dos=20merges=20feit?=
 =?UTF-8?q?os=20no=20css?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/contato.html              | 2 +-
 pages/detalhe-noticia.html      | 2 +-
 pages/missao-visao-valores.html | 2 +-
 pages/noticias.html             | 2 +-
 pages/parcerias.html            | 2 +-
 pages/projetox.html             | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pages/contato.html b/pages/contato.html
index 97cbba0..f0a5205 100644
--- a/pages/contato.html
+++ b/pages/contato.html
@@ -68,7 +68,7 @@ <h1>Contato</h1>
         </div>
       </div>
     </div>
-    <div id="conteudo" class="container">
+    <div id="conteudo" class="container aumenta-margem-top">
         <div class="card flex-row flex-wrap">
             <div class="card-header  border-0">
                 <img class= "img-contato rounded-circle"src="../images/github-icon.png" >
diff --git a/pages/detalhe-noticia.html b/pages/detalhe-noticia.html
index e72c5f0..ff3c9a9 100644
--- a/pages/detalhe-noticia.html
+++ b/pages/detalhe-noticia.html
@@ -68,7 +68,7 @@ <h1>Nome da notícia</h1>
         </div>
       </div>
     </div>
-    <div id="conteudo" class="container">
+    <div  class="container">
       <div class="row">
         <div class="col-md-12">
             <img src="../images/imagemNoticia.png" class="img-fluid imagem-principal" alt="Responsive image"/>
diff --git a/pages/missao-visao-valores.html b/pages/missao-visao-valores.html
index d1ef19d..b3b4525 100644
--- a/pages/missao-visao-valores.html
+++ b/pages/missao-visao-valores.html
@@ -67,7 +67,7 @@ <h1>MISSÃO, VISÃO E VALORES</h1>
         </div>
       </div>
     </div>
-    <div id="conteudo" class="container">
+    <div  class="container">
       <div class="container">
         <main class="row">
           <div class="col-md-12 p-4">
diff --git a/pages/noticias.html b/pages/noticias.html
index de205e7..c07e2c2 100644
--- a/pages/noticias.html
+++ b/pages/noticias.html
@@ -68,7 +68,7 @@ <h1>Notícias</h1>
         </div>
       </div>
     </div>
-    <div id="botao-ver-noticia" class="container aumenta-margem">
+    <div id="botao-ver-noticia" class="container aumenta-margem-top">
       <!-- Coloque o conteúdo aqui -->
       <main class="row">
         <div class="col-lg col-md-6 col-sm-12 aumenta-margem-bottom">
diff --git a/pages/parcerias.html b/pages/parcerias.html
index fced3bf..05a4dbc 100644
--- a/pages/parcerias.html
+++ b/pages/parcerias.html
@@ -70,7 +70,7 @@ <h1>PARCERIAS COM O LABORATÓRIO</h1>
     </div>
     <!--Fim do Sub-titulo-->
     <!--Conteudo-->
-    <div id="conteudo" class="container">
+    <div  class="container">
       <div class="row">
         <div class="col-lg-3 col-md-4 col-sm-6 p-3">
           <img src="../images/icone.png" class="rounded-circle mx-auto d-block img-membro aumenta-margem">
diff --git a/pages/projetox.html b/pages/projetox.html
index f2864a4..8c1cc0a 100644
--- a/pages/projetox.html
+++ b/pages/projetox.html
@@ -68,7 +68,7 @@ <h1>Título do Projeto de Software X</h1>
                 </div>
             </div>
         </div>
-        <div id="conteudo" class="container">
+        <div  class="container">
             <div class="container">
                 <div class="row">
                     <div class="col-md-12 p-md-5 p-2">

From 67f321ef70f35fc4004a9dcb72af446449f4aadc Mon Sep 17 00:00:00 2001
From: Vinicius Eustaquio Cortez <viniciusecortez@outlook.com>
Date: Tue, 2 Apr 2019 17:17:06 -0300
Subject: [PATCH 03/42] =?UTF-8?q?Reestrutura=C3=A7=C3=A3o=20inicial=20jeky?=
 =?UTF-8?q?ll?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                  |   1 +
 pages/layout.html => _includes/navbar.html  |  57 +-------------------
 _includes/titulo.html                       |  10 ++++
 _layouts/layout.html                        |  45 ++++++++++++++++
 {css => assets/css}/estilo_layout.css       |   0
 {images => assets/images}/github-icon.png   | Bin
 {images => assets/images}/grey.jpg          | Bin
 {images => assets/images}/icone-centro.png  | Bin
 {images => assets/images}/icone.png         | Bin
 {images => assets/images}/icone2.png        | Bin
 {images => assets/images}/icone3.png        | Bin
 {images => assets/images}/icone4.png        | Bin
 {images => assets/images}/imagemNoticia.png | Bin
 {images => assets/images}/padrao.png        | Bin
 index.html                                  |   6 ++-
 15 files changed, 63 insertions(+), 56 deletions(-)
 create mode 100644 .gitignore
 rename pages/layout.html => _includes/navbar.html (55%)
 create mode 100644 _includes/titulo.html
 create mode 100644 _layouts/layout.html
 rename {css => assets/css}/estilo_layout.css (100%)
 rename {images => assets/images}/github-icon.png (100%)
 rename {images => assets/images}/grey.jpg (100%)
 rename {images => assets/images}/icone-centro.png (100%)
 rename {images => assets/images}/icone.png (100%)
 rename {images => assets/images}/icone2.png (100%)
 rename {images => assets/images}/icone3.png (100%)
 rename {images => assets/images}/icone4.png (100%)
 rename {images => assets/images}/imagemNoticia.png (100%)
 rename {images => assets/images}/padrao.png (100%)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..72a5c3b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+_site/
\ No newline at end of file
diff --git a/pages/layout.html b/_includes/navbar.html
similarity index 55%
rename from pages/layout.html
rename to _includes/navbar.html
index 12c545d..bde8bf9 100644
--- a/pages/layout.html
+++ b/_includes/navbar.html
@@ -1,16 +1,4 @@
-<!doctype html>
-<html lang="pt-br">
-
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-  <link rel="stylesheet" href="../bootstrap/css/bootstrap.min.css">
-  <link rel="stylesheet" href="../css/estilo_layout.css">
-  <title>Layout</title>
-</head>
-
-<body>
-  <header>
+<header>
     <div class="container">
       <nav class="navbar navbar-expand-md navbar-light bg-light">
         <a class="navbar-brand " href="#">
@@ -56,45 +44,4 @@
       </nav>
     </div>
     <!--Fim de container -->
-  </header>
-  <article>
-    <div class="titulo-pagina">
-      <div class="container">
-        <div class="row">
-          <div class="col-md-12 p-4">
-            <h1>LAYOUT</h1>
-            <p class="lead">Lorem ipsum dolor sit amet consectetur adipisicing elit. </p>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div id="conteudo" class="container">
-      <!-- Coloque o conteúdo aqui -->
-    </div>
-  </article>
-  <aside id="entre-em-contato">
-    <div class="container">
-      <div class="row p-4">
-        <div class="col-sm">
-          <p>
-            <b>Faça parte da equipe do IFSP CodeLab</b>
-          </p>
-        </div>
-        <div class="col-sm ">
-          <button id="botao-entre-em-contato" type="button" class="btn btn-primary float-right">Entre em contato</button>
-        </div>
-      </div>
-    </div>
-  </aside>
-  <footer>
-    <div class="container">
-      <div class="row">
-      </div>
-    </div>
-  </footer>
-  <script src="../bootstrap/js/jquery-3.3.1.slim.min.js"></script>
-  <script src="../bootstrap/js/popper.min.js"></script>
-  <script src="../bootstrap/js/bootstrap.min.js"></script>
-</body>
-
-</html>
\ No newline at end of file
+  </header>
\ No newline at end of file
diff --git a/_includes/titulo.html b/_includes/titulo.html
new file mode 100644
index 0000000..1c38900
--- /dev/null
+++ b/_includes/titulo.html
@@ -0,0 +1,10 @@
+<div class="titulo-pagina">
+      <div class="container">
+        <div class="row">
+          <div class="col-md-12 p-4">
+            <h1>{{ page.titulo }}</h1>
+            <p class="lead"> {{ page.subtitulo }} </p>
+          </div>
+        </div>
+      </div>
+    </div>
\ No newline at end of file
diff --git a/_layouts/layout.html b/_layouts/layout.html
new file mode 100644
index 0000000..8441471
--- /dev/null
+++ b/_layouts/layout.html
@@ -0,0 +1,45 @@
+<!doctype html>
+<html lang="pt-br">
+
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <link rel="stylesheet" href="../bootstrap/css/bootstrap.min.css">
+  <link rel="stylesheet" href="../assets/css/estilo_layout.css">
+  <title>Layout</title>
+</head>
+
+<body>
+  {% include navbar.html %}
+  <article>
+    {% include titulo.html %}
+    <div class="container">
+        {{ content }}
+    </div>
+  </article>
+  <aside id="entre-em-contato">
+    <div class="container">
+      <div class="row p-4">
+        <div class="col-sm">
+          <p>
+            <b>Faça parte da equipe do IFSP CodeLab</b>
+          </p>
+        </div>
+        <div class="col-sm ">
+          <button id="botao-entre-em-contato" type="button" class="btn btn-primary float-right">Entre em contato</button>
+        </div>
+      </div>
+    </div>
+  </aside>
+  <footer>
+    <div class="container">
+      <div class="row">
+      </div>
+    </div>
+  </footer>
+  <script src="../bootstrap/js/jquery-3.3.1.slim.min.js"></script>
+  <script src="../bootstrap/js/popper.min.js"></script>
+  <script src="../bootstrap/js/bootstrap.min.js"></script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/css/estilo_layout.css b/assets/css/estilo_layout.css
similarity index 100%
rename from css/estilo_layout.css
rename to assets/css/estilo_layout.css
diff --git a/images/github-icon.png b/assets/images/github-icon.png
similarity index 100%
rename from images/github-icon.png
rename to assets/images/github-icon.png
diff --git a/images/grey.jpg b/assets/images/grey.jpg
similarity index 100%
rename from images/grey.jpg
rename to assets/images/grey.jpg
diff --git a/images/icone-centro.png b/assets/images/icone-centro.png
similarity index 100%
rename from images/icone-centro.png
rename to assets/images/icone-centro.png
diff --git a/images/icone.png b/assets/images/icone.png
similarity index 100%
rename from images/icone.png
rename to assets/images/icone.png
diff --git a/images/icone2.png b/assets/images/icone2.png
similarity index 100%
rename from images/icone2.png
rename to assets/images/icone2.png
diff --git a/images/icone3.png b/assets/images/icone3.png
similarity index 100%
rename from images/icone3.png
rename to assets/images/icone3.png
diff --git a/images/icone4.png b/assets/images/icone4.png
similarity index 100%
rename from images/icone4.png
rename to assets/images/icone4.png
diff --git a/images/imagemNoticia.png b/assets/images/imagemNoticia.png
similarity index 100%
rename from images/imagemNoticia.png
rename to assets/images/imagemNoticia.png
diff --git a/images/padrao.png b/assets/images/padrao.png
similarity index 100%
rename from images/padrao.png
rename to assets/images/padrao.png
diff --git a/index.html b/index.html
index 557db03..ce9e57c 100644
--- a/index.html
+++ b/index.html
@@ -1 +1,5 @@
-Hello World
+---
+layout: layout
+titulo: doaoda
+subtitulo: doaod
+---

From 4414c92cef78dac6e36c6661969060a64f28813e Mon Sep 17 00:00:00 2001
From: Vinicius Eustaquio Cortez <viniciusecortez@outlook.com>
Date: Tue, 2 Apr 2019 17:21:51 -0300
Subject: [PATCH 04/42] Arrumados parte dos links

---
 _includes/navbar.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/_includes/navbar.html b/_includes/navbar.html
index bde8bf9..1422a19 100644
--- a/_includes/navbar.html
+++ b/_includes/navbar.html
@@ -17,9 +17,9 @@
                 O laboratório
               </a>
               <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
-                <a class="dropdown-item" href="#">Missão, Visão e Valores</a>
-                <a class="dropdown-item" href="#">Publicações</a>
-                <a class="dropdown-item" href="#">Equipe</a>
+                <a class="dropdown-item" href="/pages/missao-visao-valores.html">Missão, Visão e Valores</a>
+                <a class="dropdown-item" href="/pages/publicacoes.html">Publicações</a>
+                <a class="dropdown-item" href="/pages/equipe.html">Equipe</a>
               </div>
             </li>
             <li class="nav-item">

From eab5f496fb659cd57f9d609a347eedd878bef43e Mon Sep 17 00:00:00 2001
From: Vinicius Eustaquio Cortez <viniciusecortez@outlook.com>
Date: Tue, 2 Apr 2019 17:28:47 -0300
Subject: [PATCH 05/42] Adicionados todos os links da navbar

---
 _includes/navbar.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/_includes/navbar.html b/_includes/navbar.html
index 1422a19..38a2b8f 100644
--- a/_includes/navbar.html
+++ b/_includes/navbar.html
@@ -23,19 +23,19 @@
               </div>
             </li>
             <li class="nav-item">
-              <a class="nav-link" href="#">Projetos</a>
+              <a class="nav-link" href="/pages/projetos.html">Projetos</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" href="#">Parcerias</a>
+              <a class="nav-link" href="/pages/parcerias.html">Parcerias</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" href="#">Notícias</a>
+              <a class="nav-link" href="/pages/noticias.html">Notícias</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" href="#">Artigos</a>
+              <a class="nav-link" href="/pages/artigos.html">Artigos</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" href="#">Contatos</a>
+              <a class="nav-link" href="/pages/contato.html">Contatos</a>
             </li>
           </ul>
           <!--fim lista -->

From 87e5b711ffdb6bd2ea9aa6a1a53cc59886b9ef63 Mon Sep 17 00:00:00 2001
From: Vinicius Eustaquio Cortez <viniciusecortez@outlook.com>
Date: Tue, 2 Apr 2019 17:53:52 -0300
Subject: [PATCH 06/42] Parcerias adequado com Jekyll

---
 pages/missao-visao-valores.html | 112 +-------------
 pages/parcerias.html            | 262 ++++++++++----------------------
 2 files changed, 92 insertions(+), 282 deletions(-)

diff --git a/pages/missao-visao-valores.html b/pages/missao-visao-valores.html
index b3b4525..e8c8f54 100644
--- a/pages/missao-visao-valores.html
+++ b/pages/missao-visao-valores.html
@@ -1,74 +1,9 @@
-<!doctype html>
-<html lang="pt-br">
-
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-  <link rel="stylesheet" href="../bootstrap/css/bootstrap.min.css">
-  <link rel="stylesheet" href="../css/estilo_layout.css">
-  <title>O laboratório > MISSÃO, VISÃO E VALORES</title>
-</head>
-
-<body>
-  <header>
-    <div class="container">
-      <nav class="navbar navbar-expand-md navbar-light bg-light">
-        <a class="navbar-brand " href="#">
-          >IFSP
-          <span>CODELAB</span>
-        </a>
-        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown"
-          aria-expanded="false" aria-label="Alterna navegação">
-          <span class="navbar-toggler-icon"></span>
-        </button>
-        <div class="collapse navbar-collapse" id="navbarNavDropdown">
-          <ul class="navbar-nav  ml-auto  ">
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true"
-                aria-expanded="false">
-                O laboratório
-              </a>
-              <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
-                <a class="dropdown-item" href="#">Missão, Visão e Valores</a>
-                <a class="dropdown-item" href="#">Publicações</a>
-                <a class="dropdown-item" href="#">Equipe</a>
-              </div>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Projetos</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Parcerias</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Notícias</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Artigos</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Contatos</a>
-            </li>
-          </ul>
-          <!--fim lista -->
-        </div>
-        <!--Fim de dropdown-->
-      </nav>
-    </div>
-    <!--Fim de container -->
-  </header>
-  <article>
-    <div class="titulo-pagina">
-      <div class="container">
-        <div class="row">
-          <div class="col-md-12 p-4">
-            <h1>MISSÃO, VISÃO E VALORES</h1>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div  class="container">
-      <div class="container">
+---
+layout: layout
+titulo: Missão, Visão e Valores
+subtitulo:
+---
+        
         <main class="row">
           <div class="col-md-12 p-4">
             <p>Lorem ipsum dolor sit amet consectetur adipisicing elit.
@@ -80,7 +15,7 @@ <h1>MISSÃO, VISÃO E VALORES</h1>
         </main>
         <div class="row">
           <div class="col-md-12 p-2">
-            <img src="../images/padrao.png" class="img-fluid rounded mx-auto d-block img-thumbnail" alt="imagem padrao">
+            <img src="../assets/images/padrao.png" class="img-fluid rounded mx-auto d-block img-thumbnail" alt="imagem padrao">
           </div>
         </div>
         <main class="row">
@@ -108,35 +43,4 @@ <h2>Valores</h2>
               laboriosam illum repudiandae laborum sunt sed optio distinctio, maxime, deleniti sit
               aperiam nisi esse! Explicabo illum blanditiis asperiores, error dolorem voluptatem!</p>
           </div>
-        </main>
-    
-    
-      </div>
-    </div>
-  </article>
-  <aside id="entre-em-contato">
-    <div class="container">
-      <div class="row p-4">
-        <div class="col-sm">
-          <p>
-            <b>Faça parte da equipe do IFSP CodeLab</b>
-          </p>
-        </div>
-        <div class="col-sm ">
-          <button id="botao-entre-em-contato" type="button" class="btn btn-primary float-right">Entre em contato</button>
-        </div>
-      </div>
-    </div>
-  </aside>
-  <footer>
-    <div class="container">
-      <div class="row">
-      </div>
-    </div>
-  </footer>
-  <script src="../bootstrap/js/jquery-3.3.1.slim.min.js"></script>
-  <script src="../bootstrap/js/popper.min.js"></script>
-  <script src="../bootstrap/js/bootstrap.min.js"></script>
-</body>
-
-</html>
\ No newline at end of file
+        </main>
\ No newline at end of file
diff --git a/pages/parcerias.html b/pages/parcerias.html
index 05a4dbc..d2552fe 100644
--- a/pages/parcerias.html
+++ b/pages/parcerias.html
@@ -1,183 +1,89 @@
-<!doctype html>
-<html lang="pt-br">
+---
+layout: layout
+titulo: PARCERIAS COM O LABORATÓRIO
+subtitulo: 
+---
 
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-  <link rel="stylesheet" href="../bootstrap/css/bootstrap.min.css">
-  <link rel="stylesheet" href="../css/estilo_layout.css">
-  <title>Parcerias</title>
-</head>
-
-<body>
-  <header>
-    <div class="container">
-      <nav class="navbar navbar-expand-md navbar-light bg-light">
-        <a class="navbar-brand " href="#">
-          >IFSP
-          <span>CODELAB</span>
-        </a>
-        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown"
-          aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Alterna navegação">
-          <span class="navbar-toggler-icon"></span>
-        </button>
-        <div class="collapse navbar-collapse" id="navbarNavDropdown">
-          <ul class="navbar-nav  ml-auto  ">
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button"
-                data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                O laboratório
-              </a>
-              <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
-                <a class="dropdown-item" href="#">Missão, Visão e Valores</a>
-                <a class="dropdown-item" href="#">Publicações</a>
-                <a class="dropdown-item" href="#">Equipe</a>
-              </div>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Projetos</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Parcerias</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Notícias</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Artigos</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Contatos</a>
-            </li>
-          </ul>
-          <!--fim lista -->
-        </div>
-        <!--Fim de dropdown-->
-      </nav>
+<div class="row">
+  <div class="col-lg-3 col-md-4 col-sm-6 p-3">
+    <img src="../assets/images/icone.png" class="rounded-circle mx-auto d-block img-membro aumenta-margem">
+    <p class="texto-imagem">Parceiro S.A.</p>
+  </div>
+  <div class="col-lg-9 col-md-8 col-sm-6 p-4">
+    <h1>Parceiro 1</h1>
+    <p>Lorem ipsum dolor, sit amet consectetur adipisicing elit.
+      Deserunt repellat eveniet tentur, in dicta omnis nemo modi vel
+      illum libero iusto quos deleniti sunt eligendi, animi velit maxime est.
+      Tempora.Eius ea tempora facilis minus quisquam animi dicta corrupti,
+      veritatis enim ad aspernatur doloribus atque dignissimos, odit incidunt
+      mollitia sed placeat id reprehenderit at molestiae velit delectus cum. Autem, repellat?
+      Tempora.Eius ea tempora facilis minus quisquam animi dicta corrupti,
+      veritatis enim ad aspernatur doloribus atque dignissimos, odit incidunt
+      mollitia sed placeat id reprehenderit at molestiae velit delectus cum. Autem, repellat?
+      Tempora.Eius ea tempora facilis minus quisquam animi dicta corrupti,
+      veritatis enim ad aspernatur doloribus atque dignissimos, odit incidunt
+      mollitia sed placeat id reprehenderit at molestiae velit delectus cum. Autem, repellat?</p>
+    <img src="../assets/images/icone4.png" class="float-left p-1">
+    <img src="../assets/images/icone4.png" class="float-left p-1">
+    <img src="../assets/images/icone4.png" class="float-left p-1">
+    <img src="../assets/images/icone4.png" class="float-left p-1">
+  </div>
+</div>
+<div class="row">
+  <div class="col-lg-3 col-md-4 col-sm-6 p-3">
+    <img src="../assets/images/icone.png" class="rounded-circle mx-auto d-block img-membro aumenta-margem">
+    <p class="texto-imagem">Parceiro S.A.</p>
+  </div>
+  <div class="col-lg-9 col-md-8 col-sm-6 p-4">
+    <h1>Parceiro 2</h1>
+    <p>Lorem ipsum dolor, sit amet consectetur adipisicing elit.
+      Deserunt repellat eveniet tentur, in dicta omnis nemo modi vel
+      illum libero iusto quos deleniti sunt eligendi, animi velit maxime est.
+      Tempora.Eius ea tempora facilis minus quisquam animi dicta corrupti,
+      veritatis enim ad aspernatur doloribus atque dignissimos, odit incidunt
+      mollitia sed placeat id reprehenderit at molestiae velit delectus cum. Autem, repellat?
+      Tempora.Eius ea tempora facilis minus quisquam animi dicta corrupti,
+      veritatis enim ad aspernatur doloribus atque dignissimos, odit incidunt
+      mollitia sed placeat id reprehenderit at molestiae velit delectus cum. Autem, repellat?
+      Tempora.Eius ea tempora facilis minus quisquam animi dicta corrupti,
+      veritatis enim ad aspernatur doloribus atque dignissimos, odit incidunt
+      mollitia sed placeat id reprehenderit at molestiae velit delectus cum. Autem, repellat?</p>
+    <img src="../assets/images/icone4.png" class="float-left p-1">
+    <img src="../assets/images/icone4.png" class="float-left p-1">
+    <img src="../assets/images/icone4.png" class="float-left p-1">
+    <img src="../assets/images/icone4.png" class="float-left p-1">
+  </div>
+  <div class="row">
+    <div class="col-lg-3 col-md-4 col-sm-6 p-3">
+      <img src="../assets/images/icone.png" class="rounded-circle mx-auto d-block img-membro aumenta-margem">
+      <p class="texto-imagem">Parceiro S.A.</p>
     </div>
-    <!--Fim de container -->
-  </header>
-  <article>
-    <!--Sub-titulo-->
-    <div class="titulo-pagina">
-      <div class="container">
-        <div class="row">
-          <div class="col-md-12 p-4">
-            <h1>PARCERIAS COM O LABORATÓRIO</h1>
-          </div>
-        </div>
-      </div>
+    <div class="col-lg-9 col-md-8 col-sm-6 p-4">
+      <h1>Parceiro 3</h1>
+      <p>Lorem ipsum dolor, sit amet consectetur adipisicing elit.
+        Deserunt repellat eveniet tentur, in dicta omnis nemo modi vel
+        illum libero iusto quos deleniti sunt eligendi, animi velit maxime est.
+        Tempora.Eius ea tempora facilis minus quisquam animi dicta corrupti,
+        veritatis enim ad aspernatur doloribus atque dignissimos, odit incidunt
+        mollitia sed placeat id reprehenderit at molestiae velit delectus cum. Autem, repellat?
+        Tempora.Eius ea tempora facilis minus quisquam animi dicta corrupti,
+        veritatis enim ad aspernatur doloribus atque dignissimos, odit incidunt
+        mollitia sed placeat id reprehenderit at molestiae velit delectus cum. Autem, repellat?
+        Tempora.Eius ea tempora facilis minus quisquam animi dicta corrupti,
+        veritatis enim ad aspernatur doloribus atque dignissimos, odit incidunt
+        mollitia sed placeat id reprehenderit at molestiae velit delectus cum. Autem, repellat?</p>
+      <img src="../assets/images/icone4.png" class="float-left p-1">
+      <img src="../assets/images/icone4.png" class="float-left p-1">
+      <img src="../assets/images/icone4.png" class="float-left p-1">
+      <img src="../assets/images/icone4.png" class="float-left p-1">
     </div>
-    <!--Fim do Sub-titulo-->
-    <!--Conteudo-->
-    <div  class="container">
-      <div class="row">
-        <div class="col-lg-3 col-md-4 col-sm-6 p-3">
-          <img src="../images/icone.png" class="rounded-circle mx-auto d-block img-membro aumenta-margem">
-          <p class="texto-imagem">Parceiro S.A.</p>
-        </div>
-        <div class="col-lg-9 col-md-8 col-sm-6 p-4">
-          <h1>Parceiro 1</h1>
-          <p>Lorem ipsum dolor, sit amet consectetur adipisicing elit.
-            Deserunt repellat eveniet tentur, in dicta omnis nemo modi vel
-            illum libero iusto quos deleniti sunt eligendi, animi velit maxime est.
-            Tempora.Eius ea tempora facilis minus quisquam animi dicta corrupti,
-            veritatis enim ad aspernatur doloribus atque dignissimos, odit incidunt
-            mollitia sed placeat id reprehenderit at molestiae velit delectus cum. Autem, repellat?
-            Tempora.Eius ea tempora facilis minus quisquam animi dicta corrupti,
-            veritatis enim ad aspernatur doloribus atque dignissimos, odit incidunt
-            mollitia sed placeat id reprehenderit at molestiae velit delectus cum. Autem, repellat?
-            Tempora.Eius ea tempora facilis minus quisquam animi dicta corrupti,
-            veritatis enim ad aspernatur doloribus atque dignissimos, odit incidunt
-            mollitia sed placeat id reprehenderit at molestiae velit delectus cum. Autem, repellat?</p>
-          <img src="../images/icone4.png" class="float-left p-1">
-          <img src="../images/icone4.png" class="float-left p-1">
-          <img src="../images/icone4.png" class="float-left p-1">
-          <img src="../images/icone4.png" class="float-left p-1">
-        </div>
-        <div class="row">
-          <div class="col-lg-3 col-md-4 col-sm-6 p-3">
-            <img src="../images/icone.png" class="rounded-circle mx-auto d-block img-membro aumenta-margem">
-            <p class="texto-imagem">Parceiro S.A.</p>
-          </div>
-          <div class="col-lg-9 col-md-8 col-sm-6 p-4">
-            <h1>Parceiro 2</h1>
-            <p>Lorem ipsum dolor, sit amet consectetur adipisicing elit.
-              Deserunt repellat eveniet tentur, in dicta omnis nemo modi vel
-              illum libero iusto quos deleniti sunt eligendi, animi velit maxime est.
-              Tempora.Eius ea tempora facilis minus quisquam animi dicta corrupti,
-              veritatis enim ad aspernatur doloribus atque dignissimos, odit incidunt
-              mollitia sed placeat id reprehenderit at molestiae velit delectus cum. Autem, repellat?
-              Tempora.Eius ea tempora facilis minus quisquam animi dicta corrupti,
-              veritatis enim ad aspernatur doloribus atque dignissimos, odit incidunt
-              mollitia sed placeat id reprehenderit at molestiae velit delectus cum. Autem, repellat?
-              Tempora.Eius ea tempora facilis minus quisquam animi dicta corrupti,
-              veritatis enim ad aspernatur doloribus atque dignissimos, odit incidunt
-              mollitia sed placeat id reprehenderit at molestiae velit delectus cum. Autem, repellat?</p>
-            <img src="../images/icone4.png" class="float-left p-1">
-            <img src="../images/icone4.png" class="float-left p-1">
-            <img src="../images/icone4.png" class="float-left p-1">
-            <img src="../images/icone4.png" class="float-left p-1">
-          </div>
-          <div class="row">
-            <div class="col-lg-3 col-md-4 col-sm-6 p-3">
-              <img src="../images/icone.png" class="rounded-circle mx-auto d-block img-membro aumenta-margem">
-              <p class="texto-imagem">Parceiro S.A.</p>
-            </div>
-            <div class="col-lg-9 col-md-8 col-sm-6 p-4">
-              <h1>Parceiro 3</h1>
-              <p>Lorem ipsum dolor, sit amet consectetur adipisicing elit.
-                Deserunt repellat eveniet tentur, in dicta omnis nemo modi vel
-                illum libero iusto quos deleniti sunt eligendi, animi velit maxime est.
-                Tempora.Eius ea tempora facilis minus quisquam animi dicta corrupti,
-                veritatis enim ad aspernatur doloribus atque dignissimos, odit incidunt
-                mollitia sed placeat id reprehenderit at molestiae velit delectus cum. Autem, repellat?
-                Tempora.Eius ea tempora facilis minus quisquam animi dicta corrupti,
-                veritatis enim ad aspernatur doloribus atque dignissimos, odit incidunt
-                mollitia sed placeat id reprehenderit at molestiae velit delectus cum. Autem, repellat?
-                Tempora.Eius ea tempora facilis minus quisquam animi dicta corrupti,
-                veritatis enim ad aspernatur doloribus atque dignissimos, odit incidunt
-                mollitia sed placeat id reprehenderit at molestiae velit delectus cum. Autem, repellat?</p>
-              <img src="../images/icone4.png" class="float-left p-1">
-              <img src="../images/icone4.png" class="float-left p-1">
-              <img src="../images/icone4.png" class="float-left p-1">
-              <img src="../images/icone4.png" class="float-left p-1">
-            </div>
-          </div>
-          
-          <!--Novas Parcerias-->
-          <div class="row">
-              <div class="col-lg p-3">
-                  <h1>Outras idéias para parceria</h1>
-                  <p>Estamos disponiveis para projetos de desenvolvimento de websites. Para outras idéias de parceria com o CodeLab, entre em contato no botão abaixo!</p>
-              </div>
-            </div>
+  </div>
 
-  </article>
-  <aside id="entre-em-contato">
-    <div class="container"></div>
-      <div class="row p-4">
-        <div class="col-sm">
-          <p>
-            <b>Faça parte da equipe do IFSP CodeLab</b>
-          </p>
-        </div>
-        <div class="col-sm ">
-          <button id="botao-entre-em-contato" type="button" class="btn btn-primary float-right">Entre em
-            contato</button>
-        </div>
-      </div>
-    </div>
-  </aside>
-  <footer>
-    <div class="container">
-      <div class="row">
-      </div>
+  <!--Novas Parcerias-->
+  <div class="row">
+    <div class="col-lg p-3">
+      <h1>Outras idéias para parceria</h1>
+      <p>Estamos disponiveis para projetos de desenvolvimento de websites. Para outras idéias de parceria com o
+        CodeLab, entre em contato no botão abaixo!</p>
     </div>
-  </footer>
-  <script src="../bootstrap/js/jquery-3.3.1.slim.min.js"></script>
-  <script src="../bootstrap/js/popper.min.js"></script>
-  <script src="../bootstrap/js/bootstrap.min.js"></script>
-</body>
-
-</html>
\ No newline at end of file
+  </div>
\ No newline at end of file

From 4805b992233d7ad181dd7f923cc81dae78e88540 Mon Sep 17 00:00:00 2001
From: Vinicius Eustaquio Cortez <viniciusecortez@outlook.com>
Date: Tue, 2 Apr 2019 18:00:19 -0300
Subject: [PATCH 07/42] Equipe adequado com Jekyll

---
 pages/equipe.html | 123 +++++++---------------------------------------
 1 file changed, 19 insertions(+), 104 deletions(-)

diff --git a/pages/equipe.html b/pages/equipe.html
index 491ca42..4cefea5 100644
--- a/pages/equipe.html
+++ b/pages/equipe.html
@@ -1,65 +1,8 @@
-<!doctype html>
-<html lang="pt-br">
-
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-  <link rel="stylesheet" href="../bootstrap/css/bootstrap.min.css">
-  <link rel="stylesheet" href="../css/estilo_layout.css">
-  <title>Equipe</title>
-</head>
-
-<body>
-  <header>
-    <div class="container">
-      <nav class="navbar navbar-expand-md navbar-light bg-light">
-        <a class="navbar-brand " href="#">
-          >IFSP
-          <span>CODELAB</span>
-        </a>
-        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown"
-          aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Alterna navegação">
-          <span class="navbar-toggler-icon"></span>
-        </button>
-        <div class="collapse navbar-collapse" id="navbarNavDropdown">
-          <ul class="navbar-nav  ml-auto  ">
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button"
-                data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                O laboratório
-              </a>
-              <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
-                <a class="dropdown-item" href="#">Missão, Visão e Valores</a>
-                <a class="dropdown-item" href="#">Publicações</a>
-                <a class="dropdown-item" href="#">Equipe</a>
-              </div>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Projetos</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Parcerias</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Notícias</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Artigos</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Contatos</a>
-            </li>
-          </ul>
-          <!--fim lista -->
-        </div>
-        <!--Fim de dropdown-->
-      </nav>
-    </div>
-    <!--Fim de container -->
-  </header>
-  <article>
-    <div class="titulo-pagina">
-      <div class="container">
+---
+layout: layout
+titulo: Equipe
+subtitulo:
+---
         <div class="row">
           <div class="col-md-12 p-4">
             <h1>Nossa Equipe</h1>
@@ -77,7 +20,7 @@ <h2>Cordenação</h2>
       <div class="row">
         <div class="col-md-3 col-sm-6">
           <div class="text-center">
-            <a href="#"><img src="../images/icone.png" class="img-fluid rounded-circle"></a>
+            <a href="#"><img src="../assets/images/icone.png" class="img-fluid rounded-circle"></a>
             <a href="#">
               <h3>Lorem ipsum dolor</h3>
             </a>
@@ -86,7 +29,7 @@ <h3>Professor do IFSP</h3>
         </div>
         <div class="col-md-3 col-sm-6">
           <div class="text-center">
-            <a href="#"><img src="../images/icone.png" class="img-fluid rounded-circle"></a>
+            <a href="#"><img src="../assets/images/icone.png" class="img-fluid rounded-circle"></a>
             <a href="#">
               <h3>Lorem ipsum dolor</h3>
             </a>
@@ -95,7 +38,7 @@ <h3>Professor do IFSP</h3>
         </div>
         <div class="col-md-3 col-sm-6">
           <div class="text-center">
-            <a href="#"><img src="../images/icone.png" class="img-fluid rounded-circle"></a>
+            <a href="#"><img src="../assets/images/icone.png" class="img-fluid rounded-circle"></a>
             <a href="#">
               <h3>Lorem ipsum dolor</h3>
             </a>
@@ -107,7 +50,7 @@ <h2>Estudantes</h2>
       <div id="quebra-line" class="row">
         <div class="col-md-3 col-sm-6">
           <div class="text-center">
-            <a href="#"><img src="../images/icone.png" class="img-fluid rounded-circle"></a>
+            <a href="#"><img src="../assets/images/icone.png" class="img-fluid rounded-circle"></a>
             <a href="#">
               <h3>Lorem ipsum dolor</h3>
             </a>
@@ -116,7 +59,7 @@ <h3>Aluno do IFSP</h3>
         </div>
         <div class="col-md-3 col-sm-6">
           <div class="text-center">
-            <a href="#"><img src="../images/icone.png" class="img-fluid rounded-circle"></a>
+            <a href="#"><img src="../assets/images/icone.png" class="img-fluid rounded-circle"></a>
             <a href="#">
               <h3>Lorem ipsum dolor</h3>
             </a>
@@ -125,7 +68,7 @@ <h3>Aluno do IFSP</h3>
         </div>
         <div class="col-md-3 col-sm-6">
           <div class="text-center">
-            <a href="#"><img src="../images/icone.png" class="img-fluid rounded-circle"></a>
+            <a href="#"><img src="../assets/images/icone.png" class="img-fluid rounded-circle"></a>
             <a href="#"></a><a href="#">
               <h3>Lorem ipsum dolor</h3>
             </a>
@@ -134,7 +77,7 @@ <h3>Aluno do IFSP</h3>
         </div>
         <div class="col-md-3 col-sm-6">
           <div class="text-center">
-            <a href="#"><img src="../images/icone.png" class="img-fluid rounded-circle"></a>
+            <a href="#"><img src="../assets/images/icone.png" class="img-fluid rounded-circle"></a>
             <a href="#">
               <h3>Lorem ipsum dolor</h3>
             </a>
@@ -146,7 +89,7 @@ <h2>Colaboradores</h2>
       <div class="row">
         <div class="col-md-3 col-sm-6">
           <div class="text-center">
-            <a href="#"><img src="../images/icone.png" class="img-fluid rounded-circle"></a>
+            <a href="#"><img src="../assets/images/icone.png" class="img-fluid rounded-circle"></a>
             <a href="#">
               <h3>Lorem ipsum dolor</h3>
             </a>
@@ -155,7 +98,7 @@ <h3>Aluno do IFSP</h3>
         </div>
         <div class="col-md-3 col-sm-6">
           <div class="text-center">
-            <a href="#"><img src="../images/icone.png" class="img-fluid rounded-circle"></a>
+            <a href="#"><img src="../assets/images/icone.png" class="img-fluid rounded-circle"></a>
             <a href="#">
               <h3>Lorem ipsum dolor</h3>
             </a>
@@ -167,7 +110,7 @@ <h2>Ex-Integrantes</h2>
       <div class="row">
         <div class="col-md-3 col-sm-6">
           <div class="text-center">
-            <a href="#"><img src="../images/icone.png" class="img-fluid rounded-circle"></a>
+            <a href="#"><img src="../assets/images/icone.png" class="img-fluid rounded-circle"></a>
             <a href="#">
               <h3>Lorem ipsum dolor</h3>
             </a>
@@ -176,7 +119,7 @@ <h3>Aluno do IFSP</h3>
         </div>
         <div class="col-md-3 col-sm-6">
           <div class="text-center">
-            <a href="#"><img src="../images/icone.png" class="img-fluid rounded-circle"></a>
+            <a href="#"><img src="../assets/images/icone.png" class="img-fluid rounded-circle"></a>
             <a href="#">
               <h3>Lorem ipsum dolor</h3>
             </a>
@@ -185,7 +128,7 @@ <h3>Aluno do IFSP</h3>
         </div>
         <div class="col-md-3 col-sm-6">
           <div class="text-center">
-            <a href="#"><img src="../images/icone.png" class="img-fluid rounded-circle"></a>
+            <a href="#"><img src="../assets/images/icone.png" class="img-fluid rounded-circle"></a>
             <a href="#">
               <h3>Lorem ipsum dolor</h3>
             </a>
@@ -194,7 +137,7 @@ <h3>Aluno do IFSP</h3>
         </div>
         <div class="col-md-3 col-sm-6">
           <div class="text-center">
-            <a href="#"><img src="../images/icone.png" class="img-fluid rounded-circle"></a>
+            <a href="#"><img src="../assets/images/icone.png" class="img-fluid rounded-circle"></a>
             <a href="#">
               <h3>Lorem ipsum dolor</h3>
             </a>
@@ -202,32 +145,4 @@ <h3>Aluno do IFSP</h3>
           </div>
         </div>
       </div>
-    </div>
-  </article>
-  <aside id="entre-em-contato">
-    <div class="container">
-      <div class="row p-4">
-        <div class="col-sm">
-          <p>
-            <b>Faça parte da equipe do IFSP CodeLab</b>
-          </p>
-        </div>
-        <div class="col-sm ">
-          <button id="botao-entre-em-contato" type="button" class="btn btn-primary float-right">Entre em
-            contato</button>
-        </div>
-      </div>
-    </div>
-  </aside>
-  <footer>
-    <div class="container">
-      <div class="row">
-      </div>
-    </div>
-  </footer>
-  <script src="../bootstrap/js/jquery-3.3.1.slim.min.js"></script>
-  <script src="../bootstrap/js/popper.min.js"></script>
-  <script src="../bootstrap/js/bootstrap.min.js"></script>
-</body>
-
-</html>
\ No newline at end of file
+    </div>
\ No newline at end of file

From 6bc48ab3fc0f67fc05b24e60da446303beaf35c4 Mon Sep 17 00:00:00 2001
From: Vinicius Eustaquio Cortez <viniciusecortez@outlook.com>
Date: Tue, 2 Apr 2019 18:08:15 -0300
Subject: [PATCH 08/42] Contato adequado com Jekyll

---
 _includes/navbar.html |   2 +-
 pages/contato.html    | 114 +++---------------------------------------
 2 files changed, 7 insertions(+), 109 deletions(-)

diff --git a/_includes/navbar.html b/_includes/navbar.html
index 38a2b8f..a38ac7f 100644
--- a/_includes/navbar.html
+++ b/_includes/navbar.html
@@ -35,7 +35,7 @@
               <a class="nav-link" href="/pages/artigos.html">Artigos</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" href="/pages/contato.html">Contatos</a>
+              <a class="nav-link" href="/pages/contato.html">Contato</a>
             </li>
           </ul>
           <!--fim lista -->
diff --git a/pages/contato.html b/pages/contato.html
index f0a5205..24fa26f 100644
--- a/pages/contato.html
+++ b/pages/contato.html
@@ -1,113 +1,11 @@
-<!doctype html>
-<html lang="pt-br">
-
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-  <link rel="stylesheet" href="../bootstrap/css/bootstrap.min.css">
-  <link rel="stylesheet" href="../css/estilo_layout.css">
-  <title>Contato</title>
-</head>
-
-<body>
-  <header>
-    <div class="container">
-      <nav class="navbar navbar-expand-md navbar-light bg-light">
-        <a class="navbar-brand " href="#">
-          >IFSP
-          <span>CODELAB</span>
-        </a>
-        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown"
-          aria-expanded="false" aria-label="Alterna navegação">
-          <span class="navbar-toggler-icon"></span>
-        </button>
-        <div class="collapse navbar-collapse" id="navbarNavDropdown">
-          <ul class="navbar-nav  ml-auto  ">
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true"
-                aria-expanded="false">
-                O laboratório
-              </a>
-              <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
-                <a class="dropdown-item" href="#">Missão, Visão e Valores</a>
-                <a class="dropdown-item" href="#">Publicações</a>
-                <a class="dropdown-item" href="#">Equipe</a>
-              </div>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Projetos</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Parcerias</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Notícias</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Artigos</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Contatos</a>
-            </li>
-          </ul>
-          <!--fim lista -->
-        </div>
-        <!--Fim de dropdown-->
-      </nav>
-    </div>
-    <!--Fim de container -->
-  </header>
-  <article>
-    <div class="titulo-pagina">
-      <div class="container">
-        <div class="row">
-          <div class="col-md-12 p-4">
-            <h1>Contato</h1>
-            <p class="lead">Lorem ipsum dolor sit amet consectetur adipisicing elit. </p>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div id="conteudo" class="container aumenta-margem-top">
-        <div class="card flex-row flex-wrap">
-            <div class="card-header  border-0">
-                <img class= "img-contato rounded-circle"src="../images/github-icon.png" >
-            </div>
-            <div class="card-block px-2 preenchimento">
-              <a href="">
-                <h2 class="card-title">Contato pelo github</h2>
-                <p class="card-text">Visite-nos pelo github!</p>
-              </a>
-            </div>
-            <div class="w-100"></div>
-         
-        </div>
-        
-    </div>  
-  </article>
-  <aside id="entre-em-contato">
-    <div class="container">
+---
+layout: layout
+titulo: Contato
+subtitulo:
+---
       <div class="row p-4">
         <div class="col-sm">
           <p>
             <b>Faça parte da equipe do IFSP CodeLab</b>
           </p>
-        </div>
-        <div class="col-sm ">
-          <button id="botao-entre-em-contato" type="button" class="btn btn-primary float-right">Entre em contato</button>
-        </div>
-      </div>
-    </div>
-  </aside>
-  <footer>
-    <div class="container">
-      <div class="row">
-      </div>
-    </div>
-  </footer>
-  <script src="../bootstrap/js/jquery-3.3.1.slim.min.js"></script>
-  <script src="../bootstrap/js/popper.min.js"></script>
-  <script src="../bootstrap/js/bootstrap.min.js"></script>
-</body>
-
-</html>
\ No newline at end of file
+        </div>
\ No newline at end of file

From 74dce5bbd82da5dbeb2e366cd682f28c9524f00f Mon Sep 17 00:00:00 2001
From: Vinicius Eustaquio Cortez <viniciusecortez@outlook.com>
Date: Wed, 3 Apr 2019 15:00:42 -0300
Subject: [PATCH 09/42] =?UTF-8?q?Adaptada=20p=C3=A1gina=20de=20not=C3=ADci?=
 =?UTF-8?q?as?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _layouts/layout.html |   2 +-
 pages/noticias.html  | 118 ++++++-------------------------------------
 2 files changed, 16 insertions(+), 104 deletions(-)

diff --git a/_layouts/layout.html b/_layouts/layout.html
index 8441471..37f8d04 100644
--- a/_layouts/layout.html
+++ b/_layouts/layout.html
@@ -6,7 +6,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
   <link rel="stylesheet" href="../bootstrap/css/bootstrap.min.css">
   <link rel="stylesheet" href="../assets/css/estilo_layout.css">
-  <title>Layout</title>
+  <title>{{ page.titulo }} - CODELAB</title>
 </head>
 
 <body>
diff --git a/pages/noticias.html b/pages/noticias.html
index c07e2c2..7cb864b 100644
--- a/pages/noticias.html
+++ b/pages/noticias.html
@@ -1,79 +1,17 @@
-<!doctype html>
-<html lang="pt-br">
-
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-  <link rel="stylesheet" href="../bootstrap/css/bootstrap.min.css">
-  <link rel="stylesheet" href="../css/estilo_layout.css">
-  <title>Notícias</title>
-</head>
-
-<body>
-  <header>
-    <div class="container">
-      <nav class="navbar navbar-expand-md navbar-light bg-light">
-        <a class="navbar-brand " href="#">
-          >IFSP
-          <span>CODELAB</span>
-        </a>
-        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown"
-          aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Alterna navegação">
-          <span class="navbar-toggler-icon"></span>
-        </button>
-        <div class="collapse navbar-collapse" id="navbarNavDropdown">
-          <ul class="navbar-nav  ml-auto  ">
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button"
-                data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                O laboratório
-              </a>
-              <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
-                <a class="dropdown-item" href="#">Missão, Visão e Valores</a>
-                <a class="dropdown-item" href="#">Publicações</a>
-                <a class="dropdown-item" href="#">Equipe</a>
-              </div>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Projetos</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Parcerias</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Notícias</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Artigos</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Contatos</a>
-            </li>
-          </ul>
-          <!--fim lista -->
-        </div>
-        <!--Fim de dropdown-->
-      </nav>
-    </div>
-    <!--Fim de container -->
-  </header>
+---  
+ layout: layout 
+ titulo: Notícias 
+ subtitulo: Lorem ipsum dolor, sit amet consectetur adipisicing elit. Eius dolorem, obcaecati ad laborum asperiores provident numquam sunt veniam, tenetur soluta odit deleniti assumenda dolorum dolor voluptas iste. Sapiente, soluta esse. 
+--- 
+  
+  
   <article>
-    <div class="titulo-pagina">
-      <div class="container">
-        <div class="row">
-          <div class="col-md-12 p-4">
-            <h1>Notícias</h1>
-            <p class="lead">Lorem ipsum dolor sit amet consectetur adipisicing elit. </p>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div id="botao-ver-noticia" class="container aumenta-margem-top">
+    <div id="botao-ver-noticia" class="aumenta-margem-top">
       <!-- Coloque o conteúdo aqui -->
       <main class="row">
         <div class="col-lg col-md-6 col-sm-12 aumenta-margem-bottom">
           <div class="card">
-            <img class="card-img-top img-fluid" src="../images/icone2.png" alt="Imagem de capa do card">
+            <img class="card-img-top img-fluid" src="../assets/images/icone2.png" alt="Imagem de capa do card">
             <div class="card-body">
               <h2 class="card-title">Título da notícia 1.1</h2>
               <p class="card-text">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Quidem deleniti in dolorum
@@ -88,7 +26,7 @@ <h2 class="card-title">Título da notícia 1.1</h2>
           <main class="row">
             <div class="col-md-6 col-sm-6 col-6">
               <div class="card">
-                <img class="card-img-top img-fluid" src="../images/icone2.png" alt="Imagem de capa do card">
+                <img class="card-img-top img-fluid" src="../assets/images/icone2.png" alt="Imagem de capa do card">
                 <div class="card-body">
                   <h2 class="card-title">Título da notícia 2.1</h2>
                   <p class="card-text">Lorem ipsum dolor sit amet, consectetur adipisicing elit.</p>
@@ -98,7 +36,7 @@ <h2 class="card-title">Título da notícia 2.1</h2>
             </div>
             <div class="col-md-6 col-sm-6 col-6">
               <div class="card">
-                <img class="card-img-top img-fluid" src="../images/icone2.png" alt="Imagem de capa do card">
+                <img class="card-img-top img-fluid" src="../assets/images/icone2.png" alt="Imagem de capa do card">
                 <div class="card-body">
                   <h2 class="card-title">Título da notícia 2.2</h2>
                   <p class="card-text">Lorem ipsum dolor sit amet, consectetur adipisicing elit.</p>
@@ -110,7 +48,7 @@ <h2 class="card-title">Título da notícia 2.2</h2>
           <main class="row aumenta-margem-top altera-font-size ">
             <div class="col-md-4 col-sm-4 col-4">
               <div class="card aumenta-margem-right">
-                <img class="card-img-top img-fluid" src="../images/icone2.png" alt="Imagem de capa do card">
+                <img class="card-img-top img-fluid" src="../assets/images/icone2.png" alt="Imagem de capa do card">
                 <div class="card-body p-2">
                   <h2 class="card-title">Título da notícia 3.1</h2>
                   <p class="card-text">Lorem ipsum dolor sit amet, consectetur adipisicing elit.</p>
@@ -120,7 +58,7 @@ <h2 class="card-title">Título da notícia 3.1</h2>
             </div>
             <div class="col-md-4 col-sm-4 col-4">
               <div class="card aumenta-margem-left-right">
-                <img class="card-img-top img-fluid" src="../images/icone2.png" alt="Imagem de capa do card">
+                <img class="card-img-top img-fluid" src="../assets/images/icone2.png" alt="Imagem de capa do card">
                 <div class="card-body p-2">
                   <h2 class="card-title">Título da notícia 3.2</h2>
                   <p class="card-text">Lorem ipsum dolor sit amet, consectetur adipisicing elit.</p>
@@ -130,7 +68,7 @@ <h2 class="card-title">Título da notícia 3.2</h2>
             </div>
             <div class="col-md-4 col-sm-4 col-4">
               <div class="card aumenta-margem-left">
-                <img class="card-img-bottom img-fluid" src="../images/icone2.png" alt="Imagem de capa do card">
+                <img class="card-img-bottom img-fluid" src="../assets/images/icone2.png" alt="Imagem de capa do card">
                 <div class="card-body p-2">
                   <h2 class="card-title">Título da notícia 3.3</h2>
                   <p class="card-text">Lorem ipsum dolor sit amet, consectetur adipisicing elit.</p>
@@ -143,30 +81,4 @@ <h2 class="card-title">Título da notícia 3.3</h2>
       </main>
     </div>
   </article>
-  <aside id="entre-em-contato">
-    <div class="container">
-      <div class="row p-4">
-        <div class="col-sm">
-          <p>
-            <b>Faça parte da equipe do IFSP CodeLab</b>
-          </p>
-        </div>
-        <div class="col-sm ">
-          <button id="botao-entre-em-contato" type="button" class="btn btn-primary float-right">Entre em
-            contato</button>
-        </div>
-      </div>
-    </div>
-  </aside>
-  <footer>
-    <div class="container">
-      <div class="row">
-      </div>
-    </div>
-  </footer>
-  <script src="../bootstrap/js/jquery-3.3.1.slim.min.js"></script>
-  <script src="../bootstrap/js/popper.min.js"></script>
-  <script src="../bootstrap/js/bootstrap.min.js"></script>
-</body>
-
-</html>
\ No newline at end of file
+ 
\ No newline at end of file

From 138e383c20e682859fa10f5ab2080f924e0f12eb Mon Sep 17 00:00:00 2001
From: Vinicius Eustaquio Cortez <viniciusecortez@outlook.com>
Date: Wed, 3 Apr 2019 15:19:17 -0300
Subject: [PATCH 10/42] Corrigido contato e modificado artigos

---
 pages/artigos.html | 239 ++++++++++++++-------------------------------
 pages/contato.html |  24 +++--
 2 files changed, 92 insertions(+), 171 deletions(-)

diff --git a/pages/artigos.html b/pages/artigos.html
index 3d83574..fc18d04 100644
--- a/pages/artigos.html
+++ b/pages/artigos.html
@@ -1,177 +1,86 @@
-<!doctype html>
-<html lang="pt-br">
-
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-  <link rel="stylesheet" href="../bootstrap/css/bootstrap.min.css">
-  <link rel="stylesheet" href="../css/estilo_layout.css">
-  <title>Artigos</title>
-</head>
-
-<body>
-  <header>
-    <div class="container">
-      <nav class="navbar navbar-expand-md navbar-light bg-light">
-        <a class="navbar-brand " href="#">
-          >IFSP
-          <span>CODELAB</span>
+---
+layout: layout
+titulo: artigos
+subtitulo:
+---
+<div class="row">
+  <div class="col-lg-3 col-md-4 col-sm-6 p-3">
+    <a href="#"><img src="../assets/images/icone.png" class="rounded mx-auto d-block img-membro aumenta-margem"></a>
+  </div>
+  <div class="col-lg-9 col-md-8 col-sm-6 p-4">
+    <div class="row">
+      <div class="col preenchimento">
+        <h1><a href="#">Artigo 01</a></h1>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col">
+        <time class="data" datetime="2017-02-14"></time>
+        <p class="negrito">12/01/2019</p>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col preenchimento">
+        <a href="#">
+          <p>Lorem ipsum dolor, sit amet consectetur adipisicing elit.
+            Deserunt repellat eveniet tentur, in dicta omnis nemo modi vel
+            illum libero iusto quos deleniti sunt eligendi, animi velit maxime est.</p>
         </a>
-        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown"
-          aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Alterna navegação">
-          <span class="navbar-toggler-icon"></span>
-        </button>
-        <div class="collapse navbar-collapse" id="navbarNavDropdown">
-          <ul class="navbar-nav  ml-auto  ">
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button"
-                data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                O laboratório
-              </a>
-              <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
-                <a class="dropdown-item" href="#">Missão, Visão e Valores</a>
-                <a class="dropdown-item" href="#">Publicações</a>
-                <a class="dropdown-item" href="#">Equipe</a>
-              </div>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Projetos</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Parcerias</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Notícias</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Artigos</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Contatos</a>
-            </li>
-          </ul>
-          <!--fim lista -->
-        </div>
-        <!--Fim de dropdown-->
-      </nav>
+      </div>
     </div>
-    <!--Fim de container -->
-  </header>
-  <article>
-    <!--Sub-titulo-->
-    <div class="titulo-pagina">
-      <div class="container">
-        <div class="row">
-          <div class="col-md-12 p-4">
-            <h1>Artigos</h1>
-          </div>
-        </div>
+  </div>
+</div>
+<div class="row">
+  <div class="col-lg-3 col-md-4 col-sm-6 p-3">
+    <a href="#"><img src="../assets/images/icone.png" class="rounded mx-auto d-block img-membro aumenta-margem"></a>
+  </div>
+  <div class="col-lg-9 col-md-8 col-sm-6 p-4">
+    <div class="row">
+      <div class="col preenchimento">
+        <h1><a href="#">Artigo 02</a></h1>
       </div>
     </div>
-    <!--Fim do Sub-titulo-->
-    <!--Conteudo-->
-    <div class="container">
-      <div class="row">
-        <div class="col-lg-3 col-md-4 col-sm-6 p-3">
-          <a href="#"><img src="../images/icone.png" class="rounded mx-auto d-block img-membro aumenta-margem"></a>
-        </div>
-        <div class="col-lg-9 col-md-8 col-sm-6 p-4">
-          <div class="row">
-            <div class="col preenchimento">
-              <h1><a href="#">Artigo 01</a></h1>
-            </div>
-          </div>
-          <div class="row">
-            <div class="col">
-              <time class="data" datetime="2017-02-14"></time>
-              <p class="negrito">12/01/2019</p>
-            </div>
-          </div>
-          <div class="row">
-            <div class="col preenchimento">
-              <a href="#"><p>Lorem ipsum dolor, sit amet consectetur adipisicing elit.
-                Deserunt repellat eveniet tentur, in dicta omnis nemo modi vel
-                illum libero iusto quos deleniti sunt eligendi, animi velit maxime est.</p></a>
-            </div>
-          </div>
-        </div>
+    <div class="row">
+      <div class="col">
+        <time class="data" datetime="2017-02-14"></time>
+        <p class="negrito">12/01/2019</p>
       </div>
-      <div class="row">
-        <div class="col-lg-3 col-md-4 col-sm-6 p-3">
-          <a href="#"><img src="../images/icone.png" class="rounded mx-auto d-block img-membro aumenta-margem"></a>
-        </div>
-        <div class="col-lg-9 col-md-8 col-sm-6 p-4">
-          <div class="row">
-            <div class="col preenchimento">
-              <h1><a href="#">Artigo 02</a></h1>
-            </div>
-          </div>
-          <div class="row">
-            <div class="col">
-              <time class="data" datetime="2017-02-14"></time>
-              <p class="negrito">12/01/2019</p>
-            </div>
-          </div>
-          <div class="row">
-            <div class="col preenchimento">
-              <a href="#"><p>Lorem ipsum dolor, sit amet consectetur adipisicing elit.
-                Deserunt repellat eveniet tentur, in dicta omnis nemo modi vel
-                illum libero iusto quos deleniti sunt eligendi, animi velit maxime est.</p></a>
-            </div>
-          </div>
-        </div>
+    </div>
+    <div class="row">
+      <div class="col preenchimento">
+        <a href="#">
+          <p>Lorem ipsum dolor, sit amet consectetur adipisicing elit.
+            Deserunt repellat eveniet tentur, in dicta omnis nemo modi vel
+            illum libero iusto quos deleniti sunt eligendi, animi velit maxime est.</p>
+        </a>
       </div>
-      <div class="row">
-        <div class="col-lg-3 col-md-4 col-sm-6 p-3">
-          <a href="#"><img src="../images/icone.png" class="rounded mx-auto d-block img-membro aumenta-margem"></a>
-        </div>
-        <div class="col-lg-9 col-md-8 col-sm-6 p-4">
-          <div class="row">
-            <div class="col preenchimento">
-              <h1><a href="#">Artigo 03</a></h1>
-            </div>
-          </div>
-          <div class="row">
-            <div class="col">
-              <time class="data" datetime="2017-02-14"></time>
-              <p class="negrito">12/01/2019</p>
-            </div>
-          </div>
-          <div class="row">
-            <div class="col preenchimento">
-              <a href="#"><p>Lorem ipsum dolor, sit amet consectetur adipisicing elit.
-                Deserunt repellat eveniet tentur, in dicta omnis nemo modi vel
-                illum libero iusto quos deleniti sunt eligendi, animi velit maxime est.</p></a>
-            </div>
-          </div>
-        </div>
+    </div>
+  </div>
+</div>
+<div class="row">
+  <div class="col-lg-3 col-md-4 col-sm-6 p-3">
+    <a href="#"><img src="../assets/images/icone.png" class="rounded mx-auto d-block img-membro aumenta-margem"></a>
+  </div>
+  <div class="col-lg-9 col-md-8 col-sm-6 p-4">
+    <div class="row">
+      <div class="col preenchimento">
+        <h1><a href="#">Artigo 03</a></h1>
       </div>
     </div>
-  </article>
-  <aside id="entre-em-contato">
-    <div class="container">
-      <div class="row p-4">
-        <div class="col-sm">
-          <p>
-            <b>Faça parte da equipe do IFSP CodeLab</b>
-          </p>
-        </div>
-        <div class="col-sm ">
-          <button id="botao-entre-em-contato" type="button" class="btn btn-primary float-right">Entre em
-            contato</button>
-        </div>
+    <div class="row">
+      <div class="col">
+        <time class="data" datetime="2017-02-14"></time>
+        <p class="negrito">12/01/2019</p>
       </div>
     </div>
-  </aside>
-  <footer>
-    <div class="container">
-      <div class="row">
+    <div class="row">
+      <div class="col preenchimento">
+        <a href="#">
+          <p>Lorem ipsum dolor, sit amet consectetur adipisicing elit.
+            Deserunt repellat eveniet tentur, in dicta omnis nemo modi vel
+            illum libero iusto quos deleniti sunt eligendi, animi velit maxime est.</p>
+        </a>
       </div>
     </div>
-  </footer>
-  <script src="../bootstrap/js/jquery-3.3.1.slim.min.js"></script>
-  <script src="../bootstrap/js/popper.min.js"></script>
-  <script src="../bootstrap/js/bootstrap.min.js"></script>
-</body>
-
-</html>
\ No newline at end of file
+  </div>
+</div>
\ No newline at end of file
diff --git a/pages/contato.html b/pages/contato.html
index 24fa26f..44a7283 100644
--- a/pages/contato.html
+++ b/pages/contato.html
@@ -3,9 +3,21 @@
 titulo: Contato
 subtitulo:
 ---
-      <div class="row p-4">
-        <div class="col-sm">
-          <p>
-            <b>Faça parte da equipe do IFSP CodeLab</b>
-          </p>
-        </div>
\ No newline at end of file
+
+<div id="conteudo">
+  <div class="card flex-row flex-wrap aumenta-margem-top">
+    <a href="https://github.com/ifspcodelab/ifspcodelab.github.io/issues">
+      <div class="card-header  border-0">
+        <img class="img-contato rounded-circle" src="../assets/images/github-icon.png">
+      </div>
+      <div class="card-block px-2 preenchimento">
+        <a href="https://github.com/ifspcodelab/ifspcodelab.github.io/issues">
+          <h2 class="card-title">Contato pelo github</h2>
+          <p class="card-text">Visite-nos pelo github!</p>
+        </a>
+      </div>
+    </a>
+    <div class="w-100"></div>
+
+  </div>
+</div>
\ No newline at end of file

From 151b8cde703669eb7f75dcc46028712c418019cc Mon Sep 17 00:00:00 2001
From: Vinicius Eustaquio Cortez <viniciusecortez@outlook.com>
Date: Wed, 3 Apr 2019 15:25:18 -0300
Subject: [PATCH 11/42] =?UTF-8?q?Adaptada=20p=C3=A1gina=20de=20projetos=20?=
 =?UTF-8?q?para=20jekyll?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/projetos.html | 181 +++++++++++---------------------------------
 1 file changed, 44 insertions(+), 137 deletions(-)

diff --git a/pages/projetos.html b/pages/projetos.html
index 43892ec..3410785 100644
--- a/pages/projetos.html
+++ b/pages/projetos.html
@@ -1,146 +1,53 @@
-<!doctype html>
-<html lang="pt-br">
+---
+layout: layout
+titulo: projetos
+subtitulo:
+---
 
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <link rel="stylesheet" href="../bootstrap/css/bootstrap.min.css">
-    <link rel="stylesheet" href="../css/estilo_layout.css">
-    <title>Projetos</title>
-</head>
-
-<body>
-    <header>
-        <div class="container">
-            <nav class="navbar navbar-expand-md navbar-light bg-light">
-                <a class="navbar-brand " href="#">
-                    >IFSP
-                    <span>CODELAB</span>
-                </a>
-                <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown"
-                    aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Alterna navegação">
-                    <span class="navbar-toggler-icon"></span>
-                </button>
-                <div class="collapse navbar-collapse" id="navbarNavDropdown">
-                    <ul class="navbar-nav  ml-auto  ">
-                        <li class="nav-item dropdown">
-                            <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button"
-                                data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                O laboratório
-                            </a>
-                            <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
-                                <a class="dropdown-item" href="#">Missão, Visão e Valores</a>
-                                <a class="dropdown-item" href="#">Publicações</a>
-                                <a class="dropdown-item" href="#">Equipe</a>
-                            </div>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" href="#">Projetos</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" href="#">Parcerias</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" href="#">Notícias</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" href="#">Artigos</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" href="#">Contatos</a>
-                        </li>
-                    </ul>
-                    <!--fim lista -->
-                </div>
-                <!--Fim de dropdown-->
-            </nav>
-        </div>
-        <!--Fim de container -->
-    </header>
-    <article>
-        <div class="titulo-pagina">
-            <div class="container">
-                <div class="row">
-                    <div class="col-md-12 p-4">
-                        <h1>PROJETOS</h1>
-                    </div>
-                </div>
+<div class="row">
+    <div class="col-lg-12 p-4">
+        <p>Lorem ipsum dolor sit amet consectetur adipisicing elit.
+            Quisquam laboriosam omnis fugiat iure quae recusandae deserunt
+            asperiores blanditiis illo totam porro repellat optio,
+            autem necessitatibus placeat esse eaque repudiandae molestiae.
+        </p>
+    </div>
+</div>
+<div class="row formatacao">
+    <div class="col-sm-6 col-md-4 p-4 d-flex">
+        <div class="card">
+            <img class="card-img-top" src="../assets/images/padrao.png" alt="imagem do card">
+            <div class="card-body flex-fill">
+                <h2 class="card-text">Projeto de Software X</h2>
+                <p>Aplicação Web</p>
             </div>
         </div>
-        <div class="container">
-            <div class="row">
-                <div class="col-lg-12 p-4">
-                    <p>Lorem ipsum dolor sit amet consectetur adipisicing elit.
-                        Quisquam laboriosam omnis fugiat iure quae recusandae deserunt
-                        asperiores blanditiis illo totam porro repellat optio,
-                        autem necessitatibus placeat esse eaque repudiandae molestiae.
-                    </p>
-                </div>
-            </div>
-            <div class="row formatacao">
-                <div class="col-sm-6 col-md-4 p-4 d-flex">
-                    <div class="card">
-                        <img class="card-img-top" src="../images/padrao.png" alt="imagem do card">
-                        <div class="card-body flex-fill">
-                            <h2 class="card-text">Projeto de Software X</h2>
-                            <p>Aplicação Web</p>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-sm-6 col-md-4 p-4 d-flex">
-                    <div class="card">
-                        <img class="card-img-top" src="../images/padrao.png" alt="imagem do card">
-                        <div class="card-body flex-fill">
-                            <h2 class="card-text">Aplicação Mobile para Controle de Y</h2>
-                            <p>Aplicação Web</p>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-sm-6 col-md-4 p-4 d-flex">
-                    <div class="card">
-                        <img class="card-img-top" src="../images/padrao.png" alt="imagem do card">
-                        <div class="card-body flex-fill">
-                            <h2 class="card-text">Sistema para gerenciamento de ABC</h2>
-                            <p>Aplicação Web</p>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-sm-6 col-md-4 p-4 d-flex">
-                    <div class="card">
-                        <img class="card-img-top" src="../images/padrao.png" alt="imagem do card">
-                        <div class="card-body flex-fill">
-                            <h2 class="card-text">Projeto de Software X</h2>
-                            <p>Projeto X</p>
-                        </div>
-                    </div>
-                </div>
+    </div>
+    <div class="col-sm-6 col-md-4 p-4 d-flex">
+        <div class="card">
+            <img class="card-img-top" src="../assets/images/padrao.png" alt="imagem do card">
+            <div class="card-body flex-fill">
+                <h2 class="card-text">Aplicação Mobile para Controle de Y</h2>
+                <p>Aplicação Web</p>
             </div>
         </div>
-    </article>
-    <aside id="entre-em-contato">
-        <div class="container">
-            <div class="row p-4">
-                <div class="col-sm">
-                    <p>
-                        <b>Faça parte da equipe do IFSP CodeLab</b>
-                    </p>
-                </div>
-                <div class="col-sm ">
-                    <button id="botao-entre-em-contato" type="button" class="btn btn-primary float-right">Entre em
-                        contato</button>
-                </div>
+    </div>
+    <div class="col-sm-6 col-md-4 p-4 d-flex">
+        <div class="card">
+            <img class="card-img-top" src="../assets/images/padrao.png" alt="imagem do card">
+            <div class="card-body flex-fill">
+                <h2 class="card-text">Sistema para gerenciamento de ABC</h2>
+                <p>Aplicação Web</p>
             </div>
         </div>
-    </aside>
-    <footer>
-        <div class="container">
-            <div class="row">
+    </div>
+    <div class="col-sm-6 col-md-4 p-4 d-flex">
+        <div class="card">
+            <img class="card-img-top" src="../assets/images/padrao.png" alt="imagem do card">
+            <div class="card-body flex-fill">
+                <h2 class="card-text">Projeto de Software X</h2>
+                <p>Projeto X</p>
             </div>
         </div>
-    </footer>
-    <script src="../bootstrap/js/jquery-3.3.1.slim.min.js"></script>
-    <script src="../bootstrap/js/popper.min.js"></script>
-    <script src="../bootstrap/js/bootstrap.min.js"></script>
-</body>
-
-</html>
\ No newline at end of file
+    </div>
+</div>
\ No newline at end of file

From 865e33f8d8b856e7647c089e7ca7671d740aeb84 Mon Sep 17 00:00:00 2001
From: Vinicius Eustaquio Cortez <viniciusecortez@outlook.com>
Date: Wed, 3 Apr 2019 15:32:10 -0300
Subject: [PATCH 12/42] Adaptado projetox

---
 pages/projetox.html | 254 ++++++++++++++------------------------------
 1 file changed, 78 insertions(+), 176 deletions(-)

diff --git a/pages/projetox.html b/pages/projetox.html
index 8c1cc0a..eb1b1b4 100644
--- a/pages/projetox.html
+++ b/pages/projetox.html
@@ -1,182 +1,84 @@
-<!doctype html>
-<html lang="pt-br">
+---
+layout: layout
+titulo: projeto
+---
+<div class="row">
+    <div class="col-md-12 p-md-5 p-2">
+        <img src="../assets/images/padrao.png" class="img-fluid rounded mx-auto d-block img-thumbnail" alt="imagem padrao">
+    </div>
+</div>
 
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <link rel="stylesheet" href="../bootstrap/css/bootstrap.min.css">
-    <link rel="stylesheet" href="../css/estilo_layout.css">
-    <link rel="stylesheet" href="../css/006.css">
-    <title>Projetos > Título do Projeto X</title>
-</head>
+<div class="row">
+    <div class="col-md-12 p-2">
+        <p>Lorem ipsum dolor sit amet consectetur adipisicing elit.
+            Quisquam laboriosam omnis fugiat iure quae recusandae deserunt
+            asperiores blanditiis illo totam porro repellat optio,
+            autem necessitatibus placeat esse eaque repudiandae molestiae.
+        </p>
+    </div>
+</div>
 
-<body>
-    <header>
-        <div class="container">
-            <nav class="navbar navbar-expand-md navbar-light bg-light">
-                <a class="navbar-brand " href="#">
-                    >IFSP
-                    <span>CODELAB</span>
-                </a>
-                <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown"
-                    aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Alterna navegação">
-                    <span class="navbar-toggler-icon"></span>
-                </button>
-                <div class="collapse navbar-collapse" id="navbarNavDropdown">
-                    <ul class="navbar-nav  ml-auto  ">
-                        <li class="nav-item dropdown">
-                            <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button"
-                                data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                O laboratório
-                            </a>
-                            <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
-                                <a class="dropdown-item" href="#">Missão, Visão e Valores</a>
-                                <a class="dropdown-item" href="#">Publicações</a>
-                                <a class="dropdown-item" href="#">Equipe</a>
-                            </div>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" href="#">Projetos</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" href="#">Parcerias</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" href="#">Notícias</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" href="#">Artigos</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" href="#">Contatos</a>
-                        </li>
-                    </ul>
-                    <!--fim lista -->
-                </div>
-                <!--Fim de dropdown-->
-            </nav>
-        </div>
-        <!--Fim de container -->
-    </header>
-    <article>
-        <div class="titulo-pagina">
-            <div class="container">
-                <div class="row">
-                    <div class="col-md-12 p-4">
-                        <h1>Título do Projeto de Software X</h1>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div  class="container">
-            <div class="container">
-                <div class="row">
-                    <div class="col-md-12 p-md-5 p-2">
-                        <img src="../images/padrao.png" class="img-fluid rounded mx-auto d-block img-thumbnail" alt="imagem padrao">
-                    </div>
-                </div>
+<div class="row formatacao">
+    <div class="col-md-12 p-2">
+        <h2>Processo de desenvolvimento</h2>
+        <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit.
+            Quia illum ex debitis facere porro! Omnis fugit dolorum expedita deserunt
+            optio dolores est vero libero saepe, ad eveniet? Quo, maiores veniam?</p>
+        <h2>Desafios e Conquistas</h2>
+        <p>Lorem ipsum dolor sit, amet consectetur adipisicing elit.
+            Maxime saepe, ab, error doloribus fugit perferendis, ullam provident
+            dolorum omnis aliquid dolor voluptates animi illum. Ullam quos atque perferendis
+            corporis dolor.Architecto iste natus autem magnam aliquam deserunt
+            perspiciatis expedita veniam quo? Ea repellendus facere porro? In, recusandae qui.
+            Minus minima at voluptas ipsum nobis! Reiciendis in fugiat itaque natus sunt?</p>
+    </div>
+</div>
 
-                <div class="row">
-                    <div class="col-md-12 p-2">
-                        <p>Lorem ipsum dolor sit amet consectetur adipisicing elit.
-                            Quisquam laboriosam omnis fugiat iure quae recusandae deserunt
-                            asperiores blanditiis illo totam porro repellat optio,
-                            autem necessitatibus placeat esse eaque repudiandae molestiae.
-                        </p>
-                    </div>
-                </div>
+<div class="row">
+    <div class="col-md-6 p-md-4 p-2">
+        <img src="../assets/images/padrao.png" class="img-fluid rounded mx-auto d-block img-thumbnail" alt="imagem padrao1">
+    </div>
+    <div class="col-md-6 p-md-4 p-2">
+        <img src="../assets/images/padrao.png" class="img-fluid rounded mx-auto d-block img-thumbnail" alt="imagem padrao2">
+    </div>
+</div>
 
-                <div class="row formatacao">
-                    <div class="col-md-12 p-2">
-                        <h2>Processo de desenvolvimento</h2>
-                        <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit.
-                            Quia illum ex debitis facere porro! Omnis fugit dolorum expedita deserunt
-                            optio dolores est vero libero saepe, ad eveniet? Quo, maiores veniam?</p>
-                        <h2>Desafios e Conquistas</h2>
-                        <p>Lorem ipsum dolor sit, amet consectetur adipisicing elit.
-                            Maxime saepe, ab, error doloribus fugit perferendis, ullam provident
-                            dolorum omnis aliquid dolor voluptates animi illum. Ullam quos atque perferendis
-                            corporis dolor.Architecto iste natus autem magnam aliquam deserunt
-                            perspiciatis expedita veniam quo? Ea repellendus facere porro? In, recusandae qui.
-                            Minus minima at voluptas ipsum nobis! Reiciendis in fugiat itaque natus sunt?</p>
-                    </div>
-                </div>
+<div class="row formatacao">
+    <div class="col-md-12 p-2">
+        <h2>Tecnologias Utilizadas</h2>
+        <p>Lorem ipsum dolor sit amet consectetur adipisicing elit.
+            Sit itaque accusantium fugit voluptatem blanditiis labore
+            laboriosam in, consequatur, sequi debitis at voluptates quidem ipsam
+            possimus maiores tempore libero nobis neque.</p>
+    </div>
 
-                <div class="row">
-                    <div class="col-md-6 p-md-4 p-2">
-                        <img src="../images/padrao.png" class="img-fluid rounded mx-auto d-block img-thumbnail" alt="imagem padrao1">
-                    </div>
-                    <div class="col-md-6 p-md-4 p-2">
-                        <img src="../images/padrao.png" class="img-fluid rounded mx-auto d-block img-thumbnail" alt="imagem padrao2">
-                    </div>
-                </div>
+</div>
+<div class="row">
+    <div class="col-6 col-sm-4 col-md-2 p-2">
+        <img src="../assets/images/grey.jpg" class="img-fluid rounded mx-auto d-block img-thumbnail" alt="imagem padrao3">
+    </div>
+    <div class="col-6 col-sm-4 col-md-2 p-2">
+        <img src="../assets/images/grey.jpg" class="img-fluid rounded mx-auto d-block img-thumbnail" alt="imagem padrao4">
+    </div>
+    <div class="col-6 col-sm-4 col-md-2 p-2">
+        <img src="../assets/images/grey.jpg" class="img-fluid rounded mx-auto d-block img-thumbnail" alt="imagem padrao5">
+    </div>
+    <div class="col-6 col-sm-4 col-md-2 p-2">
+        <img src="../assets/images/grey.jpg" class="img-fluid rounded mx-auto d-block img-thumbnail" alt="imagem padrao6">
+    </div>
+    <div class="col-6 col-sm-4 col-md-2 p-2">
+        <img src="../assets/images/grey.jpg" class="img-fluid rounded mx-auto d-block img-thumbnail" alt="imagem padrao7">
+    </div>
+    <div class="col-6 col-sm-4 col-md-2 p-2">
+        <img src="../assets/images/grey.jpg" class="img-fluid rounded mx-auto d-block img-thumbnail" alt="imagem padrao8">
+    </div>
+</div>
 
-                <div class="row formatacao">
-                    <div class="col-md-12 p-2">
-                        <h2>Tecnologias Utilizadas</h2>
-                        <p>Lorem ipsum dolor sit amet consectetur adipisicing elit.
-                            Sit itaque accusantium fugit voluptatem blanditiis labore
-                            laboriosam in, consequatur, sequi debitis at voluptates quidem ipsam
-                            possimus maiores tempore libero nobis neque.</p>
-                    </div>
-
-                </div>
-                <div class="row">
-                    <div class="col-6 col-sm-4 col-md-2 p-2">
-                        <img src="../images/grey.jpg" class="img-fluid rounded mx-auto d-block img-thumbnail" alt="imagem padrao3">
-                    </div>
-                    <div class="col-6 col-sm-4 col-md-2 p-2">
-                        <img src="../images/grey.jpg" class="img-fluid rounded mx-auto d-block img-thumbnail" alt="imagem padrao4">
-                    </div>
-                    <div class="col-6 col-sm-4 col-md-2 p-2">
-                        <img src="../images/grey.jpg" class="img-fluid rounded mx-auto d-block img-thumbnail" alt="imagem padrao5">
-                    </div>
-                    <div class="col-6 col-sm-4 col-md-2 p-2">
-                        <img src="../images/grey.jpg" class="img-fluid rounded mx-auto d-block img-thumbnail" alt="imagem padrao6">
-                    </div>
-                    <div class="col-6 col-sm-4 col-md-2 p-2">
-                        <img src="../images/grey.jpg" class="img-fluid rounded mx-auto d-block img-thumbnail" alt="imagem padrao7">
-                    </div>
-                    <div class="col-6 col-sm-4 col-md-2 p-2">
-                        <img src="../images/grey.jpg" class="img-fluid rounded mx-auto d-block img-thumbnail" alt="imagem padrao8">
-                    </div>
-                </div>
-
-                <div class="row">
-                    <div class="col-md-12 p-2">
-                        <p>Lorem ipsum dolor sit amet consectetur adipisicing elit.
-                            Sit itaque accusantium fugit voluptatem blanditiis labore
-                            laboriosam in, consequatur, sequi debitis at voluptates quidem ipsam
-                            possimus maiores tempore libero nobis neque.</p>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </article>
-    <aside id="entre-em-contato">
-        <div class="container">
-            <div class="row p-4">
-                <div class="col-sm">
-                    <p>
-                        <b>Faça parte da equipe do IFSP CodeLab</b>
-                    </p>
-                </div>
-                <div class="col-sm ">
-                    <button id="botao-entre-em-contato" type="button" class="btn btn-primary float-right">Entre em
-                        contato</button>
-                </div>
-            </div>
-        </div>
-    </aside>
-    <footer>
-        <div class="container">
-            <div class="row">
-            </div>
-        </div>
-    </footer>
-    <script src="../bootstrap/js/jquery-3.3.1.slim.min.js"></script>
-    <script src="../bootstrap/js/popper.min.js"></script>
-    <script src="../bootstrap/js/bootstrap.min.js"></script>
-</body>
-
-</html>
\ No newline at end of file
+<div class="row">
+    <div class="col-md-12 p-2">
+        <p>Lorem ipsum dolor sit amet consectetur adipisicing elit.
+            Sit itaque accusantium fugit voluptatem blanditiis labore
+            laboriosam in, consequatur, sequi debitis at voluptates quidem ipsam
+            possimus maiores tempore libero nobis neque.</p>
+    </div>
+</div>
\ No newline at end of file

From 8218f273b37edb0fa97d08cf2638283ba4ff1349 Mon Sep 17 00:00:00 2001
From: Vinicius Eustaquio Cortez <viniciusecortez@outlook.com>
Date: Wed, 3 Apr 2019 15:48:05 -0300
Subject: [PATCH 13/42] =?UTF-8?q?Corrigida=20a=20p=C3=A1gina=20publica?=
 =?UTF-8?q?=C3=A7=C3=B5es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/missao-visao-valores.html |  84 +++++++-------
 pages/publicacoes.html          | 188 ++++++++------------------------
 2 files changed, 89 insertions(+), 183 deletions(-)

diff --git a/pages/missao-visao-valores.html b/pages/missao-visao-valores.html
index e8c8f54..89a1651 100644
--- a/pages/missao-visao-valores.html
+++ b/pages/missao-visao-valores.html
@@ -3,44 +3,46 @@
 titulo: Missão, Visão e Valores
 subtitulo:
 ---
-        
-        <main class="row">
-          <div class="col-md-12 p-4">
-            <p>Lorem ipsum dolor sit amet consectetur adipisicing elit.
-              Quisquam laboriosam omnis fugiat iure quae recusandae deserunt
-              asperiores blanditiis illo totam porro repellat optio,
-              autem necessitatibus placeat esse eaque repudiandae molestiae.
-            </p>
-          </div>
-        </main>
-        <div class="row">
-          <div class="col-md-12 p-2">
-            <img src="../assets/images/padrao.png" class="img-fluid rounded mx-auto d-block img-thumbnail" alt="imagem padrao">
-          </div>
-        </div>
-        <main class="row">
-          <div class="col-md-12 p-5">
-            <h2>Missão</h2>
-            <p>Lorem ipsum dolor, sit amet consectetur adipisicing elit.
-              Deserunt repellat eveniet tenetur, in dicta omnis nemo modi vel
-              illum libero iusto quos deleniti sunt eligendi, animi velit maxime est.
-              Tempora.Eius ea tempora facilis minus quisquam animi dicta corrupti,
-              veritatis enim ad aspernatur doloribus atque dignissimos, odit incidunt
-              mollitia sed placeat id reprehenderit at molestiae velit delectus cum. Autem, repellat?</p>
-            <h2>Visão</h2>
-            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit.
-              Enim ipsum et cum alias ducimus sequi aliquid possimus.
-              Saepe hic accusantium voluptatum ad magni cupiditate reiciendis atque amet.
-              Nobis, repellendus excepturi?</p>
-            <h2>Valores</h2>
-            <p>Lorem ipsum dolor sit amet consectetur adipisicing elit.
-              Ratione repellendus nostrum id modi ab aliquam quasi maxime eligendi ad!
-              Aspernatur deleniti nobis iusto sapiente ab qui itaque? Beatae, esse saepe.
-              Provident asperiores iure, hic laboriosam ab autem magnam dignissimos cumque nisi
-              sint iste numquam? Minima rem fugiat accusantium iste aperiam ipsum eum officia!
-              Odit non adipisci eligendi voluptatem soluta doloremque.
-              Voluptates accusamus iusto, voluptatum velit tempore veritatis aperiam! Adipisci,
-              laboriosam illum repudiandae laborum sunt sed optio distinctio, maxime, deleniti sit
-              aperiam nisi esse! Explicabo illum blanditiis asperiores, error dolorem voluptatem!</p>
-          </div>
-        </main>
\ No newline at end of file
+<main>
+  <div class="row">
+    <div class="col-md-12 p-4">
+      <p>Lorem ipsum dolor sit amet consectetur adipisicing elit.
+        Quisquam laboriosam omnis fugiat iure quae recusandae deserunt
+        asperiores blanditiis illo totam porro repellat optio,
+        autem necessitatibus placeat esse eaque repudiandae molestiae.
+      </p>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-md-12 p-2">
+      <img src="../assets/images/padrao.png" class="img-fluid rounded mx-auto d-block img-thumbnail"
+        alt="imagem padrao">
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-md-12 p-5">
+      <h2>Missão</h2>
+      <p>Lorem ipsum dolor, sit amet consectetur adipisicing elit.
+        Deserunt repellat eveniet tenetur, in dicta omnis nemo modi vel
+        illum libero iusto quos deleniti sunt eligendi, animi velit maxime est.
+        Tempora.Eius ea tempora facilis minus quisquam animi dicta corrupti,
+        veritatis enim ad aspernatur doloribus atque dignissimos, odit incidunt
+        mollitia sed placeat id reprehenderit at molestiae velit delectus cum. Autem, repellat?</p>
+      <h2>Visão</h2>
+      <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit.
+        Enim ipsum et cum alias ducimus sequi aliquid possimus.
+        Saepe hic accusantium voluptatum ad magni cupiditate reiciendis atque amet.
+        Nobis, repellendus excepturi?</p>
+      <h2>Valores</h2>
+      <p>Lorem ipsum dolor sit amet consectetur adipisicing elit.
+        Ratione repellendus nostrum id modi ab aliquam quasi maxime eligendi ad!
+        Aspernatur deleniti nobis iusto sapiente ab qui itaque? Beatae, esse saepe.
+        Provident asperiores iure, hic laboriosam ab autem magnam dignissimos cumque nisi
+        sint iste numquam? Minima rem fugiat accusantium iste aperiam ipsum eum officia!
+        Odit non adipisci eligendi voluptatem soluta doloremque.
+        Voluptates accusamus iusto, voluptatum velit tempore veritatis aperiam! Adipisci,
+        laboriosam illum repudiandae laborum sunt sed optio distinctio, maxime, deleniti sit
+        aperiam nisi esse! Explicabo illum blanditiis asperiores, error dolorem voluptatem!</p>
+    </div>
+  </div>
+</main>
\ No newline at end of file
diff --git a/pages/publicacoes.html b/pages/publicacoes.html
index 4119d02..4ad69fe 100644
--- a/pages/publicacoes.html
+++ b/pages/publicacoes.html
@@ -1,149 +1,53 @@
-<!doctype html>
-<html lang="pt-br">
+---
+layout: layout
+titulo: Publicação
+---
 
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-  <link rel="stylesheet" href="../bootstrap/css/bootstrap.min.css">
-  <link rel="stylesheet" href="../css/estilo_layout.css">
-  <link rel="stylesheet" href="../css/publicacoes.css">
-  <title>Publicações</title>
-</head>
-
-<body>
-  <header>
-    <div class="container">
-      <nav class="navbar navbar-expand-md navbar-light bg-light">
-        <a class="navbar-brand " href="#">
-          >IFSP
-          <span>CODELAB</span>
-        </a>
-        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown"
-          aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Alterna navegação">
-          <span class="navbar-toggler-icon"></span>
-        </button>
-        <div class="collapse navbar-collapse" id="navbarNavDropdown">
-          <ul class="navbar-nav  ml-auto  ">
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button"
-                data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                O laboratório
-              </a>
-              <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
-                <a class="dropdown-item" href="#">Missão, Visão e Valores</a>
-                <a class="dropdown-item" href="#">Publicações</a>
-                <a class="dropdown-item" href="#">Equipe</a>
-              </div>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Projetos</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Parcerias</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Notícias</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Artigos</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Contatos</a>
-            </li>
-          </ul>
-          <!--fim lista -->
-        </div>
-        <!--Fim de dropdown-->
-      </nav>
-    </div>
-    <!--Fim de container -->
-  </header>
-  <article>
-    <div class="titulo-pagina">
-      <div class="container">
-        <div class="row">
-          <div class="col-md-12 p-4">
-            <h1>Publicações</h1>
-            <p class="lead">Lorem ipsum dolor sit amet consectetur adipisicing elit. </p>
-          </div>
-        </div>
-      </div>
+<div class=" formatacao aumenta-margem">
+  <div class="row">
+    <div class="col-md-12">
+      <h2 class="borda-bottom">PUBLICAÇÃO EM DESTAQUE</h2>
     </div>
-    <!-- Coloque o conteúdo aqui -->
-    <div class="container formatacao aumenta-margem">
-      <div class="row">
-        <div class="col-md-12">
-          <h2 class="borda-bottom">PUBLICAÇÃO EM DESTAQUE</h2>
-        </div>
-      </div>
-      <div class="row formatacao-titulo">
-        <div class="col-md-12">
-          <div class="w-100 p-3 publicacao-destaque clearfix">
-            <h3 class="negrito">Título da Publicação em Destaque</h3>
-            <p><b>Abstract:</b> Lorem ipsum dolor sit amet consectetur adipisicing elit. Est aut rem, quia fugiat hic,
-              assumenda tempore eaque labore eius ut modi molestias quisquam dicta. Rem mollitia itaque soluta officia
-              cupiditate?</p>
-            <a id="botao-publicacao" href="#" class="btn btn-primary float-right">LER PUBLICAÇÃO</a>
+  </div>
+  <div class="row formatacao-titulo">
+    <div class="col-md-12">
+      <div class="w-100 p-3 publicacao-destaque clearfix">
+        <h3 class="negrito">Título da Publicação em Destaque</h3>
+        <p><b>Abstract:</b> Lorem ipsum dolor sit amet consectetur adipisicing elit. Est aut rem, quia fugiat hic,
+          assumenda tempore eaque labore eius ut modi molestias quisquam dicta. Rem mollitia itaque soluta officia
+          cupiditate?</p>
+        <a id="botao-publicacao" href="#" class="btn btn-primary float-right">LER PUBLICAÇÃO</a>
 
-          </div>
-        </div>
-      </div>
-      <div class="row">
-        <div class="col-md-12">
-          <h2 class="borda-bottom">2020</h2>
-        </div>
-      </div>
-      <div class="row">
-        <div class="col-md-12 final-do-texto">
-          <ul class="list-group preenchimento">
-            <li class="list-group-item"><a href="#">Cras justo odio</a></li>
-            <li class="list-group-item"><a href="#">Cras justo odio</a></li>
-            <li class="list-group-item"><a href="#">Cras justo odio</a></li>
-            <li class="list-group-item"><a href="#">Cras justo odio</a></li>
-          </ul>
-        </div>
-      </div>
-      <div class="row">
-        <div class="col-md-12">
-          <h2 class="borda-bottom">2019</h2>
-        </div>
-      </div>
-      <div class="row">
-        <div class="col-md-12 final-do-texto">
-          <ul class="list-group preenchimento">
-            <li class="list-group-item"><a href="#">Cras justo odio</a></li>
-            <li class="list-group-item"><a href="#">Cras justo odio</a></li>
-            <li class="list-group-item"><a href="#">Cras justo odio</a></li>
-          </ul>
-        </div>
       </div>
     </div>
-  </article>
-  <aside id="entre-em-contato">
-    <div class="container">
-      <div class="row p-4">
-        <div class="col-sm">
-          <p>
-            <b>Faça parte da equipe do IFSP CodeLab</b>
-          </p>
-        </div>
-        <div class="col-sm ">
-          <button id="botao-entre-em-contato" type="button" class="btn btn-primary float-right">Entre em
-            contato</button>
-        </div>
-      </div>
+  </div>
+  <div class="row">
+    <div class="col-md-12">
+      <h2 class="borda-bottom">2020</h2>
     </div>
-  </aside>
-  <footer>
-    <div class="container">
-      <div class="row">
-      </div>
+  </div>
+  <div class="row">
+    <div class="col-md-12 final-do-texto">
+      <ul class="list-group preenchimento">
+        <li class="list-group-item"><a href="#">Cras justo odio</a></li>
+        <li class="list-group-item"><a href="#">Cras justo odio</a></li>
+        <li class="list-group-item"><a href="#">Cras justo odio</a></li>
+        <li class="list-group-item"><a href="#">Cras justo odio</a></li>
+      </ul>
     </div>
-  </footer>
-  <script src="../bootstrap/js/jquery-3.3.1.slim.min.js"></script>
-  <script src="../bootstrap/js/popper.min.js"></script>
-  <script src="../bootstrap/js/bootstrap.min.js"></script>
-
-</body>
-
-</html>
\ No newline at end of file
+  </div>
+  <div class="row">
+    <div class="col-md-12">
+      <h2 class="borda-bottom">2019</h2>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-md-12 final-do-texto">
+      <ul class="list-group preenchimento">
+        <li class="list-group-item"><a href="#">Cras justo odio</a></li>
+        <li class="list-group-item"><a href="#">Cras justo odio</a></li>
+        <li class="list-group-item"><a href="#">Cras justo odio</a></li>
+      </ul>
+    </div>
+  </div>
+</div>
\ No newline at end of file

From 34b8f45ca0e496ab2454d4a89c7ed3bb95e05556 Mon Sep 17 00:00:00 2001
From: Vinicius Eustaquio Cortez <viniciusecortez@outlook.com>
Date: Wed, 3 Apr 2019 16:15:20 -0300
Subject: [PATCH 14/42] Criados includes e alterados layouts

---
 _includes/footer.html      |  23 ++++++++
 _includes/head.html        |   8 +++
 _layouts/layout.html       |  24 +--------
 pages/artigos-detalhe.html | 104 ++-----------------------------------
 pages/membro-equipe.html   | 100 +++++------------------------------
 5 files changed, 51 insertions(+), 208 deletions(-)
 create mode 100644 _includes/footer.html
 create mode 100644 _includes/head.html

diff --git a/_includes/footer.html b/_includes/footer.html
new file mode 100644
index 0000000..7203608
--- /dev/null
+++ b/_includes/footer.html
@@ -0,0 +1,23 @@
+<aside id="entre-em-contato">
+    <div class="container">
+      <div class="row p-4">
+        <div class="col-sm">
+          <p>
+            <b>Faça parte da equipe do IFSP CodeLab</b>
+          </p>
+        </div>
+        <div class="col-sm ">
+          <button id="botao-entre-em-contato" type="button" class="btn btn-primary float-right">Entre em contato</button>
+        </div>
+      </div>
+    </div>
+  </aside>
+  <footer>
+    <div class="container">
+      <div class="row">
+      </div>
+    </div>
+  </footer>
+  <script src="../bootstrap/js/jquery-3.3.1.slim.min.js"></script>
+  <script src="../bootstrap/js/popper.min.js"></script>
+  <script src="../bootstrap/js/bootstrap.min.js"></script>
\ No newline at end of file
diff --git a/_includes/head.html b/_includes/head.html
new file mode 100644
index 0000000..44bcf36
--- /dev/null
+++ b/_includes/head.html
@@ -0,0 +1,8 @@
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <link rel="stylesheet" href="/bootstrap/css/bootstrap.min.css">
+    <link rel="stylesheet" href="../assets/css/estilo_layout.css">
+    <title>{{ page.titulo }} - CODELAB</title>
+  </head>
+  
\ No newline at end of file
diff --git a/_layouts/layout.html b/_layouts/layout.html
index 37f8d04..16e4123 100644
--- a/_layouts/layout.html
+++ b/_layouts/layout.html
@@ -17,29 +17,7 @@
         {{ content }}
     </div>
   </article>
-  <aside id="entre-em-contato">
-    <div class="container">
-      <div class="row p-4">
-        <div class="col-sm">
-          <p>
-            <b>Faça parte da equipe do IFSP CodeLab</b>
-          </p>
-        </div>
-        <div class="col-sm ">
-          <button id="botao-entre-em-contato" type="button" class="btn btn-primary float-right">Entre em contato</button>
-        </div>
-      </div>
-    </div>
-  </aside>
-  <footer>
-    <div class="container">
-      <div class="row">
-      </div>
-    </div>
-  </footer>
-  <script src="../bootstrap/js/jquery-3.3.1.slim.min.js"></script>
-  <script src="../bootstrap/js/popper.min.js"></script>
-  <script src="../bootstrap/js/bootstrap.min.js"></script>
+  {% include footer.html %}
 </body>
 
 </html>
\ No newline at end of file
diff --git a/pages/artigos-detalhe.html b/pages/artigos-detalhe.html
index bda5c8b..ec4a797 100644
--- a/pages/artigos-detalhe.html
+++ b/pages/artigos-detalhe.html
@@ -1,79 +1,13 @@
-<!doctype html>
-<html lang="pt-br">
-
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <link rel="stylesheet" href="../bootstrap/css/bootstrap.min.css">
-    <link rel="stylesheet" href="../css/estilo_layout.css">
-    <title>Artigo 01</title>
-</head>
-
-<body>
-    <header>
-        <div class="container">
-            <nav class="navbar navbar-expand-md navbar-light bg-light">
-                <a class="navbar-brand " href="#">
-                    >IFSP
-                    <span>CODELAB</span>
-                </a>
-                <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown"
-                    aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Alterna navegação">
-                    <span class="navbar-toggler-icon"></span>
-                </button>
-                <div class="collapse navbar-collapse" id="navbarNavDropdown">
-                    <ul class="navbar-nav  ml-auto  ">
-                        <li class="nav-item dropdown">
-                            <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button"
-                                data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                O laboratório
-                            </a>
-                            <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
-                                <a class="dropdown-item" href="#">Missão, Visão e Valores</a>
-                                <a class="dropdown-item" href="#">Publicações</a>
-                                <a class="dropdown-item" href="#">Equipe</a>
-                            </div>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" href="#">Projetos</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" href="#">Parcerias</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" href="#">Notícias</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" href="#">Artigos</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" href="#">Contatos</a>
-                        </li>
-                    </ul>
-                    <!--fim lista -->
-                </div>
-                <!--Fim de dropdown-->
-            </nav>
-        </div>
-        <!--Fim de container -->
-    </header>
-    <article>
-        <!--Sub-titulo-->
-        <div class="titulo-pagina">
-            <div class="container">
-                <div class="row">
-                    <div class="col-md-12 p-4">
-                        <h1>Artigo 01</h1>
-                    </div>
-                </div>
-            </div>
-        </div>
+---
+layout: layout
+titulo: artigo-detalhe
+---
         <!--Fim do Sub-titulo-->
         <!--Conteudo-->
         <div class="container-fluid">
             <div class="row">
                 <div class="col p-3">
-                    <img src="../images/icone-centro.png" class="rounded mx-auto d-block img-recursiva">
+                    <img src="../assets/images/icone-centro.png" class="rounded mx-auto d-block img-recursiva">
                 </div>
             </div>
         <div class="container">
@@ -92,32 +26,4 @@ <h1>Artigo 01</h1>
             </div>
         </div>
         </div>
-        </div>
-    </article>
-    <aside id="entre-em-contato">
-        <div class="container">
-            <div class="row p-4">
-                <div class="col-sm">
-                    <p>
-                        <b>Faça parte da equipe do IFSP CodeLab</b>
-                    </p>
-                </div>
-                <div class="col-sm ">
-                    <button id="botao-entre-em-contato" type="button" class="btn btn-primary float-right">Entre em
-                        contato</button>
-                </div>
-            </div>
-        </div>
-    </aside>
-    <footer>
-        <div class="container">
-            <div class="row">
-            </div>
-        </div>
-    </footer>
-    <script src="../bootstrap/js/jquery-3.3.1.slim.min.js"></script>
-    <script src="../bootstrap/js/popper.min.js"></script>
-    <script src="../bootstrap/js/bootstrap.min.js"></script>
-</body>
 
-</html>
\ No newline at end of file
diff --git a/pages/membro-equipe.html b/pages/membro-equipe.html
index e522586..2bfab19 100644
--- a/pages/membro-equipe.html
+++ b/pages/membro-equipe.html
@@ -1,78 +1,29 @@
+---
+
+---
+
 <!doctype html>
 <html lang="pt-br">
 
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-  <link rel="stylesheet" href="../bootstrap/css/bootstrap.min.css">
-  <link rel="stylesheet" href="../css/estilo_layout.css">
-  <title>Equipe</title>
-</head>
-
+{% include head.html %}
 <body>
-  <header>
-    <div class="container">
-      <nav class="navbar navbar-expand-md navbar-light bg-light">
-        <a class="navbar-brand " href="#">
-          >IFSP
-          <span>CODELAB</span>
-        </a>
-        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown"
-          aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Alterna navegação">
-          <span class="navbar-toggler-icon"></span>
-        </button>
-        <div class="collapse navbar-collapse" id="navbarNavDropdown">
-          <ul class="navbar-nav  ml-auto  ">
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button"
-                data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                O laboratório
-              </a>
-              <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
-                <a class="dropdown-item" href="#">Missão, Visão e Valores</a>
-                <a class="dropdown-item" href="#">Publicações</a>
-                <a class="dropdown-item" href="#">Equipe</a>
-              </div>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Projetos</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Parcerias</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Notícias</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Artigos</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Contatos</a>
-            </li>
-          </ul>
-          <!--fim lista -->
-        </div>
-        <!--Fim de dropdown-->
-      </nav>
-    </div>
-    <!--Fim de container -->
-  </header>
+  {% include navbar.html %}
   <article>
     <div class="titulo-pagina">
       <div class="container">
         <div class="row">
           <div class="col-lg-3 col-md-4 col-sm-12">
-            <img src="../images/icone.png" class="rounded-circle mx-auto d-block img-membro">
+            <img src="../assets/images/icone.png" class="rounded-circle mx-auto d-block img-membro">
           </div>
           <div class="col-lg-9 col-md-8 col-sm-12 p-4">
             <h1>NOME DO MEMBRO</h1>
             <p class="lead">Lorem ipsum dolor sit amet consectetur adipisicing elit. Lorem ipsum dolor sit amet
               consectetur adipisicing elit. Unde, porro commodi consequatur cum nesciunt, dignissimos officia vero eos
               dolores facilis voluptates enim natus doloribus iusto recusandae, repudiandae ad cumque labore!</p>
-            <img src="../images/icone3.png" class="float-left p-1">
-            <img src="../images/icone3.png" class="float-left p-1">
-            <img src="../images/icone3.png" class="float-left p-1">
-            <img src="../images/icone3.png" class="float-left p-1">
+            <img src="../assets/images/icone3.png" class="float-left p-1">
+            <img src="../assets/images/icone3.png" class="float-left p-1">
+            <img src="../assets/images/icone3.png" class="float-left p-1">
+            <img src="../assets/images/icone3.png" class="float-left p-1">
           </div>
         </div>
       </div>
@@ -86,7 +37,7 @@ <h2>Projetos</h2>
       <main class="row">
         <div class="col-md-4 col-sm-6">
           <div class="text-center">
-            <img src="../images/icone2.png" class="img-fluid rounded img-thumbnail">
+            <img src="../assets/images/icone2.png" class="img-fluid rounded img-thumbnail">
             <a href="#">
               <h3>Pojeto de Software X</h3>
             </a>
@@ -95,7 +46,7 @@ <h3>Aplicação Web</h3>
         </div>
         <div class="col-md-4 col-sm-6">
           <div class="text-center">
-            <img src="../images/icone2.png" class="img-fluid rounded img-thumbnail">
+            <img src="../assets/images/icone2.png" class="img-fluid rounded img-thumbnail">
             <a href="#">
               <h3>Pojeto de Software Y</h3>
             </a>
@@ -119,30 +70,7 @@ <h2>Publicações</h2>
       </main>
     </div>
   </article>
-  <aside id="entre-em-contato">
-    <div class="container">
-      <div class="row p-4">
-        <div class="col-sm">
-          <p>
-            <b>Faça parte da equipe do IFSP CodeLab</b>
-          </p>
-        </div>
-        <div class="col-sm ">
-          <button id="botao-entre-em-contato" type="button" class="btn btn-primary float-right">Entre em
-            contato</button>
-        </div>
-      </div>
-    </div>
-  </aside>
-  <footer>
-    <div class="container">
-      <div class="row">
-      </div>
-    </div>>
-  </footer>
-  <script src="../bootstrap/js/jquery-3.3.1.slim.min.js"></script>
-  <script src="../bootstrap/js/popper.min.js"></script>
-  <script src="../bootstrap/js/bootstrap.min.js"></script>
+  {% include footer.html %}
 </body>
 
 </html>
\ No newline at end of file

From deb68eccf4e24ddee465d91a5bfcf6c8b88b2725 Mon Sep 17 00:00:00 2001
From: Vinicius Eustaquio Cortez <viniciusecortez@outlook.com>
Date: Wed, 3 Apr 2019 16:23:07 -0300
Subject: [PATCH 15/42] =?UTF-8?q?Adequado=20ao=20jekyll=20a=20p=C3=A1gina?=
 =?UTF-8?q?=20artigos-detalhe?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/artigos-detalhe.html |  42 +++++------
 pages/detalhe-noticia.html | 104 ++------------------------
 pages/noticias.html        | 145 +++++++++++++++++++------------------
 3 files changed, 100 insertions(+), 191 deletions(-)

diff --git a/pages/artigos-detalhe.html b/pages/artigos-detalhe.html
index ec4a797..14a76c3 100644
--- a/pages/artigos-detalhe.html
+++ b/pages/artigos-detalhe.html
@@ -2,28 +2,26 @@
 layout: layout
 titulo: artigo-detalhe
 ---
-        <!--Fim do Sub-titulo-->
-        <!--Conteudo-->
-        <div class="container-fluid">
-            <div class="row">
-                <div class="col p-3">
-                    <img src="../assets/images/icone-centro.png" class="rounded mx-auto d-block img-recursiva">
-                </div>
-            </div>
-        <div class="container">
-            <div class="row">
-                <div class="col">
-                    <time class="data" datetime="2017-02-14"></time>
-                    <p class="negrito">12/01/2019</p>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col preenchimento">
-                    <p>Lorem ipsum dolor, sit amet consectetur adipisicing elit.
-                        Deserunt repellat eveniet tentur, in dicta omnis nemo modi vel
-                        illum libero iusto quos deleniti sunt eligendi, animi velit maxime est.</p>
-                </div>
+
+<div class="container-fluid">
+    <div class="row">
+        <div class="col p-3">
+            <img src="../assets/images/icone-centro.png" class="rounded mx-auto d-block img-recursiva">
+        </div>
+    </div>
+    <div class="container">
+        <div class="row">
+            <div class="col">
+                <time class="data" datetime="2017-02-14"></time>
+                <p class="negrito">12/01/2019</p>
             </div>
         </div>
+        <div class="row">
+            <div class="col preenchimento">
+                <p>Lorem ipsum dolor, sit amet consectetur adipisicing elit.
+                    Deserunt repellat eveniet tentur, in dicta omnis nemo modi vel
+                    illum libero iusto quos deleniti sunt eligendi, animi velit maxime est.</p>
+            </div>
         </div>
-
+    </div>
+</div>
\ No newline at end of file
diff --git a/pages/detalhe-noticia.html b/pages/detalhe-noticia.html
index ff3c9a9..0ffcf48 100644
--- a/pages/detalhe-noticia.html
+++ b/pages/detalhe-noticia.html
@@ -1,77 +1,12 @@
-<!doctype html>
-<html lang="pt-br">
-
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-  <link rel="stylesheet" href="../bootstrap/css/bootstrap.min.css">
-  <link rel="stylesheet" href="../css/estilo_layout.css">
-  <title>Nome da notícia</title>
-</head>
-
-<body>
-  <header>
-    <div class="container">
-      <nav class="navbar navbar-expand-md navbar-light bg-light">
-        <a class="navbar-brand " href="#">
-          >IFSP
-          <span>CODELAB</span>
-        </a>
-        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown"
-          aria-expanded="false" aria-label="Alterna navegação">
-          <span class="navbar-toggler-icon"></span>
-        </button>
-        <div class="collapse navbar-collapse" id="navbarNavDropdown">
-          <ul class="navbar-nav  ml-auto  ">
-            <li class="nav-item dropdown">
-              <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true"
-                aria-expanded="false">
-                O laboratório
-              </a>
-              <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
-                <a class="dropdown-item" href="#">Missão, Visão e Valores</a>
-                <a class="dropdown-item" href="#">Publicações</a>
-                <a class="dropdown-item" href="#">Equipe</a>
-              </div>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Projetos</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Parcerias</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Notícias</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Artigos</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="#">Contatos</a>
-            </li>
-          </ul>
-          <!--fim lista -->
-        </div>
-        <!--Fim de dropdown-->
-      </nav>
-    </div>
-    <!--Fim de container -->
-  </header>
-  <article>
-    <div class="titulo-pagina">
-      <div class="container">
-        <div class="row">
-          <div class="col-md-12 p-4">
-            <h1>Nome da notícia</h1>
-            <p class="lead">Lorem ipsum dolor sit amet consectetur adipisicing elit. </p>
-          </div>
-        </div>
-      </div>
-    </div>
+---
+layout: layout
+titulo: Nome notícia
+subtitulo: 
+---
     <div  class="container">
       <div class="row">
         <div class="col-md-12">
-            <img src="../images/imagemNoticia.png" class="img-fluid imagem-principal" alt="Responsive image"/>
+            <img src="../assets/images/imagemNoticia.png" class="img-fluid imagem-principal" alt="Responsive image"/>
         </div>
       </div>
       <div class="row">
@@ -90,30 +25,5 @@ <h1>Nome da notícia</h1>
         </div>
       </div>
     </div>
-  </article>
-  <aside id="entre-em-contato">
-    <div class="container">
-      <div class="row p-4">
-        <div class="col-sm">
-          <p>
-            <b>Faça parte da equipe do IFSP CodeLab</b>
-          </p>
-        </div>
-        <div class="col-sm ">
-          <button id="botao-entre-em-contato" type="button" class="btn btn-primary float-right">Entre em contato</button>
-        </div>
-      </div>
-    </div>
-  </aside>
-  <footer>
-    <div class="container">
-      <div class="row">
-      </div>
-    </div>
-  </footer>
-  <script src="../bootstrap/js/jquery-3.3.1.slim.min.js"></script>
-  <script src="../bootstrap/js/popper.min.js"></script>
-  <script src="../bootstrap/js/bootstrap.min.js"></script>
-</body>
 
-</html>
\ No newline at end of file
+ 
\ No newline at end of file
diff --git a/pages/noticias.html b/pages/noticias.html
index 7cb864b..31c1deb 100644
--- a/pages/noticias.html
+++ b/pages/noticias.html
@@ -1,84 +1,85 @@
----  
- layout: layout 
- titulo: Notícias 
- subtitulo: Lorem ipsum dolor, sit amet consectetur adipisicing elit. Eius dolorem, obcaecati ad laborum asperiores provident numquam sunt veniam, tenetur soluta odit deleniti assumenda dolorum dolor voluptas iste. Sapiente, soluta esse. 
---- 
-  
-  
-  <article>
-    <div id="botao-ver-noticia" class="aumenta-margem-top">
-      <!-- Coloque o conteúdo aqui -->
-      <main class="row">
-        <div class="col-lg col-md-6 col-sm-12 aumenta-margem-bottom">
-          <div class="card">
-            <img class="card-img-top img-fluid" src="../assets/images/icone2.png" alt="Imagem de capa do card">
-            <div class="card-body">
-              <h2 class="card-title">Título da notícia 1.1</h2>
-              <p class="card-text">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Quidem deleniti in dolorum
-                temporibus sequi eius perspiciatis voluptas, enim, sunt exercitationem atque rerum!
-                Lorem ipsum dolor sit amet, consectetur adipisicing elit. Quidem deleniti in dolorum
-                temporibus sequi eius perspiciatis voluptas, enim, sunt exercitationem atque rerum!</p>
-              <a href="#" class="btn btn-primary">Ver notícia</a>
-            </div>
+---
+layout: layout
+titulo: Notícias
+subtitulo: Lorem ipsum dolor, sit amet consectetur adipisicing elit. Eius dolorem, obcaecati ad laborum asperiores
+provident numquam sunt veniam, tenetur soluta odit deleniti assumenda dolorum dolor voluptas iste. Sapiente, soluta
+esse.
+---
+
+
+<article>
+  <div id="botao-ver-noticia" class="aumenta-margem-top">
+    <!-- Coloque o conteúdo aqui -->
+    <main class="row">
+      <div class="col-lg col-md-6 col-sm-12 aumenta-margem-bottom">
+        <div class="card">
+          <img class="card-img-top img-fluid" src="../assets/images/icone2.png" alt="Imagem de capa do card">
+          <div class="card-body">
+            <h2 class="card-title">Título da notícia 1.1</h2>
+            <p class="card-text">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Quidem deleniti in dolorum
+              temporibus sequi eius perspiciatis voluptas, enim, sunt exercitationem atque rerum!
+              Lorem ipsum dolor sit amet, consectetur adipisicing elit. Quidem deleniti in dolorum
+              temporibus sequi eius perspiciatis voluptas, enim, sunt exercitationem atque rerum!</p>
+            <a href="#" class="btn btn-primary">Ver notícia</a>
           </div>
         </div>
-        <div class="col-md">
-          <main class="row">
-            <div class="col-md-6 col-sm-6 col-6">
-              <div class="card">
-                <img class="card-img-top img-fluid" src="../assets/images/icone2.png" alt="Imagem de capa do card">
-                <div class="card-body">
-                  <h2 class="card-title">Título da notícia 2.1</h2>
-                  <p class="card-text">Lorem ipsum dolor sit amet, consectetur adipisicing elit.</p>
-                  <a href="#" class="btn btn-primary">Ver notícia</a>
-                </div>
+      </div>
+      <div class="col-md">
+        <main class="row">
+          <div class="col-md-6 col-sm-6 col-6">
+            <div class="card">
+              <img class="card-img-top img-fluid" src="../assets/images/icone2.png" alt="Imagem de capa do card">
+              <div class="card-body">
+                <h2 class="card-title">Título da notícia 2.1</h2>
+                <p class="card-text">Lorem ipsum dolor sit amet, consectetur adipisicing elit.</p>
+                <a href="#" class="btn btn-primary">Ver notícia</a>
               </div>
             </div>
-            <div class="col-md-6 col-sm-6 col-6">
-              <div class="card">
-                <img class="card-img-top img-fluid" src="../assets/images/icone2.png" alt="Imagem de capa do card">
-                <div class="card-body">
-                  <h2 class="card-title">Título da notícia 2.2</h2>
-                  <p class="card-text">Lorem ipsum dolor sit amet, consectetur adipisicing elit.</p>
-                  <a href="#" class="btn btn-primary">Ver notícia</a>
-                </div>
+          </div>
+          <div class="col-md-6 col-sm-6 col-6">
+            <div class="card">
+              <img class="card-img-top img-fluid" src="../assets/images/icone2.png" alt="Imagem de capa do card">
+              <div class="card-body">
+                <h2 class="card-title">Título da notícia 2.2</h2>
+                <p class="card-text">Lorem ipsum dolor sit amet, consectetur adipisicing elit.</p>
+                <a href="#" class="btn btn-primary">Ver notícia</a>
               </div>
             </div>
-          </main>
-          <main class="row aumenta-margem-top altera-font-size ">
-            <div class="col-md-4 col-sm-4 col-4">
-              <div class="card aumenta-margem-right">
-                <img class="card-img-top img-fluid" src="../assets/images/icone2.png" alt="Imagem de capa do card">
-                <div class="card-body p-2">
-                  <h2 class="card-title">Título da notícia 3.1</h2>
-                  <p class="card-text">Lorem ipsum dolor sit amet, consectetur adipisicing elit.</p>
-                  <a href="#" class="btn btn-primary">Ver notícia</a>
-                </div>
+          </div>
+        </main>
+        <main class="row aumenta-margem-top altera-font-size ">
+          <div class="col-md-4 col-sm-4 col-4">
+            <div class="card aumenta-margem-right">
+              <img class="card-img-top img-fluid" src="../assets/images/icone2.png" alt="Imagem de capa do card">
+              <div class="card-body p-2">
+                <h2 class="card-title">Título da notícia 3.1</h2>
+                <p class="card-text">Lorem ipsum dolor sit amet, consectetur adipisicing elit.</p>
+                <a href="#" class="btn btn-primary">Ver notícia</a>
               </div>
             </div>
-            <div class="col-md-4 col-sm-4 col-4">
-              <div class="card aumenta-margem-left-right">
-                <img class="card-img-top img-fluid" src="../assets/images/icone2.png" alt="Imagem de capa do card">
-                <div class="card-body p-2">
-                  <h2 class="card-title">Título da notícia 3.2</h2>
-                  <p class="card-text">Lorem ipsum dolor sit amet, consectetur adipisicing elit.</p>
-                  <a href="#" class="btn btn-primary">Ver notícia</a>
-                </div>
+          </div>
+          <div class="col-md-4 col-sm-4 col-4">
+            <div class="card aumenta-margem-left-right">
+              <img class="card-img-top img-fluid" src="../assets/images/icone2.png" alt="Imagem de capa do card">
+              <div class="card-body p-2">
+                <h2 class="card-title">Título da notícia 3.2</h2>
+                <p class="card-text">Lorem ipsum dolor sit amet, consectetur adipisicing elit.</p>
+                <a href="#" class="btn btn-primary">Ver notícia</a>
               </div>
             </div>
-            <div class="col-md-4 col-sm-4 col-4">
-              <div class="card aumenta-margem-left">
-                <img class="card-img-bottom img-fluid" src="../assets/images/icone2.png" alt="Imagem de capa do card">
-                <div class="card-body p-2">
-                  <h2 class="card-title">Título da notícia 3.3</h2>
-                  <p class="card-text">Lorem ipsum dolor sit amet, consectetur adipisicing elit.</p>
-                  <a href="#" class="btn btn-primary"> Ver notícia </a>
-                </div>
+          </div>
+          <div class="col-md-4 col-sm-4 col-4">
+            <div class="card aumenta-margem-left">
+              <img class="card-img-bottom img-fluid" src="../assets/images/icone2.png" alt="Imagem de capa do card">
+              <div class="card-body p-2">
+                <h2 class="card-title">Título da notícia 3.3</h2>
+                <p class="card-text">Lorem ipsum dolor sit amet, consectetur adipisicing elit.</p>
+                <a href="#" class="btn btn-primary"> Ver notícia </a>
               </div>
             </div>
-          </main>
-        </div>
-      </main>
-    </div>
-  </article>
- 
\ No newline at end of file
+          </div>
+        </main>
+      </div>
+    </main>
+  </div>
+</article>
\ No newline at end of file

From ade5b15b49db5f4e385908f3bff0db1b100ca17a Mon Sep 17 00:00:00 2001
From: Vinicius Eustaquio Cortez <viniciusecortez@outlook.com>
Date: Wed, 3 Apr 2019 16:25:55 -0300
Subject: [PATCH 16/42] =?UTF-8?q?Colocado=20subtitulo=20vazio=20para=20a?=
 =?UTF-8?q?=20padroniza=C3=A7=C3=A3o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/artigos-detalhe.html | 1 +
 pages/projetox.html        | 1 +
 pages/publicacoes.html     | 1 +
 3 files changed, 3 insertions(+)

diff --git a/pages/artigos-detalhe.html b/pages/artigos-detalhe.html
index 14a76c3..8d8a675 100644
--- a/pages/artigos-detalhe.html
+++ b/pages/artigos-detalhe.html
@@ -1,6 +1,7 @@
 ---
 layout: layout
 titulo: artigo-detalhe
+subtitulo:
 ---
 
 <div class="container-fluid">
diff --git a/pages/projetox.html b/pages/projetox.html
index eb1b1b4..461ebe0 100644
--- a/pages/projetox.html
+++ b/pages/projetox.html
@@ -1,6 +1,7 @@
 ---
 layout: layout
 titulo: projeto
+subtitulo:
 ---
 <div class="row">
     <div class="col-md-12 p-md-5 p-2">
diff --git a/pages/publicacoes.html b/pages/publicacoes.html
index 4ad69fe..51dacc9 100644
--- a/pages/publicacoes.html
+++ b/pages/publicacoes.html
@@ -1,6 +1,7 @@
 ---
 layout: layout
 titulo: Publicação
+subtitulo:
 ---
 
 <div class=" formatacao aumenta-margem">

From dbd7a86e761ec55d23ce0336ba3cabe6736ee68f Mon Sep 17 00:00:00 2001
From: Vinicius Eustaquio Cortez <viniciusecortez@outlook.com>
Date: Wed, 3 Apr 2019 17:02:21 -0300
Subject: [PATCH 17/42] =?UTF-8?q?Arrumada=20not=C3=ADcia?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/noticias.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pages/noticias.html b/pages/noticias.html
index 31c1deb..9ff1e20 100644
--- a/pages/noticias.html
+++ b/pages/noticias.html
@@ -1,9 +1,7 @@
 ---
 layout: layout
 titulo: Notícias
-subtitulo: Lorem ipsum dolor, sit amet consectetur adipisicing elit. Eius dolorem, obcaecati ad laborum asperiores
-provident numquam sunt veniam, tenetur soluta odit deleniti assumenda dolorum dolor voluptas iste. Sapiente, soluta
-esse.
+subtitulo: Lorem ipsum dolor, sit amet consectetur adipisicing elit. Eius dolorem, obcaecati ad laborum asperiores provident numquam sunt veniam, tenetur soluta odit deleniti assumenda dolorum dolor voluptas iste. Sapiente, solutaesse.
 ---
 
 

From 4a3df1df63563dd00ab45449cc99a6cac870ab84 Mon Sep 17 00:00:00 2001
From: Matheus Reis <matheus.reisluz@gmail.com>
Date: Thu, 4 Apr 2019 15:41:35 -0300
Subject: [PATCH 18/42] Ajustado tamanho da fonte nos paragrafos da pagina
 missao-visao-valores

---
 pages/missao-visao-valores.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pages/missao-visao-valores.html b/pages/missao-visao-valores.html
index 89a1651..83e91a9 100644
--- a/pages/missao-visao-valores.html
+++ b/pages/missao-visao-valores.html
@@ -3,7 +3,6 @@
 titulo: Missão, Visão e Valores
 subtitulo:
 ---
-<main>
   <div class="row">
     <div class="col-md-12 p-4">
       <p>Lorem ipsum dolor sit amet consectetur adipisicing elit.
@@ -45,4 +44,3 @@ <h2>Valores</h2>
         aperiam nisi esse! Explicabo illum blanditiis asperiores, error dolorem voluptatem!</p>
     </div>
   </div>
-</main>
\ No newline at end of file

From 4ed9495de9813fdaf2ae9534fe927aed36a38158 Mon Sep 17 00:00:00 2001
From: Jefferson <jeffersonss999@gmail.com>
Date: Thu, 4 Apr 2019 15:58:49 -0300
Subject: [PATCH 19/42] Testes dos links para membros da equipe

---
 _config.yml                           |  19 +++
 _layouts/membro-equipe.html           |  74 +++++++++
 _membros/jerso.md                     |   8 +
 _membros/matheus.md                   |   7 +
 _membros/thiago.md                    |   7 +
 _membros/vinicius.md                  |   7 +
 {pages => membros}/membro-equipe.html |   6 +-
 pages/equipe.html                     | 207 +++++++++-----------------
 8 files changed, 193 insertions(+), 142 deletions(-)
 create mode 100644 _config.yml
 create mode 100644 _layouts/membro-equipe.html
 create mode 100644 _membros/jerso.md
 create mode 100644 _membros/matheus.md
 create mode 100644 _membros/thiago.md
 create mode 100644 _membros/vinicius.md
 rename {pages => membros}/membro-equipe.html (85%)

diff --git a/_config.yml b/_config.yml
new file mode 100644
index 0000000..f775d0d
--- /dev/null
+++ b/_config.yml
@@ -0,0 +1,19 @@
+collections:
+  membros:
+    output: true
+
+defaults:
+  - scope:
+      path: ""
+      type: "authors"
+    values:
+      layout: "author"
+  - scope:
+      path: ""
+      type: "posts"
+    values:
+      layout: "post"
+  - scope:
+      path: ""
+    values:
+      layout: "default"
\ No newline at end of file
diff --git a/_layouts/membro-equipe.html b/_layouts/membro-equipe.html
new file mode 100644
index 0000000..21acc46
--- /dev/null
+++ b/_layouts/membro-equipe.html
@@ -0,0 +1,74 @@
+---
+
+---
+
+<!doctype html>
+<html lang="pt-br">
+
+{% include head.html %}
+<body>
+  {% include navbar.html %}
+  <article>
+    <div class="titulo-pagina">
+      <div class="container">
+        <div class="row">
+          <div class="col-lg-3 col-md-4 col-sm-12">
+            <img src="{{ page.imagem }}" class="rounded-circle mx-auto d-block img-membro">
+          </div>
+          <div class="col-lg-9 col-md-8 col-sm-12 p-4">
+            <h1>{{ page.nome }} - {{ page.funcao }}</h1>
+            <p class="lead">{{ content }}</p>
+            <img src="../assets/images/icone3.png" class="float-left p-1">
+            <img src="../assets/images/icone3.png" class="float-left p-1">
+            <img src="../assets/images/icone3.png" class="float-left p-1">
+            <img src="../assets/images/icone3.png" class="float-left p-1">
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="container aumenta-margem borda-bottom formatacao-link">
+      <main class="row">
+        <div class="col-md-12">
+          <h2>Projetos</h2>
+        </div>
+      </main>
+      <main class="row">
+        <div class="col-md-4 col-sm-6">
+          <div class="text-center">
+            <img src="../assets/images/icone2.png" class="img-fluid rounded img-thumbnail">
+            <a href="#">
+              <h3>Pojeto de Software X</h3>
+            </a>
+            <h3>Aplicação Web</h3>
+          </div>
+        </div>
+        <div class="col-md-4 col-sm-6">
+          <div class="text-center">
+            <img src="../assets/images/icone2.png" class="img-fluid rounded img-thumbnail">
+            <a href="#">
+              <h3>Pojeto de Software Y</h3>
+            </a>
+            <h3>Aplicação Web</h3>
+          </div>
+        </div>
+      </main>
+      <main class="row">
+        <div class="col-md-12">
+          <h2>Publicações</h2>
+        </div>
+      </main>
+      <main class="row final-do-texto">
+        <div class="col-md-12">
+          <div class="list-group preenchimento">
+            <a href="#" class="list-group-item list-group-item-action">Dapibus ac facilisis in</a>
+            <a href="#" class="list-group-item list-group-item-action">Morbi leo risus</a>
+            <a href="#" class="list-group-item list-group-item-action">Porta ac consectetur ac</a>
+          </div>
+        </div>
+      </main>
+    </div>
+  </article>
+  {% include footer.html %}
+</body>
+
+</html>
\ No newline at end of file
diff --git a/_membros/jerso.md b/_membros/jerso.md
new file mode 100644
index 0000000..4074ffe
--- /dev/null
+++ b/_membros/jerso.md
@@ -0,0 +1,8 @@
+---
+layout: membro-equipe
+nome: Jefferson
+funcao: Programador
+link: /membros/membro-equipe1.html
+imagem: ../assets/images/icone.png
+---
+Integrante do Laboratório de Desenvolvimento de software - IFSP CodeLab
\ No newline at end of file
diff --git a/_membros/matheus.md b/_membros/matheus.md
new file mode 100644
index 0000000..7d4010a
--- /dev/null
+++ b/_membros/matheus.md
@@ -0,0 +1,7 @@
+---
+nome: Matheus
+funcao: Programador
+link: /membros/membro-equipe2.html
+imagem: ../assets/images/icone.png
+---
+Integrante do Laboratório de Desenvolvimento de software - IFSP CodeLab
\ No newline at end of file
diff --git a/_membros/thiago.md b/_membros/thiago.md
new file mode 100644
index 0000000..c5f5ac6
--- /dev/null
+++ b/_membros/thiago.md
@@ -0,0 +1,7 @@
+---
+nome: Thiago
+funcao: Programador
+link: /membros/membro-equipe3.html
+imagem: ../assets/images/icone.png
+---
+Integrante do Laboratório de Desenvolvimento de software - IFSP CodeLab
\ No newline at end of file
diff --git a/_membros/vinicius.md b/_membros/vinicius.md
new file mode 100644
index 0000000..40dcf36
--- /dev/null
+++ b/_membros/vinicius.md
@@ -0,0 +1,7 @@
+---
+nome: Vinicius
+funcao: Programador
+link: /membros/membro-equipe4.html
+imagem: ../assets/images/icone.png
+---
+Integrante do Laboratório de Desenvolvimento de software - IFSP CodeLab
\ No newline at end of file
diff --git a/pages/membro-equipe.html b/membros/membro-equipe.html
similarity index 85%
rename from pages/membro-equipe.html
rename to membros/membro-equipe.html
index 2bfab19..6c8f22a 100644
--- a/pages/membro-equipe.html
+++ b/membros/membro-equipe.html
@@ -16,10 +16,8 @@
             <img src="../assets/images/icone.png" class="rounded-circle mx-auto d-block img-membro">
           </div>
           <div class="col-lg-9 col-md-8 col-sm-12 p-4">
-            <h1>NOME DO MEMBRO</h1>
-            <p class="lead">Lorem ipsum dolor sit amet consectetur adipisicing elit. Lorem ipsum dolor sit amet
-              consectetur adipisicing elit. Unde, porro commodi consequatur cum nesciunt, dignissimos officia vero eos
-              dolores facilis voluptates enim natus doloribus iusto recusandae, repudiandae ad cumque labore!</p>
+            <h1>{{page.nome}} - {{page.funcao}}</h1>
+            <p class="lead">{{ content }}</p>
             <img src="../assets/images/icone3.png" class="float-left p-1">
             <img src="../assets/images/icone3.png" class="float-left p-1">
             <img src="../assets/images/icone3.png" class="float-left p-1">
diff --git a/pages/equipe.html b/pages/equipe.html
index 4cefea5..79ea7a5 100644
--- a/pages/equipe.html
+++ b/pages/equipe.html
@@ -3,146 +3,77 @@
 titulo: Equipe
 subtitulo:
 ---
-        <div class="row">
-          <div class="col-md-12 p-4">
-            <h1>Nossa Equipe</h1>
-            <p class="lead">Lorem ipsum dolor sit amet consectetur adipisicing elit. </p>
-          </div>
-        </div>
-      </div>
+<div class="row">
+  <div class="col-md-12 p-4">
+    <h1>Nossa Equipe</h1>
+    <p class="lead">Lorem ipsum dolor sit amet consectetur adipisicing elit. </p>
+  </div>
+</div>
+</div>
+</div>
+<div class="container formatacao aumenta-margem borda-bottom formatacao-link">
+  <div class="row">
+    <div class="col-md-12">
+      <h2>Cordenação</h2>
     </div>
-    <div class="container formatacao aumenta-margem borda-bottom formatacao-link">
-      <div class="row">
-        <div class="col-md-12">
-          <h2>Cordenação</h2>
-        </div>
-      </div>
-      <div class="row">
-        <div class="col-md-3 col-sm-6">
-          <div class="text-center">
-            <a href="#"><img src="../assets/images/icone.png" class="img-fluid rounded-circle"></a>
-            <a href="#">
-              <h3>Lorem ipsum dolor</h3>
-            </a>
-            <h3>Professor do IFSP</h3>
-          </div>
-        </div>
-        <div class="col-md-3 col-sm-6">
-          <div class="text-center">
-            <a href="#"><img src="../assets/images/icone.png" class="img-fluid rounded-circle"></a>
-            <a href="#">
-              <h3>Lorem ipsum dolor</h3>
-            </a>
-            <h3>Professor do IFSP</h3>
-          </div>
-        </div>
-        <div class="col-md-3 col-sm-6">
-          <div class="text-center">
-            <a href="#"><img src="../assets/images/icone.png" class="img-fluid rounded-circle"></a>
-            <a href="#">
-              <h3>Lorem ipsum dolor</h3>
-            </a>
-            <h3>Professor do IFSP</h3>
-          </div>
-        </div>
+  </div>
+  <div class="row">
+    <div class="col-md-3 col-sm-6">
+      <div class="text-center">
+        <a href="#"><img src="../assets/images/icone.png" class="img-fluid rounded-circle"></a>
+        <a href="#">
+          <h3>Lorem ipsum dolor</h3>
+        </a>
+        <h3>Professor do IFSP</h3>
       </div>
-      <h2>Estudantes</h2>
-      <div id="quebra-line" class="row">
-        <div class="col-md-3 col-sm-6">
-          <div class="text-center">
-            <a href="#"><img src="../assets/images/icone.png" class="img-fluid rounded-circle"></a>
-            <a href="#">
-              <h3>Lorem ipsum dolor</h3>
-            </a>
-            <h3>Aluno do IFSP</h3>
-          </div>
-        </div>
-        <div class="col-md-3 col-sm-6">
-          <div class="text-center">
-            <a href="#"><img src="../assets/images/icone.png" class="img-fluid rounded-circle"></a>
-            <a href="#">
-              <h3>Lorem ipsum dolor</h3>
-            </a>
-            <h3>Aluno do IFSP</h3>
-          </div>
-        </div>
-        <div class="col-md-3 col-sm-6">
-          <div class="text-center">
-            <a href="#"><img src="../assets/images/icone.png" class="img-fluid rounded-circle"></a>
-            <a href="#"></a><a href="#">
-              <h3>Lorem ipsum dolor</h3>
-            </a>
-            <h3>Aluno do IFSP</h3>
-          </div>
-        </div>
-        <div class="col-md-3 col-sm-6">
-          <div class="text-center">
-            <a href="#"><img src="../assets/images/icone.png" class="img-fluid rounded-circle"></a>
-            <a href="#">
-              <h3>Lorem ipsum dolor</h3>
-            </a>
-            <h3>Aluno do IFSP</h3>
-          </div>
-        </div>
+    </div>
+    <div class="col-md-3 col-sm-6">
+      <div class="text-center">
+        <a href="#"><img src="../assets/images/icone.png" class="img-fluid rounded-circle"></a>
+        <a href="#">
+          <h3>Lorem ipsum dolor</h3>
+        </a>
+        <h3>Professor do IFSP</h3>
       </div>
-      <h2>Colaboradores</h2>
-      <div class="row">
-        <div class="col-md-3 col-sm-6">
-          <div class="text-center">
-            <a href="#"><img src="../assets/images/icone.png" class="img-fluid rounded-circle"></a>
-            <a href="#">
-              <h3>Lorem ipsum dolor</h3>
-            </a>
-            <h3>Aluno do IFSP</h3>
-          </div>
-        </div>
-        <div class="col-md-3 col-sm-6">
-          <div class="text-center">
-            <a href="#"><img src="../assets/images/icone.png" class="img-fluid rounded-circle"></a>
-            <a href="#">
-              <h3>Lorem ipsum dolor</h3>
-            </a>
-            <h3>Aluno do IFSP</h3>
-          </div>
-        </div>
+    </div>
+    <div class="col-md-3 col-sm-6">
+      <div class="text-center">
+        <a href="#"><img src="../assets/images/icone.png" class="img-fluid rounded-circle"></a>
+        <a href="#">
+          <h3>Lorem ipsum dolor</h3>
+        </a>
+        <h3>Professor do IFSP</h3>
       </div>
-      <h2>Ex-Integrantes</h2>
-      <div class="row">
-        <div class="col-md-3 col-sm-6">
-          <div class="text-center">
-            <a href="#"><img src="../assets/images/icone.png" class="img-fluid rounded-circle"></a>
-            <a href="#">
-              <h3>Lorem ipsum dolor</h3>
-            </a>
-            <h3>Aluno do IFSP</h3>
-          </div>
-        </div>
-        <div class="col-md-3 col-sm-6">
-          <div class="text-center">
-            <a href="#"><img src="../assets/images/icone.png" class="img-fluid rounded-circle"></a>
-            <a href="#">
-              <h3>Lorem ipsum dolor</h3>
-            </a>
-            <h3>Aluno do IFSP</h3>
-          </div>
-        </div>
-        <div class="col-md-3 col-sm-6">
-          <div class="text-center">
-            <a href="#"><img src="../assets/images/icone.png" class="img-fluid rounded-circle"></a>
-            <a href="#">
-              <h3>Lorem ipsum dolor</h3>
-            </a>
-            <h3>Aluno do IFSP</h3>
-          </div>
-        </div>
-        <div class="col-md-3 col-sm-6">
-          <div class="text-center">
-            <a href="#"><img src="../assets/images/icone.png" class="img-fluid rounded-circle"></a>
-            <a href="#">
-              <h3>Lorem ipsum dolor</h3>
-            </a>
-            <h3>Aluno do IFSP</h3>
-          </div>
-        </div>
+    </div>
+  </div>
+  <div class="row">
+    <h2>Colaboradores</h2>
+  </div>
+  <div class="row">
+    {% for membro in site.membros %}
+    <div class="col-md-3 col-sm-6">
+      <div class="text-center">
+        <a href="{{ membro.link }}"><img src="{{ membro.imagem }}" class="img-fluid rounded-circle"></a>
+        <h3><a href="{{ membro.link }}">{{ membro.nome }}</a></h3>
+        <h3>{{ membro.funcao }}</h3>
       </div>
-    </div>
\ No newline at end of file
+    </div>
+    {% endfor %}
+  </div>
+
+</div>
+
+
+<!--
+<h1>Equ</h1>
+
+<ul>
+  {% for membro in site.membros %}
+  <li>
+    <h2><a href="{{ membro.link }}">{{ membro.nome }}</a></h2>
+    <h3>{{ membro.funcao }}</h3>
+    <p>{{ membro.content | markdownify }}</p>
+  </li>
+  {% endfor %}
+</ul>
+-->
\ No newline at end of file

From bd76f07c39c1d0c6681e0b7096690a78bab92311 Mon Sep 17 00:00:00 2001
From: Jefferson <jeffersonss999@gmail.com>
Date: Thu, 4 Apr 2019 16:11:57 -0300
Subject: [PATCH 20/42] =?UTF-8?q?Difini=C3=A7=C3=A3o=20de=20um=20tamanho?=
 =?UTF-8?q?=20fixo=20para=20imagens=20em=20equipe?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipe.scssc                                | Bin 0 -> 1722 bytes
 .../main.scssc                                  | Bin 0 -> 46391 bytes
 _config.yml                                     |  16 ----------------
 _membros/{jerso.md => jefferson.md}             |   2 +-
 _sass/equipe.scss                               |   4 ++++
 assets/css/estilo_layout.css => _sass/main.scss |   0
 assets/css/estilo_layout.scss                   |   5 +++++
 pages/equipe.html                               |   8 ++++----
 8 files changed, 14 insertions(+), 21 deletions(-)
 create mode 100644 .sass-cache/631075a38d64437aed7121870b46e2e50d54b2ab/equipe.scssc
 create mode 100644 .sass-cache/631075a38d64437aed7121870b46e2e50d54b2ab/main.scssc
 rename _membros/{jerso.md => jefferson.md} (83%)
 create mode 100644 _sass/equipe.scss
 rename assets/css/estilo_layout.css => _sass/main.scss (100%)
 create mode 100644 assets/css/estilo_layout.scss

diff --git a/.sass-cache/631075a38d64437aed7121870b46e2e50d54b2ab/equipe.scssc b/.sass-cache/631075a38d64437aed7121870b46e2e50d54b2ab/equipe.scssc
new file mode 100644
index 0000000000000000000000000000000000000000..a25be0ef8302c6b571ce0892f6ba39f9ea94be35
GIT binary patch
literal 1722
zcmbtUTW`}a80`Z}yKbY~Bv{!6RYfoctk+$@elZM?Dj|eufrmXrZt}G?q;arawrS$O
z^EpYwQpN+KFOBW*a=vqp-EEvS4$IvRc%62e^X{nAX`dXAfP05+-fbOsyDwgJJN}V(
z{G5AGzEzUsUY~1C$Up%Q@=;3jUiz>?ZZmHp0$)LR<}3!y0<b|9Qf3Oj&zxR;ts$o4
z1Nc4@5jezoGawr*;!1<>+7K;CJ?Ybj06ZfVA*XUW<$X+n(1Q|LWmA|AL227>cQJS#
zSEMWU{J|gRVj2Z7k6KQmwicsK1Dv&lutPqDUcGV+GhG_sejq{+4h}yO0ob4x;?lF>
zSHv8D%9--)G^IWm2NNb-Pkt8O;<P$GaupB9AW1cC9d9D9c6W(Xm^NG)H<DOlJ0J2v
zYGH&7i*y|ktS~tmX)yS?${_UP6uK23(rvMhtu4eBLdD6YGN4*Ek!~b^$tT%nI_2BV
z;iJ_hdQbkY=g^&Ns|~u_tG_xW%}*NjXo``Jny*2BGct-79*Q6EVPh=JWHxLF*>p7$
z+f3wdXisZ|jj~E#gyZ`97ZLjMTpzSMM;&@!l3Fr(F9nY7dyBK^OKo6k)luleUj6u=
z0XVeAwvl87JaGT7NR??+-?bKS&$$Y54lU^&hu*bnmzm*1Eeg~*D=u7)4@yS%a;(uc
zdoRl8!Z#Dgx@(#J;K2-UOGZH7QzA0+yZ26@h&(9Ky*~mz+eAY8Mj?(Rx`%b!-BxrF
z*Ii{Yvc}O@1q<vl0#Xq^ghq@6C{kxWL<&4^@GgoFdql1k3c+BEbxV<M%Ik(GT7zYV
zu&cXtmu=DeY==G+1+vZ}9MaX7q2U*#6v8?3P_WK>!uJ1CuY7YovKe2+8_da?xs1vj
z0jVZ5-jI?yIEBwz^At%RrD`lsK#V8G(nj}C2>RHvP4^cljpukupV0$LPicXk5)!hJ
zfwQa4c_&K`ZO~?(kDCho<|ALAl_<ep<{GSJ4ca-SQYh?IcAkmg%u%yyR?3Nyr&8jR
zg^!mzf8__Me)yo^EsO%RORr9@z3R2Aat(j6pGhsYAB}esPP46_<(OXk0Of6EyXW5-
JCxhJ?`~r?+>IDD*

literal 0
HcmV?d00001

diff --git a/.sass-cache/631075a38d64437aed7121870b46e2e50d54b2ab/main.scssc b/.sass-cache/631075a38d64437aed7121870b46e2e50d54b2ab/main.scssc
new file mode 100644
index 0000000000000000000000000000000000000000..9091a071d47f2f093669db2a1999a7e70d1a973e
GIT binary patch
literal 46391
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

literal 0
HcmV?d00001

diff --git a/_config.yml b/_config.yml
index f775d0d..96b2548 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,19 +1,3 @@
 collections:
   membros:
     output: true
-
-defaults:
-  - scope:
-      path: ""
-      type: "authors"
-    values:
-      layout: "author"
-  - scope:
-      path: ""
-      type: "posts"
-    values:
-      layout: "post"
-  - scope:
-      path: ""
-    values:
-      layout: "default"
\ No newline at end of file
diff --git a/_membros/jerso.md b/_membros/jefferson.md
similarity index 83%
rename from _membros/jerso.md
rename to _membros/jefferson.md
index 4074ffe..9272d97 100644
--- a/_membros/jerso.md
+++ b/_membros/jefferson.md
@@ -2,7 +2,7 @@
 layout: membro-equipe
 nome: Jefferson
 funcao: Programador
-link: /membros/membro-equipe1.html
+link: /membros/jefferson.html
 imagem: ../assets/images/icone.png
 ---
 Integrante do Laboratório de Desenvolvimento de software - IFSP CodeLab
\ No newline at end of file
diff --git a/_sass/equipe.scss b/_sass/equipe.scss
new file mode 100644
index 0000000..056ae16
--- /dev/null
+++ b/_sass/equipe.scss
@@ -0,0 +1,4 @@
+.img-equipe {
+    width: 130px;
+    height: 130px;
+}
diff --git a/assets/css/estilo_layout.css b/_sass/main.scss
similarity index 100%
rename from assets/css/estilo_layout.css
rename to _sass/main.scss
diff --git a/assets/css/estilo_layout.scss b/assets/css/estilo_layout.scss
new file mode 100644
index 0000000..face9db
--- /dev/null
+++ b/assets/css/estilo_layout.scss
@@ -0,0 +1,5 @@
+---
+---
+
+@import "main";
+@import "equipe";
\ No newline at end of file
diff --git a/pages/equipe.html b/pages/equipe.html
index 79ea7a5..761ad2c 100644
--- a/pages/equipe.html
+++ b/pages/equipe.html
@@ -20,7 +20,7 @@ <h2>Cordenação</h2>
   <div class="row">
     <div class="col-md-3 col-sm-6">
       <div class="text-center">
-        <a href="#"><img src="../assets/images/icone.png" class="img-fluid rounded-circle"></a>
+        <a href="#"><img src="../assets/images/icone.png" class="img-equipe rounded-circle"></a>
         <a href="#">
           <h3>Lorem ipsum dolor</h3>
         </a>
@@ -29,7 +29,7 @@ <h3>Professor do IFSP</h3>
     </div>
     <div class="col-md-3 col-sm-6">
       <div class="text-center">
-        <a href="#"><img src="../assets/images/icone.png" class="img-fluid rounded-circle"></a>
+        <a href="#"><img src="../assets/images/icone.png" class="img-equipe rounded-circle"></a>
         <a href="#">
           <h3>Lorem ipsum dolor</h3>
         </a>
@@ -38,7 +38,7 @@ <h3>Professor do IFSP</h3>
     </div>
     <div class="col-md-3 col-sm-6">
       <div class="text-center">
-        <a href="#"><img src="../assets/images/icone.png" class="img-fluid rounded-circle"></a>
+        <a href="#"><img src="../assets/images/icone.png" class="img-equipe rounded-circle"></a>
         <a href="#">
           <h3>Lorem ipsum dolor</h3>
         </a>
@@ -53,7 +53,7 @@ <h2>Colaboradores</h2>
     {% for membro in site.membros %}
     <div class="col-md-3 col-sm-6">
       <div class="text-center">
-        <a href="{{ membro.link }}"><img src="{{ membro.imagem }}" class="img-fluid rounded-circle"></a>
+        <a href="{{ membro.link }}"><img src="{{ membro.imagem }}" class="img-equipe rounded-circle"></a>
         <h3><a href="{{ membro.link }}">{{ membro.nome }}</a></h3>
         <h3>{{ membro.funcao }}</h3>
       </div>

From 5e8c21c47688a9dcc07c1a6d269289ac3db5a441 Mon Sep 17 00:00:00 2001
From: Vinicius Eustaquio Cortez <viniciusecortez@outlook.com>
Date: Thu, 4 Apr 2019 16:21:24 -0300
Subject: [PATCH 21/42] Arrumados links

---
 _membros/matheus.md  | 2 +-
 _membros/thiago.md   | 2 +-
 _membros/vinicius.md | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/_membros/matheus.md b/_membros/matheus.md
index 7d4010a..561ad8f 100644
--- a/_membros/matheus.md
+++ b/_membros/matheus.md
@@ -1,7 +1,7 @@
 ---
 nome: Matheus
 funcao: Programador
-link: /membros/membro-equipe2.html
+link: /membros/matheus.html
 imagem: ../assets/images/icone.png
 ---
 Integrante do Laboratório de Desenvolvimento de software - IFSP CodeLab
\ No newline at end of file
diff --git a/_membros/thiago.md b/_membros/thiago.md
index c5f5ac6..1502dd9 100644
--- a/_membros/thiago.md
+++ b/_membros/thiago.md
@@ -1,7 +1,7 @@
 ---
 nome: Thiago
 funcao: Programador
-link: /membros/membro-equipe3.html
+link: /membros/thiago.html
 imagem: ../assets/images/icone.png
 ---
 Integrante do Laboratório de Desenvolvimento de software - IFSP CodeLab
\ No newline at end of file
diff --git a/_membros/vinicius.md b/_membros/vinicius.md
index 40dcf36..e9aaec7 100644
--- a/_membros/vinicius.md
+++ b/_membros/vinicius.md
@@ -1,7 +1,7 @@
 ---
 nome: Vinicius
 funcao: Programador
-link: /membros/membro-equipe4.html
+link: /membros/vinicius.html
 imagem: ../assets/images/icone.png
 ---
 Integrante do Laboratório de Desenvolvimento de software - IFSP CodeLab
\ No newline at end of file

From e1c9553c443b03c52328808b07e3a39072ddcaed Mon Sep 17 00:00:00 2001
From: Vinicius Eustaquio Cortez <viniciusecortez@outlook.com>
Date: Thu, 4 Apr 2019 16:24:08 -0300
Subject: [PATCH 22/42] =?UTF-8?q?Colocado=20layout=20para=20as=20p=C3=A1gi?=
 =?UTF-8?q?nas=20de=20membros?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipe.scssc                              | Bin 1722 -> 1722 bytes
 .../main.scssc                                | Bin 46391 -> 46391 bytes
 _membros/matheus.md                           |   1 +
 _membros/thiago.md                            |   1 +
 _membros/vinicius.md                          |   1 +
 5 files changed, 3 insertions(+)

diff --git a/.sass-cache/631075a38d64437aed7121870b46e2e50d54b2ab/equipe.scssc b/.sass-cache/631075a38d64437aed7121870b46e2e50d54b2ab/equipe.scssc
index a25be0ef8302c6b571ce0892f6ba39f9ea94be35..4607ad20baa48e02a591d0167e03eb3e7b7e6ca2 100644
GIT binary patch
delta 14
VcmdnRyNj3ASkGL~cq8jpHUJ-P1O5O2

delta 14
VcmdnRyNj3ASkGL~WFzZVHUJ-U1OEU3

diff --git a/.sass-cache/631075a38d64437aed7121870b46e2e50d54b2ab/main.scssc b/.sass-cache/631075a38d64437aed7121870b46e2e50d54b2ab/main.scssc
index 9091a071d47f2f093669db2a1999a7e70d1a973e..66563660a9c3ec579c1fa7bb2da7c04727313d7f 100644
GIT binary patch
delta 16
Xcmdn~ifQ{RCRSrTb3NmYtVUY_IG6?E

delta 16
Xcmdn~ifQ{RCRSrTb3K!dtVUY_IGqLK

diff --git a/_membros/matheus.md b/_membros/matheus.md
index 561ad8f..64ad22a 100644
--- a/_membros/matheus.md
+++ b/_membros/matheus.md
@@ -1,4 +1,5 @@
 ---
+layout: membro-equipe
 nome: Matheus
 funcao: Programador
 link: /membros/matheus.html
diff --git a/_membros/thiago.md b/_membros/thiago.md
index 1502dd9..d4e7e2c 100644
--- a/_membros/thiago.md
+++ b/_membros/thiago.md
@@ -1,4 +1,5 @@
 ---
+layout: membro-equipe
 nome: Thiago
 funcao: Programador
 link: /membros/thiago.html
diff --git a/_membros/vinicius.md b/_membros/vinicius.md
index e9aaec7..9aa74a3 100644
--- a/_membros/vinicius.md
+++ b/_membros/vinicius.md
@@ -1,4 +1,5 @@
 ---
+layout: membro-equipe
 nome: Vinicius
 funcao: Programador
 link: /membros/vinicius.html

From ac8a2c31f8a7dcae0547608331b8e6f1c392ba34 Mon Sep 17 00:00:00 2001
From: Vinicius Eustaquio Cortez <viniciusecortez@outlook.com>
Date: Thu, 4 Apr 2019 16:28:10 -0300
Subject: [PATCH 23/42] Adicionado atributo titulo aos membros

---
 _membros/jefferson.md | 1 +
 _membros/matheus.md   | 2 ++
 _membros/thiago.md    | 1 +
 _membros/vinicius.md  | 1 +
 4 files changed, 5 insertions(+)

diff --git a/_membros/jefferson.md b/_membros/jefferson.md
index 9272d97..89f2d68 100644
--- a/_membros/jefferson.md
+++ b/_membros/jefferson.md
@@ -2,6 +2,7 @@
 layout: membro-equipe
 nome: Jefferson
 funcao: Programador
+titulo: Colaborador
 link: /membros/jefferson.html
 imagem: ../assets/images/icone.png
 ---
diff --git a/_membros/matheus.md b/_membros/matheus.md
index 64ad22a..e13887c 100644
--- a/_membros/matheus.md
+++ b/_membros/matheus.md
@@ -2,7 +2,9 @@
 layout: membro-equipe
 nome: Matheus
 funcao: Programador
+titulo: Colaborador
 link: /membros/matheus.html
 imagem: ../assets/images/icone.png
+status: ativo
 ---
 Integrante do Laboratório de Desenvolvimento de software - IFSP CodeLab
\ No newline at end of file
diff --git a/_membros/thiago.md b/_membros/thiago.md
index d4e7e2c..f4924b1 100644
--- a/_membros/thiago.md
+++ b/_membros/thiago.md
@@ -2,6 +2,7 @@
 layout: membro-equipe
 nome: Thiago
 funcao: Programador
+titulo: Colaborador
 link: /membros/thiago.html
 imagem: ../assets/images/icone.png
 ---
diff --git a/_membros/vinicius.md b/_membros/vinicius.md
index 9aa74a3..7ad3d6f 100644
--- a/_membros/vinicius.md
+++ b/_membros/vinicius.md
@@ -2,6 +2,7 @@
 layout: membro-equipe
 nome: Vinicius
 funcao: Programador
+titulo: Colaborador
 link: /membros/vinicius.html
 imagem: ../assets/images/icone.png
 ---

From 02e48472febcfca221d045a663181e15ccea0e1b Mon Sep 17 00:00:00 2001
From: Vinicius Eustaquio Cortez <viniciusecortez@outlook.com>
Date: Thu, 4 Apr 2019 16:33:31 -0300
Subject: [PATCH 24/42] Colocado if para selecionar membros colaboradores

---
 pages/equipe.html | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pages/equipe.html b/pages/equipe.html
index 761ad2c..97c560c 100644
--- a/pages/equipe.html
+++ b/pages/equipe.html
@@ -51,13 +51,15 @@ <h2>Colaboradores</h2>
   </div>
   <div class="row">
     {% for membro in site.membros %}
-    <div class="col-md-3 col-sm-6">
-      <div class="text-center">
-        <a href="{{ membro.link }}"><img src="{{ membro.imagem }}" class="img-equipe rounded-circle"></a>
-        <h3><a href="{{ membro.link }}">{{ membro.nome }}</a></h3>
-        <h3>{{ membro.funcao }}</h3>
+      {% if membro.titulo == "Colaborador" %}
+      <div class="col-md-3 col-sm-6">
+        <div class="text-center">
+          <a href="{{ membro.link }}"><img src="{{ membro.imagem }}" class="img-equipe rounded-circle"></a>
+          <h3><a href="{{ membro.link }}">{{ membro.nome }}</a></h3>
+          <h3>{{ membro.funcao }}</h3>
+        </div>
       </div>
-    </div>
+      {% endif %}
     {% endfor %}
   </div>
 

From 5ea2b09a0f6e40acf6a73c76b77fd4aae4eb1bcb Mon Sep 17 00:00:00 2001
From: Vinicius Eustaquio Cortez <viniciusecortez@outlook.com>
Date: Thu, 4 Apr 2019 16:36:55 -0300
Subject: [PATCH 25/42] =?UTF-8?q?Altera=C3=A7=C3=B5es=20no=20.gitignore=20?=
 =?UTF-8?q?para=20retirar=20os=20novos=20arquivos=20execut=C3=A1veis?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore            | 4 +++-
 .vscode/settings.json | 2 --
 2 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 .vscode/settings.json

diff --git a/.gitignore b/.gitignore
index 72a5c3b..bac727c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
-_site/
\ No newline at end of file
+_site/
+_sass-cache/
+.vscode/
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 7a73a41..0000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{
-}
\ No newline at end of file

From bf068c9c83a40c84c2cb8f6162db19ee5d51fc2c Mon Sep 17 00:00:00 2001
From: Vinicius Eustaquio Cortez <viniciusecortez@outlook.com>
Date: Thu, 4 Apr 2019 17:12:31 -0300
Subject: [PATCH 26/42] Adicionado o .md do latorre

---
 _includes/navbar.html |  2 +-
 _membros/jefferson.md |  1 +
 _membros/latorre.md   | 10 +++++++
 _membros/matheus.md   |  1 +
 _membros/thiago.md    |  1 +
 _membros/vinicius.md  |  3 ++-
 pages/equipe.html     | 61 ++++++++++++++++++-------------------------
 7 files changed, 41 insertions(+), 38 deletions(-)
 create mode 100644 _membros/latorre.md

diff --git a/_includes/navbar.html b/_includes/navbar.html
index a38ac7f..97a522f 100644
--- a/_includes/navbar.html
+++ b/_includes/navbar.html
@@ -1,7 +1,7 @@
 <header>
     <div class="container">
       <nav class="navbar navbar-expand-md navbar-light bg-light">
-        <a class="navbar-brand " href="#">
+        <a class="navbar-brand " href="/">
           >IFSP
           <span>CODELAB</span>
         </a>
diff --git a/_membros/jefferson.md b/_membros/jefferson.md
index 89f2d68..c45400c 100644
--- a/_membros/jefferson.md
+++ b/_membros/jefferson.md
@@ -1,5 +1,6 @@
 ---
 layout: membro-equipe
+nick: Jerson
 nome: Jefferson
 funcao: Programador
 titulo: Colaborador
diff --git a/_membros/latorre.md b/_membros/latorre.md
new file mode 100644
index 0000000..ffb8711
--- /dev/null
+++ b/_membros/latorre.md
@@ -0,0 +1,10 @@
+---
+layout: membro-equipe
+nick: Latorre
+nome: Domingos Lucas Latorre de Oliveira
+titulo: Coordenador
+funcao: Professor do IFSP
+link: /membros/latorre.html
+imagem: ../assets/images/icone.png
+---
+
diff --git a/_membros/matheus.md b/_membros/matheus.md
index e13887c..63b5c67 100644
--- a/_membros/matheus.md
+++ b/_membros/matheus.md
@@ -1,5 +1,6 @@
 ---
 layout: membro-equipe
+nick: Matheus
 nome: Matheus
 funcao: Programador
 titulo: Colaborador
diff --git a/_membros/thiago.md b/_membros/thiago.md
index f4924b1..50b36e6 100644
--- a/_membros/thiago.md
+++ b/_membros/thiago.md
@@ -1,5 +1,6 @@
 ---
 layout: membro-equipe
+nick: Thiago
 nome: Thiago
 funcao: Programador
 titulo: Colaborador
diff --git a/_membros/vinicius.md b/_membros/vinicius.md
index 7ad3d6f..7f2a25f 100644
--- a/_membros/vinicius.md
+++ b/_membros/vinicius.md
@@ -1,6 +1,7 @@
 ---
 layout: membro-equipe
-nome: Vinicius
+nick: Vinicius
+nome: Vinicius Eustaquio Cortez
 funcao: Programador
 titulo: Colaborador
 link: /membros/vinicius.html
diff --git a/pages/equipe.html b/pages/equipe.html
index 97c560c..d13cb99 100644
--- a/pages/equipe.html
+++ b/pages/equipe.html
@@ -1,7 +1,7 @@
----
-layout: layout
-titulo: Equipe
-subtitulo:
+--- 
+layout: layout 
+titulo: Equipe 
+subtitulo: 
 ---
 <div class="row">
   <div class="col-md-12 p-4">
@@ -18,49 +18,38 @@ <h2>Cordenação</h2>
     </div>
   </div>
   <div class="row">
+    {% for membro in site.membros %} 
+    {% if membro.titulo == "Coordenador" %}
     <div class="col-md-3 col-sm-6">
       <div class="text-center">
-        <a href="#"><img src="../assets/images/icone.png" class="img-equipe rounded-circle"></a>
-        <a href="#">
-          <h3>Lorem ipsum dolor</h3>
-        </a>
-        <h3>Professor do IFSP</h3>
-      </div>
-    </div>
-    <div class="col-md-3 col-sm-6">
-      <div class="text-center">
-        <a href="#"><img src="../assets/images/icone.png" class="img-equipe rounded-circle"></a>
-        <a href="#">
-          <h3>Lorem ipsum dolor</h3>
-        </a>
-        <h3>Professor do IFSP</h3>
-      </div>
-    </div>
-    <div class="col-md-3 col-sm-6">
-      <div class="text-center">
-        <a href="#"><img src="../assets/images/icone.png" class="img-equipe rounded-circle"></a>
-        <a href="#">
-          <h3>Lorem ipsum dolor</h3>
+        <a href="{{ membro.link }}">
+          <img src="{{ membro.imagem }}" class="img-equipe rounded-circle">
+          <h3>{{ membro.nick }}</h3>
         </a>
-        <h3>Professor do IFSP</h3>
+        <h3>{{ membro.funcao }}</h3>
       </div>
     </div>
+    {% endif %} 
+    {% endfor %}
+
   </div>
   <div class="row">
     <h2>Colaboradores</h2>
   </div>
   <div class="row">
-    {% for membro in site.membros %}
-      {% if membro.titulo == "Colaborador" %}
-      <div class="col-md-3 col-sm-6">
-        <div class="text-center">
-          <a href="{{ membro.link }}"><img src="{{ membro.imagem }}" class="img-equipe rounded-circle"></a>
-          <h3><a href="{{ membro.link }}">{{ membro.nome }}</a></h3>
-          <h3>{{ membro.funcao }}</h3>
-        </div>
+    {% for membro in site.membros %} {% if membro.titulo == "Colaborador" %}
+    <div class="col-md col-sm">
+      <div class="text-center">
+        <a href="{{ membro.link }}">
+          <img src="{{ membro.imagem }}" class="img-equipe rounded-circle">
+        
+        <h3>
+          {{ membro.nick }}
+        </h3></a>
+        <h3>{{ membro.funcao }}</h3>
       </div>
-      {% endif %}
-    {% endfor %}
+    </div>
+    {% endif %} {% endfor %}
   </div>
 
 </div>

From d95c21771c241c95af819eed8db62ddb1e745777 Mon Sep 17 00:00:00 2001
From: Matheus Reis <matheus.reisluz@gmail.com>
Date: Thu, 4 Apr 2019 17:16:10 -0300
Subject: [PATCH 27/42] Nome matheus completo adicionado

---
 .../equipe.scssc                              | Bin 1722 -> 1722 bytes
 .../main.scssc                                | Bin 46391 -> 46391 bytes
 _membros/matheus.md                           |   2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/.sass-cache/631075a38d64437aed7121870b46e2e50d54b2ab/equipe.scssc b/.sass-cache/631075a38d64437aed7121870b46e2e50d54b2ab/equipe.scssc
index 4607ad20baa48e02a591d0167e03eb3e7b7e6ca2..a25be0ef8302c6b571ce0892f6ba39f9ea94be35 100644
GIT binary patch
delta 14
VcmdnRyNj3ASkGL~WFzZVHUJ-U1OEU3

delta 14
VcmdnRyNj3ASkGL~cq8jpHUJ-P1O5O2

diff --git a/.sass-cache/631075a38d64437aed7121870b46e2e50d54b2ab/main.scssc b/.sass-cache/631075a38d64437aed7121870b46e2e50d54b2ab/main.scssc
index 66563660a9c3ec579c1fa7bb2da7c04727313d7f..9091a071d47f2f093669db2a1999a7e70d1a973e 100644
GIT binary patch
delta 16
Xcmdn~ifQ{RCRSrTb3K!dtVUY_IGqLK

delta 16
Xcmdn~ifQ{RCRSrTb3NmYtVUY_IG6?E

diff --git a/_membros/matheus.md b/_membros/matheus.md
index 63b5c67..c48a874 100644
--- a/_membros/matheus.md
+++ b/_membros/matheus.md
@@ -1,7 +1,7 @@
 ---
 layout: membro-equipe
 nick: Matheus
-nome: Matheus
+nome: Matheus Reis Luz
 funcao: Programador
 titulo: Colaborador
 link: /membros/matheus.html

From 0f3a394d181c32ad64313d0f6c3e204595a28bee Mon Sep 17 00:00:00 2001
From: Jefferson <jeffersonss999@gmail.com>
Date: Thu, 4 Apr 2019 17:24:47 -0300
Subject: [PATCH 28/42] =?UTF-8?q?Adi=C3=A7=C3=A3o=20do=20nome=20Jefferson?=
 =?UTF-8?q?=20Souza=20Santos=20e=20corre=C3=A7=C3=A3o=20da=20coluna=20de?=
 =?UTF-8?q?=20colaboradores?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipe.scssc                              | Bin 1722 -> 1722 bytes
 .../main.scssc                                | Bin 46391 -> 46391 bytes
 _membros/jefferson.md                         |   4 ++--
 pages/equipe.html                             |   2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.sass-cache/631075a38d64437aed7121870b46e2e50d54b2ab/equipe.scssc b/.sass-cache/631075a38d64437aed7121870b46e2e50d54b2ab/equipe.scssc
index 4607ad20baa48e02a591d0167e03eb3e7b7e6ca2..a25be0ef8302c6b571ce0892f6ba39f9ea94be35 100644
GIT binary patch
delta 14
VcmdnRyNj3ASkGL~WFzZVHUJ-U1OEU3

delta 14
VcmdnRyNj3ASkGL~cq8jpHUJ-P1O5O2

diff --git a/.sass-cache/631075a38d64437aed7121870b46e2e50d54b2ab/main.scssc b/.sass-cache/631075a38d64437aed7121870b46e2e50d54b2ab/main.scssc
index 66563660a9c3ec579c1fa7bb2da7c04727313d7f..9091a071d47f2f093669db2a1999a7e70d1a973e 100644
GIT binary patch
delta 16
Xcmdn~ifQ{RCRSrTb3K!dtVUY_IGqLK

delta 16
Xcmdn~ifQ{RCRSrTb3NmYtVUY_IG6?E

diff --git a/_membros/jefferson.md b/_membros/jefferson.md
index c45400c..c68df37 100644
--- a/_membros/jefferson.md
+++ b/_membros/jefferson.md
@@ -1,7 +1,7 @@
 ---
 layout: membro-equipe
-nick: Jerson
-nome: Jefferson
+nick: Jefferson
+nome: Jefferson Souza Santos
 funcao: Programador
 titulo: Colaborador
 link: /membros/jefferson.html
diff --git a/pages/equipe.html b/pages/equipe.html
index d13cb99..9e27ee7 100644
--- a/pages/equipe.html
+++ b/pages/equipe.html
@@ -38,7 +38,7 @@ <h2>Colaboradores</h2>
   </div>
   <div class="row">
     {% for membro in site.membros %} {% if membro.titulo == "Colaborador" %}
-    <div class="col-md col-sm">
+    <div class="col-md-3 col-sm-6">
       <div class="text-center">
         <a href="{{ membro.link }}">
           <img src="{{ membro.imagem }}" class="img-equipe rounded-circle">

From 49e8b901a4266f9a9ba59ec7b7f5f253f917f352 Mon Sep 17 00:00:00 2001
From: Thiago Xavier <thiago.xra@gmail.com>
Date: Thu, 4 Apr 2019 23:27:27 -0300
Subject: [PATCH 29/42] criado colecao de artigos

---
 .../artigos.scssc                             | Bin 0 -> 1752 bytes
 .../equipe.scssc                              | Bin 1722 -> 1722 bytes
 .../main.scssc                                | Bin 46391 -> 46391 bytes
 _artigos/artigo01.md                          |   9 +++
 _config.yml                                   |   3 +
 _layouts/artigos-detalhe.html                 |  24 +++++++
 _sass/artigos.scss                            |   4 ++
 assets/css/estilo_layout.scss                 |   3 +-
 pages/artigos-detalhe.html                    |   2 +-
 pages/artigos.html                            |  67 ++----------------
 10 files changed, 50 insertions(+), 62 deletions(-)
 create mode 100644 .sass-cache/631075a38d64437aed7121870b46e2e50d54b2ab/artigos.scssc
 create mode 100644 _artigos/artigo01.md
 create mode 100644 _layouts/artigos-detalhe.html
 create mode 100644 _sass/artigos.scss

diff --git a/.sass-cache/631075a38d64437aed7121870b46e2e50d54b2ab/artigos.scssc b/.sass-cache/631075a38d64437aed7121870b46e2e50d54b2ab/artigos.scssc
new file mode 100644
index 0000000000000000000000000000000000000000..a36db3fef7362160f24cf41be61b35a30d77b01b
GIT binary patch
literal 1752
zcmbtUO>-MX5Y>TN$+C?<2(cW+DX}Rq0jw`O!c1QV45`{GDwRS44nAzHc6;T4)y^_A
zigBg#-|5*8SyIe_LKn?!_w>Ae@AaH_zwKT$@dEpUcr>_(hW*PJ2j|gfFdBw0`_s`V
z#>+u8{VqPAUJjZcH6%M82U;^WQHYHFBBgmPBivyh^YBI_k;3%a*-Tm_Xp{C>lPg+Z
zJDz*+Tu%SM(0KD;h7NOnny^Ej1xjP&+Z-*KTU<28gz}_f>`Kn(!5IHqU>ahB?eaO!
zr>L~O@MJT&%B#bUjX(b&F6LQ+Rn~Tqb+nn~MGXR-26Ob>{Z+)UHK9NvQWOsL9*YER
zR-aJmMc!GylnWKwUK(RG4js4&^v(O)E9zC}AzuaQ3?*xo7v~>|R{M2}?Qv}aW&BK1
ziS~NR8>xj6GOfb_A=u$Ejx`!u?s80{{0KbBgU}X-bhU-pC#cl7R0dVw9)!c<uUN7+
z*CpHj8a`-k!Lhur=fKmI-6wG3xmQ=L_p2r~dLq_Y??=>s8kyyrkhD*NX?G^f&0^XW
zvgd2^P>)&@GpV~e)S7UUsxlJk%su#Bq>;SUXM^F(Av}|;Q?%}t$jN=Ls2P2y4bH7T
zid^WqqyLP+fevpI%L;?U|9?eVT$B91^?-jHsFeE95<Yd{v6Z{YO)%A>2F`VTV>sR@
znc3mkhkZL2dxgo)VqqNXv2Fe~NES3QOBTkV5}Bz6@Ml3%21x@>KS=n^9%O866oJ`-
zQ_pRN@-3>o?k<;^wU2&Rv*_+JWP2jQ)QDK1VlIy`Qy2z@=24_{N9NPu2?9eo)-!cD
zlB>3;lg%D4ZDDt9IN?v=8Gj0&iyAxN8FlLGyVL}Kvqp-yL`Kc}?<@Y|U+Og<uE&n@
ziG0AKytj7ZQH6lD3K}0cQu?@r&->L8315_wJSrujDa<F%@&~7+2z+U2hZi}w+aVEC
zkehe(HGBhSmZ-)CQH`9MYJTkQv+7Pu6m+4t&dfsv?wMIH&@VLM-!FNv@#EzMgEh@c
zDEx<Id?|-hq2{e+DThkYtQVrv6Go4jUp@MhQb~GXXehIUjN`f9>LcHI*X+>m-ruZ~
h+YwejR~%C;rxTj*bGq&OwC*<xX8jp*DrhjA`~%M0_}Kse

literal 0
HcmV?d00001

diff --git a/.sass-cache/631075a38d64437aed7121870b46e2e50d54b2ab/equipe.scssc b/.sass-cache/631075a38d64437aed7121870b46e2e50d54b2ab/equipe.scssc
index 4607ad20baa48e02a591d0167e03eb3e7b7e6ca2..a25be0ef8302c6b571ce0892f6ba39f9ea94be35 100644
GIT binary patch
delta 14
VcmdnRyNj3ASkGL~WFzZVHUJ-U1OEU3

delta 14
VcmdnRyNj3ASkGL~cq8jpHUJ-P1O5O2

diff --git a/.sass-cache/631075a38d64437aed7121870b46e2e50d54b2ab/main.scssc b/.sass-cache/631075a38d64437aed7121870b46e2e50d54b2ab/main.scssc
index 66563660a9c3ec579c1fa7bb2da7c04727313d7f..9091a071d47f2f093669db2a1999a7e70d1a973e 100644
GIT binary patch
delta 16
Xcmdn~ifQ{RCRSrTb3K!dtVUY_IGqLK

delta 16
Xcmdn~ifQ{RCRSrTb3NmYtVUY_IG6?E

diff --git a/_artigos/artigo01.md b/_artigos/artigo01.md
new file mode 100644
index 0000000..6905923
--- /dev/null
+++ b/_artigos/artigo01.md
@@ -0,0 +1,9 @@
+---
+layout: artigos-detalhe
+titulo: Artigo 01
+data: 15/03/2019
+sub-titulo: artigo 01 teste chamada
+link: /artigos/artigo01.html
+imagem: ../assets/images/icone.png
+---
+
diff --git a/_config.yml b/_config.yml
index 96b2548..84e5cdc 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,3 +1,6 @@
 collections:
   membros:
     output: true
+
+  artigos:
+    output: true
diff --git a/_layouts/artigos-detalhe.html b/_layouts/artigos-detalhe.html
new file mode 100644
index 0000000..63bce9e
--- /dev/null
+++ b/_layouts/artigos-detalhe.html
@@ -0,0 +1,24 @@
+---
+layout: layout
+---
+
+<div class="container-fluid">
+    <div class="row">
+        <div class="col p-3">
+            <img src="../assets/images/icone-centro.png" class="objectImage rounded mx-auto d-block img-recursiva">
+        </div>
+    </div>
+    <div class="container">
+        <div class="row">
+            <div class="col">
+                <time class="data" datetime="2017-02-14"></time>
+                <p class="negrito">{{ page.data }}</p>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col preenchimento">
+                {{ content }}
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/_sass/artigos.scss b/_sass/artigos.scss
new file mode 100644
index 0000000..50e5e32
--- /dev/null
+++ b/_sass/artigos.scss
@@ -0,0 +1,4 @@
+#objectImage {
+    object-fit: cover;
+    object-position: center;
+}
\ No newline at end of file
diff --git a/assets/css/estilo_layout.scss b/assets/css/estilo_layout.scss
index face9db..32aeedd 100644
--- a/assets/css/estilo_layout.scss
+++ b/assets/css/estilo_layout.scss
@@ -2,4 +2,5 @@
 ---
 
 @import "main";
-@import "equipe";
\ No newline at end of file
+@import "equipe";
+@import "artigos";
\ No newline at end of file
diff --git a/pages/artigos-detalhe.html b/pages/artigos-detalhe.html
index 8d8a675..692742e 100644
--- a/pages/artigos-detalhe.html
+++ b/pages/artigos-detalhe.html
@@ -1,6 +1,6 @@
 ---
 layout: layout
-titulo: artigo-detalhe
+titulo: artigo
 subtitulo:
 ---
 
diff --git a/pages/artigos.html b/pages/artigos.html
index fc18d04..a1cc5f6 100644
--- a/pages/artigos.html
+++ b/pages/artigos.html
@@ -3,84 +3,31 @@
 titulo: artigos
 subtitulo:
 ---
+{% for artigo in site.artigos %}
+
 <div class="row">
   <div class="col-lg-3 col-md-4 col-sm-6 p-3">
-    <a href="#"><img src="../assets/images/icone.png" class="rounded mx-auto d-block img-membro aumenta-margem"></a>
+    <a href="#"><img src="{{ artigo.imagem }}" class="rounded mx-auto d-block img-membro aumenta-margem"></a>
   </div>
   <div class="col-lg-9 col-md-8 col-sm-6 p-4">
     <div class="row">
       <div class="col preenchimento">
-        <h1><a href="#">Artigo 01</a></h1>
+        <h1><a href="{{ artigo.url }}">Artigo 01</a></h1>
       </div>
     </div>
     <div class="row">
       <div class="col">
         <time class="data" datetime="2017-02-14"></time>
-        <p class="negrito">12/01/2019</p>
+        <p class="negrito">{{ artigo.data }}</p>
       </div>
     </div>
     <div class="row">
       <div class="col preenchimento">
         <a href="#">
-          <p>Lorem ipsum dolor, sit amet consectetur adipisicing elit.
-            Deserunt repellat eveniet tentur, in dicta omnis nemo modi vel
-            illum libero iusto quos deleniti sunt eligendi, animi velit maxime est.</p>
+          <p> {{ artigo.sub-titulo }} </p>
         </a>
       </div>
     </div>
   </div>
 </div>
-<div class="row">
-  <div class="col-lg-3 col-md-4 col-sm-6 p-3">
-    <a href="#"><img src="../assets/images/icone.png" class="rounded mx-auto d-block img-membro aumenta-margem"></a>
-  </div>
-  <div class="col-lg-9 col-md-8 col-sm-6 p-4">
-    <div class="row">
-      <div class="col preenchimento">
-        <h1><a href="#">Artigo 02</a></h1>
-      </div>
-    </div>
-    <div class="row">
-      <div class="col">
-        <time class="data" datetime="2017-02-14"></time>
-        <p class="negrito">12/01/2019</p>
-      </div>
-    </div>
-    <div class="row">
-      <div class="col preenchimento">
-        <a href="#">
-          <p>Lorem ipsum dolor, sit amet consectetur adipisicing elit.
-            Deserunt repellat eveniet tentur, in dicta omnis nemo modi vel
-            illum libero iusto quos deleniti sunt eligendi, animi velit maxime est.</p>
-        </a>
-      </div>
-    </div>
-  </div>
-</div>
-<div class="row">
-  <div class="col-lg-3 col-md-4 col-sm-6 p-3">
-    <a href="#"><img src="../assets/images/icone.png" class="rounded mx-auto d-block img-membro aumenta-margem"></a>
-  </div>
-  <div class="col-lg-9 col-md-8 col-sm-6 p-4">
-    <div class="row">
-      <div class="col preenchimento">
-        <h1><a href="#">Artigo 03</a></h1>
-      </div>
-    </div>
-    <div class="row">
-      <div class="col">
-        <time class="data" datetime="2017-02-14"></time>
-        <p class="negrito">12/01/2019</p>
-      </div>
-    </div>
-    <div class="row">
-      <div class="col preenchimento">
-        <a href="#">
-          <p>Lorem ipsum dolor, sit amet consectetur adipisicing elit.
-            Deserunt repellat eveniet tentur, in dicta omnis nemo modi vel
-            illum libero iusto quos deleniti sunt eligendi, animi velit maxime est.</p>
-        </a>
-      </div>
-    </div>
-  </div>
-</div>
\ No newline at end of file
+{% endfor %}
\ No newline at end of file

From 498b9d074cb9553df106f16f43147913eb95a793 Mon Sep 17 00:00:00 2001
From: Vinicius Eustaquio Cortez <viniciusecortez@outlook.com>
Date: Fri, 5 Apr 2019 15:10:06 -0300
Subject: [PATCH 30/42] Apagada pasta adicional

---
 membros/membro-equipe.html | 74 --------------------------------------
 1 file changed, 74 deletions(-)
 delete mode 100644 membros/membro-equipe.html

diff --git a/membros/membro-equipe.html b/membros/membro-equipe.html
deleted file mode 100644
index 6c8f22a..0000000
--- a/membros/membro-equipe.html
+++ /dev/null
@@ -1,74 +0,0 @@
----
-
----
-
-<!doctype html>
-<html lang="pt-br">
-
-{% include head.html %}
-<body>
-  {% include navbar.html %}
-  <article>
-    <div class="titulo-pagina">
-      <div class="container">
-        <div class="row">
-          <div class="col-lg-3 col-md-4 col-sm-12">
-            <img src="../assets/images/icone.png" class="rounded-circle mx-auto d-block img-membro">
-          </div>
-          <div class="col-lg-9 col-md-8 col-sm-12 p-4">
-            <h1>{{page.nome}} - {{page.funcao}}</h1>
-            <p class="lead">{{ content }}</p>
-            <img src="../assets/images/icone3.png" class="float-left p-1">
-            <img src="../assets/images/icone3.png" class="float-left p-1">
-            <img src="../assets/images/icone3.png" class="float-left p-1">
-            <img src="../assets/images/icone3.png" class="float-left p-1">
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="container aumenta-margem borda-bottom formatacao-link">
-      <main class="row">
-        <div class="col-md-12">
-          <h2>Projetos</h2>
-        </div>
-      </main>
-      <main class="row">
-        <div class="col-md-4 col-sm-6">
-          <div class="text-center">
-            <img src="../assets/images/icone2.png" class="img-fluid rounded img-thumbnail">
-            <a href="#">
-              <h3>Pojeto de Software X</h3>
-            </a>
-            <h3>Aplicação Web</h3>
-          </div>
-        </div>
-        <div class="col-md-4 col-sm-6">
-          <div class="text-center">
-            <img src="../assets/images/icone2.png" class="img-fluid rounded img-thumbnail">
-            <a href="#">
-              <h3>Pojeto de Software Y</h3>
-            </a>
-            <h3>Aplicação Web</h3>
-          </div>
-        </div>
-      </main>
-      <main class="row">
-        <div class="col-md-12">
-          <h2>Publicações</h2>
-        </div>
-      </main>
-      <main class="row final-do-texto">
-        <div class="col-md-12">
-          <div class="list-group preenchimento">
-            <a href="#" class="list-group-item list-group-item-action">Dapibus ac facilisis in</a>
-            <a href="#" class="list-group-item list-group-item-action">Morbi leo risus</a>
-            <a href="#" class="list-group-item list-group-item-action">Porta ac consectetur ac</a>
-          </div>
-        </div>
-      </main>
-    </div>
-  </article>
-  {% include footer.html %}
-</body>
-
-</html>
\ No newline at end of file

From a6510f3ee052b8ef593c938cd5cbc1312f40334f Mon Sep 17 00:00:00 2001
From: jefferson <jeffersonss999@gmail.com>
Date: Fri, 5 Apr 2019 17:47:56 -0300
Subject: [PATCH 31/42] =?UTF-8?q?Cia=C3=A7=C3=A3o=20da=20cole=C3=A7=C3=A3o?=
 =?UTF-8?q?=20de=20noticias*?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _config.yml                   |  3 ++
 _layouts/detalhe-noticia.html | 17 +++++++++++
 _noticias/noticia1.md         | 10 ++++++
 _noticias/noticia2.md         |  9 ++++++
 _noticias/noticia3.md         |  9 ++++++
 _noticias/noticia4.md         |  9 ++++++
 _noticias/noticia5.md         |  9 ++++++
 pages/detalhe-noticia.html    |  2 --
 pages/noticias.html           | 57 +++++++++--------------------------
 9 files changed, 81 insertions(+), 44 deletions(-)
 create mode 100644 _layouts/detalhe-noticia.html
 create mode 100644 _noticias/noticia1.md
 create mode 100644 _noticias/noticia2.md
 create mode 100644 _noticias/noticia3.md
 create mode 100644 _noticias/noticia4.md
 create mode 100644 _noticias/noticia5.md

diff --git a/_config.yml b/_config.yml
index 84e5cdc..3855dc3 100644
--- a/_config.yml
+++ b/_config.yml
@@ -4,3 +4,6 @@ collections:
 
   artigos:
     output: true
+
+  noticias:
+    output: true
diff --git a/_layouts/detalhe-noticia.html b/_layouts/detalhe-noticia.html
new file mode 100644
index 0000000..9b2be3f
--- /dev/null
+++ b/_layouts/detalhe-noticia.html
@@ -0,0 +1,17 @@
+---
+layout: layout
+---
+    <div  class="container">
+      <div class="row">
+        <div class="col-md-12">
+            <img src="../assets/images/imagemNoticia.png" class="img-fluid imagem-principal" alt="Responsive image"/>
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-md-12 texto-principal">
+           <p class=""> {{ content }} </p>
+        </div>
+      </div>
+    </div>
+
+ 
\ No newline at end of file
diff --git a/_noticias/noticia1.md b/_noticias/noticia1.md
new file mode 100644
index 0000000..76f57bc
--- /dev/null
+++ b/_noticias/noticia1.md
@@ -0,0 +1,10 @@
+---
+layout: detalhe-noticia
+titulo: Um dia vermelho 1
+introducao: As atividades do Laboratório de Desenvolvimento de Software - IFSP CodeLab houve uma chacina!
+data: 20190214
+link: /membros/noticia1.html
+imagem: ../assets/images/icone.png
+---
+As atividades do Laboratório de Desenvolvimento de Software - IFSP CodeLab, no dia 14/02/2019, foi marcado uma matança generalizada dos estudantes da monitoria. 
+Quando questionados, os estudantes do CodeLab apresentaram uma razão que não poderia ser mais justa: "Eles gritavam demais".
\ No newline at end of file
diff --git a/_noticias/noticia2.md b/_noticias/noticia2.md
new file mode 100644
index 0000000..0647073
--- /dev/null
+++ b/_noticias/noticia2.md
@@ -0,0 +1,9 @@
+---
+layout: detalhe-noticia
+titulo: Um dia vermelho 2
+introducao: As atividades do Laboratório de Desenvolvimento de Software - IFSP CodeLab houve uma chacina!
+data: 20190215
+link: /membros/noticia1.html
+imagem: ../assets/images/icone.png
+---
+As atividades do Laboratório de Desenvolvimento de Software - IFSP CodeLab, no dia 14/02/2019, foi marcado uma matança generalizada dos estudantes da monitoria.
\ No newline at end of file
diff --git a/_noticias/noticia3.md b/_noticias/noticia3.md
new file mode 100644
index 0000000..e77c9aa
--- /dev/null
+++ b/_noticias/noticia3.md
@@ -0,0 +1,9 @@
+---
+layout: detalhe-noticia
+titulo: Um dia vermelho 3
+introducao: As atividades do Laboratório de Desenvolvimento de Software - IFSP CodeLab houve uma chacina!
+data: 20190216
+link: /membros/noticia1.html
+imagem: ../assets/images/icone.png
+---
+As atividades do Laboratório de Desenvolvimento de Software - IFSP CodeLab, no dia 14/02/2019, foi marcado uma matança generalizada dos estudantes da monitoria.
\ No newline at end of file
diff --git a/_noticias/noticia4.md b/_noticias/noticia4.md
new file mode 100644
index 0000000..85ab4f5
--- /dev/null
+++ b/_noticias/noticia4.md
@@ -0,0 +1,9 @@
+---
+layout: detalhe-noticia
+titulo: Um dia vermelho 4
+introducao: As atividades do Laboratório de Desenvolvimento de Software - IFSP CodeLab houve uma chacina!
+data: 20190217
+link: /membros/noticia1.html
+imagem: ../assets/images/icone.png
+---
+As atividades do Laboratório de Desenvolvimento de Software - IFSP CodeLab, no dia 14/02/2019, foi marcado uma matança generalizada dos estudantes da monitoria.
\ No newline at end of file
diff --git a/_noticias/noticia5.md b/_noticias/noticia5.md
new file mode 100644
index 0000000..79d031c
--- /dev/null
+++ b/_noticias/noticia5.md
@@ -0,0 +1,9 @@
+---
+layout: detalhe-noticia
+titulo: Um dia vermelho 5
+introducao: As atividades do Laboratório de Desenvolvimento de Software - IFSP CodeLab houve uma chacina!
+data: 20190218
+link: /membros/noticia1.html
+imagem: ../assets/images/icone.png
+---
+As atividades do Laboratório de Desenvolvimento de Software - IFSP CodeLab, no dia 14/02/2019, foi marcado uma matança generalizada dos estudantes da monitoria.
\ No newline at end of file
diff --git a/pages/detalhe-noticia.html b/pages/detalhe-noticia.html
index 0ffcf48..17027c1 100644
--- a/pages/detalhe-noticia.html
+++ b/pages/detalhe-noticia.html
@@ -1,7 +1,5 @@
 ---
 layout: layout
-titulo: Nome notícia
-subtitulo: 
 ---
     <div  class="container">
       <div class="row">
diff --git a/pages/noticias.html b/pages/noticias.html
index 9ff1e20..82e958c 100644
--- a/pages/noticias.html
+++ b/pages/noticias.html
@@ -1,10 +1,9 @@
 ---
 layout: layout
 titulo: Notícias
-subtitulo: Lorem ipsum dolor, sit amet consectetur adipisicing elit. Eius dolorem, obcaecati ad laborum asperiores provident numquam sunt veniam, tenetur soluta odit deleniti assumenda dolorum dolor voluptas iste. Sapiente, solutaesse.
+subtitulo: Lorem
 ---
 
-
 <article>
   <div id="botao-ver-noticia" class="aumenta-margem-top">
     <!-- Coloque o conteúdo aqui -->
@@ -13,69 +12,43 @@
         <div class="card">
           <img class="card-img-top img-fluid" src="../assets/images/icone2.png" alt="Imagem de capa do card">
           <div class="card-body">
-            <h2 class="card-title">Título da notícia 1.1</h2>
-            <p class="card-text">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Quidem deleniti in dolorum
-              temporibus sequi eius perspiciatis voluptas, enim, sunt exercitationem atque rerum!
-              Lorem ipsum dolor sit amet, consectetur adipisicing elit. Quidem deleniti in dolorum
-              temporibus sequi eius perspiciatis voluptas, enim, sunt exercitationem atque rerum!</p>
+            <h2 class="card-title">{{ f[0].titulo }}</h2>
+            <p class="card-text">{{ f[0].content }}</p>
             <a href="#" class="btn btn-primary">Ver notícia</a>
           </div>
         </div>
       </div>
+
       <div class="col-md">
         <main class="row">
+            {% for i in (1..2) %}
           <div class="col-md-6 col-sm-6 col-6">
             <div class="card">
               <img class="card-img-top img-fluid" src="../assets/images/icone2.png" alt="Imagem de capa do card">
               <div class="card-body">
-                <h2 class="card-title">Título da notícia 2.1</h2>
-                <p class="card-text">Lorem ipsum dolor sit amet, consectetur adipisicing elit.</p>
-                <a href="#" class="btn btn-primary">Ver notícia</a>
-              </div>
-            </div>
-          </div>
-          <div class="col-md-6 col-sm-6 col-6">
-            <div class="card">
-              <img class="card-img-top img-fluid" src="../assets/images/icone2.png" alt="Imagem de capa do card">
-              <div class="card-body">
-                <h2 class="card-title">Título da notícia 2.2</h2>
-                <p class="card-text">Lorem ipsum dolor sit amet, consectetur adipisicing elit.</p>
+                <h2 class="card-title">{{ f[i].titulo }}</h2>
+                <p class="card-text">{{ f[i].content }}</p>
                 <a href="#" class="btn btn-primary">Ver notícia</a>
               </div>
             </div>
           </div>
+          {% endfor %}
         </main>
         <main class="row aumenta-margem-top altera-font-size ">
+            {% for i in (3..f.size) %}
           <div class="col-md-4 col-sm-4 col-4">
             <div class="card aumenta-margem-right">
               <img class="card-img-top img-fluid" src="../assets/images/icone2.png" alt="Imagem de capa do card">
               <div class="card-body p-2">
-                <h2 class="card-title">Título da notícia 3.1</h2>
-                <p class="card-text">Lorem ipsum dolor sit amet, consectetur adipisicing elit.</p>
-                <a href="#" class="btn btn-primary">Ver notícia</a>
-              </div>
-            </div>
-          </div>
-          <div class="col-md-4 col-sm-4 col-4">
-            <div class="card aumenta-margem-left-right">
-              <img class="card-img-top img-fluid" src="../assets/images/icone2.png" alt="Imagem de capa do card">
-              <div class="card-body p-2">
-                <h2 class="card-title">Título da notícia 3.2</h2>
-                <p class="card-text">Lorem ipsum dolor sit amet, consectetur adipisicing elit.</p>
-                <a href="#" class="btn btn-primary">Ver notícia</a>
-              </div>
-            </div>
-          </div>
-          <div class="col-md-4 col-sm-4 col-4">
-            <div class="card aumenta-margem-left">
-              <img class="card-img-bottom img-fluid" src="../assets/images/icone2.png" alt="Imagem de capa do card">
-              <div class="card-body p-2">
-                <h2 class="card-title">Título da notícia 3.3</h2>
-                <p class="card-text">Lorem ipsum dolor sit amet, consectetur adipisicing elit.</p>
-                <a href="#" class="btn btn-primary"> Ver notícia </a>
+                <h2 class="card-title">{{ f[i].titulo }}</h2>
+                    <p >{{ f[i].content }}</p>
+                    <a href="#" class="btn btn-primary">Ver notícia</a>
               </div>
             </div>
           </div>
+
+
+          {% endfor %}
         </main>
       </div>
     </main>

From c1e0deb72012fc7cd4f2694d5d3bafe832d79f7e Mon Sep 17 00:00:00 2001
From: jefferson <jeffersonss999@gmail.com>
Date: Fri, 5 Apr 2019 17:52:29 -0300
Subject: [PATCH 32/42] =?UTF-8?q?Corre=C3=A7=C3=A3o=20do=20ultimo=20commit?=
 =?UTF-8?q?=20da=20cole=C3=A7=C3=A3o=20de=20noticias?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/noticias.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pages/noticias.html b/pages/noticias.html
index 82e958c..d9e2866 100644
--- a/pages/noticias.html
+++ b/pages/noticias.html
@@ -8,6 +8,9 @@
   <div id="botao-ver-noticia" class="aumenta-margem-top">
     <!-- Coloque o conteúdo aqui -->
     <main class="row">
+        {% assign f = site.noticias | reverse  %}
+        {% assign k = f.size %}
+
       <div class="col-lg col-md-6 col-sm-12 aumenta-margem-bottom">
         <div class="card">
           <img class="card-img-top img-fluid" src="../assets/images/icone2.png" alt="Imagem de capa do card">

From 2cda284025afe8b0a7026bd35e81885285342b0b Mon Sep 17 00:00:00 2001
From: Vinicius Eustaquio Cortez <viniciusecortez@outlook.com>
Date: Mon, 8 Apr 2019 15:58:11 -0300
Subject: [PATCH 33/42] Corrigida erro em artigos

---
 .gitignore         | 2 +-
 _config.yml        | 1 +
 pages/artigos.html | 3 +--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index bac727c..c791152 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 _site/
-_sass-cache/
+.sass-cache/
 .vscode/
\ No newline at end of file
diff --git a/_config.yml b/_config.yml
index 3855dc3..7fad8b9 100644
--- a/_config.yml
+++ b/_config.yml
@@ -7,3 +7,4 @@ collections:
 
   noticias:
     output: true
+
diff --git a/pages/artigos.html b/pages/artigos.html
index a1cc5f6..5069a34 100644
--- a/pages/artigos.html
+++ b/pages/artigos.html
@@ -12,12 +12,11 @@
   <div class="col-lg-9 col-md-8 col-sm-6 p-4">
     <div class="row">
       <div class="col preenchimento">
-        <h1><a href="{{ artigo.url }}">Artigo 01</a></h1>
+        <h1><a href="{{ artigo.url }}">{{ artigo.titulo }}</a></h1>
       </div>
     </div>
     <div class="row">
       <div class="col">
-        <time class="data" datetime="2017-02-14"></time>
         <p class="negrito">{{ artigo.data }}</p>
       </div>
     </div>

From 772993296fca226b4a7bacf558fa0791bfbc2d5c Mon Sep 17 00:00:00 2001
From: Matheus Reis <matheus.reisluz@gmail.com>
Date: Mon, 8 Apr 2019 16:17:36 -0300
Subject: [PATCH 34/42] Criado projetos-detalhe e sua collection

---
 _config.yml                                   |  3 ++
 .../projetos-detalhe.html                     |  2 -
 _projetos/projeto1.md                         |  6 +++
 _projetos/projeto2.md                         |  6 +++
 pages/projetos.html                           | 45 ++++++-------------
 5 files changed, 28 insertions(+), 34 deletions(-)
 rename pages/projetox.html => _layouts/projetos-detalhe.html (99%)
 create mode 100644 _projetos/projeto1.md
 create mode 100644 _projetos/projeto2.md

diff --git a/_config.yml b/_config.yml
index 7fad8b9..73cb98c 100644
--- a/_config.yml
+++ b/_config.yml
@@ -7,4 +7,7 @@ collections:
 
   noticias:
     output: true
+  
+  projetos:
+    output: true
 
diff --git a/pages/projetox.html b/_layouts/projetos-detalhe.html
similarity index 99%
rename from pages/projetox.html
rename to _layouts/projetos-detalhe.html
index 461ebe0..1a2a1cb 100644
--- a/pages/projetox.html
+++ b/_layouts/projetos-detalhe.html
@@ -1,7 +1,5 @@
 ---
 layout: layout
-titulo: projeto
-subtitulo:
 ---
 <div class="row">
     <div class="col-md-12 p-md-5 p-2">
diff --git a/_projetos/projeto1.md b/_projetos/projeto1.md
new file mode 100644
index 0000000..1514fa4
--- /dev/null
+++ b/_projetos/projeto1.md
@@ -0,0 +1,6 @@
+---
+layout: projetos-detalhe
+titulo: projeto1
+subtitulo: subtitulo do projeto 1
+imagem: ../assets/images/padrao.png
+---
diff --git a/_projetos/projeto2.md b/_projetos/projeto2.md
new file mode 100644
index 0000000..1458c6d
--- /dev/null
+++ b/_projetos/projeto2.md
@@ -0,0 +1,6 @@
+---
+layout: projetos-detalhe
+titulo: projeto2
+subtitulo: subtitulo do projeto 2
+imagem: ../assets/images/padrao.png
+---
diff --git a/pages/projetos.html b/pages/projetos.html
index 3410785..93b75e2 100644
--- a/pages/projetos.html
+++ b/pages/projetos.html
@@ -5,6 +5,8 @@
 ---
 
 <div class="row">
+        {% assign f = site.projetos | reverse  %}
+        {% assign k = f.size %}
     <div class="col-lg-12 p-4">
         <p>Lorem ipsum dolor sit amet consectetur adipisicing elit.
             Quisquam laboriosam omnis fugiat iure quae recusandae deserunt
@@ -14,40 +16,19 @@
     </div>
 </div>
 <div class="row formatacao">
+    {% for i in (0..f.size) %}
+        {% if i == f.size %}
+            {% break %}
+        {% else %}    
     <div class="col-sm-6 col-md-4 p-4 d-flex">
-        <div class="card">
-            <img class="card-img-top" src="../assets/images/padrao.png" alt="imagem do card">
+        <a href="{{f[i].url}}" class="card">
+            <img class="card-img-top" src="{{f[i].imagem}}" alt="imagem do card">
             <div class="card-body flex-fill">
-                <h2 class="card-text">Projeto de Software X</h2>
-                <p>Aplicação Web</p>
+                <h2 class="card-text">{{ f[i].titulo }}</h2>
+                <p>{{ f[i].subtitulo }}</p>
             </div>
-        </div>
-    </div>
-    <div class="col-sm-6 col-md-4 p-4 d-flex">
-        <div class="card">
-            <img class="card-img-top" src="../assets/images/padrao.png" alt="imagem do card">
-            <div class="card-body flex-fill">
-                <h2 class="card-text">Aplicação Mobile para Controle de Y</h2>
-                <p>Aplicação Web</p>
-            </div>
-        </div>
-    </div>
-    <div class="col-sm-6 col-md-4 p-4 d-flex">
-        <div class="card">
-            <img class="card-img-top" src="../assets/images/padrao.png" alt="imagem do card">
-            <div class="card-body flex-fill">
-                <h2 class="card-text">Sistema para gerenciamento de ABC</h2>
-                <p>Aplicação Web</p>
-            </div>
-        </div>
-    </div>
-    <div class="col-sm-6 col-md-4 p-4 d-flex">
-        <div class="card">
-            <img class="card-img-top" src="../assets/images/padrao.png" alt="imagem do card">
-            <div class="card-body flex-fill">
-                <h2 class="card-text">Projeto de Software X</h2>
-                <p>Projeto X</p>
-            </div>
-        </div>
+        </a>
     </div>
+        {% endif %}
+    {% endfor %}
 </div>
\ No newline at end of file

From 67c832102d1c69dfedce530f96d39dfe9f0f852d Mon Sep 17 00:00:00 2001
From: Jefferson <jeffersonss999@gmail.com>
Date: Mon, 8 Apr 2019 16:24:37 -0300
Subject: [PATCH 35/42] =?UTF-8?q?Cria=C3=A7=C3=A3o=20do=20if=20para=20escr?=
 =?UTF-8?q?ever=20somente=20as=20noticias=20existentes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../artigos.scssc                               | Bin 0 -> 1761 bytes
 .../equipe.scssc                                | Bin 0 -> 1731 bytes
 .../main.scssc                                  | Bin 0 -> 46400 bytes
 _noticias/noticia1.md                           |  11 +++++------
 _noticias/noticia2.md                           |  10 +++++-----
 _noticias/noticia3.md                           |  10 +++++-----
 _noticias/noticia4.md                           |  10 +++++-----
 _noticias/noticia5.md                           |   8 ++++----
 pages/noticias.html                             |  14 +++++++-------
 9 files changed, 31 insertions(+), 32 deletions(-)
 create mode 100644 .sass-cache/d3e2e48bac7c1bcad55fcffab55e545bd62307c1/artigos.scssc
 create mode 100644 .sass-cache/d3e2e48bac7c1bcad55fcffab55e545bd62307c1/equipe.scssc
 create mode 100644 .sass-cache/d3e2e48bac7c1bcad55fcffab55e545bd62307c1/main.scssc

diff --git a/.sass-cache/d3e2e48bac7c1bcad55fcffab55e545bd62307c1/artigos.scssc b/.sass-cache/d3e2e48bac7c1bcad55fcffab55e545bd62307c1/artigos.scssc
new file mode 100644
index 0000000000000000000000000000000000000000..24e2a8c8a198c517e0129e78705017bbf2b8fe64
GIT binary patch
literal 1761
zcmbtUNpBlB6xN{_$+BH9O=3BU17(8LS!!)|6o<SpOAQQA1V*K{2OkF1%o~~QXgDRQ
zI7X2Fp2t~aNpUW%E+Xe`-}~P8c-(%~KB>bAbbHaDcM|ryrxEmy!$EJ*4_<c1gFytR
zy>R?GIv$_)>Oa&Z*&lMP2^lE>LVlOhe2^h*kRMraDdJE;a^b8x&0?@lTcpkuo-Z8F
z-FYm>e?wrrDW8BtoL@&|m!({32z~3LC2{jYLx|B&Dnj1L>68!Q-x(wU)W{~A!gLHu
z+kywH&ZS?KZdm){Z|q{4#!z~#=U#iOUS3#3&<US{=WZ_|rfVZK#3BLVVDFKL!FqKO
zm7ZmtWk)$vf$gO>1mj@9CD)f<DreZM&P=}I$pj>66os>oNUQz2Mz)wXTp2%=n4-Dt
zaxS$nLMBzZg9tX5j3NyNkDCmVFbkpgGb3$^T`X-Ob`dJ}EtLV)wSjau|I3f0$#lWC
zzl4uA*66;x$>-1q3%8%>f#;sRBb`4qPNNe+2#Uv@_n`kVGVO>+rvZ*X=HvE6n9JF?
zEo8^nD5DN`Cni$2b)Ypu$HB@_BolY%FOh`uN+0$5FZ=YNB(1!AuK<q%Ji~tUwKg!d
zBT^_t&wc%0KsdC;n#i>R9{c}0PlIXHfp5j&UvZUSH(JuW4!vjRUT21nwWv_%qPnsr
z=Srq_OSb8@U68F@ZAXzXjuqQF`^e)N?#`TxVW326%1!)D;7oa3qle!({AmLT85)IP
z*65+<)&uzwRF-#>$<*pdf38?`*C~)K5kg`_BtQ|Dg^(%;xWUB~3D!t`+(3a~(8r3W
zO84ZVKB}m<dvkr*TazBJ`}84uK%a;T*<mSm>g(&o@K2<cz!j2Fu|j;#o_!}@{q}rh
zFI&x9w8}b55qC-iq><BjOGqK;0zT`OA(H-FjO0!+5?se@^(=q%5GO*PTH5KejNA19
ziOI>$I(k8Wp+}ae+6qy%jGA(h?Cnum(-KA7w6o02Z3%9eSx(T+XTsjhd9e2Vd4b;2
z%nB&%?c6>ehf|_vjd>~uQ{mF*L&diYUp2pc{YS+l@uk7lOk)&|=X#5;ed}|*g})np
jlU622y7;-|7;PDywEiWd+dfpwdb41b-y^4lM*E|$vbFq0

literal 0
HcmV?d00001

diff --git a/.sass-cache/d3e2e48bac7c1bcad55fcffab55e545bd62307c1/equipe.scssc b/.sass-cache/d3e2e48bac7c1bcad55fcffab55e545bd62307c1/equipe.scssc
new file mode 100644
index 0000000000000000000000000000000000000000..5acea6e34be6e41f099579025eeabed19c5467f0
GIT binary patch
literal 1731
zcmbtUOK;Oa5Y7QPY1)#u5;T3GC<w}{dA5b_UKR>Skq|;8z@Z0gV^5L=$7^;sl&b1~
zXV!L19m)lA$$EDl-+c4UbQ{kbhvjYuyiU8#d3V(5w4Wc3fP05+-fbOsyC)~zj(_AG
zzu+E}Z<Qq3>T|6L87KfkK1ylcOCMIqZRSlx;428voJFHq0M@8N%1q(;%<0wF8e%#=
zfbTOAfkT`(1G2#)t~B_rHPMpPlRSM0z%x=2aw?}&-bWV*Jt&b?HihXBl(zZy7LDh2
zMY>|&@Bi^GrcnTMtL4OMd(rANz*<WPJLFU7)hpL9)1?942O<RFVDTdnfHi6%E<GE5
zMa=P0&Xi}XDfPiP=rG}Wa#eVX)#~`kRXiMnB-J!^e2Ki;+a*$A+HhsuNMeYcyvYZt
zg%L6=(se|z!sKYA!QgR~LFmUWbUS{eJ7OJETZk=$ij_-cK((wR-AMkDBiUg(<=f5S
zqtzw4C4a|r=<c<z4Z7E>zd0q%Pa6Bt9Dxst2hG=@zZn@d#YjgU_CMgm##oriY}gR8
z>1yP*nJA#4J*^Qrc2@c#9M{*sh|rhk`k>u8>d<?V)RN+RDRva#TP#OkXaiH*AcaEg
z)ldEfgF|a<2dP%T1NXn<RGCH@xK<19IaeW8qb0rL(7U$nWoGzLivo4diVIWnLCMHY
z$r@d=15!R0zL_{yX3Ojc4`w(v84Z0;iO9@{@SVVJ@}NZb|1kJ$9SP|hg*cYzKE`c#
zThY%r?kba!Rgk_cSYQ_skc#jjG-4z`kvj7sQs8leLn%Vc5xKTq2nKDeY>ISKUROrZ
zDlJon{klu{*fzb#cIg9AAnPo`B3*qE8vc`%LO4er3RZ$o*yF#%E8iTCY{oNrgGyO5
z=TVs>Ak~D%8(dN;r|?;8?jq^Kv>VG45aWrlw9$QR1bt-LrjHjWjq7+ypV0$LPicXk
z5)!hJfwNzm^Guc=+MvxmA2$W~%||{!E9nG#nM<&iC1~e5l|o^!viGbB&KxzXW}%!I
zdD=?cUAV>E`MMvZ{lm?Ivls;^mtLJ*Tko~Yat(j6o=Gj1AB}GkPP414a!jw?M0r`+
M?D>V`WUxDfUklvraR2}S

literal 0
HcmV?d00001

diff --git a/.sass-cache/d3e2e48bac7c1bcad55fcffab55e545bd62307c1/main.scssc b/.sass-cache/d3e2e48bac7c1bcad55fcffab55e545bd62307c1/main.scssc
new file mode 100644
index 0000000000000000000000000000000000000000..cb9fd99cffa066647f0b25762ea64795973ba376
GIT binary patch
literal 46400
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

literal 0
HcmV?d00001

diff --git a/_noticias/noticia1.md b/_noticias/noticia1.md
index 76f57bc..fe592ca 100644
--- a/_noticias/noticia1.md
+++ b/_noticias/noticia1.md
@@ -1,10 +1,9 @@
 ---
 layout: detalhe-noticia
-titulo: Um dia vermelho 1
-introducao: As atividades do Laboratório de Desenvolvimento de Software - IFSP CodeLab houve uma chacina!
-data: 20190214
-link: /membros/noticia1.html
+titulo: IFSP CodeLab 1
+introducao: Inicio das atividades do Laboratório de Desenvolvimento de Software - IFSP CodeLab 
+data: 20190218
+link: /noticias/noticia1.html
 imagem: ../assets/images/icone.png
 ---
-As atividades do Laboratório de Desenvolvimento de Software - IFSP CodeLab, no dia 14/02/2019, foi marcado uma matança generalizada dos estudantes da monitoria. 
-Quando questionados, os estudantes do CodeLab apresentaram uma razão que não poderia ser mais justa: "Eles gritavam demais".
\ No newline at end of file
+Lorem ipsum dolor sit amet, consectetur adipisicing elit.
\ No newline at end of file
diff --git a/_noticias/noticia2.md b/_noticias/noticia2.md
index 0647073..9f5ba7a 100644
--- a/_noticias/noticia2.md
+++ b/_noticias/noticia2.md
@@ -1,9 +1,9 @@
 ---
 layout: detalhe-noticia
-titulo: Um dia vermelho 2
-introducao: As atividades do Laboratório de Desenvolvimento de Software - IFSP CodeLab houve uma chacina!
-data: 20190215
-link: /membros/noticia1.html
+titulo: IFSP CodeLab 2
+introducao: Inicio das atividades do Laboratório de Desenvolvimento de Software - IFSP CodeLab 
+data: 20190218
+link: /noticias/noticia2.html
 imagem: ../assets/images/icone.png
 ---
-As atividades do Laboratório de Desenvolvimento de Software - IFSP CodeLab, no dia 14/02/2019, foi marcado uma matança generalizada dos estudantes da monitoria.
\ No newline at end of file
+Lorem ipsum dolor sit amet, consectetur adipisicing elit.
\ No newline at end of file
diff --git a/_noticias/noticia3.md b/_noticias/noticia3.md
index e77c9aa..99f7966 100644
--- a/_noticias/noticia3.md
+++ b/_noticias/noticia3.md
@@ -1,9 +1,9 @@
 ---
 layout: detalhe-noticia
-titulo: Um dia vermelho 3
-introducao: As atividades do Laboratório de Desenvolvimento de Software - IFSP CodeLab houve uma chacina!
-data: 20190216
-link: /membros/noticia1.html
+titulo: IFSP CodeLab 3
+introducao: Inicio das atividades do Laboratório de Desenvolvimento de Software - IFSP CodeLab 
+data: 20190218
+link: /noticias/noticia2.html
 imagem: ../assets/images/icone.png
 ---
-As atividades do Laboratório de Desenvolvimento de Software - IFSP CodeLab, no dia 14/02/2019, foi marcado uma matança generalizada dos estudantes da monitoria.
\ No newline at end of file
+Lorem ipsum dolor sit amet, consectetur adipisicing elit.
\ No newline at end of file
diff --git a/_noticias/noticia4.md b/_noticias/noticia4.md
index 85ab4f5..651aa95 100644
--- a/_noticias/noticia4.md
+++ b/_noticias/noticia4.md
@@ -1,9 +1,9 @@
 ---
 layout: detalhe-noticia
-titulo: Um dia vermelho 4
-introducao: As atividades do Laboratório de Desenvolvimento de Software - IFSP CodeLab houve uma chacina!
-data: 20190217
-link: /membros/noticia1.html
+titulo: IFSP CodeLab 4
+introducao: Inicio das atividades do Laboratório de Desenvolvimento de Software - IFSP CodeLab 
+data: 20190218
+link: /noticias/noticia3.html
 imagem: ../assets/images/icone.png
 ---
-As atividades do Laboratório de Desenvolvimento de Software - IFSP CodeLab, no dia 14/02/2019, foi marcado uma matança generalizada dos estudantes da monitoria.
\ No newline at end of file
+Lorem ipsum dolor sit amet, consectetur adipisicing elit. 
\ No newline at end of file
diff --git a/_noticias/noticia5.md b/_noticias/noticia5.md
index 79d031c..5f7393d 100644
--- a/_noticias/noticia5.md
+++ b/_noticias/noticia5.md
@@ -1,9 +1,9 @@
 ---
 layout: detalhe-noticia
-titulo: Um dia vermelho 5
-introducao: As atividades do Laboratório de Desenvolvimento de Software - IFSP CodeLab houve uma chacina!
+titulo: IFSP CodeLab 5
+introducao: Inicio das atividades do Laboratório de Desenvolvimento de Software - IFSP CodeLab 
 data: 20190218
-link: /membros/noticia1.html
+link: /noticias/noticia5.html
 imagem: ../assets/images/icone.png
 ---
-As atividades do Laboratório de Desenvolvimento de Software - IFSP CodeLab, no dia 14/02/2019, foi marcado uma matança generalizada dos estudantes da monitoria.
\ No newline at end of file
+Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolorum voluptas error saepe quasi sit, similique dignissimos repellendus, illum excepturi ea et obcaecati quos, quas ex recusandae ipsam eveniet atque pariatur?
\ No newline at end of file
diff --git a/pages/noticias.html b/pages/noticias.html
index d9e2866..027f087 100644
--- a/pages/noticias.html
+++ b/pages/noticias.html
@@ -10,18 +10,16 @@
     <main class="row">
         {% assign f = site.noticias | reverse  %}
         {% assign k = f.size %}
-
       <div class="col-lg col-md-6 col-sm-12 aumenta-margem-bottom">
         <div class="card">
           <img class="card-img-top img-fluid" src="../assets/images/icone2.png" alt="Imagem de capa do card">
           <div class="card-body">
             <h2 class="card-title">{{ f[0].titulo }}</h2>
             <p class="card-text">{{ f[0].content }}</p>
-            <a href="#" class="btn btn-primary">Ver notícia</a>
+            <a href="{{ f[0].link }}" class="btn btn-primary">Ver notícia</a>
           </div>
         </div>
       </div>
-
       <div class="col-md">
         <main class="row">
             {% for i in (1..2) %}
@@ -31,7 +29,7 @@ <h2 class="card-title">{{ f[0].titulo }}</h2>
               <div class="card-body">
                 <h2 class="card-title">{{ f[i].titulo }}</h2>
                 <p class="card-text">{{ f[i].content }}</p>
-                <a href="#" class="btn btn-primary">Ver notícia</a>
+                <a href="{{ f[i].link }}" class="btn btn-primary">Ver notícia</a>
               </div>
             </div>
           </div>
@@ -39,18 +37,20 @@ <h2 class="card-title">{{ f[i].titulo }}</h2>
         </main>
         <main class="row aumenta-margem-top altera-font-size ">
             {% for i in (3..f.size) %}
+            {% if i == f.size %}
+            {% break %}
+          {% else %}
           <div class="col-md-4 col-sm-4 col-4">
             <div class="card aumenta-margem-right">
               <img class="card-img-top img-fluid" src="../assets/images/icone2.png" alt="Imagem de capa do card">
               <div class="card-body p-2">
                 <h2 class="card-title">{{ f[i].titulo }}</h2>
                     <p >{{ f[i].content }}</p>
-                    <a href="#" class="btn btn-primary">Ver notícia</a>
+                    <a href="{{ f[i].link }}" class="btn btn-primary">Ver notícia</a>
               </div>
             </div>
           </div>
-
-
+          {% endif %}
           {% endfor %}
         </main>
       </div>

From 99615d1e0f31ac05c15abe479e2207706e38df9b Mon Sep 17 00:00:00 2001
From: Jefferson <jeffersonss999@gmail.com>
Date: Mon, 8 Apr 2019 16:24:54 -0300
Subject: [PATCH 36/42] =?UTF-8?q?Cria=C3=A7=C3=A3o=20do=20if=20para=20escr?=
 =?UTF-8?q?ever=20somente=20as=20noticias=20existentes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/noticias.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pages/noticias.html b/pages/noticias.html
index 027f087..0d263f2 100644
--- a/pages/noticias.html
+++ b/pages/noticias.html
@@ -23,6 +23,9 @@ <h2 class="card-title">{{ f[0].titulo }}</h2>
       <div class="col-md">
         <main class="row">
             {% for i in (1..2) %}
+            {% if i == f.size %}
+            {% break %}
+          {% else %}
           <div class="col-md-6 col-sm-6 col-6">
             <div class="card">
               <img class="card-img-top img-fluid" src="../assets/images/icone2.png" alt="Imagem de capa do card">
@@ -33,6 +36,7 @@ <h2 class="card-title">{{ f[i].titulo }}</h2>
               </div>
             </div>
           </div>
+          {% endif %}
           {% endfor %}
         </main>
         <main class="row aumenta-margem-top altera-font-size ">

From 000c828b72fb09d6162b0c2f3579a7d86ecefe45 Mon Sep 17 00:00:00 2001
From: Jefferson <jeffersonss999@gmail.com>
Date: Mon, 8 Apr 2019 17:32:29 -0300
Subject: [PATCH 37/42] =?UTF-8?q?Implementa=C3=A7=C3=A3o=20do=20metodo=20p?=
 =?UTF-8?q?ara=20exibir=20noticias=20por=20ordem=20de=20data?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _noticias/noticia2.md | 2 +-
 _noticias/noticia3.md | 2 +-
 _noticias/noticia4.md | 2 +-
 _noticias/noticia5.md | 2 +-
 pages/noticias.html   | 3 ++-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/_noticias/noticia2.md b/_noticias/noticia2.md
index 9f5ba7a..33f6de4 100644
--- a/_noticias/noticia2.md
+++ b/_noticias/noticia2.md
@@ -2,7 +2,7 @@
 layout: detalhe-noticia
 titulo: IFSP CodeLab 2
 introducao: Inicio das atividades do Laboratório de Desenvolvimento de Software - IFSP CodeLab 
-data: 20190218
+data: 20190219
 link: /noticias/noticia2.html
 imagem: ../assets/images/icone.png
 ---
diff --git a/_noticias/noticia3.md b/_noticias/noticia3.md
index 99f7966..444c8c9 100644
--- a/_noticias/noticia3.md
+++ b/_noticias/noticia3.md
@@ -2,7 +2,7 @@
 layout: detalhe-noticia
 titulo: IFSP CodeLab 3
 introducao: Inicio das atividades do Laboratório de Desenvolvimento de Software - IFSP CodeLab 
-data: 20190218
+data: 20190220
 link: /noticias/noticia2.html
 imagem: ../assets/images/icone.png
 ---
diff --git a/_noticias/noticia4.md b/_noticias/noticia4.md
index 651aa95..16c1b9b 100644
--- a/_noticias/noticia4.md
+++ b/_noticias/noticia4.md
@@ -2,7 +2,7 @@
 layout: detalhe-noticia
 titulo: IFSP CodeLab 4
 introducao: Inicio das atividades do Laboratório de Desenvolvimento de Software - IFSP CodeLab 
-data: 20190218
+data: 20190221
 link: /noticias/noticia3.html
 imagem: ../assets/images/icone.png
 ---
diff --git a/_noticias/noticia5.md b/_noticias/noticia5.md
index 5f7393d..01489be 100644
--- a/_noticias/noticia5.md
+++ b/_noticias/noticia5.md
@@ -2,7 +2,7 @@
 layout: detalhe-noticia
 titulo: IFSP CodeLab 5
 introducao: Inicio das atividades do Laboratório de Desenvolvimento de Software - IFSP CodeLab 
-data: 20190218
+data: 20190222
 link: /noticias/noticia5.html
 imagem: ../assets/images/icone.png
 ---
diff --git a/pages/noticias.html b/pages/noticias.html
index 0d263f2..19122e8 100644
--- a/pages/noticias.html
+++ b/pages/noticias.html
@@ -8,7 +8,8 @@
   <div id="botao-ver-noticia" class="aumenta-margem-top">
     <!-- Coloque o conteúdo aqui -->
     <main class="row">
-        {% assign f = site.noticias | reverse  %}
+        {% assign f = site.noticias | sort: 'data' %}
+        {% assign f = f | reverse %}
         {% assign k = f.size %}
       <div class="col-lg col-md-6 col-sm-12 aumenta-margem-bottom">
         <div class="card">

From ae7cb7c61caa4a4773f31aca3eecdeacc2caf13f Mon Sep 17 00:00:00 2001
From: Vinicius Eustaquio Cortez <viniciusecortez@outlook.com>
Date: Mon, 8 Apr 2019 18:02:31 -0300
Subject: [PATCH 38/42] =?UTF-8?q?Adequada=20publica=C3=A7=C3=B5es=20ao=20j?=
 =?UTF-8?q?ekyll?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _data/publicacoes.json | 38 ++++++++++++++++++++++++++++++++++++++
 pages/publicacoes.html | 25 ++++++-------------------
 2 files changed, 44 insertions(+), 19 deletions(-)
 create mode 100644 _data/publicacoes.json

diff --git a/_data/publicacoes.json b/_data/publicacoes.json
new file mode 100644
index 0000000..089b4cb
--- /dev/null
+++ b/_data/publicacoes.json
@@ -0,0 +1,38 @@
+[
+    {
+        "data": "2020",
+        "grupo":[
+            {
+                "nome": "Cras justo odio",
+                "link": "#"
+            },
+            {
+                "nome": "Cras justo odio",
+                "link": "#"
+            },
+            {
+                "nome": "Cras justo odio",
+                "link": "#"
+            }
+
+
+        ]
+    },
+    {
+        "data": "2021",
+        "grupo":[
+            {
+                "nome": "Cras justo odio",
+                "link": "#"
+            },
+            {
+                "nome": "Cras justo odio",
+                "link": "#"
+            }
+
+
+        ]
+    }
+
+
+]
\ No newline at end of file
diff --git a/pages/publicacoes.html b/pages/publicacoes.html
index 51dacc9..a73c315 100644
--- a/pages/publicacoes.html
+++ b/pages/publicacoes.html
@@ -22,33 +22,20 @@ <h3 class="negrito">Título da Publicação em Destaque</h3>
       </div>
     </div>
   </div>
+  {% for publicacao in site.data.publicacoes %}
   <div class="row">
     <div class="col-md-12">
-      <h2 class="borda-bottom">2020</h2>
+      <h2 class="borda-bottom">{{publicacao.data}}</h2>
     </div>
   </div>
   <div class="row">
     <div class="col-md-12 final-do-texto">
       <ul class="list-group preenchimento">
-        <li class="list-group-item"><a href="#">Cras justo odio</a></li>
-        <li class="list-group-item"><a href="#">Cras justo odio</a></li>
-        <li class="list-group-item"><a href="#">Cras justo odio</a></li>
-        <li class="list-group-item"><a href="#">Cras justo odio</a></li>
-      </ul>
-    </div>
-  </div>
-  <div class="row">
-    <div class="col-md-12">
-      <h2 class="borda-bottom">2019</h2>
-    </div>
-  </div>
-  <div class="row">
-    <div class="col-md-12 final-do-texto">
-      <ul class="list-group preenchimento">
-        <li class="list-group-item"><a href="#">Cras justo odio</a></li>
-        <li class="list-group-item"><a href="#">Cras justo odio</a></li>
-        <li class="list-group-item"><a href="#">Cras justo odio</a></li>
+        {% for g in publicacao.grupo %}
+        <li class="list-group-item"><a href="{{ g.link }}">{{ g.nome }}</a></li>
+        {% endfor %}
       </ul>
     </div>
   </div>
+  {% endfor %}
 </div>
\ No newline at end of file

From 9e9e4d39f2d5acb110608e9e38a33133fccec7ea Mon Sep 17 00:00:00 2001
From: Vinicius Eustaquio Cortez <viniciusecortez@outlook.com>
Date: Mon, 8 Apr 2019 18:05:26 -0300
Subject: [PATCH 39/42] Arrumado merge

---
 _layouts/projetos-detalhe.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/_layouts/projetos-detalhe.html b/_layouts/projetos-detalhe.html
index 1a2a1cb..461ebe0 100644
--- a/_layouts/projetos-detalhe.html
+++ b/_layouts/projetos-detalhe.html
@@ -1,5 +1,7 @@
 ---
 layout: layout
+titulo: projeto
+subtitulo:
 ---
 <div class="row">
     <div class="col-md-12 p-md-5 p-2">

From b9d0e56c7db5d6cced0933fe12529fcceea39302 Mon Sep 17 00:00:00 2001
From: Matheus Reis <matheus.reisluz@gmail.com>
Date: Tue, 9 Apr 2019 14:41:32 -0300
Subject: [PATCH 40/42] =?UTF-8?q?Edi=C3=A7=C3=A3o=20na=20aparencia=20dos?=
 =?UTF-8?q?=20links=20nos=20cards?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _sass/main.scss     | 4 ++++
 pages/projetos.html | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/_sass/main.scss b/_sass/main.scss
index f289fea..3705d8d 100644
--- a/_sass/main.scss
+++ b/_sass/main.scss
@@ -262,4 +262,8 @@ main h3 {
 .img-contato {
     width: 90px;
     height: 90px;
+}
+.card a{
+    color: black;
+    text-decoration: none;
 }
\ No newline at end of file
diff --git a/pages/projetos.html b/pages/projetos.html
index 93b75e2..bfe4172 100644
--- a/pages/projetos.html
+++ b/pages/projetos.html
@@ -20,14 +20,16 @@
         {% if i == f.size %}
             {% break %}
         {% else %}    
-    <div class="col-sm-6 col-md-4 p-4 d-flex">
-        <a href="{{f[i].url}}" class="card">
+    <div  class="col-sm-6 col-md-4 p-4 d-flex">
+        <div  class="card">
+            <a href="{{f[i].url}}">
             <img class="card-img-top" src="{{f[i].imagem}}" alt="imagem do card">
             <div class="card-body flex-fill">
                 <h2 class="card-text">{{ f[i].titulo }}</h2>
                 <p>{{ f[i].subtitulo }}</p>
             </div>
         </a>
+        </div>
     </div>
         {% endif %}
     {% endfor %}

From 29bb8276c8cb3711a212f6378d6e80ee774c44f6 Mon Sep 17 00:00:00 2001
From: Jefferson <jefferonss999@gmail.com>
Date: Tue, 9 Apr 2019 17:13:05 -0300
Subject: [PATCH 41/42] Merge da branch jekyll-noticias na branch jekyll

---
 .../artigos.scssc                               | Bin 1761 -> 0 bytes
 .../equipe.scssc                                | Bin 1731 -> 0 bytes
 .../main.scssc                                  | Bin 46400 -> 0 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 .sass-cache/d3e2e48bac7c1bcad55fcffab55e545bd62307c1/artigos.scssc
 delete mode 100644 .sass-cache/d3e2e48bac7c1bcad55fcffab55e545bd62307c1/equipe.scssc
 delete mode 100644 .sass-cache/d3e2e48bac7c1bcad55fcffab55e545bd62307c1/main.scssc

diff --git a/.sass-cache/d3e2e48bac7c1bcad55fcffab55e545bd62307c1/artigos.scssc b/.sass-cache/d3e2e48bac7c1bcad55fcffab55e545bd62307c1/artigos.scssc
deleted file mode 100644
index 24e2a8c8a198c517e0129e78705017bbf2b8fe64..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1761
zcmbtUNpBlB6xN{_$+BH9O=3BU17(8LS!!)|6o<SpOAQQA1V*K{2OkF1%o~~QXgDRQ
zI7X2Fp2t~aNpUW%E+Xe`-}~P8c-(%~KB>bAbbHaDcM|ryrxEmy!$EJ*4_<c1gFytR
zy>R?GIv$_)>Oa&Z*&lMP2^lE>LVlOhe2^h*kRMraDdJE;a^b8x&0?@lTcpkuo-Z8F
z-FYm>e?wrrDW8BtoL@&|m!({32z~3LC2{jYLx|B&Dnj1L>68!Q-x(wU)W{~A!gLHu
z+kywH&ZS?KZdm){Z|q{4#!z~#=U#iOUS3#3&<US{=WZ_|rfVZK#3BLVVDFKL!FqKO
zm7ZmtWk)$vf$gO>1mj@9CD)f<DreZM&P=}I$pj>66os>oNUQz2Mz)wXTp2%=n4-Dt
zaxS$nLMBzZg9tX5j3NyNkDCmVFbkpgGb3$^T`X-Ob`dJ}EtLV)wSjau|I3f0$#lWC
zzl4uA*66;x$>-1q3%8%>f#;sRBb`4qPNNe+2#Uv@_n`kVGVO>+rvZ*X=HvE6n9JF?
zEo8^nD5DN`Cni$2b)Ypu$HB@_BolY%FOh`uN+0$5FZ=YNB(1!AuK<q%Ji~tUwKg!d
zBT^_t&wc%0KsdC;n#i>R9{c}0PlIXHfp5j&UvZUSH(JuW4!vjRUT21nwWv_%qPnsr
z=Srq_OSb8@U68F@ZAXzXjuqQF`^e)N?#`TxVW326%1!)D;7oa3qle!({AmLT85)IP
z*65+<)&uzwRF-#>$<*pdf38?`*C~)K5kg`_BtQ|Dg^(%;xWUB~3D!t`+(3a~(8r3W
zO84ZVKB}m<dvkr*TazBJ`}84uK%a;T*<mSm>g(&o@K2<cz!j2Fu|j;#o_!}@{q}rh
zFI&x9w8}b55qC-iq><BjOGqK;0zT`OA(H-FjO0!+5?se@^(=q%5GO*PTH5KejNA19
ziOI>$I(k8Wp+}ae+6qy%jGA(h?Cnum(-KA7w6o02Z3%9eSx(T+XTsjhd9e2Vd4b;2
z%nB&%?c6>ehf|_vjd>~uQ{mF*L&diYUp2pc{YS+l@uk7lOk)&|=X#5;ed}|*g})np
jlU622y7;-|7;PDywEiWd+dfpwdb41b-y^4lM*E|$vbFq0

diff --git a/.sass-cache/d3e2e48bac7c1bcad55fcffab55e545bd62307c1/equipe.scssc b/.sass-cache/d3e2e48bac7c1bcad55fcffab55e545bd62307c1/equipe.scssc
deleted file mode 100644
index 5acea6e34be6e41f099579025eeabed19c5467f0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1731
zcmbtUOK;Oa5Y7QPY1)#u5;T3GC<w}{dA5b_UKR>Skq|;8z@Z0gV^5L=$7^;sl&b1~
zXV!L19m)lA$$EDl-+c4UbQ{kbhvjYuyiU8#d3V(5w4Wc3fP05+-fbOsyC)~zj(_AG
zzu+E}Z<Qq3>T|6L87KfkK1ylcOCMIqZRSlx;428voJFHq0M@8N%1q(;%<0wF8e%#=
zfbTOAfkT`(1G2#)t~B_rHPMpPlRSM0z%x=2aw?}&-bWV*Jt&b?HihXBl(zZy7LDh2
zMY>|&@Bi^GrcnTMtL4OMd(rANz*<WPJLFU7)hpL9)1?942O<RFVDTdnfHi6%E<GE5
zMa=P0&Xi}XDfPiP=rG}Wa#eVX)#~`kRXiMnB-J!^e2Ki;+a*$A+HhsuNMeYcyvYZt
zg%L6=(se|z!sKYA!QgR~LFmUWbUS{eJ7OJETZk=$ij_-cK((wR-AMkDBiUg(<=f5S
zqtzw4C4a|r=<c<z4Z7E>zd0q%Pa6Bt9Dxst2hG=@zZn@d#YjgU_CMgm##oriY}gR8
z>1yP*nJA#4J*^Qrc2@c#9M{*sh|rhk`k>u8>d<?V)RN+RDRva#TP#OkXaiH*AcaEg
z)ldEfgF|a<2dP%T1NXn<RGCH@xK<19IaeW8qb0rL(7U$nWoGzLivo4diVIWnLCMHY
z$r@d=15!R0zL_{yX3Ojc4`w(v84Z0;iO9@{@SVVJ@}NZb|1kJ$9SP|hg*cYzKE`c#
zThY%r?kba!Rgk_cSYQ_skc#jjG-4z`kvj7sQs8leLn%Vc5xKTq2nKDeY>ISKUROrZ
zDlJon{klu{*fzb#cIg9AAnPo`B3*qE8vc`%LO4er3RZ$o*yF#%E8iTCY{oNrgGyO5
z=TVs>Ak~D%8(dN;r|?;8?jq^Kv>VG45aWrlw9$QR1bt-LrjHjWjq7+ypV0$LPicXk
z5)!hJfwNzm^Guc=+MvxmA2$W~%||{!E9nG#nM<&iC1~e5l|o^!viGbB&KxzXW}%!I
zdD=?cUAV>E`MMvZ{lm?Ivls;^mtLJ*Tko~Yat(j6o=Gj1AB}GkPP414a!jw?M0r`+
M?D>V`WUxDfUklvraR2}S

diff --git a/.sass-cache/d3e2e48bac7c1bcad55fcffab55e545bd62307c1/main.scssc b/.sass-cache/d3e2e48bac7c1bcad55fcffab55e545bd62307c1/main.scssc
deleted file mode 100644
index cb9fd99cffa066647f0b25762ea64795973ba376..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 46400
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


From e2012c7e2129d780cf52a5db6320a1b56a879567 Mon Sep 17 00:00:00 2001
From: Vinicius Eustaquio Cortez <viniciusecortez@outlook.com>
Date: Thu, 11 Apr 2019 15:10:03 -0300
Subject: [PATCH 42/42] =?UTF-8?q?Corre=C3=A7=C3=A3o=20dos=20bot=C3=B5es=20?=
 =?UTF-8?q?de=20not=C3=ADcia?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main.scssc                                | Bin 46391 -> 47319 bytes
 _sass/main.scss                               |   2 +-
 pages/projetos.html                           |   4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.sass-cache/631075a38d64437aed7121870b46e2e50d54b2ab/main.scssc b/.sass-cache/631075a38d64437aed7121870b46e2e50d54b2ab/main.scssc
index 9091a071d47f2f093669db2a1999a7e70d1a973e..98cc4b3d15dc2a6f060a773e36fbb88ce26bde22 100644
GIT binary patch
delta 533
zcmdn~is|}CCS7Aab3GF-6GH<NV-o{I)8xdoBm)C;lVrm*V}n#fLn8wVBNOA~q_h;H
zWOK`jx*Cjz8^aWrO}>-F#m=LblbM&TF!>_C*kt}PL4HmUm(7|p#9A<uiHmV^qk++6
zZB8y`5c^?;JeY1YQ1R!nmdUr4Vh5^XvzE@}wU#xomNS6pu@-_cz(#<$^7+;hoYs<1
z9YC{ydf4D5fXx1&DL46XgNX_gH>0&Us%oH!bfzFeHTUFsi&T_xsN+Ib_im{;-%Er`
zfo4x$&?qemvIA_Q1Jf%WYgq>=YdHs*$^13$s!Ti>wgW|^Go=xx@-R*|Oi}X0r4q@0
zuugfH`PK#yUpX-SMsg9*wEH#EJRsA+wm2~TnQXXNL=G52&`@w-x`m`39CEyqbCxME
cuG!qXtdx(93mk!y<u-~<4%{L$nQ5yj07|5HPXGV_

delta 76
zcmV-S0JHzs@dCH%0xdHxH!d^^VPiRDHDoh2Gh$;hGGsYsH!w6}Ffe0dI5se0I5IFW
iH)dluW@a^!Ehqsnu~s3bli#To0d%wVsdWyMqPR7uff@t=

diff --git a/_sass/main.scss b/_sass/main.scss
index 3705d8d..17c74b8 100644
--- a/_sass/main.scss
+++ b/_sass/main.scss
@@ -263,7 +263,7 @@ main h3 {
     width: 90px;
     height: 90px;
 }
-.card a{
+.link a{
     color: black;
     text-decoration: none;
 }
\ No newline at end of file
diff --git a/pages/projetos.html b/pages/projetos.html
index bfe4172..868001b 100644
--- a/pages/projetos.html
+++ b/pages/projetos.html
@@ -21,8 +21,8 @@
             {% break %}
         {% else %}    
     <div  class="col-sm-6 col-md-4 p-4 d-flex">
-        <div  class="card">
-            <a href="{{f[i].url}}">
+        <div  class="card link">
+            <a class=" " href="{{f[i].url}}">
             <img class="card-img-top" src="{{f[i].imagem}}" alt="imagem do card">
             <div class="card-body flex-fill">
                 <h2 class="card-text">{{ f[i].titulo }}</h2>