8000 Template de page "Study Plan" by alinekeller · Pull Request #499 · epfl-si/elements · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Template de page "Study Plan" #499

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.

Sign up for GitHub

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

Merged
merged 14 commits into from
Mar 19, 2021
Merged

Template de page "Study Plan" #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e814edc
Update study plan structure
alinekeller Nov 29, 2019
cef0fcf
Merge branch 'dev' into feature/improve-study-plan
alinekeller Feb 23, 2021
c9c7dc0
Clean up study-plan.scss
alinekeller Feb 23, 2021
e0fed6a
Center language cell
alinekeller Feb 23, 2021
f32c487
Add <abbr> tags
alinekeller Feb 23, 2021
77743b6
Improve display of specialisation list
alinekeller Feb 23, 2021
9b6fe9c
Reorder css properties
alinekeller Mar 10, 2021
ffba6e2
base template: allow to create custom side nav
alinekeller Mar 10, 2021
0d42c65
Split study plan content type in separate templates
alinekeller Mar 10, 2021
88a8aef
Study plan: update title tags
alinekeller Mar 10, 2021
653206b
Study plan: remove 'white-space: nowrap' from specialization list
alinekeller Mar 10, 2021
41af92b
Create Study Plan Page
alinekeller Mar 10, 2021
11532de
Merge branch 'dev' into feature/study-plan-page
alinekeller Mar 19, 2021
4ff2d36
Fix study plan content type
alinekeller Mar 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
875 changes: 875 additions & 0 deletions assets/components/content-types/study-plan/study-plan-bachelor.twig
View file
Open in desktop

Large diffs are not rendered by default.

483 changes: 483 additions & 0 deletions assets/components/content-types/study-plan/study-plan-master.twig
View file
Open in desktop

Large diffs are not rendered by default.

135 changes: 135 additions & 0 deletions assets/components/content-types/study-plan/study-plan-mineur.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@

<!-- Study Plan Mineurs -->

<div class="study-plan table-like" style="--table-columns: minmax(300px, 4fr) 1fr minmax(auto, 2fr) 1fr">
<h3>Mineur : Informatique</h3>

<div class="line-up">
<div class="first-line">
<div class="cours-title">
<div class="titre">Cours</div>
</div>
<div class="langue">
<div class="titre">Langue</div>
</div>
<div class="examen">
<div class="titre_bachlor bold">Examen</div>
<div class="titre">&nbsp;</div>
</div>
<div class="credit">
<div class="titre_bachlor bold">Crédits</div>
<div class="titre">&nbsp;</div>
</div>
</div>
<div class="clear">&nbsp;</div>
</div>

<div class="line-down">
<div class="line">
<div class="cours" data-title="Advanced algorithms">
<div class="cours-name">
<a href="#">Advanced algorithms</a>
</div>
<div class="cours-info">CS-450 / Section <abbr title="Informatique">IN</abbr></div>
<div class="enseignement-name">
<a href="#">Svensson</a>
&nbsp;
</div>
</div>
<div class="langue" data-title="Langue">
<div class="langue"><abbr title="English">EN</abbr></div>
&nbsp;
</div>
<div class="examen" data-title="Examens">
<div class="exam-text"><b>Session d'été</b><br>Examen écrit</div>
&nbsp;
</div>
<div class="credit red-color">
<div class="credit-time">7</div>
</div>
</div>
<div class="clear">&nbsp;</div>
</div>

<div class="line-down">
<div class="line">
<div class="cours" data-title="Advanced computer architecture">
<div class="cours-name">
<a href="#">Advanced computer architecture</a>
</div>
<div class="cours-info">CS-470 / Section <abbr title="Informatique">IN</abbr></div>
<div class="enseignement-name">
<a href="#">Ienne</a>
&nbsp;
</div>
</div>
<div class="langue" data-title="Langue">
<div class="langue"><abbr title="English">EN</abbr></div>
&nbsp;
</div>
<div class="examen" data-title="Examens">
<div class="exam-text"><b>Session d'été</b><br>Examen oral</div>
&nbsp;
</div>
<div class="credit red-color">
<div class="credit-time">4</div>
</div>
</div>
<div class="clear">&nbsp;</div>
</div>

<div class="line-down">
<div class="line">
<div class="cours" data-title="Advanced computer graphics">
<div class="cours-name">
<a href="#">Advanced computer graphics</a>
</div>
<div class="cours-info">CS-440 / Section <abbr title="Informatique">IN</abbr></div>
<div class="enseignement-name">
<a href="#">Jakob</a>
&nbsp;
</div>
</div>
<div class="langue" data-title="Langue">
<div class="langue"><abbr title="English">EN</abbr></div>
&nbsp;
</div>
<div class="examen" data-title="Examens">
<div class="exam-text"><b>Session d'été</b><br>Examens pendant le semestre</div>
&nbsp;
</div>
<div class="credit red-color">
<div class="credit-time">6</div>
</div>
</div>
<div class="clear">&nbsp;</div>
</div>

<div class="line-down">
<div class="line">
<div class="cours" data-title="Architecture des systems-on-chip">
<div class="cours-name">
<a href="#">Architecture des systems-on-chip</a>
</div>
<div class="cours-info">CS-209 / Section <abbr title="Informatique">IN</abbr></div>
<div class="enseignement-name">
<a href="#">Ienne</a>
&nbsp;
</div>
</div>
<div class="langue" data-title="Langue">
<div class="langue"><abbr title="Français">FR</abbr></div>
&nbsp;
</div>
<div class="examen" data-title="Examens">
<div class="exam-text"><b>Session d'été</b><br>Examens pendant le semestre</div>
&nbsp;
</div>
<div class="credit red-color">
<div class="credit-time">4</div>
</div>
</div>
<div class="clear">&nbsp;</div>
</div>

