Skip to content

Commit

Permalink
Merge branch 'master' into prod
Browse files Browse the repository at this point in the history
  • Loading branch information
mdavis-xyz committed Feb 19, 2024
2 parents f25c3a7 + 4e70368 commit 2e98796
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 4 deletions.
Binary file added docs/tse-calendar/calendar-button.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/tse-calendar/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ <h1>TSE Calendar Sync</h1>
<li>Expand "Ecole économie Toulouse -TSE" (or if you're from a different part of UT1, choose your area)</li>
<li>Scroll down to find your course, e.g. "M2 EA I: PPD". (You can choose a subfolder within that if you want.) You should now see a timetable.</li>
<li>Down the bottom-left, click on the calendar icon.
<img src="images/calendar-button.png" alt="Calendar Button" class="inline-image">
<img src="calendar-button.png" alt="Calendar Button" class="inline-image">
</li>
<li>Click "Générer URL". (Don't bother updating the date field.)</li>
<li>You should see a URL and a QR code. Copy the URL and paste it here:</li>
Expand Down
6 changes: 5 additions & 1 deletion docs/tse-calendar/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ label {
height: 2em; /* Adjust the height as needed */
vertical-align: middle;
margin-right: 0.2em; /* Optional: Adjust the spacing between image and text */
background-color: black;
border-radius: 0.3em;
}

Expand All @@ -26,4 +25,9 @@ textarea {

.warning {
color: red;
}

select {
font-size: 1.2em;
margin: 0.2em;
}
2 changes: 1 addition & 1 deletion pages/tse-calendar/content.html
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ <h1>TSE Calendar Sync</h1>
<li>Expand "Ecole économie Toulouse -TSE" (or if you're from a different part of UT1, choose your area)</li>
<li>Scroll down to find your course, e.g. "M2 EA I: PPD". (You can choose a subfolder within that if you want.) You should now see a timetable.</li>
<li>Down the bottom-left, click on the calendar icon.
<img src="images/calendar-button.png" alt="Calendar Button" class="inline-image">
<img src="calendar-button.png" alt="Calendar Button" class="inline-image">
</li>
<li>Click "Générer URL". (Don't bother updating the date field.)</li>
<li>You should see a URL and a QR code. Copy the URL and paste it here:</li>
Expand Down
Binary file added pages/tse-calendar/docs/calendar-button.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion pages/tse-calendar/docs/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ label {
height: 2em; /* Adjust the height as needed */
vertical-align: middle;
margin-right: 0.2em; /* Optional: Adjust the spacing between image and text */
background-color: black;
border-radius: 0.3em;
}

Expand All @@ -26,4 +25,9 @@ textarea {

.warning {
color: red;
}

select {
font-size: 1.2em;
margin: 0.2em;
}

0 comments on commit 2e98796

Please sign in to comment.