monitoring-jekyll-theme 0.5.8 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abaee2f7aed3b7708c4f46602e50b280da8823ae2514d530e2bbebc22f1bd59b
-  data.tar.gz: 5b33e08e8470de9e69ff0318c5c2c4b642d1404a27fb410af1496122ba7bf1e2
+  metadata.gz: 8b8862eda219c200dff6618edb790d3d1f256d1ea3405be1322068705f7b6656
+  data.tar.gz: e2c99367f0d16e179831afad932fb7761cf2098529b1868d17512c7b90cc1de0
 SHA512:
-  metadata.gz: ffc502535d82567000526774d98720a4321aed9c64f84d040bc4692f63dcf6a9b1ffea8df09e153e18d772bbe28909dc561a3ec1781a8672209940806c2ca1bd
-  data.tar.gz: e3fa3dd351ce3a1aa13b9dde1d7bd50f2bcada0de28ec075703fc633c30f66a97786dcf69f8ca57c9d75272961493d7ec42810efc325ac8f693a003fbd565d37
+  metadata.gz: 73cd1e52db2f3257ccf97c504c4fe121b1cd5e323ea2694124de9d1d10e8581327d70cdfc8d19315a093a8ac4b340de1c28439e68ecb90a55fce17887b1607ed
+  data.tar.gz: 679c9e980870658d33988b612e259d6d2cbb9b005f614febffa0a9c2c72ca63b0526591ef815129e6a5aeb8aab03e70117a513b6c506762527e453c0a14776ea

data/README.md

@@ -16,6 +16,7 @@
 -   <https://www.npmjs.com/package/google>
 -   <https://raphaelfabeni.com/ui-interactions/>
 -   <https://www.ekopedia.fr/wiki/H%C3%A9bergement_Internet>
+- https://www.aditus.io/button-contrast-checker/
 
 ## Annuaires Immobilier
 
@@ -30,7 +31,7 @@
 
 _Regular expression in all files_
 
-find \_data/ -name '_.json' -exec sed -i 's/{"charset": "(.\*)"}//g' {} \\;
+find \_data/ -name '_.json' -exec sed -i 's/{}//g' {} \\;
 replace \\/ => / seocli
 
 ## Services

data/_includes/index/energy.html

@@ -1,54 +1,47 @@
-{% assign gpagespeed      = site.data.[website].gpagespeed[datelastcrawl] %}
-  {% assign yellowlabtools  = site.data.[website].yellowlabtools[datelastcrawl] %}
-  {% assign lighthouse      = site.data.[website].lighthouse[datelastcrawl] %}
-  {% assign moz             = site.data.[website].moz[datelastcrawl]%}
-  {% assign stylestats      = site.data.[website].stylestats[datelastcrawl] %}
-  {% assign observatory     = site.data.[website].observatory[datelastcrawl] %}
+{% assign indexes = "" | split: ',' %}
+{% assign indexesname = "Accessibilité,Bonnes pratiques,Performance,SEO,PWA,Speed Index" | split: ',' %}
+{% comment %}{% endcomment %}
+{% assign indexes = indexes | push: lighthouse.categories.accessibility.score | push: lighthouse.categories.best-practices.score | push: lighthouse.categories.performance.score | push: lighthouse.categories.seo.score | push: lighthouse.categories.pwa.score | push: lighthouse.audits.speed-index.score %}
 
-  {% assign indexes = "" | split: ',' %}
-  {% assign indexesname = "Accessibilité,Bonnes pratiques,Performance,SEO,PWA,Speed Index" | split: ',' %}
-  {% comment %}{% endcomment %}
-  {% assign indexes = indexes | push: lighthouse.categories.accessibility.score | push: lighthouse.categories.best-practices.score | push: lighthouse.categories.performance.score | push: lighthouse.categories.seo.score | push: lighthouse.categories.pwa.score | push: lighthouse.audits.speed-index.score %}
+{% comment %}Calcul du score moyen à partir des données httparchive{% endcomment %}
+{% assign domaverage = 600 | times: 3 %}{% assign httpaverage = 74 | times: 2 %}
+{% assign ecoaverage = domaverage | plus: httpaverage | plus: 2000000 | times: 5 | divided_by: 6 %}
 
-  {% comment %}Calcul du score moyen à partir des données httparchive{% endcomment %}
-  {% assign domaverage = 600 | times: 3 %}{% assign httpaverage = 74 | times: 2 %}
-  {% assign ecoaverage = domaverage | plus: httpaverage | plus: 2000000 | times: 5 | divided_by: 6 %}
+{% comment %}Calcul du score le meilleur à partir du site bertrandkeller.info {% endcomment %}
+{% assign dombest = 150 | times: 3 %}{% assign httpbest = 15 | times: 2 %}
+{% assign ecobest = dombest | plus: httpbest | plus: 130000 | times: 5 | divided_by: 6 %}
 
