Skip to content

Commit 9c381ad

Browse files
Meriem-BenIsmailMeriem-BenIsmail
committed
merge resolved
1 parent 9991417 commit 9c381ad

File tree

1 file changed

+121
-118
lines changed

1 file changed

+121
-118
lines changed

‎the-team.html‎

Lines changed: 121 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -678,21 +678,21 @@ <h3><a href="javascript:;">Nour Cheour </a><br />
678678
src="img/github.svg"></a>
679679
</div>
680680
<p> @Nour-Cheour10 </p>
681-
682681
</div>
683682
</div>
684683
</div>
685684
<div class="col-md-4">
686685
<div class="portrait-bis">
687686
<div data-href="meriem.html">
687+
688688
<div class="haut-portrait">
689689
</div>
690690
<div class="text-center">
691691
<a href="javascript:;" class="img-circle avatar">
692-
<img src="img/avatar/Meriem.jpg" srcset="img/avatar/Meriem@2x.jpg 2x"
692+
<img src="img/avatar/meriem.jpg" srcset="img/avatar/meriem@2x.jpeg 2x"
693693
class="img-circle avatar">
694694
</a>
695-
<h3><a href="javascript:;">Meriem Ben Ismail</a><br />
695+
<h3><a href="javascript:;">Meriem Ben Ismail </a><br />
696696
Software Engineering Intern
697697
</h3>
698698
<a href="javascript:;"><img class="fleche" src="img/fleche-droite.svg"></a>
@@ -703,99 +703,102 @@ <h3><a href="javascript:;">Meriem Ben Ismail</a><br />
703703
<a target="_blank" href="https://github.com/Meriem-BenIsmail"><img class="twi-gith"
704704
src="img/github.svg"></a>
705705
</div>
706-
<p>@Meriem-BenIsmail</p>
706+
<p> @Meriem-BenIsmail</p>
707707
</div>
708708
</div>
709709
</div>
710+
</div>
711+
</div>
710712

711-
<div class="container">
712-
<h2 class="col-md-10 col-md-push-1">QuantStack Collaborators</h2>
713-
<h4 class="col-md-10 col-md-push-1">We partner with independent open-source developers and experts of
714-
the community on a regular basis.</h4>
715-
</div>
716713

