Merge remote-tracking branch 'nextleap-project/master'

nextleap-project · Jul 20, 2016 · 1cb76b9 · 1cb76b9
2 parents 5e28475 + c2c27c1
commit 1cb76b9
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/src/source/images/banner.jpg b/src/source/images/banner.jpg
diff --git a/src/source/images/banner.png b/src/source/images/banner.png
diff --git a/src/source/images/texte_intro.png b/src/source/images/texte_intro.png
diff --git a/src/source/index.html.erb b/src/source/index.html.erb
@@ -6,8 +6,8 @@ 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 'texte_intro.png', :resize_to => '900'%>
+    <%= image_tag 'logobanner.png', :resize_to => '700'%>
+    <div class="nextleap-tagline">NEXt generation Techno-social and Legal Encryption Access and Privacy</div>
   </div>
 </div>
 

diff --git a/src/source/stylesheets/_fonts.scss b/src/source/stylesheets/_fonts.scss
@@ -58,6 +58,5 @@
   font-family: 'OCRAEXT';
   font-weight: 400;
   font-style: normal;
-  src: url('../fonts/OCRAEXT/OCRAEXT.ttf')format('truetype'),
-       local('OCRAEXT');
-       }
+  src: font-url('OCRAEXT/OCRAEXT.TTF') format('truetype');
+}
diff --git a/src/source/stylesheets/screen.css.sass b/src/source/stylesheets/screen.css.sass
@@ -41,5 +41,12 @@ $eu-gold: #FFCC00
     margin-bottom: 1rem
 
 .header-callout
-    background-image: url("/images/banner.png")
+    background-image: image-url("banner.jpg")
     background-size: 100%
+
+.nextleap-tagline
+    color: $white
+    font-size: 1.5rem
+    font-family: OCRAEXT
+    font-weight: normal
+    font-style: normal