-  {% comment %}Calcul du score le meilleur à partir du site bertrandkeller.info {% endcomment %}
-  {% assign dombest = 150 | times: 3 %}{% assign httpbest = 15 | times: 2 %}
-  {% assign ecobest = dombest | plus: httpbest | plus: 130000 | times: 5 | divided_by: 6 %}
+{% comment %}Calcul du score pour le site le pire{% endcomment %}
+{% assign domworth = 3000 | times: 3 %}{% assign httpworth = 120 | times: 2 %}
+{% assign ecoworth = domworth | plus: httpworth | plus: 5000000 | times: 5 | divided_by: 6 %}
 
-  {% comment %}Calcul du score pour le site le pire{% endcomment %}
-  {% assign domworth = 3000 | times: 3 %}{% assign httpworth = 120 | times: 2 %}
-  {% assign ecoworth = domworth | plus: httpworth | plus: 5000000 | times: 5 | divided_by: 6 %}
+{% comment %}Calcul du score le meilleur{% endcomment %}
+{% assign ecobestscore = ecobest | times: 100 | divided_by: ecoworth %}
 
-  {% comment %}Calcul du score le meilleur{% endcomment %}
-  {% assign ecobestscore = ecobest | times: 100 | divided_by: ecoworth %}
+{% comment %}Calcul de la valeur du site audité{% endcomment %}
+{% assign dom = lighthouse.audits["dom-size"].details.items[0].value | replace: ",","" | times: 3 %}{% assign http = lighthouse.audits.diagnostics.details.items[0].numRequests | times: 2 %}
+{% assign eco = dom | plus: http | plus: lighthouse.audits.diagnostics.details.items[0].totalByteWeight | times: 5 | divided_by: 6 %}
 
-  {% comment %}Calcul de la valeur du site audité{% endcomment %}
-  {% assign dom = lighthouse.audits["dom-size"].details.items[0].value | replace: ",","" | times: 3 %}{% assign http = lighthouse.audits.diagnostics.details.items[0].numRequests | times: 2 %}
-  {% assign eco = dom | plus: http | plus: lighthouse.audits.diagnostics.details.items[0].totalByteWeight | times: 5 | divided_by: 6 %}
+{% assign ecodiviser = ecoworth | minus: ecobest %}
 
-  {% assign ecodiviser = ecoworth | minus: ecobest %}
-
-  {% if lighthouse %}
-  <div class="progress progress-bar flex">
-    <div><h4>Energie</h4></div>
-    <div>
-    <div class="progress-bar-element">
-      <div>
-      <!-- <div class="progress-bar-tooltip" style="transform: translate(50%,-50%);background: rgba(34,150,30,1);">Max</div> -->
-      <div class="progress-bar-tooltip" style="left: {{ ecoaverage | minus: ecobest | times: 100 | divided_by: ecodiviser }}%;">Moyenne grands sites</div>
-      <div class="progress-bar-tooltip" style="left: {{ eco | minus: ecobest  | times: 100 | divided_by: ecodiviser }}%;;z-index:2">{{ site.title }}</div>
-      <!-- <div class="progress-bar-tooltip" style="background: rgba(176,2,2,1);">Min</div> -->
-    </div>
+{% if lighthouse %}
+<div class="progress progress-bar flex">
+  <div><h4>Energie</h4></div>
+  <div>
+  <div class="progress-bar-element">
     <div>
-      <!-- <div class="progress-bar-score" style="transform: translate(50%,35%);color: rgba(34,150,30,1);">Good</div> -->
-      <div class="progress-bar-score" style="left: {{ ecoaverage | minus: ecobest  | times: 100 | divided_by: ecodiviser }}%;">{{ ecoaverage | minus: ecobest | times: 100 | divided_by: ecodiviser | minus: 100 | times: -1 }}</div>
-      <div class="progress-bar-score" style="left: {{ eco | minus: ecobest | times: 100 | divided_by: ecodiviser }}%;z-index:2">{{ eco | minus: ecobest | times: 100 | divided_by: ecodiviser | minus: 100 | times: -1 }}</div>
-      <!-- <div class="progress-bar-score" style="color: rgba(176,2,2,1);">Bad</div> -->
-    </div>
-    </div>
-    </div>
+    <!-- <div class="progress-bar-tooltip" style="transform: translate(50%,-50%);background: rgba(34,150,30,1);">Max</div> -->
+    <div class="progress-bar-tooltip" style="left: {{ ecoaverage | minus: ecobest | times: 100 | divided_by: ecodiviser }}%;">Moyenne grands sites</div>
+    <div class="progress-bar-tooltip" style="left: {{ eco | minus: ecobest  | times: 100 | divided_by: ecodiviser }}%;;z-index:2">{{ site.title }}</div>
+    <!-- <div class="progress-bar-tooltip" style="background: rgba(176,2,2,1);">Min</div> -->
+  </div>
+  <div>
+    <!-- <div class="progress-bar-score" style="transform: translate(50%,35%);color: rgba(34,150,30,1);">Good</div> -->
+    <div class="progress-bar-score" style="left: {{ ecoaverage | minus: ecobest  | times: 100 | divided_by: ecodiviser }}%;">{{ ecoaverage | minus: ecobest | times: 100 | divided_by: ecodiviser | minus: 100 | times: -1 }}</div>
+    <div class="progress-bar-score" style="left: {{ eco | minus: ecobest | times: 100 | divided_by: ecodiviser }}%;z-index:2">{{ eco | minus: ecobest | times: 100 | divided_by: ecodiviser | minus: 100 | times: -1 }}</div>
+    <!-- <div class="progress-bar-score" style="color: rgba(176,2,2,1);">Bad</div> -->
+  </div>
+  </div>
   </div>
