Merge pull request #4 from javaryr/master

Change font for headers (titles) and top bar
nextleap-project · Jul 20, 2016 · f0cb302 · f0cb302
2 parents c2c27c1 + f3e63cd
commit f0cb302
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 12 deletions.
diff --git a/src/source/index.html.erb b/src/source/index.html.erb
@@ -6,7 +6,7 @@ no_footer: true
 <div class="callout large header-callout">
 
   <div class="row column text-center nextleap-callout">
-    <%= image_tag 'logobanner.png', :resize_to => '700'%>
+    <%= image_tag 'logobanner.png', :resize_to => '500'%>
     <div class="nextleap-tagline">NEXt generation Techno-social and Legal Encryption Access and Privacy</div>
   </div>
 </div>

diff --git a/src/source/objectives.html.erb b/src/source/objectives.html.erb
@@ -13,9 +13,9 @@ title: Project NextLeap - Objectives
 <h5>NEXTLEAP pursues three main objectives:</h5>
   <p>
     <ol>
-      <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>
+      <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
         <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>

diff --git a/src/source/stylesheets/_settings.scss b/src/source/stylesheets/_settings.scss
@@ -96,7 +96,7 @@ $block-grid-max: 8;
 // 4. Base Typography
 // ------------------
 
-$header-font-family: $body-font-family;
+$header-font-family: OCRAEXT;
 $header-font-weight: $global-weight-normal;
 $header-font-style: normal;
 $font-family-monospace: Consolas, 'Liberation Mono', Courier, monospace;

diff --git a/src/source/stylesheets/screen.css.sass b/src/source/stylesheets/screen.css.sass
@@ -43,10 +43,19 @@ $eu-gold: #FFCC00
 .header-callout
     background-image: image-url("banner.jpg")
     background-size: 100%
+    margin-bottom: 3rem
 
 .nextleap-tagline
     color: $white
     font-size: 1.5rem
     font-family: OCRAEXT
     font-weight: normal
-    font-style: normal
+    font-style: normal
+
+.top-bar
+    font-family: OCRAEXT
+    font-weight: normal
+    font-style: normal
+
+.institutions h5
+    font-size: 1.1rem
diff --git a/src/source/tasks.html.erb b/src/source/tasks.html.erb
@@ -18,12 +18,12 @@ title: Project NextLeap - Tasks
   <div class="medium-6 columns">
   <p> NEXTLEAP is divided in the following work packages that tackle the above tasks.
     <ol>
-      <li><h6>Project Management (INRIA)</h6></li>
-      <li><h6>Science of Decentralized Architectures (UCL)</h6></li>
-      <li><h6>Social Design and Philosophical Foundations of Decentralization (CNRS)</h6></li>
-      <li><h6>Validation via Formal Modelling and Simulation (IMDEA Software Institute)</h6></li>
-      <li><h6>Open Source Code and User Validation (Merlinux)</h6></li>
-      <li><h6>Outreach and Dissemination (IRI)</h6></li>
+      <li>Project Management (INRIA)</li>
+      <li>Science of Decentralized Architectures (UCL)</li>
+      <li>Social Design and Philosophical Foundations of Decentralization (CNRS)</li>
+      <li>Validation via Formal Modelling and Simulation (IMDEA Software Institute)</li>
+      <li>Open Source Code and User Validation (Merlinux)</li>
+      <li>Outreach and Dissemination (IRI)</li>
     </ol>
   </p>
 </div>