Skip to content

Commit 935909c

Browse files
jdfootejdfoote
committed
Merge branch 'summer2020'
2 parents 48ffc24 + 445b1fb commit 935909c

File tree

465 files changed

+34877
-83551
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

465 files changed

+34877
-83551
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
__pycache__
2-
Syllabi
32
auth.py
43
pythonlearn.pdf
54
class_list*
65
.ipynb_check*
76
assignments/
7+
twitter_authentication.py
8+
reddit_auth.py

‎copy_teaching_materials.py‎

Lines changed: 0 additions & 123 deletions
This file was deleted.

‎summer2020/lectures/day_1/Makefile‎ renamed to ‎day_1/lecture/Makefile‎

File renamed without changes.

‎summer2020/lectures/day_1/day_1.Rmd‎ renamed to ‎day_1/lecture/day_1.Rmd‎

Lines changed: 3 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
---
2-
pagetitle: Intro
3-
template: "./resources/template.html"
2+
pagetitle: Welcome
43
output:
54
revealjs::revealjs_presentation:
65
theme: white
76
progress: true
87
transition: convex
98
self_contained: true
9+
css: ../../resources/css/custom_css.css
1010
---
1111

1212
```{r setup, include=FALSE}
1313
knitr::opts_chunk$set(echo = FALSE)
1414
knitr::opts_knit$set(root.dir = './')
15-
source("resources/preamble.R")
1615
1716
f <- function (x) {formatC(x, format="d", big.mark=',')}
1817
bold <- function(x) {paste('{\\textbf{',x,'}}', sep ='')}
@@ -21,74 +20,7 @@ wrapify <- function (x) {paste("{", x, "}", sep="")}
2120
p <- function (x) {formatC(x, format='f', digits=1, big.mark=',')}
2221
```
2322

24-
<style type="text/css">
25-
26-
/* Changes to RevealJS default formatting.
27-
28-
I prefer this style but you can change these to your preferences */
29-
30-
/* This bit lets you do columns */
31-
.container{
32-
display: flex;
33-
}
34-
35-
.col{
36-
flex: 1;
37-
}
38-
39-
.reveal section img{
40-
border: none;
41-
background: none;
42-
box-shadow: none;
43-
}
44-
45-
.highlight {
46-
color: LightCoral;
47-
}
48-
49-
.reveal h1,
50-
.reveal h2,
51-
.reveal h3,
52-
.reveal h4,
53-
.reveal h5,
54-
.reveal h6 {
55-
text-transform: none;
56-
}
57-
58-
.reveal h1 {
59-
margin-top:200px;
60-
}
61-
62-
div.footnote {
63-
font-size: 40%;
64-
text-align: right;
65-
}
66-
67-
.bg-image{
68-
width: 180px;
69-
}
70-
71-
.reveal .slides section .fragment.fade-in-then-out,
72-
.reveal .slides section .fragment.current-visible {
73-
opacity: 0;
74-
visibility: hidden; }
75-
.reveal .slides section .fragment.fade-in-then-out.current-fragment,
76-
.reveal .slides section .fragment.current-visible.current-fragment {
77-
opacity: 1;
78-
visibility: inherit; }
79-
80-
.reveal .slides section .fragment.fade-in-then-semi-out {
81-
opacity: 0;
82-
visibility: hidden; }
83-
.reveal .slides section .fragment.fade-in-then-semi-out.visible {
84-
opacity: 0.5;
85-
visibility: inherit; }
86-
.reveal .slides section .fragment.fade-in-then-semi-out.current-fragment {
87-
opacity: 1;
88-
visibility: inherit; }
89-
</style>
90-
91-
# Welcome!
23+
# Welcome to COM 674!
9224

9325
## Introductions
9426

‎summer2020/lectures/day_1/day_1.html‎ renamed to ‎day_1/lecture/day_1.html‎

Lines changed: 39 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta charset="utf-8">
55
<meta name="generator" content="pandoc">
6-
<title>Intro</title>
6+
<title>Welcome</title>
77
<meta name="apple-mobile-web-app-capable" content="yes">
88
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
99
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, minimal-ui">
@@ -1378,6 +1378,41 @@
13781378

13791379
<style type="text/css">code{white-space: pre;}</style>
13801380

