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

Merge branch 'mobile-index-card' into 'master'

Mobile

See merge request OCamlPro/www!84
parents 2484cf85 71b84e26
...@@ -315,19 +315,19 @@ let pp_article_excerpt fmt article = ...@@ -315,19 +315,19 @@ let pp_article_excerpt fmt article =
<h3><a href="/blog/%s">%s</a></h3> <h3><a href="/blog/%s">%s</a></h3>
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-3"> <div class="col-6 col-lg-3">
<img class="icon" src="/blog/assets/img/icon_person.svg"/> <img class="icon" src="/blog/assets/img/icon_person.svg"/>
Authors: %a Authors: %a
</div> </div>
<div class="col-lg-3"> <div class="col-6 col-lg-3">
<img class="icon" src="/blog/assets/img/icon_calendar.svg"/> <img class="icon" src="/blog/assets/img/icon_calendar.svg"/>
Date: %4d-%02d-%02d Date: %4d-%02d-%02d
</div> </div>
<div class="col-lg-3"> <div class="col-6 col-lg-3">
<img class="icon" src="/blog/assets/img/icon_category.svg"/> <img class="icon" src="/blog/assets/img/icon_category.svg"/>
Category: <a href="/blog/category/%s">%s</a> Category: <a href="/blog/category/%s">%s</a>
</div> </div>
<div class="col-lg-3"> <div class="col-6 col-lg-3">
<img class="icon" src="/blog/assets/img/icon_tags.svg"/> <img class="icon" src="/blog/assets/img/icon_tags.svg"/>
Tags: %a Tags: %a
</div> </div>
...@@ -356,22 +356,22 @@ let specific_article_header title authors (year, month, day) category tags = ...@@ -356,22 +356,22 @@ let specific_article_header title authors (year, month, day) category tags =
Format.asprintf Format.asprintf
{|<h1 id="page-title">%s</h1> {|<h1 id="page-title">%s</h1>
<div class="row"> <div class="row">
<div class="col-lg-3"> <div class="col-6 col-lg-3">
<img class="icon" src="/blog/assets/img/icon_person.svg"/> <img class="icon" src="/blog/assets/img/icon_person.svg"/>
Authors: %a Authors: %a
</div> </div>
<div class="col-lg-2"> <div class="col-6 col-lg-2">
<img class="icon" src="/blog/assets/img/icon_calendar.svg"/> <img class="icon" src="/blog/assets/img/icon_calendar.svg"/>
Date: %4d-%02d-%02d Date: %4d-%02d-%02d
</div> </div>
<div class="col-lg-1" align="center"> <div class="col-6 col-lg-1" align="center">
<a href="/blog/feed"><img class="icon" src="/blog/assets/img/icon_atom_feed.svg"/></a> <a href="/blog/feed"><img class="icon" src="/blog/assets/img/icon_atom_feed.svg"/></a>
</div> </div>
<div class="col-lg-3"> <div class="col-6 col-lg-3">
<img class="icon" src="/blog/assets/img/icon_category.svg"/> <img class="icon" src="/blog/assets/img/icon_category.svg"/>
Category: <a href="/blog/category/%s">%s</a> Category: <a href="/blog/category/%s">%s</a>
</div> </div>
<div class="col-lg-3"> <div class="col-6 col-lg-3">
<img class="icon" src="/blog/assets/img/icon_tags.svg"/> <img class="icon" src="/blog/assets/img/icon_tags.svg"/>
Tags: %a Tags: %a
</div> </div>
......
This diff is collapsed.
This diff is collapsed.
...@@ -21,7 +21,7 @@ body { ...@@ -21,7 +21,7 @@ body {
color: #5a5a5a; color: #5a5a5a;
background-color: #EEEEEE; background-color: #EEEEEE;
line-height: 1.6; line-height: 1.6;
font-size: 18px; font-size: 21px;
} }
p img { p img {
...@@ -2055,7 +2055,7 @@ img.feed { ...@@ -2055,7 +2055,7 @@ img.feed {
#timeline .timeline-movement .timeline-item .timeline-panel.credits .timeline-panel-ul .righting-wrap { #timeline .timeline-movement .timeline-item .timeline-panel.credits .timeline-panel-ul .righting-wrap {
float: left; float: left;
width: 75%; /*70%*/ /*75%*/ width: 75%; /*70%*/ /*75%*/
height: 325px; /*250px*/ /*325px*/ height: 510px; /*250px*/ /*325px*/
padding: 0 12px 0 0; padding: 0 12px 0 0;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
......
<h1 id="page-title">Harnessing Cutting-Edge Technologies</h1> <h1 style=font-size:50px id="page-title">Harnessing Cutting-Edge Technologies</h1>
<hr class="featurette-divider"> <hr class="featurette-divider">
...@@ -8,19 +8,34 @@ We have years of experience on the research and development of programming langu ...@@ -8,19 +8,34 @@ We have years of experience on the research and development of programming langu
<br /> <br />
<br /> <br />
<div class="row"> <div class="row">
<div class="col-lg-4"> <div class="col-4">
<p><img src="assets/img/home_industry.png" /></p> <div class="card bg-transparent" >
<h3 align="center">For industrial partners who face challenges</h3> <img src="assets/img/home_industry.png" />
<div class="card-body">
<h5 class="card-title">For industrial partners who face challenges</h5>
</div> </div>
<div class="col-lg-4"> </div>
<p><img src="assets/img/home_research.png" /></p> </div>
<h3 align="center">For R&amp;D labs who need collaboration</h3> <div class="col-4">
<div class="card bg-transparent" >
<img src="assets/img/home_research.png" />
<div class="card-body">
<h5 class="card-title">For R&amp;D labs who need collaboration</h5>
</div> </div>
<div class="col-lg-4"> </div>
<p><img src="assets/img/home_dev.png" /></p> </div>
<h3 align="center">For developers to reach mastery</h3> <div class="col-4">
<div class="card bg-transparent" >
<img src="assets/img/home_dev.png" />
<div class="card-body">
<h5 class="card-title">For developers to reach mastery</h5>
</div> </div>
</div> </div>
</div>
</div>
<br /> <br />
<p align="center"> <p align="center">
<a role="button" class="btn btn-primary" href="https://calendly.com/contact-ocamlpro">Let's discuss your projects</a> <a role="button" class="btn btn-primary" href="https://calendly.com/contact-ocamlpro">Let's discuss your projects</a>
...@@ -38,21 +53,34 @@ We cater to very specific needs. For example, we can translate a “black box” ...@@ -38,21 +53,34 @@ We cater to very specific needs. For example, we can translate a “black box”
<br /> <br />
<div class="row"> <div class="row">
<div class="col-lg-3"> <div class="col-6 col-lg-3">
<p><img class="img_products" src="assets/img/logo_opam.png"/></p> <p><img class="img_products" src="assets/img/logo_opam.png"/></p>
<h3 align="center"><a href="https://opam.ocaml.org">opam</a></h3> <h3 align="center"><a href="https://opam.ocaml.org">opam</a></h3>
<p class="p_index_center">A highly scalable package manager</p> <p class="p_index_center">A highly scalable package manager</p>
</div> </div>
<div class="col-lg-3"> <div class="col-6 col-lg-3">
<p><img class="img_products" src="assets/img/logo_ocaml.svg" /></p> <p><img class="img_products" src="assets/img/logo_ocaml.svg" /></p>
<h3 align="center"><a href="https://ocaml-sf.org/learn-ocaml-public/#">Learn OCaml</a></h3> <h3 align="center"><a href="https://ocaml-sf.org/learn-ocaml-public/#">Learn OCaml</a></h3>
<p class="p_index_center">Exercise platform for teachers and learners around the world aiming to discover OCaml</p> <p class="p_index_center">Exercise platform for teachers and learners around the world aiming to discover OCaml</p>
</div> </div>
<div class="col-lg-3"> <div class="col-6 col-lg-3">
<p><img class="img_products" src="assets/img/logo_altergo.png" /></p> <p><img class="img_products" src="assets/img/logo_altergo.png" /></p>
<h3 align="center"><a href="https://alt-ergo.ocamlpro.com/">Alt-Ergo</a></h3> <h3 align="center"><a href="https://alt-ergo.ocamlpro.com/">Alt-Ergo</a></h3>
<p class="p_index_center">An SMT solver for software verification</p> <p class="p_index_center">An SMT solver for software verification</p>
</div> </div>
<<<<<<< HEAD
<div class="col-6 col-lg-3">
<p><img class="img_products" src="assets/img/logo_dune_gimp.png"/></p>
<h3 align="center"><a href="https://dunscan.io/">DunScan</a></h3>
<p class="p_index_center">The Dune network explorer</p>
</div>
</div>
<div class="row">
<div class="col-6 col-lg-3">
<p><img class="img_products" src="assets/img/logo_love_gimp.png"/></p>
<h3 align="center"><a href="https://dune.network/docs/dune-node-next/love-doc/reference/love.htmlo/">LOVE</a></h3>
<p class="p_index_center">A smart-contract language for the Dune Network blockchain</p>
=======
<div class="col-lg-3"> <div class="col-lg-3">
<h3 align="center"><a href="https://dunscan.io/">DunScan</a> & <a href="https://tzscan.io/">TzScan</a></h3> <h3 align="center"><a href="https://dunscan.io/">DunScan</a> & <a href="https://tzscan.io/">TzScan</a></h3>
<p>Blockchain explorers</p> <p>Blockchain explorers</p>
...@@ -64,22 +92,30 @@ We cater to very specific needs. For example, we can translate a “black box” ...@@ -64,22 +92,30 @@ We cater to very specific needs. For example, we can translate a “black box”
<h3 align="center"><a href="https://dune.network/docs/dune-node-next/love-doc/reference/love.htmlo/">LOVE & Liquidity</a></h3> <h3 align="center"><a href="https://dune.network/docs/dune-node-next/love-doc/reference/love.htmlo/">LOVE & Liquidity</a></h3>
<p>Smart-contract languages for the Dune Network & Tezos blockchains</p> <p>Smart-contract languages for the Dune Network & Tezos blockchains</p>
>>>>>>> ocp/master
</div> </div>
<div class="col-lg-3"> <div class="col-6 col-lg-3">
<p><img class="img_products" src="assets/img/logo_tezos.svg" /></p> <p><img class="img_products" src="assets/img/logo_tezos.svg" /></p>
<h3 align="center"><a href="https://en.wikipedia.org/wiki/Tezos">Tezos</a></h3> <h3 align="center"><a href="https://en.wikipedia.org/wiki/Tezos">Tezos</a></h3>
<p class="p_index_center">A blockchain with integrated governance</p> <p class="p_index_center">A blockchain with integrated governance</p>
</div> </div>
<div class="col-lg-3"> <div class="col-6 col-lg-3">
<p><img class="img_products" src="assets/img/logo_solidity.png" /></p> <p><img class="img_products" src="assets/img/logo_solidity.png" /></p>
<h3 align="center"><a href="https://gitlab.com/o-labs/solidity-parser-ocaml">Solidity parser</a></h3> <h3 align="center"><a href="https://gitlab.com/o-labs/solidity-parser-ocaml">Solidity parser</a></h3>
<p class="p_index_center">A Solidity Parser in OCaml with Menhir</p> <p class="p_index_center">A Solidity Parser in OCaml with Menhir</p>
</div> </div>
<<<<<<< HEAD
<div class="col-6 col-lg-3">
<p><img class="img_products" src="assets/img/logo_tzscan_gimp.jpg"/></p>
<h3 align="center"><a href="https://tzscan.io/">TZScan</a></h3>
<p class="p_index_center">The Tezos network explorer</p>
=======
<div class="col-lg-3"> <div class="col-lg-3">
<p><img src="assets/img/optal.png"/></p> <p><img src="assets/img/optal.png"/></p>
<h3 align="center"><a href="http://optal.ocamlpro.com/">Optal</a></h3> <h3 align="center"><a href="http://optal.ocamlpro.com/">Optal</a></h3>
<p>A language for linear optimisation</p> <p>A language for linear optimisation</p>
>>>>>>> ocp/master
</div> </div>
</div> </div>
<br /> <br />
...@@ -120,56 +156,56 @@ We cater to very specific needs. For example, we can translate a “black box” ...@@ -120,56 +156,56 @@ We cater to very specific needs. For example, we can translate a “black box”
<br /> <br />
<br /> <br />
<div class="row"> <div class="row">
<div class="col-lg-2"> <div class="col-4 col-lg-2">
<p><a href="https://www.janestreet.com"><img src="assets/img/logo_janestreet.svg" width="150"/></a></p> <p><a href="https://www.janestreet.com"><img src="assets/img/logo_janestreet.svg" width="150"/></a></p>
</div> </div>
<div class="col-lg-2"> <div class="col-4 col-lg-2">
<p><a href="https://www.samsung.com"><img src="assets/img/logo_samsung.svg" width="150"/></a></p> <p><a href="https://www.samsung.com"><img src="assets/img/logo_samsung.svg" width="150"/></a></p>
</div> </div>
<div class="col-lg-2"> <div class="col-4 col-lg-2">
<p><a href="https://www.mitsubishielectric-rce.eu/"><img src="assets/img/logo_merce.png" width="150"/></a></p> <p><a href="https://www.mitsubishielectric-rce.eu/"><img src="assets/img/logo_merce.png" width="150"/></a></p>
</div> </div>
<div class="col-lg-2"> <div class="col-4 col-lg-2">
<p><a href="https://www.adacore.com/"><img src="assets/img/logo_adacore.svg" width="150"/></a></p> <p><a href="https://www.adacore.com/"><img src="assets/img/logo_adacore.svg" width="150"/></a></p>
</div> </div>
<div class="col-lg-2"> <div class="col-4 col-lg-2">
<p><a href="https://trust-in-soft.com/"><img src="assets/img/logo_trustinsoft.svg" width="150"/></a></p> <p><a href="https://trust-in-soft.com/"><img src="assets/img/logo_trustinsoft.svg" width="150"/></a></p>
</div> </div>
<div class="col-lg-2"> <div class="col-4 col-lg-2">
<p><a href="https://cryptosense.com/"><img src="assets/img/logo_cryptosense.png" width="150"/></a></p> <p><a href="https://cryptosense.com/"><img src="assets/img/logo_cryptosense.png" width="150"/></a></p>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-2"> <div class="col-4 col-lg-2">
<p><a href="https://www.inria.fr"><img src="assets/img/logo_inria.svg" width="150"/></a></p> <p><a href="https://www.inria.fr"><img src="assets/img/logo_inria.svg" width="150"/></a></p>
</div> </div>
<div class="col-lg-2"> <div class="col-4 col-lg-2">
<p><a href="http://www-list.cea.fr"><img src="assets/img/logo_cealist.png" width="150"/></a></p> <p><a href="http://www-list.cea.fr"><img src="assets/img/logo_cealist.png" width="150"/></a></p>
</div> </div>
<div class="col-lg-2"> <div class="col-4 col-lg-2">
<p><a href="https://www.lexifi.com"><img src="assets/img/logo_lexifi.svg" width="150"/></a></p> <p><a href="https://www.lexifi.com"><img src="assets/img/logo_lexifi.svg" width="150"/></a></p>
</div> </div>
<div class="col-lg-2"> <div class="col-4 col-lg-2">
<p><a href="https://www.bloomberg.com"><img src="assets/img/logo_bloomberg.svg" width="150"/></a></p> <p><a href="https://www.bloomberg.com"><img src="assets/img/logo_bloomberg.svg" width="150"/></a></p>
</div> </div>
<div class="col-lg-2"> <div class="col-4 col-lg-2">
<p><a href="https://www.facebook.com/"><img src="assets/img/logo_facebook.svg" width="150"/></a></p> <p><a href="https://www.facebook.com/"><img src="assets/img/logo_facebook.svg" width="150"/></a></p>
</div> </div>
<div class="col-lg-2"> <div class="col-4 col-lg-2">
<p><a href="https://dune.network/"><img src="assets/img/logo_dune_network.svg" width="150"/></a></p> <p><a href="https://dune.network/"><img src="assets/img/logo_dune_network.svg" width="150"/></a></p>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-2"> <div class="col-4 col-lg-2">
<p><a href="https://ocaml-sf.org/"><img src="assets/img/logo_fondation_ocaml.svg" width="150"/></a></p> <p><a href="https://ocaml-sf.org/"><img src="assets/img/logo_fondation_ocaml.svg" width="150"/></a></p>
</div> </div>
<div class="col-lg-2"> <div class="col-4 col-lg-2">
<p><a href="https://www.irill.org/"><img src="assets/img/logo_irill.png" width="150"/></a></p> <p><a href="https://www.irill.org/"><img src="assets/img/logo_irill.png" width="150"/></a></p>
</div> </div>
<div class="col-lg-2"> <div class="col-4 col-lg-2">
<p><a href="https://origin-labs.com/"><img src="assets/img/logo_origin_labs.svg" width="150"/></a></p> <p><a href="https://origin-labs.com/"><img src="assets/img/logo_origin_labs.svg" width="150"/></a></p>
</div> </div>
<div class="col-lg-2"> <div class="col-4 col-lg-2">
<p><a href="https://systematic-paris-region.org/"><img src="assets/img/logo_systematic-paris-region.png" width="150"/></a></p> <p><a href="https://systematic-paris-region.org/"><img src="assets/img/logo_systematic-paris-region.png" width="150"/></a></p>
</div> </div>
</div> </div>
......
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