Merge pull request #8 from fhdsl/lesson1

Lesson1
fhdsl · Sep 28, 2023 · cfc7548 · cfc7548
2 parents db89961 + 0177030
commit cfc7548
Show file tree

Hide file tree

Showing 15 changed files with 94 additions and 45 deletions.
diff --git a/02-lesson1.Rmd b/02-lesson1.Rmd
@@ -1,8 +1,4 @@
-```{r, include = FALSE}
-ottrpal::set_knitr_image_path()
-```
-
-# W1: Intro to Computing
+# Intro to Computing
 
 ## Goals of the course
 

diff --git a/_bookdown.yml b/_bookdown.yml
@@ -1,4 +1,4 @@
-book_filename: "Season 1 Introduction to R"
+book_filename: "Introduction to R, Season 1"
 chapter_name: "Chapter "
 repo: https://github.com/jhudsl/OTTR_Template/
 rmd_files: ["01-intro.Rmd",

diff --git a/assets/big-dasl-stacked.png b/assets/big-dasl-stacked.png
diff --git a/assets/big-dasl.png b/assets/big-dasl.png
diff --git a/assets/big-image_fhdasl.html b/assets/big-image_fhdasl.html
@@ -0,0 +1,12 @@
+<head>
+  <meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=10.0,initial-scale=1.0">
+  <!--script src="https://kit.fontawesome.com/6a26f47516.js"></script-->
+  <!--<script src="assets/hideOutput.js"></script>-->
+  <link href="assets/style.css" rel="stylesheet">
+</head>
+
+
+
+<div class="hero-image-container"> 
+  <img class= "hero-image" src="assets/dasl_thin_main_image.png">
+</div>
diff --git a/assets/box_images/terminal.png b/assets/box_images/terminal.png
diff --git a/assets/brothers.png b/assets/brothers.png
diff --git a/assets/course-logo/funfetti-dasl-hex-cluster101-web.png b/assets/course-logo/funfetti-dasl-hex-cluster101-web.png
diff --git a/assets/dasl_thin_main_image.png b/assets/dasl_thin_main_image.png
diff --git a/assets/favicon.ico b/assets/favicon.ico
diff --git a/assets/footer.html b/assets/footer.html
@@ -4,5 +4,6 @@
       All illustrations <a href="https://creativecommons.org/licenses/by/4.0/">CC-BY. </a>
       <br>
       All other materials <a href= "https://creativecommons.org/licenses/by/4.0/"> CC-BY </a> unless noted otherwise.
+      <a href="https://hutchdatascience.org/" target="_blank"><img src="https://hutchdatascience.org/images/crazy-idea-wide.png" style="width: 80%; padding-left: 15px; padding-top: 8px;"</a>
   </div>
 </center>
diff --git a/assets/style.css b/assets/style.css
@@ -1,4 +1,4 @@
-@import url('https://fonts.googleapis.com/css?family=Abril+Fatface|Karla:400,400i,700,700i|Lora:400,400i,700,700i&display=swap');
+@import url('https://fonts.googleapis.com/css?family=Abril+Fatface|Arimo:400,400i,700,700i|Tinos:400,400i,700,700i&display=swap');
 
 p.caption {
   color: #777;
@@ -43,18 +43,18 @@ pre code {
 /* ------------Links------------------ */
 
 .book .book-body .page-wrapper .page-inner section.normal a {
-  color: #68ace5;
+  color: #00C1D5;
 }
 
 
 /*------------- Body and header text---------------- */
 
 .book.font-family-1 {
-  font-family: 'Karla', arial, sans-serif;
+  font-family: Arial, 'Arimo', sans-serif;
 }
 
 h1, h2, h3, h4 {
-  font-family: 'Lora', arial, sans-serif;
+  font-family: 'Times New Roman', 'Tinos', serif;
 }
 
 
@@ -69,16 +69,16 @@ h1, h2, h3, h4 {
 }
 
 .title {
-  font-family: 'Lora';
+  font-family: 'Times New Roman', 'Tinos', serif;
   font-size: 4em !important;
-  color: #012d72;
+  color: #1B365D;
   margin-top: 0.275em !important;
   margin-bottom: 0.35em !important;
 }
 
 .subtitle {
-  font-family: 'Lora';
-  color: #0b8d96;
+  font-family: 'Times New Roman', 'Tinos', serif;
+  color: #1B365D;
 }
 
 
@@ -99,7 +99,7 @@ h1, h2, h3, h4 {
 */
 
 .section.level1 > p:first-of-type:first-letter { /*drop cap for first p beneath level 1 headers only within class .section*/
-  color: #012d72;
+  color: #1B365D;
   float: left;
   font-family: 'Abril Fatface', serif;
   font-size: 7em;
@@ -138,11 +138,11 @@ h1, h2, h3, h4 {
 /*---color of links in TOC----*/
 
 .book .book-summary a {
-color: #012d72
+color: #1B365D
 }
 
 .summary{
-  font-family: 'Karla', sans-serif;
+  font-family: Arial, 'Arimo', sans-serif;
 }
 
 /* all TOC list items, basically */
@@ -152,20 +152,38 @@ color: #012d72
   padding-bottom: 8px;
   padding-left: 15px;
   padding-right: 15px;
-  color: #012d72;
+  color: #1B365D;
 }
 
 .summary a:hover {
-  color: #68ace5 !important;
+  color: #00C1D5 !important;
 }
 
 .book .book-summary ul.summary li.active>a { /*active TOC links*/
-  color: #68ace5 !important;
+  color: #00C1D5 !important;
   border-left: solid 4px;
-  border-color: #68ace5;
+  border-color: #00C1D5;
   padding-left: 11px !important;
 }
 
+.trapezoid {
+  width: 132px;
+  text-align: center;
+  position: relative;
+    left: 10px;
+  border-right: 50px solid #ffb809;
+  border-bottom: 50px solid #dbdbdb;
+  border-left: 50px solid #b842ca;
+  box-sizing: content-box;
+}
+.trapezoid span { 
+  position: absolute;
+  top: 8px;
+  bottom: 5px;
+  left: 5%;
+  color: #dbdbdb;
+}
+
 
 li.appendix span, li.part span { /* for TOC part names */
   margin-top: 1em;
@@ -246,11 +264,19 @@ li.appendix span, li.part span { /* for TOC part names */
   width: 50%;
 }
 
+.click_to_expand_block {
+    padding: 1em;
+    padding-top: .5em;
+    border: 1px grey;
+    background: #E8E8E8;
+    color: black;
+}
 
 /* Sidebar formating --------------------------------------------*/
 /* from r-pkgs.org*/
 
-div.notice, div.warning, div.github, div.dictionary, div.reflection {
+div.notice, div.warning, div.github, div.dictionary, div.reflection, div.terminal {
+  border-style: solid;
   padding: 1em;
   margin: 1em 0;
   padding-left: 100px;
@@ -259,18 +285,15 @@ div.notice, div.warning, div.github, div.dictionary, div.reflection {
 }
 
 div.notice{
-  border: 4px #68ace5;
-  border-style: solid;
+  border: 4px #00C1D5;
   background-size: 70px;
   background-position: 15px center;
   background-color: #e8ebee;
   background-image: url("../assets/box_images/note.png");
 }
 
-
 div.warning{
   border: 4px #e0471c;
-  border-style: solid;
   background-size: 70px;
   background-position: 15px center;
   background-color: #e8ebee;
@@ -279,31 +302,36 @@ div.warning{
 
 div.github{
   border: 4px #000000;
-  border-style: solid;
   background-size: 70px;
   background-position: 15px center;
   background-color: #e8ebee;
   background-image: url("../assets/box_images/github.png");
 }
 
 div.dictionary{
-  border: 4px #68ace5;
-  border-style: solid;
+  border: 4px #00C1D5;
   background-size: 70px;
   background-position: 15px center;
   background-color: #e8ebee;
   background-image: url("../assets/box_images/dictionary.png");
 }
 
 div.reflection{
-  border: 4px #68ace5;
-  border-style: solid;
+  border: 4px #00C1D5;
   background-size: 90px;
   background-position: 15px center;
   background-color: #e8ebee;
   background-image: url("../assets/box_images/thinking_face.png");
 }
 
+div.terminal{
+  border: 4px #00C1D5;
+  background-size: 70px;
+  background-position: 15px center;
+  background-color: #e8ebee;
+  background-image: url("../assets/box_images/terminal.png");
+}
+
 
 /* .book .book-body .page-wrapper .page-inner section.normal is needed
    to override the styles produced by gitbook, which are ridiculously
@@ -424,7 +452,30 @@ a.anchor:hover {
 /* Footer */
 
 .footer {
-  font-family: "Lora", serif;
+  font-family: 'Times New Roman', 'Tinos', serif;
   font-size: .85em;
   color: #193a5c;
 }
+
+/* AnVIL style */
+/* Things above this comment should be identical to OTTR_Template style.css */
+/* Things below this comment are AnVIL customizations */
+
+.hero-image-container {
+  height: 100px;
+}
+
+.page-inner {
+  padding-top: 60px !important;
+}
+
+.book .book-body .page-wrapper .page-inner section.normal h1,
+.book .book-body .page-wrapper .page-inner section.normal h2,
+.book .book-body .page-wrapper .page-inner section.normal h3,
+.book .book-body .page-wrapper .page-inner section.normal h4,
+.book .book-body .page-wrapper .page-inner section.normal h5,
+.book .book-body .page-wrapper .page-inner section.normal h6 {
+    margin-top: 1em;
+    margin-bottom: 1em;
+}
+
diff --git a/assets/title_image.jpg b/assets/title_image.jpg
diff --git a/assets/toc_close.css b/assets/toc_close.css
@@ -16,18 +16,6 @@
     width: 0% !important;
 }
 
-
-
 .book-body.fixed > div > .book-header.fixed > a:nth-child(1) {
   visibility: hidden;
 }
-
-.fa-angle-right:before {
-  color: #FFFFFF;
-  font-size:0em !important;
-}
-
-.fa-angle-left:before {
-  color: #FFFFFF;
-  font-size:0em !important;
-}
diff --git a/index.Rmd b/index.Rmd
@@ -13,5 +13,6 @@ output:
       toc: true
 ---
 
-# About this Course {-}
+# About this Course
 
+The course covers fundamentals of R, a high-level programming language, and use it to wrangle data for analysis and visualization.