717-
<div class="container">
718-
<div class="col-lg-10 col-lg-push-1 portraits">
719-
<div class="col-md-4">
720-
<div class="portrait-bis">
721-
<div data-href="serge.html">
722-
<div class="haut-portrait">
723-
</div>
724-
<div class="text-center">
725-
<a href="javascript:;" class="img-circle avatar">
726-
<img src="img/avatar/Serge.jpg" srcset="img/avatar/Serge@2x.jpg 2x"
727-
class="img-circle avatar">
728-
</a>
729-
<h3><a href="javascript:;">Serge Guelton</a><br />
730-
Scientific Software Developer
731-
</h3>
732-
<a href="javascript:;"><img class="fleche" src="img/fleche-droite.svg"></a>
733-
</div>
734-
</div>
735-
<div class="text-center">
736-
<div class="reseau">
737-
<a target="_blank" href="https://github.com/serge-sans-paille"><img class="twi-gith"
738-
src="img/github.svg"></a>
739-
</div>
740-
<p>@serge-sans-paille</p>
741-
</div>
742-
</div>
743-
</div>
744-
<div class="col-md-4">
745-
<div class="portrait-bis">
746-
<div data-href="romain.html">
747-
<div class="haut-portrait">
748-
</div>
749-
<div class="text-center">
750-
<a href="javascript:;" class="img-circle avatar">
751-
<img src="img/avatar/Romain.jpg" srcset="img/avatar/Romain@2x.jpg 2x"
752-
class="img-circle avatar">
753-
</a>
754-
<h3><a href="javascript:;">Romain Menegaux</a><br />
755-
Scientific Software Developer
756-
</h3>
757-
<a href="javascript:;"><img class="fleche" src="img/fleche-droite.svg"></a>
758-
</div>
759-
</div>
760-
<div class="text-center">
761-
<div class="reseau">
762-
<a target="_blank" href="https://twitter.com/RomainMenegaux"><img class="twi-gith"
763-
src="img/twitter.svg"></a>
764-
<a target="_blank" href="https://github.com/rmenegaux"><img class="twi-gith"
765-
src="img/github.svg"></a>
766-
</div>
767-
<p>@RomainMenegaux | @rmenegaux </p>
768-
</div>
714+
<div class="container">
715+
<h2 class="col-md-10 col-md-push-1">QuantStack Collaborators</h2>
716+
<h4 class="col-md-10 col-md-push-1">We partner with independent open-source developers and experts of the
717+
community on a regular basis.</h4>
718+
</div>
719+
720+
<div class="container">
721+
<div class="col-lg-10 col-lg-push-1 portraits">
722+
<div class="col-md-4">
723+
<div class="portrait-bis">
724+
<div data-href="serge.html">
725+
<div class="haut-portrait">
726+
</div>
727+
<div class="text-center">
728+
<a href="javascript:;" class="img-circle avatar">
729+
<img src="img/avatar/Serge.jpg" srcset="img/avatar/Serge@2x.jpg 2x"
730+
class="img-circle avatar">
731+
</a>
732+
<h3><a href="javascript:;">Serge Guelton</a><br />
733+
Scientific Software Developer
734+
</h3>
735+
<a href="javascript:;"><img class="fleche" src="img/fleche-droite.svg"></a>
769736
</div>
770737
</div>
771-
738+
<div class="text-center">
739+
<div class="reseau">
740+
<a target="_blank" href="https://github.com/serge-sans-paille"><img class="twi-gith"
741+
src="img/github.svg"></a>
742+
</div>
743+
<p>@serge-sans-paille</p>
744+
</div>
772745
</div>
773746
</div>
774-
775-
<div class="container">
776-
<h2 class="col-md-10 col-md-push-1">We have permanent offices in the greater Paris area.</h2>
747+
<div class="col-md-4">
748+
<div class="portrait-bis">
749+
<div data-href="romain.html">
750+
<div class="haut-portrait">
751+
</div>
752+
<div class="text-center">
753+
<a href="javascript:;" class="img-circle avatar">
754+
<img src="img/avatar/Romain.jpg" srcset="img/avatar/Romain@2x.jpg 2x"
755+
class="img-circle avatar">
756+
</a>
757+
<h3><a href="javascript:;">Romain Menegaux</a><br />
758+
Scientific Software Developer
759+
</h3>
760+
<a href="javascript:;"><img class="fleche" src="img/fleche-droite.svg"></a>
761+
</div>
762+
</div>
763+
<div class="text-center">
764+
<div class="reseau">
765+
<a target="_blank" href="https://twitter.com/RomainMenegaux"><img class="twi-gith"
766+
src="img/twitter.svg"></a>
767+
<a target="_blank" href="https://github.com/rmenegaux"><img class="twi-gith"
768+
src="img/github.svg"></a>
769+
</div>
770+
<p>@RomainMenegaux | @rmenegaux </p>
771+
</div>
772+
</div>
777773
</div>
778774

