Skip to content

GitLab

Commit d212337c authored by Dario Pinto's avatar Dario Pinto
Browse files

Merge branch 'CssElias' into 'master' 

Css elias

See merge request !92
parents d45ccbf8 e70ba7a9
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 91 deletions
src/content/assets/css/style.css
View file @ d212337c
......@@ -183,8 +183,8 @@ body{margin-top:20px;}
/* Current modifications : minor style changes (UI mainly no Js and/or dynamic changes for the moment) */
.img_products {
width: 200px;
height: 200px;
width: 150px;
height: 150px;
}
.p_index_center {
......@@ -2014,8 +2014,8 @@ img.feed {
#timeline .timeline-badge.timeline-future-movement p {
color:#1782cc;
position: absolute;
top: 35px;
left: 25px;
top: 30px;
left: 20px;
}
#timeline .timeline-badge.timeline-future-movement a span {
color: #4997cd;
......@@ -2058,8 +2058,8 @@ img.feed {
}
#timeline .timeline-movement .timeline-item .timeline-panel.credits .timeline-panel-ul .righting-wrap {
float: left;
width: 75%; /*70%*/ /*75%*/
height: 510px; /*250px*/ /*325px*/
width: 75%; /*Some reference values ->*/ /*70%*/ /*75%*/
max-height: 530px; /*Some reference values ->*/ /*250px*/ /*325px*/
padding: 0 12px 0 0;
display: flex;
flex-direction: column;
......@@ -2092,7 +2092,7 @@ img.feed {
}
#timeline .timeline-movement .timeline-item .timeline-panel.debits .timeline-panel-ul li.img-wraping a img, #timeline .timeline-movement .timeline-item .timeline-panel.credits .timeline-panel-ul li.img-wraping a img {
width: 100%;
height: /*100px*/100%;
height: 100%;
background-color: #EEEEEE;
}
#timeline .timeline-movement .timeline-item .timeline-panel.debits .timeline-panel-ul li {
......
src/content/index.md
View file @ d212337c
......@@ -201,7 +201,7 @@ We cater to very specific needs. For example, we can translate a “black box”
<p align="center">
<a href="https://timelines.cc/">
You can also create your own timeline here.
You can create your own timeline here.
</a>
</p>
<br />
......@@ -330,7 +330,6 @@ We cater to very specific needs. For example, we can translate a “black box”
<li><a href="#" class="importo">December 1, 2014</a></li>
<li><span class="causale" style="color:#000; font-weight: 600;">Release of the Flambda optimizing compiler </span> </li>
<li><span class="causale">The first Flambda is proposed into OCaml by Pierre Chambart and Mark Shinwell in PR #132 - work funded by Jane Street. </span> </li>
<li><p><small class="text-muted"><i class="glyphicon glyphicon-time"></i> 11/01/2018, 13:05"</small></p> </li>
</div>
<div class="clear"></div>
</ul>
......@@ -352,8 +351,8 @@ We cater to very specific needs. For example, we can translate a “black box”
</div>
<div class="righting-wrap">
<li><a href="#" class="importo">July 1, 2015</a></li>
<li><span class="causale" style="color:#000; font-weight: 600;">Université Paris 7 appoints OCamlPro to implement the exercise platform of the OCaml MOOC on France Université Numérique</span> </li>
<li><span class="causale">OCamlPro implements the first version of the exercise autocorrecting platform of the OCaml MOOC on France Université Numérique for Université Paris 7, based on TryOCaml, integrates to the OpenEDX/FUN and designs some of the exercices of the course, in close collaboration with Roberto Di Cosmo and Yann-Régis Gianas at Irill.</span> </li>
<li><span class="causale" style="color:#000; font-weight: 600;">Paris 7 appoints OCamlPro to implement the exercise platform of the OCaml MOOC on France Université Numérique</span> </li>
<li><span class="causale">OCamlPro implements the first version of the exercise autocorrecting platform of the OCaml MOOC on FUN for Paris 7, based on TryOCaml, integrates to the OpenEDX/FUN and designs some of the exercices of the course, in collaboration with Roberto Di Cosmo and Yann-Régis Gianas (Irill).</span> </li>
</div>
<div class="clear"></div>
</ul>
......@@ -481,86 +480,6 @@ We cater to very specific needs. For example, we can translate a “black box”
</div>
</div>
<!--
All the code for the timeline below has been taken from the following: https://www.bootdey.com/snippets/view/timeline-steps
<div class="row">
<div class="col">
<div class="timeline-steps aos-init aos-animate" data-aos="fade-up">
<div class="timeline-step">
<div class="timeline-content" data-toggle="popover" data-trigger="hover" data-placement="top" title="" data-content="OCamlPro is founded by Inria researchers." data-original-title="2011">
<div class="inner-circle"></div>
<p class="h6 mt-3 mb-1">2011</p>
<p class="h6 text-muted mb-0 mb-lg-0">OCamlPro is founded by Inria researchers.</p>
</div>
</div>
<div class="timeline-step">
<div class="timeline-content" data-toggle="popover" data-trigger="hover" data-placement="top" title="" data-content="Working on a development toolsuite: the Typerex initiative." data-original-title="2012">
<div class="inner-circle"></div>
<p class="h6 mt-3 mb-1">2012</p>
<p class="h6 text-muted mb-0 mb-lg-0">Working on a development toolsuite: the Typerex initiative.</p>
</div>
</div>
<div class="timeline-step">
<div class="timeline-content" data-toggle="popover" data-trigger="hover" data-placement="top" title="" data-content="Release of the package manager OPAM 1.0." data-original-title="2013">
<div class="inner-circle"></div>
<p class="h6 mt-3 mb-1">2013</p>
<p class="h6 text-muted mb-0 mb-lg-0">Release of the package manager OPAM 1.0.</p>
</div>
</div>
<div class="timeline-step">
<div class="timeline-content" data-toggle="popover" data-trigger="hover" data-placement="top" title="" data-content="Release of the Flambda optimizing compiler in OCaml" data-original-title="2014">
<div class="inner-circle"></div>
<p class="h6 mt-3 mb-1">2014</p>
<p class="h6 text-muted mb-0 mb-lg-0">Release of Flambda optimizing compiler in OCaml.</p>
</div>
</div>
<div class="timeline-step mb-0">
<div class="timeline-content" data-toggle="popover" data-trigger="hover" data-placement="top" title="" data-content="OCamlPro develops the Irill/Paris 7 OCaml FUN Mooc" data-original-title="2015">
<div class="inner-circle"></div>
<p class="h6 mt-3 mb-1">2015</p>
<p class="h6 text-muted mb-0 mb-lg-0">OCamlPro develops the Irill/Paris 7 OCaml FUN Mooc.</p>
</div>
</div>
<div class="timeline-step mb-0">
<div class="timeline-content" data-toggle="popover" data-trigger="hover" data-placement="top" title="" data-content="The Alt-Ergo SMT Solver v1.30 is released." data-original-title="2016">
<div class="inner-circle"></div>
<p class="h6 mt-3 mb-1">2016</p>
<p class="h6 text-muted mb-0 mb-lg-0">The Alt-Ergo SMT Solver v1.30 is released.</p>
</div>
</div>
<div class="timeline-step mb-0">
<div class="timeline-content" data-toggle="popover" data-trigger="hover" data-placement="top" title="" data-content="OCamlPro delivers Tezos and its crowdfunding platform, complete with the TZscan and Liquidity tools." data-original-title="2017">
<div class="inner-circle"></div>
<p class="h6 mt-3 mb-1">2017</p>
<p class="h6 text-muted mb-0 mb-lg-0">OCamlPro delivers Tezos and its crowdfunding platform, complete with the TZscan and Liquidity tools.</p>
</div>
</div>
<div class="timeline-step mb-0">
<div class="timeline-content" data-toggle="popover" data-trigger="hover" data-placement="top" title="" data-content="Inria’s OCaml Software Foundation is created." data-original-title="2018">
<div class="inner-circle"></div>
<p class="h6 mt-3 mb-1">2018</p>
<p class="h6 text-muted mb-0 mb-lg-0">Inria’s OCaml Software Foundation is created.</p>
</div>
</div>
<div class="timeline-step mb-0">
<div class="timeline-content" data-toggle="popover" data-trigger="hover" data-placement="top" title="" data-content="New company Origin Labs is created to tackle blockchain-related challenges." data-original-title="2019">
<div class="inner-circle"></div>
<p class="h6 mt-3 mb-1">2019</p>
<p class="h6 text-muted mb-0 mb-lg-0">New company Origin Labs is created to tackle blockchain-related challenges.</p>
</div>
</div>
<div class="timeline-step mb-0">
<div class="timeline-content" data-toggle="popover" data-trigger="hover" data-placement="top" title="" data-content="Alt-Ergo Users’ Club 2nd annual meeting" data-original-title="2020">
<div class="inner-circle"></div>
<p class="h6 mt-3 mb-1">2020</p>
<p class="h6 text-muted mb-0 mb-lg-0">Alt-Ergo Users’ Club 2nd annual meeting.</p>
</div>
</div>
</div>
</div>
</div>
All the code for the timeline above has been taken from the following: https://www.bootdey.com/snippets/view/timeline-steps -->
<script>
/*Timeline Animation*/
/**********************Scroll Animation "START"************************************/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment