Merge branch 'refacto' of git.frama-c.com:pub/pub.frama-c.com into refacto

41cd0045 · Augustin Lemesle · 35cb983d · f7f32ee4 · 41cd0045 · 41cd0045
Commit 41cd0045 authored 4 years ago by Augustin Lemesle
--- a/_data/nav.yml
+++ b/_data/nav.yml
 - name: Using Frama-C
  link: /html/using-frama-c.html
+  id  : using
 - name: Features
  link: /html/kernel-plugin.html
+  id  : features
 - name: Documentation
  link: /html/documentation.html
+  id  : documentation
 - name: Blog
  link: /blog/index.html
-# - name: Careers
-  # link: /html/careers.html
+  id  : blog
+#- name: Careers
+#  link: /html/careers.html
+#  id  : careers
 - name: Contact
  link: /html/contact.html
+  id  : contact
--- a/_fc-plugins/wp.md
+++ b/_fc-plugins/wp.md
@@ -10,7 +10,7 @@ additional:
    short: "ACSL by Example"
    link:  https://fraunhoferfokus.github.io/acsl-by-example
  - name:  "Introduction to C program proof with Frama-C and WP, by Allan Blanchard"
-    short: "Tutorial on Frama-C and WP"
+    short: "Tutorial on Frama-C/WP"
    link:  https://github.com/AllanBlanchard/tutoriel_wp
 ---


--- a/_includes/headers.html
+++ b/_includes/headers.html
@@ -8,7 +8,7 @@
 	<div class="menu-primary-meny-container">
 	  <ul id="menu-primary-meny" class="menu">
 	  {% for item in site.data.nav %}
-	  {% if forloop.index == include.header %}
+	  {% if item.id == include.header %}
 	  <li class="menu-item menu-item-type-post_type menu-item-object-page current-menu-item page_item current_page_item">
 	  {% else %}	  
 	  <li class="menu-item menu-item-type-post_type menu-item-object-page">		

--- a/_layouts/blog.html
+++ b/_layouts/blog.html
@@ -7,7 +7,7 @@ css: blog
 <div id="wrapper" class="hfeed">

  <!-- TODO after new website is online: uncomment below and comment after
-	{% include headers.html header=4 title=Blog %}
+	{% include headers.html header="blog" title=Blog %}
 -->
 	{% include blog-headers-standalone.html %}


--- a/_layouts/clean_page.html
+++ b/_layouts/clean_page.html
@@ -6,7 +6,7 @@ css: wiki

 <body class="page-template page-template-page-kernel page-template-page-kernel-php page nonTouch">
 <div id="wrapper" class="hfeed">
-{% include headers.html header=3 %}
+{% include headers.html header="documentation" %}

 <div id="container" class="mainContainer">
  <div class="defaultPage wikiPage pages textLeft" id="content" role="main">

--- a/_layouts/feature.html
+++ b/_layouts/feature.html
@@ -8,7 +8,7 @@ title: Kernel & Plugins - Frama-C
  <div id="wrapper" class="hfeed">


-    {% include headers.html header=2 %}
+    {% include headers.html header="features" %}

    <div id="container" class="mainContainer">
      <div class="tabs">

--- a/_layouts/plugin.html
+++ b/_layouts/plugin.html
@@ -6,7 +6,7 @@ css: plugin
 <body class="page-template page-template-page-kernel page-template-page-kernel-php page nonTouch">
  <div id="wrapper" class="hfeed">

-    {% include headers.html header=2 %}
+    {% include headers.html header="features" %}

    <div id="container" class="mainContainer">
      <div class="tabs">

--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -5,7 +5,7 @@ layout: default
  <div id="wrapper" class="hfeed">
    
  <!-- TODO after new website is online: uncomment below
-	{% include headers.html header=4 title=Blog %}
+	{% include headers.html header="blog" title=Blog %}
 -->

    <div id="container" class="mainContainer">

--- a/assets/css/tiles.css
+++ b/assets/css/tiles.css
@@ -14,11 +14,13 @@
  color: inherit;
  position: relative;
  background-color: var(--tile-color);
-  padding: 40px 45px;
  box-sizing: border-box;
 }
+.tileWrapper[size="big"] .tile {
+  padding: 40px 40px 40px 45px;
+}
 .tileWrapper[size="small"] .tile {
-  padding: 30px 35px;
+  padding: 30px 30px 30px 35px;
 }
 .nonTouch .tile {
  transition: 0.35s ease-out;

--- a/html/careers.html
+++ b/html/careers.html
@@ -7,7 +7,7 @@ title: Careers at Frama-C
 <body class="page-template page-template-page-careers page-template-page-careers-php page page-id-146 nonTouch">
  <div id="wrapper" class="hfeed">

-	{% include headers.html header=5 %}
+	{% include headers.html header="careers" %}

    <div id="container" class="mainContainer">
      <div class="pageCareers pages">

--- a/html/contact.html
+++ b/html/contact.html
@@ -69,7 +69,7 @@ function(err, data) {
 <div id="wrapper" class="hfeed">


-	{% include headers.html header=5 %}
+	{% include headers.html header="contact" %}

 <div id="container" class="mainContainer">
  <div class="pageContact pages">

--- a/html/documentation.html
+++ b/html/documentation.html
@@ -9,7 +9,7 @@ title: Documentation - Frama-C

  <div id="wrapper" class="hfeed">

-    {% include headers.html header=3 %}
+    {% include headers.html header="documentation" %}

    <div id="container" class="mainContainer">
      <div class="pageDocumentation pages">

--- a/html/using-frama-c.html
+++ b/html/using-frama-c.html
@@ -7,7 +7,7 @@ css: plugin
 <body class="page-template page-template-page-usingFramac page-template-page-usingFramac-php page page-id-12 nonTouch">
  <div id="wrapper" class="hfeed">

-	{% include headers.html header=1 %}
+	{% include headers.html header="using" %}

    <div id="container" class="mainContainer">
      <div class="defaultPage usagePage" id="content" role="main">