Skip to content

Commit

Permalink
Update reference week
Browse files Browse the repository at this point in the history
Add new schedule types with new icons
  • Loading branch information
alinekeller committed Sep 11, 2024
1 parent f99f663 commit 01e19e1
Show file tree
Hide file tree
Showing 8 changed files with 71 additions and 31 deletions.
53 changes: 38 additions & 15 deletions assets/components/content-types/coursebook/coursebook.scss
Original file line number Diff line number Diff line change
Expand Up @@ -158,23 +158,35 @@
padding-left: 0;
}

td.taken {
tr td.taken {
background: $red-dark;
background-repeat: no-repeat;
background-position: 0.25rem 0.25rem;
color: #fff;

a {
color: #fff;
font-weight: bold;
}

&.cours {
background: $red;
&.exercice {
background-image: url(../images/icons/icon-course-exercise.svg);
}

&.exercice {
background: $red-dark url(../images/icons/icon-course-exercise.svg) no-repeat 4px 4px;
&.tp {
background-image: url(../images/icons/icon-course-tp.svg);
}

&.labo {
background-image: url(../images/icons/icon-course-lab.svg);
}

&.projet {
background: #8e0000 url(../images/icons/icon-course-project.svg) no-repeat 4px 4px;
&.course-based-project {
background-image: url(../images/icons/icon-course-based-project.svg);
}

&.individual-project {
background-image: url(../images/icons/icon-course-individual-project.svg);
}
}
}
Expand All @@ -186,24 +198,35 @@
margin-bottom: .5rem;

.caption-icon {
background: $red-dark;
background-repeat: no-repeat;
background-position: .5rem .5rem;
display: inline-block;
width: 2rem;
height: 2rem;
width: 1.75rem;
height: 1.75rem;
margin-right: .25rem;
vertical-align: middle;
}
}

.caption-cours .caption-icon {
background: $red;
.caption-exercice .caption-icon {
background-image: url(../images/icons/icon-course-exercise.svg);
}

.caption-exercice .caption-icon {
background: $red-dark url(../images/icons/icon-course-exercise.svg) no-repeat .5rem .5rem;
.caption-tp .caption-icon {
background-image: url(../images/icons/icon-course-tp.svg);
}

.caption-labo .caption-icon {
background-image: url(../images/icons/icon-course-lab.svg);
}

.caption-course-based-project .caption-icon {
background-image: url(../images/icons/icon-course-based-project.svg);
}

.caption-projet .caption-icon {
background: #8e0000 url(../images/icons/icon-course-project.svg) no-repeat .5rem .5rem;
.caption-course-individual-project .caption-icon {
background-image: url(../images/icons/icon-course-individual-project.svg);
}
}

Expand Down
30 changes: 19 additions & 11 deletions assets/components/content-types/coursebook/coursebook.twig
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,12 @@
<td class="time">10-11</td>
<td rowspan="2" class="taken exercice">&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td rowspan="2" class="taken course-based-project"><a href="#">CM5</a></td>
<td rowspan="2" class="taken individual-project">&nbsp;</td>
</tr>
<tr>
<td class="time">11-12</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
<tr>
<td class="time">12-13</td>
Expand All @@ -48,7 +46,7 @@
</tr>
<tr>
<td class="time">13-14</td>
<td rowspan="6" class="taken projet">&nbsp;</td>
<td rowspan="6" class="taken tp">&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
Expand All @@ -57,7 +55,7 @@
<tr>
<td class="time">14-15</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td rowspan="3" class="taken labo"><a href="#">CM5</a></td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
Expand All @@ -66,14 +64,12 @@
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
<tr>
<td class="time">16-17</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
<tr>
<td class="time">17-18</td>
Expand Down Expand Up @@ -124,11 +120,23 @@
</p>
<p class="caption caption-exercice">
<span class="caption-icon"></span>
Exercice, TP
Exercices
</p>
<p class="caption caption-labo">
<span class="caption-icon"></span>
Labo
</p>
<p class="caption caption-tp">
<span class="caption-icon"></span>
Travaux pratiques
</p>
<p class="caption caption-course-based-project">
<span class="caption-icon"></span>
Course based project
</p>
<p class="caption caption-projet">
<p class="caption caption-course-individual-project">
<span class="caption-icon"></span>
Projet, autre
Individual project
</p>
</div>

Expand Down
3 changes: 3 additions & 0 deletions assets/images/icons/icon-course-based-project.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions assets/images/icons/icon-course-exercise.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions assets/images/icons/icon-course-individual-project.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions assets/images/icons/icon-course-lab.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 0 additions & 3 deletions assets/images/icons/icon-course-project.svg

This file was deleted.

3 changes: 3 additions & 0 deletions assets/images/icons/icon-course-tp.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 01e19e1

Please sign in to comment.