</div>
71 changes: 36 additions & 35 deletions assets/components/content-types/study-plan/study-plan.scss
View file
Open in desktop
< BA58 td class="blob-code blob-code-context js-file-line"> content: attr(data-title);
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ $study-plan-master-pdm: minmax(250px, 3fr) 1fr 2fr 2fr 2fr 2fr minmax(140px, 3fr
overflow-x: initial;
max-width: 100%;

h3,
h4 {
font-size: $font-size-base;
font-weight: $font-weight-bold;
Expand Down Expand Up @@ -63,12 +64,12 @@ $study-plan-master-pdm: minmax(250px, 3fr) 1fr 2fr 2fr 2fr 2fr minmax(140px, 3fr
padding: $table-cell-padding;
}
}

.line {

> div {
padding: 0;

> div {
padding: $table-cell-padding;
}
Expand Down Expand Up @@ -108,7 +109,7 @@ $study-plan-master-pdm: minmax(250px, 3fr) 1fr 2fr 2fr 2fr 2fr minmax(140px, 3fr
grid-column: 1 / -1;
background-color: $body-bg;
margin-bottom: 0;
padding-bottom: $headings-margin-bottom;
padding-bottom: calc( #{$headings-margin-bottom} * 1.5) ;
}

.line-down + h3,
Expand Down Expand Up @@ -193,11 +194,11 @@ $study-plan-master-pdm: minmax(250px, 3fr) 1fr 2fr 2fr 2fr 2fr minmax(140px, 3fr
> div {
padding: 0 $table-cell-padding;
background-color: $body-bg;

&:first-child {
padding-top: .6rem;
}

&:last-child {
padding-bottom: .6rem;
}
Expand All @@ -206,7 +207,7 @@ $study-plan-master-pdm: minmax(250px, 3fr) 1fr 2fr 2fr 2fr 2fr minmax(140px, 3fr
.cours-name {
font-weight: bold;
padding-bottom: .6rem !important;

i {
font-weight: normal;
}
Expand All @@ -228,9 +229,9 @@ $study-plan-master-pdm: minmax(250px, 3fr) 1fr 2fr 2fr 2fr 2fr minmax(140px, 3fr
grid-row: span 2;
}
}

// Lang

.langue {
text-align: center;
}
Expand All @@ -246,11 +247,11 @@ $study-plan-master-pdm: minmax(250px, 3fr) 1fr 2fr 2fr 2fr 2fr minmax(140px, 3fr
text-align: center;
color: $text-muted;
}

// Specialisations

.specialisation {

p {
display: inline-block;
font-size: .875rem;
Expand Down Expand Up @@ -278,12 +279,12 @@ $study-plan-master-pdm: minmax(250px, 3fr) 1fr 2fr 2fr 2fr 2fr minmax(140px, 3fr

li {
display: inline-block;
white-space: nowrap;
//white-space: nowrap;

&:before {
top: .38em;
}

&:after {
display: none;
}
Expand Down Expand Up @@ -343,7 +344,7 @@ $study-plan-master-pdm: minmax(250px, 3fr) 1fr 2fr 2fr 2fr 2fr minmax(140px, 3fr
.clear {
display: none;
}

.btn-collapse {
display: none;
}
Expand Down Expand Up @@ -372,14 +373,14 @@ $study-plan-master-pdm: minmax(250px, 3fr) 1fr 2fr 2fr 2fr 2fr minmax(140px, 3fr

.table-like {
display: block;

.line-up {
display: none;
}

.line-down {
display: block;

.line {
border-bottom: 4px solid #fff;
display: block;
Expand All @@ -391,7 +392,7 @@ $study-plan-master-pdm: minmax(250px, 3fr) 1fr 2fr 2fr 2fr 2fr minmax(140px, 3fr
&:not(.open) {
max-height: 34px;
}

.btn-collapse {
display: block;
position: absolute;
Expand All @@ -402,44 +403,44 @@ $study-plan-master-pdm: minmax(250px, 3fr) 1fr 2fr 2fr 2fr 2fr minmax(140px, 3fr
border: 0;
cursor: pointer;
padding-top: 0;

& > * {
float: right;
}

& > span {
@include sr-only;
}

.icon {
color: $gray-200;
transition: all .3s ease-in-out;
}
}

&:hover {

.btn-collapse .icon {
color: $white;
}
}

&.open {

.btn-collapse svg {
transform: rotate(180deg);
}
}
}

.line > div {
border-right: 1px solid #d5d5d5;
}
}

.line > div {
display: block;

&:before {
display: block !important;
Expand All @@ -449,20 +450,20 @@ $study-plan-master-pdm: minmax(250px, 3fr) 1fr 2fr 2fr 2fr 2fr minmax(140px, 3fr
color: #000;
min-width: 100%;
}

&.cours:before {
background: #707070;
font-weight: bold;
color: #fff;
}
}

.line {

.examen > div {
display: inline-block;
}

.langue {
text-align: left;
}
Expand All @@ -474,7 +475,7 @@ $study-plan-master-pdm: minmax(250px, 3fr) 1fr 2fr 2fr 2fr 2fr minmax(140px, 3fr
.specialisation {
text-align: left;
}

.cep .label {
clip: auto;
clip-path: none;
Expand All @@ -485,4 +486,4 @@ $study-plan-master-pdm: minmax(250px, 3fr) 1fr 2fr 2fr 2fr 2fr minmax(140px, 3fr
}
}

}
}
Loading
0