1381+
<style type="text/css">
1382+
1383+
.container{
1384+
display: flex;
1385+
}
1386+
.col{
1387+
flex: 1;
1388+
}
1389+
.reveal section img{
1390+
border: none;
1391+
background: none;
1392+
box-shadow: none;
1393+
}
1394+
.highlight {
1395+
color: LightCoral;
1396+
}
1397+
.reveal h1,
1398+
.reveal h2,
1399+
.reveal h3,
1400+
.reveal h4,
1401+
.reveal h5,
1402+
.reveal h6 {
1403+
text-transform: none;
1404+
}
1405+
.reveal h1 {
1406+
margin-top:200px;
1407+
}
1408+
div.footnote {
1409+
font-size: 40%;
1410+
text-align: right;
1411+
}
1412+
.bg-image{
1413+
width: 180px;
1414+
}
1415+
</style>
13811416

13821417
<!-- Printing and PDF exports -->
13831418
<script id="paper-css" type="application/dynamic-css">
@@ -1767,76 +1802,7 @@
17671802
<div class="slides">
17681803

17691804

1770-
<section class="slide level2">
1771-
1772-
<style type="text/css">
1773-
1774-
/* Changes to RevealJS default formatting.
1775-
1776-
I prefer this style but you can change these to your preferences */
1777-
1778-
/* This bit lets you do columns */
1779-
.container{
1780-
display: flex;
1781-
}
1782-
1783-
.col{
1784-
flex: 1;
1785-
}
1786-
1787-
.reveal section img{
1788-
border: none;
1789-
background: none;
1790-
box-shadow: none;
1791-
}
1792-
1793-
.highlight {
1794-
color: LightCoral;
1795-
}
1796-
1797-
.reveal h1,
1798-
.reveal h2,
1799-
.reveal h3,
1800-
.reveal h4,
1801-
.reveal h5,
1802-
.reveal h6 {
1803-
text-transform: none;
1804-
}
1805-
1806-
.reveal h1 {
1807-
margin-top:200px;
1808-
}
1809-
1810-
div.footnote {
1811-
font-size: 40%;
1812-
text-align: right;
1813-
}
1814-
1815-
.bg-image{
1816-
width: 180px;
1817-
}
1818-
1819-
.reveal .slides section .fragment.fade-in-then-out,
1820-
.reveal .slides section .fragment.current-visible {
1821-
opacity: 0;
1822-
visibility: hidden; }
1823-
.reveal .slides section .fragment.fade-in-then-out.current-fragment,
1824-
.reveal .slides section .fragment.current-visible.current-fragment {
1825-
opacity: 1;
1826-
visibility: inherit; }
1827-
1828-
.reveal .slides section .fragment.fade-in-then-semi-out {
1829-
opacity: 0;
1830-
visibility: hidden; }
1831-
.reveal .slides section .fragment.fade-in-then-semi-out.visible {
1832-
opacity: 0.5;
1833-
visibility: inherit; }
1834-
.reveal .slides section .fragment.fade-in-then-semi-out.current-fragment {
1835-
opacity: 1;
1836-
visibility: inherit; }
1837-
</style>
1838-
</section>
1839-
<section><section id="welcome" class="title-slide slide level1"><h1>Welcome!</h1></section><section id="introductions" class="slide level2">
1805+
<section><section id="welcome-to-com-674" class="title-slide slide level1"><h1>Welcome to COM 674!</h1></section><section id="introductions" class="slide level2">
18401806
<h2>Introductions</h2>
18411807
</section><section id="about-me" class="slide level2">
18421808
<h2>About Me</h2>
@@ -1906,6 +1872,8 @@ <h2>Project Milestones</h2>
19061872
<li class="fragment">Project presentation + report</li>
19071873
</ul></li>
19081874
</ul>
1875+
</section><section id="grades" class="slide level2">
1876+
<h2>Grades</h2>
19091877
</section></section>
19101878
<section><section id="resources" class="title-slide slide level1"><h1>Resources</h1></section><section id="wiki" class="slide level2">
19111879
<h2>Wiki</h2>

‎summer2020/lectures/day_1/images/the_fam.jpg‎ renamed to ‎day_1/lecture/images/the_fam.jpg‎

File renamed without changes.

0 commit comments

Comments
 (0)