Skip to content

Commit

Permalink
Built site for gh-pages
Browse files Browse the repository at this point in the history
  • Loading branch information
Quarto GHA Workflow Runner committed Aug 24, 2023
1 parent c79ca10 commit 4e172aa
Show file tree
Hide file tree
Showing 15 changed files with 1,704 additions and 320 deletions.
2 changes: 1 addition & 1 deletion .nojekyll
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
76864e81
851c0777
110 changes: 55 additions & 55 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,27 +183,27 @@ <h1 class="title">Reproduciblity and Data Science in R</h1>
<section id="schedule-tentative" class="level2">
<h2 class="anchored" data-anchor-id="schedule-tentative">Schedule (tentative)</h2>
<p>We’ll meet on Tuesdays and Thursdays from 11am to 1pm via Zoom (link)</p>
<!-- Edit by editing schedule.csv. To add links, use markdown [text](url) separated by commas. This code turns that into a bulleted list. -->
<!-- Edit by editing schedule.csv. To add links, use markdown [text](url) separated by commas. This code turns that into a bulleted list.-->
<div class="cell">
<div class="cell-output-display">

<div id="esgcmitxnt" style="padding-left:0px;padding-right:0px;padding-top:10px;padding-bottom:10px;overflow-x:auto;overflow-y:auto;width:auto;height:auto;">
<style>#esgcmitxnt table {
<div id="dvasfyzpnq" style="padding-left:0px;padding-right:0px;padding-top:10px;padding-bottom:10px;overflow-x:auto;overflow-y:auto;width:auto;height:auto;">
<style>#dvasfyzpnq table {
font-family: system-ui, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}

#esgcmitxnt thead, #esgcmitxnt tbody, #esgcmitxnt tfoot, #esgcmitxnt tr, #esgcmitxnt td, #esgcmitxnt th {
#dvasfyzpnq thead, #dvasfyzpnq tbody, #dvasfyzpnq tfoot, #dvasfyzpnq tr, #dvasfyzpnq td, #dvasfyzpnq th {
border-style: none;
}

#esgcmitxnt p {
#dvasfyzpnq p {
margin: 0;
padding: 0;
}

#esgcmitxnt .gt_table {
#dvasfyzpnq .gt_table {
display: table;
border-collapse: collapse;
line-height: normal;
Expand All @@ -229,12 +229,12 @@ <h2 class="anchored" data-anchor-id="schedule-tentative">Schedule (tentative)</h
border-left-color: #D3D3D3;
}

#esgcmitxnt .gt_caption {
#dvasfyzpnq .gt_caption {
padding-top: 4px;
padding-bottom: 4px;
}

#esgcmitxnt .gt_title {
#dvasfyzpnq .gt_title {
color: #333333;
font-size: 125%;
font-weight: initial;
Expand All @@ -246,7 +246,7 @@ <h2 class="anchored" data-anchor-id="schedule-tentative">Schedule (tentative)</h
border-bottom-width: 0;
}

#esgcmitxnt .gt_subtitle {
#dvasfyzpnq .gt_subtitle {
color: #333333;
font-size: 85%;
font-weight: initial;
Expand All @@ -258,7 +258,7 @@ <h2 class="anchored" data-anchor-id="schedule-tentative">Schedule (tentative)</h
border-top-width: 0;
}

#esgcmitxnt .gt_heading {
#dvasfyzpnq .gt_heading {
background-color: #FFFFFF;
text-align: center;
border-bottom-color: #FFFFFF;
Expand All @@ -270,13 +270,13 @@ <h2 class="anchored" data-anchor-id="schedule-tentative">Schedule (tentative)</h
border-right-color: #D3D3D3;
}

#esgcmitxnt .gt_bottom_border {
#dvasfyzpnq .gt_bottom_border {
border-bottom-style: solid;
border-bottom-width: 2px;
border-bottom-color: #D3D3D3;
}

