Repository navigation
Expand on version control section #22
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
jackdfranklin
wants to merge
10
commits into
bas-training-2026
Choose a base branch
from
18-expand-on-version-control-section
base: bas-training-2026
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
3046346
Add intro to git course as submodule
jackdfranklin afae5eb
Switch to nix flake from docs
jackdfranklin 44a3f16
Add intro to git content from ICCS course
jackdfranklin 9df21b6
Move all figures into `images` directory for consistency
jackdfranklin 16b1a94
Add submodules to GH actions
jackdfranklin 25b29af
Add branches content
jackdfranklin e8159ce
Fix logo size
jackdfranklin 24778e5
Update flake lock
jackdfranklin dee2126
Add extensions directory to git
jackdfranklin 797d1cd
Add slides on atomic commits
jackdfranklin File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| [submodule "src/Summer-school-Intro-Git"] | ||
| path = src/Summer-school-Intro-Git | ||
| url = git@github.com:Cambridge-ICCS/Summer-school-Intro-Git.git |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,40 @@ | ||
| { | ||
| description = "Reproducibility in Scientific Software environment"; | ||
|
|
||
| inputs.flake-utils.url = "github:numtide/flake-utils"; | ||
|
|
||
| outputs = { self, nixpkgs, flake-utils }: | ||
| flake-utils.lib.eachDefaultSystem | ||
| (system: | ||
| let pkgs = nixpkgs.legacyPackages.${system}; in | ||
| { | ||
| devShells.default = import ./shell.nix { inherit pkgs; }; | ||
| } | ||
| ); | ||
| inputs = { | ||
| nixpkgs.url = "github:Nixos/nixpkgs/nixos-unstable"; | ||
| }; | ||
| outputs = { self, nixpkgs }: | ||
| let | ||
| system = "x86_64-linux"; | ||
| pkgs = nixpkgs.legacyPackages.${system}; | ||
| myPythonPackages = ps: with ps; [ | ||
| pandas | ||
| numpy | ||
| matplotlib | ||
| jupyter | ||
| jupyter-cache | ||
| ]; | ||
| pythonEnv = pkgs.python3.withPackages myPythonPackages; | ||
| in | ||
| { | ||
| devShells.${system}.default = pkgs.mkShell { | ||
| packages = [ | ||
| ((pkgs.quarto.override { | ||
| extraPythonPackages = myPythonPackages; | ||
| }).overrideAttrs (oldAttrs: { | ||
| # Remove this overrideAttrs patch when fixed. | ||
| # See https://github.com/NixOS/nixpkgs/issues/519484#issuecomment-4667477454 | ||
| postPatch = (oldAttrs.postPatch or "") + '' | ||
| substituteInPlace bin/quarto.js \ | ||
| --replace-fail "syntax-highlighting" "highlight-style" | ||
| ''; | ||
| })) | ||
| pythonEnv | ||
| ]; | ||
| shellHook = '' | ||
| echo "Quarto Environment Active (Pure Flake)" | ||
| echo "Quickstart: run 'quarto render document.qmd'" | ||
| ''; | ||
| }; | ||
| }; | ||
| } |
This file was deleted.
Oops, something went wrong.
Submodule Summer-school-Intro-Git
added at
1a5cba
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| title: Attribution | ||
| author: Roland Schmehl | ||
| version: 0.1.1 | ||
| quarto-required: ">=1.2.198" | ||
| contributes: | ||
| revealjs-plugins: | ||
| - name: RevealAttribution | ||
| script: | ||
| - attribution.js | ||
| stylesheet: | ||
| - attribution.css | ||
|
|
||
|
|
||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| /* Attribution plugin: text along the right edge of the viewport */ | ||
| .attribution{ | ||
| position: absolute; | ||
| top: 50%; | ||
| bottom: auto; | ||
| left: 50%; | ||
| right: auto; | ||
| font-size: 0.4em; | ||
| pointer-events: none; | ||
| text-align: center; | ||
| writing-mode: vertical-lr; | ||
| transform: translate( -50%, -50% ) scale( 100% ) rotate(-180deg); | ||
| text-orientation: sideways; | ||
| } | ||
|
|
||
| /* Attribution plugin: activate pointer events for attribution text only */ | ||
| .attribution .content{ | ||
| pointer-events: auto; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| /***************************************************************** | ||
| ** Author: Roland Schmehl, r.schmehl@tudelft.nl | ||
| ** | ||
| ** A plugin for displaying attribution texts sideways along the right | ||
| ** edge of the viewport. When resizing the viewport or toggling full | ||
| ** screen mode, the attribution text sticks persistently to the right | ||
| ** edge of the viewport. | ||
| ** | ||
| ** The dynamic scaling of the attribution text via CSS transform | ||
| ** is adopted from the fullscreen plugin. | ||
| ** | ||
| ** Version: 1.0 | ||
| ** | ||
| ** License: MIT license (see file LICENSE) | ||
| ** | ||
| ******************************************************************/ | ||
|
|
||
| window.RevealAttribution = window.RevealAttribution || { | ||
| id: 'RevealAttribution', | ||
| init: function(deck) { | ||
| initAttribution(deck); | ||
| } | ||
| }; | ||
|
|
||
| const initAttribution = function(Reveal){ | ||
|
|
||
| var ready = false; | ||
| var resize = false; | ||
| var scale = 1; | ||
|
|
||
| window.addEventListener( 'ready', function( event ) { | ||
|
|
||
| var content; | ||
|
|
||
| // Remove configured margin of the presentation | ||
| var attribution = document.getElementsByClassName("attribution"); | ||
| var width = window.innerWidth; | ||
| var configuredWidth = Reveal.getConfig().width; | ||
| var configuredHeight = Reveal.getConfig().height; | ||
|
|
||
| scale = 1/(1-Reveal.getConfig().margin); | ||
|
|
||
| for (var i = 0; i < attribution.length; i++) { | ||
| content = attribution[i].innerHTML; | ||
| attribution[i].style.width = configuredWidth + "px"; | ||
| attribution[i].style.height = configuredHeight + "px"; | ||
| attribution[i].innerHTML = "<span class='content'>" + content + "</span>"; | ||
| attribution[i].style.transform = 'translate( -50%, -50% ) scale( ' + scale*100 + '% ) rotate(-180deg)'; | ||
| } | ||
|
|
||
| // Scale with cover class to mimic backgroundSize cover | ||
| resizeCover(); | ||
|
|
||
| }); | ||
|
|
||
| window.addEventListener( 'resize', resizeCover ); | ||
|
|
||
| function resizeCover() { | ||
|
|
||
| // Scale to mimic backgroundSize cover | ||
| var attribution = document.getElementsByClassName("attribution"); | ||
| var xScale = window.innerWidth / Reveal.getConfig().width; | ||
| var yScale = window.innerHeight / Reveal.getConfig().height; | ||
| var s = 1; | ||
|
|
||
| if (xScale > yScale) { | ||
| // The div fits perfectly in x axis, stretched in y | ||
| s = xScale/yScale; | ||
| } | ||
| for (var i = 0; i < attribution.length; i++) { | ||
| attribution[i].style.transform = 'translate( -50%, -50% ) scale( ' + s*scale*100 + '% ) rotate(-180deg)'; | ||
| } | ||
| } | ||
|
|
||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,106 @@ | ||
| /*-- scss:defaults --*/ | ||
|
|
||
| $presentation-font-size-root: 1.5em; | ||
| $presentation-line-height: 1.5em; | ||
| // FONTS | ||
| @import url('https://fonts.googleapis.com/css2?family=Montserrat:wght@500;600;700&display=swap'); | ||
|
|
||
| ul { | ||
| $presentation-heading-font: 'Montserrat', sans-serif; | ||
|
|
||
| $accent: #0c4e8a; | ||
| /*-- scss:rules --*/ | ||
|
|
||
| // Title and headings styling | ||
| #title-slide { | ||
| text-align: center; | ||
|
|
||
| .title { | ||
| font-family: $presentation-heading-font; | ||
| font-weight: 400; | ||
| font-size: 2.5em; | ||
| color: #0c4e8a; | ||
| } | ||
|
|
||
| .subtitle { | ||
| color: $accent; | ||
| font-style: italic; | ||
| } | ||
|
|
||
| .author, | ||
| .quarto-title-author-name { | ||
| color: $body-color; | ||
| font-size: 1.2em; | ||
| } | ||
|
|
||
| .quarto-title-authors { | ||
| display: flex; | ||
| justify-content: center; | ||
| flex-direction: row; // Ensure horizontal layout | ||
| flex-wrap: wrap; | ||
| gap: 2em; // Space between authors | ||
| // display: flex; | ||
| // flex-direction: row; | ||
| // flex-wrap: wrap; | ||
|
|
||
| .quarto-title-author { | ||
| padding-left: 0em; | ||
| padding-right: 0em; | ||
| width: auto; // Allow variable width based on content | ||
| max-width: 30%; // Limit width so multiple fit on one row | ||
| flex: 0 0 auto; // Don't grow or shrink | ||
| } | ||
| } | ||
|
|
||
| .institute, | ||
| .quarto-title-affiliation, | ||
| .quarto-title-author-email { | ||
| font-style: italic; | ||
| font-size: 80%; | ||
| // color: #fffafa; | ||
| } | ||
|
|
||
| .date { | ||
| font-weight: 400; // Set your desired font weight (100-900) | ||
| font-size: 1em; // Optionally adjust the size | ||
| color: $body-color; // Use the default text color or set your own | ||
| margin-top: 1em; // Add some space above the date | ||
| } | ||
|
|
||
|
|
||
| } | ||
|
|
||
| // Control heading size and weight for non-title slides | ||
| .reveal h1:not(#title-slide h1) { | ||
| font-size: 2.0em; | ||
| font-weight: 600; | ||
| } | ||
|
|
||
| .reveal h2:not(#title-slide h2) { | ||
| font-size: 1.7em; | ||
| font-weight: 550; | ||
| } | ||
|
|
||
| .reveal h3:not(#title-slide h3) { | ||
| font-size: 1.3em; | ||
| font-weight: 500; | ||
| } | ||
|
|
||
| /*-- vertically center columns (or any container) --*/ | ||
| .v-center-container { | ||
| display: flex; | ||
| justify-content: center; | ||
| align-items: center; | ||
| height: 90%; | ||
| } | ||
|
|
||
| /*-- Get rid of column margins - quarto revealjs has strange behaviour --*/ | ||
| .reveal .columns> { | ||
|
|
||
| .column, | ||
| .column:last-child { | ||
|
|
||
| > :not(ul, ol) { | ||
|
|
||
| margin-left: 0em; | ||
| margin-right: 0em; | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,7 +23,7 @@ | |
| :::: | ||
|
|
||
| ::::{.column width=50%} | ||
|  | ||
|  | ||
| :::: | ||
| ::: | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it intentional to have OS-specific files in the repo?