-  {% endif %}
+</div>
+{% endif %}

data/_layouts/default.html

@@ -1,5 +1,5 @@
-<!DOCTYPE html lang="fr">
-<html>
+<!DOCTYPE html>
+<html lang="fr">
 
 <head>
   <meta charset="utf-8">
@@ -19,8 +19,7 @@
     {% endif %}{{ site.name }}</title>
   <meta name="subject" content="{{ site.subject }}">
   <meta name="generator" content="jekyll v{{ jekyll.version }}">
-  <meta itemprop="name"
-    content="{% if page.title %}{{ page.title }}{% endif %} | {% if page.description %}{{ page.description }} - {% endif %}{{ site.name }}">
+  <meta itemprop="name" content="{% if page.title %}{{ page.title }}{% endif %} | {% if page.description %}{{ page.description }} - {% endif %}{{ site.name }}">
   <meta itemprop="description" content="{{ site.subject }}">
   <meta name="robots" content="{{ site.robots }}">
 
@@ -64,7 +63,7 @@
   <script>
     if ("fonts" in document) {
       var Optiker = new FontFace("Optiker-K","url(/assets/fonts/Optiker-K.woff2) format('woff2')", {weight: "300"});
-      var IBMPlexMonoBold = new FontFace("IBMPlexMono","url(/assets/fonts/IBMPlexMono-Medium.woff2) format('woff2')", {weight: "300",unicode-range: U+0030-0039;});
+      var IBMPlexMonoBold = new FontFace("IBMPlexMono","url(/assets/fonts/IBMPlexMono-Medium.woff2) format('woff2')", {weight: "300",unicode-range: "U+0030-0039";});
       var PublicSansExtraLight = new FontFace("PublicSans","url(/assets/fonts/PublicSans-ExtraLight.woff2) format('woff2')", {weight: "100"});
       var PublicSansRegular = new FontFace("PublicSans","url(/assets/fonts/PublicSans-Regular.woff2) format('woff2')", {weight: "300"});
       Promise.all([PublicSansRegular.load(), PublicSansExtraLight.load(), IBMPlexMonoBold.load(), Optiker.load()]).then(function (fonts) {
@@ -85,24 +84,48 @@
   <div class="wrapper">
     {{ content }}
   </div>
-</body>
 <script src="/assets/js/van11y-accessible-tab-panel-aria.es6.js" defer></script>
 <script src="/assets/js/van11y-accessible-hide-show-aria.es6.js" defer></script>
+<script>
+  // Vanilla JavaScript Scroll to Anchor
+  // @ https://perishablepress.com/vanilla-javascript-scroll-anchor/
+
+  (function () {
+    scrollTo();
+  })();
+
+  function scrollTo() {
+    const links = document.querySelectorAll('.anchor');
+    links.forEach(each => (each.onclick = scrollAnchors));
+  }
+
+  function scrollAnchors(e, respond = null) {
+    const distanceToTop = el => Math.floor(el.getBoundingClientRect().top);
+    e.preventDefault();
+    var targetID = (respond) ? respond.getAttribute('href') : this.getAttribute('href');
+    const targetAnchor = document.querySelector(targetID);
+    if (!targetAnchor) return;
+    const originalTop = distanceToTop(targetAnchor);
+    window.scrollBy({
+      top: originalTop - 30,
+      left: 0,
+      behavior: 'smooth'
+    });
+    const checkIfDone = setInterval(function () {
+      const atBottom = window.innerHeight + window.pageYOffset >= document.body.offsetHeight - 2;
+      if (distanceToTop(targetAnchor) === 0 || atBottom) {
+        targetAnchor.tabIndex = '-1';
+        targetAnchor.focus();
+        window.history.pushState('', '', targetID);
+        clearInterval(checkIfDone);
+      }
+    }, 100);
+  }
+</script>
 
 {% if site.zone.livehouse == true %}
 <script src="/assets/js/lighthouse.js"></script>
-<script>
-  run();
-
-</script>
+<script>run();</script>
 {% endif %}
-<script>
-  // var link = document.querySelector(".js-expandmore")
-  // link.addEventListener("click", function(){
-  //   history.pushState("", document.title, window.location.pathname);
-  //   window.location.href.substr(0, window.location.href.indexOf('#'))
-  // });
-
-</script>
-
+</body>
 </html>

data/assets/css/styles.css

@@ -886,6 +886,7 @@ a {
   margin: 0;
   padding: 1rem 1.5rem;
   background: #fff;
+  overflow: hidden;
 }
 
 @media screen and (min-width: 1024px) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: monitoring-jekyll-theme
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors:
 - bertrandkeller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-25 00:00:00.000000000 Z
+date: 2019-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll