Merge pull request #1 from javaryr/master

Site redesign

src/source/events/2016-02-15-nextleap_face_to_face_meeting.html.md

@@ -0,0 +1,9 @@
+---
+title: Face-to-face meeting in Paris - NEXTLEAP Team
+tags: event
+image: meeting_nextleap.jpg
+---
+
+# Face-to-face meeting in Paris - NEXTLEAP Team
+
+15-16 february - INRIA Paris

src/source/events/2016-05-29-bitcoin_summer_school.html.md

@@ -0,0 +1,12 @@
+---
+title: Bitcoin summer school
+tags: event
+image: bitcoin_summer_school.png
+---
+
+# Bitcoin summer school
+
+May 29 - June 2nd
+George Danezis, UCL
+
+[https://bitcoinschool.gr/](https://bitcoinschool.gr/)

src/source/events/2016-06-19-support_event_assange.html.md

@@ -0,0 +1,13 @@
+---
+title: Support Event for Julian Assange in Paris
+tags: event
+image: support_assange.png
+---
+
+# Support Event for Julian Assange - Paris - Centre Pompidou
+
+Bernard Stiegler (IRI)
+Ars Industrialis
+Libération
+
+[Video](http://www.dailymotion.com/video/x4hdfae_live-debat-a-l-occasion-du-4e-anniversaire-de-l-enfermement-de-julian-assange_news)

src/source/events/2016-07-18-privacy_enhancing_technologies.html.md

@@ -0,0 +1,15 @@
+---
+title: Workshop on Strategic Research Challenges for Privacy Technologies
+tags: event
+image: ecrypt.png
+---
+
+# Workshop on Strategic Research Challenges for Privacy Technologies
+
+ECRYPT [http://www.ecrypt.eu.org/csa/](http://www.ecrypt.eu.org/csa/)
+18 July 2016
+Darmstadt (Germany)
+
+Participants: Nadim Kobeissi (INRIA Paris), George Danezis (UCL), Harry Halpin (INRIA Paris)
+
+[https://www.cosic.esat.kuleuven.be/ecrypt/csa/privacy/program.shtml](https://www.cosic.esat.kuleuven.be/ecrypt/csa/privacy/program.shtml)

src/source/index.html.erb

@@ -5,68 +5,72 @@ no_footer: true
 
 <div class="callout large">
   <div class="row column text-center nextleap-callout">
-  <h1>NextLeap</h1>
-  <p class="lead">NeXt generation Techno-social and Legal Encryption Access and Privacy</p>
+  <%= image_tag 'nextleap_logo.png', :resize_to => '400'%>
+    <%= image_tag 'texte_intro.png', :resize_to => '900'%>
   </div>
 </div>
 
 <div class="row">
-  <div class="medium-6 columns medium-push-6">
-    <%= image_tag 'nextleap_logo.png', :resize_to => '750x350', :class=> 'thumbnail' %>
-  </div>
-  <div class="medium-6 columns medium-pull-6">
-    <h2>About NEXTLEAP.</h2>
-    <p>In the wake of the Snowden revelations, public trust in the Internet has eroded.
-      <blockquote>
-        We need to encode our values not just in writing but in the structure of the Internet, and it's something that I invite everyone around the world, to join and participate in.
-        <cite>Edward Snowden</cite>
-      </blockquote>
-      The primary motivation of NEXTLEAP is to create, validate, and deploy <strong>communication and computation protocols</strong> that can serve as pillars for a secure, trust-worthy, annotable and privacy-respecting Internet that ensures citizens fundamental rights. For this purpose NEXLEAP will develop an interdisciplinary <strong>internet science of decentralisation</strong> that provides the basis on which these protocols will be built.</p>
-  </div>
-</div>
 
-<div class="row column europe-flag">
-  <div class="medium-2 columns">
-    <%= image_tag 'eu-flag.jpg', :resize_to => '170' %>
+  <div class="medium-6 columns">
+    <h3>The NEXTLEAP Project</h3>
+    <p>In the wake of the Snowden revelations, public trust in the Internet has eroded.</p>
+      <p>The primary motivation of NEXTLEAP is to create, validate, and deploy communication and computation protocols that can serve as pillars for a secure, trust-worthy, annotable and privacy-respecting Internet that ensures citizens fundamental rights. For this purpose NEXTLEAP will develop an interdisciplinary internet science of decentralisation that provides the basis on which these protocols will be built.</p>
   </div>
-  <div class="medium-10 columns">
-    <p> This project has received funding from the European Union’s Horizon 2020 Framework Programme for Research and Innovation (H2020-ICT-2015, ICT-10-2015) under grant agreement nº 688722</p>
+  <div class="medium-6 columns">
+    <%= image_tag 'phototeam.jpg', :resize_to => '750x350', :class=> 'thumbnail' %>
+    </div>
   </div>
-</div>
+      <div class="row">
 
-<hr>
+        <div class="medium-6 columns">
+            <center><%= image_tag 'schema3.png', :resize_to => '250'%></center>
+        </div>
+            <div class="medium-6 columns">
+              <blockquote><p>"WE NEED TO ENCODE OUR VALUES NOT JUST IN WRITING BUT IN THE STRUCTURE OF THE INTERNET, AND IT'S SOMETHING THAT I INVITE EVERYONE AROUND THE WORLD, TO JOIN AND PARTICIPATE IN."</p><p>Edward Snowden</p></blockquote>
 
-<div class="row column">
-  <h3>Partners and Contact</h3>
+        </div>
+      </div>
+<div class="row">
+  <hr>
+  <div class="medium-6 columns">
+      <%= image_tag 'eu-flag.jpg', :resize_to => '90' %>
+    <p><font size=-30%>This project has received funding from the European Union’s Horizon 2020 Framework Programme for Research and Innovation (H2020-ICT-2015, ICT-10-2015) under grant agreement nº 688722.</font size></p>
+  </div>
+  <div class="medium-6 columns">
+  <h5>Contact</h5>
+    <p class"lead"><font size=inherit>Coordinator: <%= link_to '[email protected]','mailto:[email protected]' %></p>
 </div>
+</div>
+<hr>
 
 <div class="row column">
-  <p class"lead">Co-coordinator: <%= link_to '[email protected]','mailto:[email protected]' %></p>
+  <h5>Partners</h5>
 </div>
 
 <div class="row institutions">
   <div class="medium-2 columns">
-    <h5><%= link_to 'INRIA', 'http://www.inria.fr', :target => '_blank', :title => 'INRIA' %></h5>
-    <%= image_tag 'INRIA.png', :resize_to => '170x170', :class => 'thumbnail' %>
+    <h5><%= link_to 'INRIA', 'http://www.inria.fr', :target => '_blank'%></h5>
+    <%= image_tag 'INRIA.png', :resize_to => '130', :class => 'thumbnail' %>
   </div>
   <div class="medium-2 columns">
-    <h5><%= link_to 'IMDEA Software', 'https://software.imdea.org', :target => '_blank', :title => 'IMDEA' %></h5>
-    <%= image_tag 'imdea-software.jpg', :resize_to => '170x170', :class => 'thumbnail' %>
+    <h5><%= link_to 'IMDEA Software', 'https://software.imdea.org', :target => '_blank'%></h5>
+    <%= image_tag 'imdea-software.jpg', :resize_to => '130', :class => 'thumbnail' %>
   </div>
   <div class="medium-2 columns">
-    <h5><%= link_to 'CNRS', 'http://www.cnrs.fr', :target => '_blank', :title => 'CNRS'%></h5>
-    <%= image_tag 'CNRS.jpg', :resize_to => '170x170', :class => 'thumbnail' %>
+    <h5><%= link_to 'CNRS', 'http://www.cnrs.fr', :target => '_blank'%></h5>
+    <%= image_tag 'CNRS.jpg', :resize_to => '130', :class => 'thumbnail' %>
   </div>
   <div class="medium-2 columns">
-    <h5><%= link_to 'IRI', 'http://www.iri.centrepompidou.fr', :target => '_blank', :title => 'Institut de Recherche et d\'Innovation'%></h5>
-    <%= image_tag 'IRI.png', :resize_to => '170x170', :class => 'thumbnail' %>
+    <h5><%= link_to 'IRI', 'http://www.iri.centrepompidou.fr', :target => '_blank'%></h5>
+    <%= image_tag 'IRI.png', :resize_to => '130', :class => 'thumbnail' %>
   </div>
   <div class="medium-2 columns">
-    <h5><%= link_to 'UCL', 'http://www.ucl.ac.uk', :target => '_blank', :title => 'University College London'%></h5>
-    <%= image_tag 'UCL.png', :resize_to => '170x170', :class => 'thumbnail' %>
+    <h5><%= link_to 'UCL', 'http://www.ucl.ac.uk', :target => '_blank'%></h5>
+    <%= image_tag 'UCL.png', :resize_to => '130', :class => 'thumbnail' %>
   </div>
   <div class="medium-2 columns">
-    <h5><%= link_to 'Merlinux', 'http://www.merlinux.de', :target => '_blank', :title => 'Merlinux' %></h5>
-    <%= image_tag 'merlinux.jpg', :resize_to => '170x170', :class => 'thumbnail' %>
+    <h5><%= link_to 'Merlinux', 'http://www.merlinux.de', :target => '_blank' %></h5>
+    <%= image_tag 'merlinux.jpg', :resize_to => '130', :class => 'thumbnail' %>
   </div>
 </div>

src/source/objectives.html.erb

@@ -7,13 +7,15 @@ title: Project NextLeap - Objectives
 </div>
 <hr>
 
-<div class="row column">
-NEXTLEAP pursues three main objectives:
+<div class="row">
+
+  <div class="medium-6 columns">
+<h5>NEXTLEAP pursues three main objectives:</h5>
   <p>
     <ol>
-      <li>The creation of a fundamental rights-preserving socio-technical science of decentralised internet architecture.</li>
-      <li>A fundamental re-thinking of the ethical and philosophical foundations of the Internet. </li>
-      <li>The modular specification of decentralised protocols implemented as open-source software modules for
+      <li><h6>The creation of a fundamental rights-preserving socio-technical science of decentralised internet architecture.</h6></li>
+      <li><h6>A fundamental re-thinking of the ethical and philosophical foundations of the Internet.</h6></li>
+      <li><h6>The modular specification of decentralised protocols implemented as open-source software modules for</h6>
         <ol type='a'>
           <li>Privacy-preserving contact lists and presence services supporting federated identity</li>
           <li>Secure messaging services that hide metadata (e.g., who, when, how often, etc.)</li>
@@ -22,21 +24,20 @@ NEXTLEAP pursues three main objectives:
       </li>
     </ol>
   </p>
-</div>
-
-
-<div class="row column">
-
 
   <p class="text-justify">
     The technical solutions developed by NEXTLEAP will be rooted in both philosophy
-    and real-world usage of the Internet. In this aspect the project partners will strive to answer the following questions: 
+    and real-world usage of the Internet. In this aspect the project partners will strive to answer the following questions:
+  </p>
+</div>
+<div class="medium-6 columns">
     <ul>
     <li><strong>what motivations and values can be used to predict successful adoption of
     decentralised systems by communities of users?</strong> While it appears users are
     often unhappy with losing control of their data to companies that own
     centralised platforms, very few users do move to alternatives and what
-    precisely the social success or failure of a system is unclear.</li>
+    precisely the social success or failure of a system is unclear.</li></p>
+    <p>
     <li><strong>Is there a decentralised philosophy at the core of the Internet that makes
     sense of the success of existing protocols?</strong> It is claimed that values
     around collective intelligence, open innovation, privacy, and
@@ -48,13 +49,18 @@ NEXTLEAP pursues three main objectives:
     the rights and needs elicited from the answers to the above questions.
   </p>
 
+</div>
+<div class="row">
+  <hr>
+  <div class="medium-6 columns">
   <p class="text-justify">
-    There main technical questions NEXTLEAP will strive to answer are the following:
+    <h5>The main technical questions NEXTLEAP will strive to answer are the following:</h5>
     <ul>
     <li><strong>Can decentralisation help privacy and anonymity?</strong>
     While intuitively many people claim that decentralisation helps privacy,
     actually recent research shows that de-anonymisation and surveillance is
-    actually easier on decentralised networks.</li>
+    actually easier on decentralised networks.</li></p>
+    <p>
     <li><strong>How can we build scalable, high-performing, and secure decentralised
     architectures based on verified protocols?</strong>
     Decentralisation typically has impact on the performance of the system with
@@ -64,9 +70,16 @@ NEXTLEAP pursues three main objectives:
     </ul>
     These aspects are hard to understand by users and developers. The modular components and automated analysis developed in NEXTLEAP will help building secure and privacy-preserving Internet services.
   </p>
-
-  <p class="text-justify">
-    The three technical building blocks that NEXLEAP will output respond to the following questions:
+</div>
+<div class="medium-6 columns">
+   <%= image_tag 'nextleap_schema_silo.png', :class => 'float-right thumbnail', :id =>'nextleap_schema_silo' %>
+ </div>
+</div>
+<div class="row">
+  <hr>
+ <div class="medium-6 columns">
+<p class="text-justify">
+    <h5>The three technical building blocks that NEXLEAP will output respond to the following questions:</h5>
     <ul>
     <li>An address-book (“friends”, social graph, contacts, etc.)
     is the fundamental building block for any messaging protocol. Such an
@@ -76,9 +89,9 @@ NEXTLEAP pursues three main objectives:
     as public key material typically are centralised and, if decentralised, not
     accessed in a privacy-preserving manner. <strong> Can we achieve a breakthrough to
     allow users to keep track of their contacts without losing their rights or
-    becoming part of a centralised silo?</strong> </li>
+    becoming part of a centralised silo?</strong> </li></p>
 
-    <li><strong>How can a person send secure messages to others, regardless of what system
+  <p>  <li><strong>How can a person send secure messages to others, regardless of what system
     they are using?</strong> These messages need to be end-to-end encrypted, resistant
     to ‘metadata’ analysis, and may have a number of properties such as forward
     secrecy and future secrecy. While currently a number of secure next
@@ -88,11 +101,10 @@ NEXTLEAP pursues three main objectives:
     Existing interoperable protocols like SMTP (e-mail) are by default
     non-encrypted and leak metadata. <strong>Can we unify a protocol that starts with
     e-mail and goes all the way to secure messaging?</strong></li>
-
-  <div>
-    <%= image_tag 'nextleap_schema_silo.png', :class => 'float-center thumbnail', :id =>'nextleap_schema_silo' %>
-  </div>
-
+</p>
+</div>
+<div class="medium-6 columns">
+<p>
     <li>Lastly, much of the drive towards centralisation in Internet-based systems
     is also driven by practical needs to harness the collective ‘wisdom of the
     crowds’, improve their system, and to ‘know your user.’ However, even those
@@ -102,3 +114,7 @@ NEXTLEAP pursues three main objectives:
     machine-learning for good while respecting the rights of their users?</strong></li>
   </p>
 </div>
+<div class="medium-6 columns">
+   <%= image_tag 'schemanextleap.png', :class => 'float-right thumbnail', :id =>'nextleap_schema' %>
+ </div>
+ </div>

src/source/partials/_header.erb

@@ -2,12 +2,12 @@
   <div class="top-bar-left">
     <ul class="menu">
       <li><%= image_tag 'nextleap_logo_transp.png', :resize_to => '75x40' %></li>
-      <li class="menu-text">NextLeap Project</li>
+      <li class="menu-text">NEXTLEAP Project</li>
     </ul>
   </div>
   <div class="top-bar-right">
     <ul class="menu">
-      <li><%= link_to 'About', '/' %></li>
+      <li><%= link_to 'Home', '/' %></li>
       <li><%= link_to 'Objectives', '/objectives.html' %></li>
       <li><%= link_to 'Tasks', '/tasks.html' %></li>
       <li><%= link_to 'Resources', '/resources.html' %></li>

src/source/stylesheets/_fonts.scss

@@ -53,3 +53,11 @@
        url('../fonts/Raleway-regular/Raleway-regular.ttf') format('truetype'),
        url('../fonts/Raleway-regular/Raleway-regular.svg#Raleway') format('svg');
 }
+
+@font-face {
+  font-family: 'OCRAEXT';
+  font-weight: 400;
+  font-style: normal;
+  src: url('../fonts/OCRAEXT/OCRAEXT.ttf')format('truetype'),
+       local('OCRAEXT');
+       }

src/source/stylesheets/_settings.scss

@@ -44,10 +44,10 @@
 // 1. Global
 // ---------
 
-$global-font-size: 100%;
-$global-width: rem-calc(1200);
-$global-lineheight: 1.5;
-$primary-color: #2199e8;
+$global-font-size: 90%;
+$global-width: rem-calc(1000);
+$global-lineheight: 1.3;
+$primary-color:#00ACDE;
 $secondary-color: #777;
 $success-color: #3adb76;
 $warning-color: #ffae00;
@@ -58,9 +58,9 @@ $dark-gray: #8a8a8a;
 $black: #0a0a0a;
 $white: #fefefe;
 $body-background: $white;
-$body-font-color: $black;
+$body-font-color: #555555;
 //$body-font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif;
-$body-font-family: Lato;
+$body-font-family: Helvetica Neue;
 $body-antialiased: true;
 $global-margin: 1rem;
 $global-padding: 1rem;
@@ -118,14 +118,14 @@ $header-sizes: (
     'h6': 16,
   ),
 );
-$header-color: inherit;
+$header-color: #FF6054;
 $header-lineheight: 1.4;
 $header-margin-bottom: 0.5rem;
 $header-text-rendering: optimizeLegibility;
 $small-font-size: 80%;
 $header-small-font-color: $medium-gray;
-$paragraph-lineheight: 1.6;
-$paragraph-margin-bottom: 1rem;
+$paragraph-lineheight: 1.3;
+$paragraph-margin-bottom: 1.6rem;
 $paragraph-text-rendering: optimizeLegibility;
 $code-color: $black;
 $code-font-family: $font-family-monospace;
@@ -149,9 +149,9 @@ $list-nested-side-margin: 1.25rem;
 $defnlist-margin-bottom: 1rem;
 $defnlist-term-weight: $global-weight-bold;
 $defnlist-term-margin-bottom: 0.3rem;
-$blockquote-color: $dark-gray;
-$blockquote-padding: rem-calc(9 20 0 19);
-$blockquote-border: 1px solid $medium-gray;
+$blockquote-color: #00ACDE;
+$blockquote-padding: rem-calc(3 20 0 19);
+$blockquote-border: Opx solid $medium-gray;
 $cite-font-size: rem-calc(13);
 $cite-color: $dark-gray;
 $keystroke-font: $font-family-monospace;
@@ -254,8 +254,8 @@ $buttongroup-expand-max: 6;
 // 13. Callout
 // -----------
 
-$callout-background: $white;
-$callout-background-fade: 85%;
+$callout-background: #00ACDE;
+$callout-background-fade: 0%;
 $callout-border: 1px solid rgba($black, 0.25);
 $callout-margin: 0 0 1rem 0;
 $callout-padding: 1rem;