Merge branch 'release' of github.com:TeachBooks/manual into release

This commit is contained in:
Tom van Woudenberg 2024-11-28 09:15:51 +01:00
commit cf370df077
5 changed files with 8 additions and 25 deletions

View file

@ -11,10 +11,6 @@ only_build_toc_files: true
html:
favicon : "images/favicon.ico"
baseurl : "https://teachbooks.io/manual/"
# START REMOVE-FROM-PUBLISH
comments:
hypothesis: true
# END REMOVE-FROM-PUBLISH
sphinx:
extra_extensions:
@ -23,6 +19,7 @@ sphinx:
- download_link_replacer
- jupyterbook_patches
- teachbooks_sphinx_grasple
- sphinx_image_inverter
config:
html_js_files:
- https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.4/require.min.js

View file

@ -12,11 +12,13 @@ Truss structures are structures assembled of straight elements connected in node
Examples of these structures are commonly found in rail bridges like the one below:
```{figure} theory_questions_images/pic0.jpg
:class: dark-light
:width: 400
```
Furthermore, these structures are commonly found in building as well, both invisible and visible:
```{figure} theory_questions_images/pic1.jpg
:class: dark-light
:width: 400
```

View file

@ -83,6 +83,7 @@ name: Clone_GitHub
Clone using SSH
```
``````
``````{tab-item} ... GitHub through GitHub Desktop
1. Open the repository that you would like to clone. In the top bar on the right, you will a green button called `<> Code`.

View file

@ -197,17 +197,11 @@ After committing, click the 🔄 button to push our changes to the remote reposi
3. Add changes to Git-timeline locally (committing). In the field that says `Summary(Required)`, write a short description of the changes you have made. This message is what is called the *Commit Message*. After we've done this, click the blue button `Commit to repository`.
4. Now we need to add changes to GitHub/GitLab. This is called pushing to the local repository. After committing, the following screen will pop up. Click on `Push Origin`.
4. Now we need to add changes to GitHub/GitLab. This is called pushing to the local repository. After committing, click on `Push origin` in the top bar.
<figure align="center">
<img src="figures/Push_GitHubDesktop.PNG" alt="Example Image" width="650">
</figure>
Alternatively, you can also click on `Push origin` in the top bar.
<figure align="center">
<img src="figures/Push_GitHubDesktop2.PNG" alt="Example Image" width="650">
</figure>
````
`````
``````
@ -313,18 +307,12 @@ Choose one of the options to resolve the merge conflict. You now have updated yo
5. Add changes to Git-timeline locally (committing). In the field that says `Summary(Required)`, write a short description of the changes you have made. This message is what is called the *Commit Message*. After we've done this, click the blue button `Commit to repository`.
6. Now we need to add changes to GitHub/GitLab. This is called pushing to the local repository. After committing, the following screen will pop up. Click on `Push Origin`.
6. Now we need to add changes to GitHub/GitLab. This is called pushing to the local repository. After committing, click on `Push origin` in the top bar.
<figure align="center">
<img src="figures/Push_GitHubDesktop.PNG" alt="Example Image" width="650">
</figure>
Alternatively, you can also click on `Push origin` in the top bar.
<figure align="center">
<img src="figures/Push_GitHubDesktop2.PNG" alt="Example Image" width="650">
</figure>
````
````{tab-item} ... using 'VS Code in your browser'
@ -686,16 +674,10 @@ If your book includes interactive element a webserver is required to host the bo
6. Add changes to Git-timeline locally (committing). In the field that says `Summary(Required)`, write a short description of the changes you have made. This message is what is called the *Commit Message*. After we've done this, click the blue button `Commit to repository`.
7. Now we need to add changes to GitHub/GitLab. This is called pushing to the local repository. After committing, the following screen will pop up. Click on `Push Origin`.
7. Now we need to add changes to GitHub/GitLab. This is called pushing to the local repository. After committing, click on `Push origin` in the top bar.
<figure align="center">
<img src="figures/Push_GitHubDesktop.PNG" alt="Example Image" width="650">
</figure>
Alternatively, you can also click on `Push origin` in the top bar.
<figure align="center">
<img src="figures/Push_GitHubDesktop2.PNG" alt="Example Image" width="650">
</figure>
````
````{tab-item} ... using 'VS Code in your browser'

View file

@ -5,6 +5,7 @@ jupyterlite-sphinx
jupyterbook_patches
download_link_replacer
teachbooks-sphinx-grasple
sphinx-image-inverter
--extra-index-url https://gitlab.tudelft.nl/api/v4/projects/11239/packages/pypi/simple