#esgcmitxnt .gt_col_headings {
#dvasfyzpnq .gt_col_headings {
border-top-style: solid;
border-top-width: 2px;
border-top-color: #D3D3D3;
Expand All @@ -291,7 +291,7 @@ <h2 class="anchored" data-anchor-id="schedule-tentative">Schedule (tentative)</h
border-right-color: #D3D3D3;
}

#esgcmitxnt .gt_col_heading {
#dvasfyzpnq .gt_col_heading {
color: #333333;
background-color: #FFFFFF;
font-size: 100%;
Expand All @@ -311,7 +311,7 @@ <h2 class="anchored" data-anchor-id="schedule-tentative">Schedule (tentative)</h
overflow-x: hidden;
}

#esgcmitxnt .gt_column_spanner_outer {
#dvasfyzpnq .gt_column_spanner_outer {
color: #333333;
background-color: #FFFFFF;
font-size: 100%;
Expand All @@ -323,15 +323,15 @@ <h2 class="anchored" data-anchor-id="schedule-tentative">Schedule (tentative)</h
padding-right: 4px;
}

#esgcmitxnt .gt_column_spanner_outer:first-child {
#dvasfyzpnq .gt_column_spanner_outer:first-child {
padding-left: 0;
}

#esgcmitxnt .gt_column_spanner_outer:last-child {
#dvasfyzpnq .gt_column_spanner_outer:last-child {
padding-right: 0;
}

#esgcmitxnt .gt_column_spanner {
#dvasfyzpnq .gt_column_spanner {
border-bottom-style: solid;
border-bottom-width: 2px;
border-bottom-color: #D3D3D3;
Expand All @@ -343,11 +343,11 @@ <h2 class="anchored" data-anchor-id="schedule-tentative">Schedule (tentative)</h
width: 100%;
}

#esgcmitxnt .gt_spanner_row {
#dvasfyzpnq .gt_spanner_row {
border-bottom-style: hidden;
}

#esgcmitxnt .gt_group_heading {
#dvasfyzpnq .gt_group_heading {
padding-top: 8px;
padding-bottom: 8px;
padding-left: 5px;
Expand All @@ -373,7 +373,7 @@ <h2 class="anchored" data-anchor-id="schedule-tentative">Schedule (tentative)</h
text-align: left;
}

#esgcmitxnt .gt_empty_group_heading {
#dvasfyzpnq .gt_empty_group_heading {
padding: 0.5px;
color: #333333;
background-color: #FFFFFF;
Expand All @@ -388,15 +388,15 @@ <h2 class="anchored" data-anchor-id="schedule-tentative">Schedule (tentative)</h
vertical-align: middle;
}

#esgcmitxnt .gt_from_md > :first-child {
#dvasfyzpnq .gt_from_md > :first-child {
margin-top: 0;
}

#esgcmitxnt .gt_from_md > :last-child {
#dvasfyzpnq .gt_from_md > :last-child {
margin-bottom: 0;
}

#esgcmitxnt .gt_row {
#dvasfyzpnq .gt_row {
padding-top: 8px;
padding-bottom: 8px;
padding-left: 5px;
Expand All @@ -415,7 +415,7 @@ <h2 class="anchored" data-anchor-id="schedule-tentative">Schedule (tentative)</h
overflow-x: hidden;
}

#esgcmitxnt .gt_stub {
#dvasfyzpnq .gt_stub {
color: #333333;
background-color: #FFFFFF;
font-size: 100%;
Expand All @@ -428,7 +428,7 @@ <h2 class="anchored" data-anchor-id="schedule-tentative">Schedule (tentative)</h
padding-right: 5px;
}

#esgcmitxnt .gt_stub_row_group {
#dvasfyzpnq .gt_stub_row_group {
color: #333333;
background-color: #FFFFFF;
font-size: 100%;
Expand All @@ -442,15 +442,15 @@ <h2 class="anchored" data-anchor-id="schedule-tentative">Schedule (tentative)</h
vertical-align: top;
}

#esgcmitxnt .gt_row_group_first td {
#dvasfyzpnq .gt_row_group_first td {
border-top-width: 2px;
}

