Merge pull request #8 from SussexPsychMethods/milan

Milan
SussexPsychMethods · Oct 1, 2020 · 5619901 · 5619901
2 parents e73674c + 771a62a
commit 5619901
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 25 deletions.
diff --git a/inst/tutorials/01_intro/01_intro.Rmd b/inst/tutorials/01_intro/01_intro.Rmd
@@ -164,33 +164,33 @@ All you need to do to access this space is to install OneDrive, log in using you
 If you need help, the uni website has an [entire page on setting up and working with OneDrive](http://www.sussex.ac.uk/its/onedrive).
 
 
-<!-- ### R and RStudio -->
+### R and RStudio
 
-<!-- We will be using the RStudio software to write documents (*e.g.*, analysis reports) and to process, analyse, and visualise data. -->
-<!-- RStudio is the most popular software for programming in the `R` programming language. -->
-<!-- In order to use it, you first need to install both `R` and RStudio. -->
+We will be using the RStudio software to write documents (*e.g.*, analysis reports) and to process, analyse, and visualise data.
+RStudio is the most popular software for programming in the `R` programming language.
+In order to use it, you first need to install both `R` and RStudio.
 
-<!-- **So, for your second task, install `R` and RStudio Desktop on your computer.** -->
+**So, for your second task, install `R` and RStudio Desktop on your computer.**
 
-<!-- You can install `R` from the (`R` project website)[https://cloud.r-project.org/]. -->
+You can install `R` from the (`R` project website)[https://cloud.r-project.org/].
 
-<!-- Once you've installed `R`, to install RStudio go to the (RStudio website)[https://rstudio.com/products/rstudio/download/#download] and download the free version of the RStudio Desktop software. -->
+Once you've installed `R`, to install RStudio go to the (RStudio website)[https://rstudio.com/products/rstudio/download/#download] and download the free version of the RStudio Desktop software.
 
-<!-- <div class="warn"> -->
-<!-- In both cases, it is important to install the latest version (at the time of writing, these were `R` 4.0.2, and RStudio Desktop 1.3.1073). -->
-<!-- </div> -->
+<div class="warn">
+In both cases, it is important to install the latest version (at the time of writing, these were `R` 4.0.2, and RStudio Desktop 1.3.1073).
+</div>
 
-<!-- If you need help installing either of these, here's a video guide on how to install both on Windows: -->
-<!-- ![](https://www.youtube.com/watch?v=9-RrkJQQYqY&t=3s) -->
-<!-- And here is one for MacOS users: -->
-<!-- ![](https://www.youtube.com/watch?v=by5HyJX6H1I) -->
+If you need help installing either of these, here's a video guide on how to install both on Windows:
+![](https://www.youtube.com/watch?v=9-RrkJQQYqY&t=3s)
+And here is one for MacOS users:
+![](https://www.youtube.com/watch?v=by5HyJX6H1I)
 
-<!-- (Videos courtesy of helpful youtubers, [Xperimental Learning](https://www.youtube.com/channel/UCrEpGdiRBgj6-ru1Q7WKIBw) and [thatRnerd](https://www.youtube.com/channel/UCPJIY0oU-CJRRdweKZ44UZw), respectively) -->
+(Videos courtesy of helpful youtubers, [Xperimental Learning](https://www.youtube.com/channel/UCrEpGdiRBgj6-ru1Q7WKIBw) and [thatRnerd](https://www.youtube.com/channel/UCPJIY0oU-CJRRdweKZ44UZw), respectively)
 
-<!-- \  -->
+\
 
-<!-- If you feel like you're just doing things and you don't understand what exactly it is you're doing and why you're doing it, relax. -->
-<!-- We will start lifting the fog of war pretty soon! -->
+If you feel like you're just doing things and you don't understand what exactly it is you're doing and why you're doing it, relax.
+We will start lifting the fog of war pretty soon!
 
 
 ## Computers

diff --git a/inst/tutorials/01_intro/css/paas_learnr.css b/inst/tutorials/01_intro/css/paas_learnr.css
@@ -7,7 +7,7 @@
 
 @import url('https://fonts.googleapis.com/css2?family=Source+Code+Pro&display=swap');
 
-body {
+body, body.ss-reconnecting {
   color: rgb(var(--font-col));
   background: linear-gradient(90deg, rgb(var(--sidebar-col)) 20%, #fafafa 20%);
   line-height: 1.4em;

diff --git a/inst/tutorials/02_files_paths_projects/02_files_paths_projects.Rmd b/inst/tutorials/02_files_paths_projects/02_files_paths_projects.Rmd
@@ -93,7 +93,7 @@ quiz(caption = "Quiz on files and paths",
     answer("There's no difference; they are synonyms.", correct = TRUE),
     answer("Folders cannot contain other folders but directories can."),
     answer("Folders cannot contain other folders but they can contain directories."),
-    answer("Directories can contain both dolders and directoreis but folders cannot. ")
+    answer("Directories can contain both folders and directories but folders cannot. ")
   ),
   question("Which one of these is **NOT** a valid file extension for pictures?",
     answer(".exe", correct = TRUE),
@@ -226,7 +226,7 @@ quiz(caption = "Quiz on RStudio projects",
   question("Where does an RStudio project set your current location to?",
     answer("Your OneDrive folder."),
     answer("The given project folder.", correct = TRUE),
-    answer("Therever RStudio is installed."),
+    answer("Wherever RStudio is installed."),
     answer("Your HOME directory.")
   )
 )

diff --git a/inst/tutorials/02_files_paths_projects/css/paas_learnr.css b/inst/tutorials/02_files_paths_projects/css/paas_learnr.css
@@ -7,7 +7,7 @@
 
 @import url('https://fonts.googleapis.com/css2?family=Source+Code+Pro&display=swap');
 
-body {
+body, body.ss-reconnecting {
   color: rgb(var(--font-col));
   background: linear-gradient(90deg, rgb(var(--sidebar-col)) 20%, #fafafa 20%);
   line-height: 1.4em;
@@ -303,6 +303,14 @@ code {
 	font-family: monospace;
 }
 
+.ace-editor {
+	font-family: monospace;
+}
+
+.ace-tm .ace_string, .hljs-string {
+	color: rgb(var(--warn-col));
+}
+
 table code {
 	line-height: 1;
 }

diff --git a/inst/tutorials/03_r_markdown/css/paas_learnr.css b/inst/tutorials/03_r_markdown/css/paas_learnr.css
@@ -7,7 +7,7 @@
 
 @import url('https://fonts.googleapis.com/css2?family=Source+Code+Pro&display=swap');
 
-body {
+body, body.ss-reconnecting {
   color: rgb(var(--font-col));
   background: linear-gradient(90deg, rgb(var(--sidebar-col)) 20%, #fafafa 20%);
   line-height: 1.4em;
@@ -303,6 +303,14 @@ code {
 	font-family: monospace;
 }
 
+.ace-editor {
+	font-family: monospace;
+}
+
+.ace-tm .ace_string, .hljs-string {
+	color: rgb(var(--warn-col));
+}
+
 table code {
 	line-height: 1;
 }

diff --git a/inst/tutorials/04_basic_r/css/paas_learnr.css b/inst/tutorials/04_basic_r/css/paas_learnr.css
@@ -7,7 +7,7 @@
 
 @import url('https://fonts.googleapis.com/css2?family=Source+Code+Pro&display=swap');
 
-body {
+body, body.ss-reconnecting {
   color: rgb(var(--font-col));
   background: linear-gradient(90deg, rgb(var(--sidebar-col)) 20%, #fafafa 20%);
   line-height: 1.4em;
@@ -303,6 +303,14 @@ code {
 	font-family: monospace;
 }
 
+.ace-editor {
+	font-family: monospace;
+}
+
+.ace-tm .ace_string, .hljs-string {
+	color: rgb(var(--warn-col));
+}
+
 table code {
 	line-height: 1;
 }

diff --git a/inst/tutorials/05_objects_functions_data/css/paas_learnr.css b/inst/tutorials/05_objects_functions_data/css/paas_learnr.css
@@ -7,7 +7,7 @@
 
 @import url('https://fonts.googleapis.com/css2?family=Source+Code+Pro&display=swap');
 
-body {
+body, body.ss-reconnecting {
   color: rgb(var(--font-col));
   background: linear-gradient(90deg, rgb(var(--sidebar-col)) 20%, #fafafa 20%);
   line-height: 1.4em;
@@ -303,6 +303,14 @@ code {
 	font-family: monospace;
 }
 
+.ace-editor {
+	font-family: monospace;
+}
+
+.ace-tm .ace_string, .hljs-string {
+	color: rgb(var(--warn-col));
+}
+
 table code {
 	line-height: 1;
 }