Merge branch 'main' into production

agile-alliance-brazil · Sep 28, 2023 · 9276b02 · 9276b02
2 parents 0dd93ce + 992eca7
commit 9276b02
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -17,8 +17,8 @@
     {% include favicon.html %}
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link rel="stylesheet" href="{{ "/assets/css/main.css#2.1" | prepend: site.baseurl_root }}" />
-    <link rel="stylesheet" href="{{ "/assets/css/custom.css#2.1" | prepend: site.baseurl_root }}" />
+    <link rel="stylesheet" href="{{ "/assets/css/main.css#2.2" | prepend: site.baseurl_root }}" />
+    <link rel="stylesheet" href="{{ "/assets/css/custom.css#2.2" | prepend: site.baseurl_root }}" />
 
     {% seo %}
 	</head>
@@ -50,9 +50,9 @@
 			<script src="{{ "/assets/js/jquery.min.js" | prepend: site.baseurl_root }}"></script>
 			<script src="{{ "/assets/js/browser.min.js" | prepend: site.baseurl_root }}"></script>
 			<script src="{{ "/assets/js/breakpoints.min.js" | prepend: site.baseurl_root }}"></script>
-			<script src="{{ "/assets/js/util.js#2.1" | prepend: site.baseurl_root }}"></script>
-			<script src="{{ "/assets/js/main.js#2.1" | prepend: site.baseurl_root }}"></script>
-			<script src="{{ "/assets/js/programacao.js#2.1" | prepend: site.baseurl_root }}"></script>
+			<script src="{{ "/assets/js/util.js#2.2" | prepend: site.baseurl_root }}"></script>
+			<script src="{{ "/assets/js/main.js#2.2" | prepend: site.baseurl_root }}"></script>
+			<script src="{{ "/assets/js/programa.js#2.2" | prepend: site.baseurl_root }}"></script>
 		<!-- Google tag (gtag.js) -->
 
 		<script async src="https://www.googletagmanager.com/gtag/js?id=G-ZSY442YMPP"></script>

diff --git a/_pages/program.html b/_pages/program.html
@@ -160,6 +160,10 @@ <h3>Trilhas:</h3>
             <td><div class="time card-program">18:00</div></td>
             <td colspan="7" id="identificacao-1800"></td>
           </tr>
+          <tr class="dia-linha-10">
+            <td><div class="time card-program">18:30</div></td>
+            <td colspan="7" id="identificacao-1830"></td>
+          </tr>
         </tbody>
       </table>  
 
@@ -310,6 +314,10 @@ <h3>Trilhas:</h3>
             <td><div class="time card-program">18:00</div></td>
             <td id="identificacao-1800"></td>
           </tr>
+          <tr  class="dia-linha-10">
+            <td><div class="time card-program">18:30</div></td>
+            <td id="identificacao-1830"></td>
+          </tr>
         </tbody>
       </table> 
 

diff --git a/assets/css/main.css b/assets/css/main.css
@@ -161,7 +161,7 @@ ul.icons.hastag {
 }
 
 #identificacao-900 div, #identificacao-930 div, #identificacao-1020 div,
-#identificacao-1800 div, #identificacao-1710 div, #identificacao-1640 div {
+#identificacao-1800 div, #identificacao-1710 div, #identificacao-1640 div, #identificacao-1830 div {
 	text-transform: uppercase !important;
 }
 

diff --git a/assets/js/programacao.js → assets/js/programa.js b/assets/js/programacao.js → assets/js/programa.js
@@ -353,7 +353,8 @@
 					<p class="title">Open Space</p>
 					<p class="autor"></p>
 				</div>`,
-			'identificacao-1800': '<div class="activity full-space card-program">Encerramento</div>',
+			'identificacao-1800': '<div class="activity full-space card-program">Lançamento Agilidade Preta</div>',
+			'identificacao-1830': '<div class="activity full-space card-program">Encerramento</div>',
 		},
 		11: {	
 			'identificacao-800': '<div class="activity full-space card-program">Credenciamento</div>',