#esgcmitxnt .gt_row_group_first th {
#dvasfyzpnq .gt_row_group_first th {
border-top-width: 2px;
}

#esgcmitxnt .gt_summary_row {
#dvasfyzpnq .gt_summary_row {
color: #333333;
background-color: #FFFFFF;
text-transform: inherit;
Expand All @@ -460,16 +460,16 @@ <h2 class="anchored" data-anchor-id="schedule-tentative">Schedule (tentative)</h
padding-right: 5px;
}

#esgcmitxnt .gt_first_summary_row {
#dvasfyzpnq .gt_first_summary_row {
border-top-style: solid;
border-top-color: #D3D3D3;
}

#esgcmitxnt .gt_first_summary_row.thick {
#dvasfyzpnq .gt_first_summary_row.thick {
border-top-width: 2px;
}

#esgcmitxnt .gt_last_summary_row {
#dvasfyzpnq .gt_last_summary_row {
padding-top: 8px;
padding-bottom: 8px;
padding-left: 5px;
Expand All @@ -479,7 +479,7 @@ <h2 class="anchored" data-anchor-id="schedule-tentative">Schedule (tentative)</h
border-bottom-color: #D3D3D3;
}

#esgcmitxnt .gt_grand_summary_row {
#dvasfyzpnq .gt_grand_summary_row {
color: #333333;
background-color: #FFFFFF;
text-transform: inherit;
Expand All @@ -489,7 +489,7 @@ <h2 class="anchored" data-anchor-id="schedule-tentative">Schedule (tentative)</h
padding-right: 5px;
}

#esgcmitxnt .gt_first_grand_summary_row {
#dvasfyzpnq .gt_first_grand_summary_row {
padding-top: 8px;
padding-bottom: 8px;
padding-left: 5px;
Expand All @@ -499,7 +499,7 @@ <h2 class="anchored" data-anchor-id="schedule-tentative">Schedule (tentative)</h
border-top-color: #D3D3D3;
}

#esgcmitxnt .gt_last_grand_summary_row_top {
#dvasfyzpnq .gt_last_grand_summary_row_top {
padding-top: 8px;
padding-bottom: 8px;
padding-left: 5px;
Expand All @@ -509,11 +509,11 @@ <h2 class="anchored" data-anchor-id="schedule-tentative">Schedule (tentative)</h
border-bottom-color: #D3D3D3;
}

#esgcmitxnt .gt_striped {
#dvasfyzpnq .gt_striped {
background-color: rgba(128, 128, 128, 0.05);
}

#esgcmitxnt .gt_table_body {
#dvasfyzpnq .gt_table_body {
border-top-style: solid;
border-top-width: 2px;
border-top-color: #D3D3D3;
Expand All @@ -522,7 +522,7 @@ <h2 class="anchored" data-anchor-id="schedule-tentative">Schedule (tentative)</h
border-bottom-color: #D3D3D3;
}

#esgcmitxnt .gt_footnotes {
#dvasfyzpnq .gt_footnotes {
color: #333333;
background-color: #FFFFFF;
border-bottom-style: none;
Expand All @@ -536,7 +536,7 @@ <h2 class="anchored" data-anchor-id="schedule-tentative">Schedule (tentative)</h
border-right-color: #D3D3D3;
}

#esgcmitxnt .gt_footnote {
#dvasfyzpnq .gt_footnote {
margin: 0px;
font-size: 90%;
padding-top: 4px;
Expand All @@ -545,7 +545,7 @@ <h2 class="anchored" data-anchor-id="schedule-tentative">Schedule (tentative)</h
padding-right: 5px;
}

#esgcmitxnt .gt_sourcenotes {
#dvasfyzpnq .gt_sourcenotes {
color: #333333;
background-color: #FFFFFF;
border-bottom-style: none;
Expand All @@ -559,71 +559,71 @@ <h2 class="anchored" data-anchor-id="schedule-tentative">Schedule (tentative)</h
border-right-color: #D3D3D3;
}