779-
<div class="container">
780-
<div class="col-lg-10 col-lg-push-1 locations">
781-
<div class="col-md-6 ">
782-
<div class="col-md-12 bloc-contact">
783-
<div id="map-paris" style="width: 100%; height: 360px; margin: 0;"></div>
784-
</div>
785-
<div class="bloc-contact col-md-12">
786-
<div class="col-md-5">
787-
<img src="img/drapeau.svg" class="img-responsive hidden-xs hidden-sm">
788-
</div>
789-
<div class="col-md-7">
790-
<p><strong>QuantStack Paris</strong><br>
791-
16 avenue Curti<br>
792-
94100 Saint-Maur-des-Fossés<br>
793-
France</p>
794-
<div class="clearfix"></div>
795-
</div>
796-
</div>
797-
</div>
798-
<!--
775+
</div>
776+
</div>
777+
778+
<div class="container">
779+
<h2 class="col-md-10 col-md-push-1">We have permanent offices in the greater Paris area.</h2>
780+
</div>
781+
782+
<div class="container">
783+
<div class="col-lg-10 col-lg-push-1 locations">
784+
<div class="col-md-6 ">
785+
<div class="col-md-12 bloc-contact">
786+
<div id="map-paris" style="width: 100%; height: 360px; margin: 0;"></div>
787+
</div>
788+
<div class="bloc-contact col-md-12">
789+
<div class="col-md-5">
790+
<img src="img/drapeau.svg" class="img-responsive hidden-xs hidden-sm">
791+
</div>
792+
<div class="col-md-7">
793+
<p><strong>QuantStack Paris</strong><br>
794+
16 avenue Curti<br>
795+
94100 Saint-Maur-des-Fossés<br>
796+
France</p>
797+
<div class="clearfix"></div>
798+
</div>
799+
</div>
800+
</div>
801+
<!--
799802
<div class="col-md-6 ">
800803
<div class="bloc-contact col-md-12">
801804
<div class="col-md-5">
@@ -814,40 +817,40 @@ <h2 class="col-md-10 col-md-push-1">We have permanent offices in the greater Par
814817
</div>
815818
</div>
816819
-->
817-
</div>
818-
</div>
820+
</div>
821+
</div>
819822

820-
<div class="spacer big"></div>
821-
822-
<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
823-
<script src="js/jquery.min.js"></script>
824-
<!-- Include all compiled plugins (below), or include individual files as needed -->
825-
<script src="js/bootstrap.min.js"></script>
826-
827-
<div id="content-foot"></div>
828-
<script src="js/include-menus.js"></script>
829-
830-
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.6.0/dist/leaflet.css" />
831-
832-
<script src="https://unpkg.com/leaflet@1.6.0/dist/leaflet.js"></script>
833-
<script>
834-
function initMaps() {
835-
var parisMap = L.map('map-paris', { attributionControl: false }).setView([48.80451, 2.49294], 11);
836-
// var berlinMap = L.map('map-berlin', {attributionControl: false}).setView([52.493625, 13.448053], 11);
837-
838-
L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
839-
maxZoom: 14,
840-
}).addTo(parisMap);
841-
//L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
842-
// maxZoom: 14,
843-
//}).addTo(berlinMap);
844-
845-
var parisMarker = L.marker([48.80451, 2.49294], { title: "QuantStack Paris" }).addTo(parisMap);
846-
//var berlinMarker = L.marker([52.493625, 13.448053], { title: "QuantStack Berlin" }).addTo(berlinMap);
847-
}
848-
initMaps();
849-
</script>
850-
</script>
823+
<div class="spacer big"></div>
824+
825+
<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
826+
<script src="js/jquery.min.js"></script>
827+
<!-- Include all compiled plugins (below), or include individual files as needed -->
828+
<script src="js/bootstrap.min.js"></script>
829+
830+
<div id="content-foot"></div>
831+
<script src="js/include-menus.js"></script>
832+
833+
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.6.0/dist/leaflet.css" />
834+
835+
<script src="https://unpkg.com/leaflet@1.6.0/dist/leaflet.js"></script>
836+
<script>
837+
function initMaps() {
838+
var parisMap = L.map('map-paris', { attributionControl: false }).setView([48.80451, 2.49294], 11);
839+
// var berlinMap = L.map('map-berlin', {attributionControl: false}).setView([52.493625, 13.448053], 11);
840+
841+
L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
842+
maxZoom: 14,
843+
}).addTo(parisMap);
844+
//L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
845+
// maxZoom: 14,
846+
//}).addTo(berlinMap);
847+
848+
var parisMarker = L.marker([48.80451, 2.49294], { title: "QuantStack Paris" }).addTo(parisMap);
849+
//var berlinMarker = L.marker([52.493625, 13.448053], { title: "QuantStack Berlin" }).addTo(berlinMap);
850+
}
851+
initMaps();
852+
</script>
853+
</script>
851854
</body>
852855

853856
</html>

0 commit comments

Comments
 (0)