From 58a8b9a7a60dda1f65cc737b847d8519e4bad09f Mon Sep 17 00:00:00 2001
From: georgeas <george.a.stoica@ntnu.no>
Date: Mon, 31 Aug 2020 13:31:04 +0200
Subject: [PATCH] Fix leftover text from conflicted file
* remove leftover text from a git conflict
* change the presentation to include the header and footer
---
lectures/revealjs/gitpod.adoc | 58 +++++++----------------------------
1 file changed, 11 insertions(+), 47 deletions(-)
diff --git a/lectures/revealjs/gitpod.adoc b/lectures/revealjs/gitpod.adoc
index aa331ed..c14015a 100644
--- a/lectures/revealjs/gitpod.adoc
+++ b/lectures/revealjs/gitpod.adoc
@@ -1,10 +1,12 @@
= Gitpod
:customcss: slides.css
:icons: font
+:includedir: revealjs/includes/
+:LECTURE_TOPIC: Gitpod
+:LECTURE_NO:
+
+include::{includedir}header.adoc[]
-++++
- <img id="main-logo" class="main-logo" src="images/template/main_logo_eng_no_text.png" width="300" alt="ntnu logo"/>
-++++
== Problem
@@ -43,7 +45,7 @@ Spesielt problematisk for kortvarig bruk, f.eks. øvinger og eksempler
[.stretch]
image::../images/gitpod-arch.png[width=800]
-<<<<<<< HEAD
+
== Gitpod-scenarier
Dele eksempler
@@ -82,7 +84,8 @@ Eksamen
** lagre besvarelse i eget repo
* sensor
** åpner repo-lenke og vurderer besvarelse
-=======
+
+
== Gitpod i IDI-emner
Støtter mange undervisnings-scenarier
@@ -104,45 +107,6 @@ Jobbe videre med eksempel/mal
** lager evt. eget repo på *gitlab.stud.idi.ntnu.no*
** bytter til eget repo med *git remote*
** lagrer endringer med *git add, commit og push*
->>>>>>> master
-
-++++
- <div id="footer" class="footer">
- <div style="display:table-row;">
- <span class="element" style="width:150px;">
- <a href="https://www.ntnu.no" target="_blank">
- <img id="footer-logo" class="footer-logo"
- src="images/template/logo_ntnu.png"
- alt="ntnu logo" height="28"/>
- </a>
- </span>
-<<<<<<< HEAD
- <span class="element" style="width:300px;">| IT1901 </span>
- <span class="element">| Gitpod </span>
-=======
- <span class="element" style="width:300px;">| IT1901 - Om gitpod </span>
->>>>>>> master
- <span class="element"> </span>
- </div>
- </div>
-
- <div id="vertical-ntnu-name" class="vertical-ntnu-name">
- <span class="helper"></span>
- <img src="images/template/vertical-ntnu-name.png" alt="Norwegian University of Science and Technology" />
- </div>
-
- <script type="text/javascript">
- window.addEventListener("load", function() {
- revealDiv = document.querySelector("body div.reveal")
- footer = document.getElementById("footer");
- revealDiv.appendChild(footer);
-
- titleSlideDiv = document.querySelector("div.slides section.title")
- mainLogo = document.getElementById("main-logo");
- titleSlideDiv.prepend(mainLogo);
-
- vertName = document.getElementById("vertical-ntnu-name");
- revealDiv.appendChild(vertName);
- } );
- </script>
-++++
\ No newline at end of file
+
+include::{includedir}footer.adoc[]
+
--
GitLab