#esgcmitxnt .gt_sourcenote {
#dvasfyzpnq .gt_sourcenote {
font-size: 90%;
padding-top: 4px;
padding-bottom: 4px;
padding-left: 5px;
padding-right: 5px;
}

#esgcmitxnt .gt_left {
#dvasfyzpnq .gt_left {
text-align: left;
}

#esgcmitxnt .gt_center {
#dvasfyzpnq .gt_center {
text-align: center;
}

#esgcmitxnt .gt_right {
#dvasfyzpnq .gt_right {
text-align: right;
font-variant-numeric: tabular-nums;
}

#esgcmitxnt .gt_font_normal {
#dvasfyzpnq .gt_font_normal {
font-weight: normal;
}

#esgcmitxnt .gt_font_bold {
#dvasfyzpnq .gt_font_bold {
font-weight: bold;
}

#esgcmitxnt .gt_font_italic {
#dvasfyzpnq .gt_font_italic {
font-style: italic;
}

#esgcmitxnt .gt_super {
#dvasfyzpnq .gt_super {
font-size: 65%;
}

#esgcmitxnt .gt_footnote_marks {
#dvasfyzpnq .gt_footnote_marks {
font-size: 75%;
vertical-align: 0.4em;
position: initial;
}

#esgcmitxnt .gt_asterisk {
#dvasfyzpnq .gt_asterisk {
font-size: 100%;
vertical-align: 0;
}

#esgcmitxnt .gt_indent_1 {
#dvasfyzpnq .gt_indent_1 {
text-indent: 5px;
}

#esgcmitxnt .gt_indent_2 {
#dvasfyzpnq .gt_indent_2 {
text-indent: 10px;
}

#esgcmitxnt .gt_indent_3 {
#dvasfyzpnq .gt_indent_3 {
text-indent: 15px;
}

#esgcmitxnt .gt_indent_4 {
#dvasfyzpnq .gt_indent_4 {
text-indent: 20px;
}

#esgcmitxnt .gt_indent_5 {
#dvasfyzpnq .gt_indent_5 {
text-indent: 25px;
}
</style>
Expand Down Expand Up @@ -683,7 +683,7 @@ <h2 class="anchored" data-anchor-id="schedule-tentative">Schedule (tentative)</h
<td headers="Theme" class="gt_row gt_left">Share &amp; Collaborate</td>
<td headers="Topic" class="gt_row gt_left">Collaborating with GitHub</td>
<td headers="Links" class="gt_row gt_left"><div class="gt_from_md"><ul>
<li><a href="https://docs.google.com/presentation/d/1oKZ2VK50_CW90Um_iOJ8D6KEPgvapqYvXBFMlx0_aiw/">slides</a></li>
<li><a href="lessons/5-github-collab/slides.html">slides</a></li>
</ul>
</div></td></tr>
<tr><td headers="Lesson" class="gt_row gt_left">6</td>
Expand Down
Binary file added lessons/5-github-collab/fork_btn.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added lessons/5-github-collab/fork_diagram.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added lessons/5-github-collab/github-diagram-bryan.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added lessons/5-github-collab/merge_conflict.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion lessons/5-github-collab/notes.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,8 @@ <h2 class="anchored" data-anchor-id="lesson-outline">Lesson Outline</h2>
<li>Share a repo with everyone &amp; have everyone clone w/ RStudio</li>
<li>Ask 1 (one) volunteer to make a change and practice commit + push</li>
<li>Both instructor and volunteer make a change in the same file and push to main</li>
<li>Show how to resolve merge conflict on GitHub</li>
<li>Should error for whoever pushes second</li>
<li>Try following hints and pull, then set <code>git config pull.rebase false</code></li>
</ul></li>
<li><p>Working on branches (slides)</p></li>
<li><p>Live Coding:</p>
Expand Down
Binary file added lessons/5-github-collab/pull_error.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added lessons/5-github-collab/push_error.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 4e172aa

Please sign in to comment.