Merge branch 'add-banner' into 'develop'

Add GDPR banner See merge request !32

Merge branch 'add-banner' into 'develop'
Add GDPR banner See merge request !32
c483fde5 · Jacek Lebioda · a9400520 · 028394ec · c483fde5 · c483fde5
Commit c483fde5 authored Jul 20, 2020 by Jacek Lebioda
85 changed files
--- a/_config.yml
+++ b/_config.yml
 title: ELIXIR.LU jekyll template
 email: jacek.lebioda@uni.lu
-description: >- 
-  This gem contains a jekyll theme for the Luxembourgish ELIXIR Node's website 
+description: >-
+  This gem contains a jekyll theme for the Luxembourgish ELIXIR Node's website
 footer-text: >-
  This is a text in the footer
 baseurl: ""
-url: "" 
+url: ""

 # Build settings
-markdown: kramdown
\ No newline at end of file
+markdown: kramdown
+
+# GDPR banner settings
+banner_title: >-
+  This website needs some cookies and similar means to function.
+banner_text: >-
+  If you permit us, we will use those means to collect data on your visits for aggregated statistics to improve our service.
+banner_accept_text: >-
+  Accept cookies for aggregated statistics
+banner_refuse_text: >-
+  No thanks, only technically necessary cookies
+doNotTrack_text: >-
+  Do Not Track is enabled
+banner_more_text: >-
+  More information
+cookies_expire: 180 # days
+analyticsurl: https://analytics.lcsb.uni.lu/hub/
+lapurl: https://analytics.lcsb.uni.lu/lap/
+siteID: 4 # you get this siteID by sending an email to lcsb-r3@uni.lu
+cookieName: lap
+accept_all_text: >-
+  Aggregate statistics cookies accepted
+only_necessary_text: >-
+  Only necessary cookies accepted
+path_policy: privacy-policy
+logo_policy: /assets/ELIXIR_LU.svg
+timeout_hidebanner: 500 # milliseconds
+cookieDomain: '*' # track visitors across all subdomains of a given domain; set to * to ignore
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -34,10 +34,15 @@
        </div>
        <div>
            <h3>
-              <a href="{{ '/privacy/' | relative_url }}">Privacy</a>
+                <a href="{{ '/privacy/' | relative_url }}">Privacy</a>
            </h3>
+
            <ul>
+                <li><a href="{{ '/privacy/policy' | relative_url }}">Privacy policy</a></li>
                <li><a href="{{ '/privacy/cookies' | relative_url }}">Cookies</a></li>
+                {% if site.siteID > 0 %}
+                {%- include policy.html -%}
+                {% endif %}
                <li><a href="{{ '/privacy/terms_of_use' | relative_url }}">Terms of use</a></li>
            </ul>
        </div>
@@ -62,3 +67,7 @@
        </div>
    </div>
 </footer>
+
+{% if site.siteID > 0 %}
+{%- include gdpr-banner.html -%}
+{% endif %}
\ No newline at end of file
--- a/_includes/gdpr-banner.html
+++ b/_includes/gdpr-banner.html
+<div id="lap-cookies-banner">
+    <div class="banner-intro">
+        <div class="close-button">
+            <a class="lap-refuse"><i class="fa fa-times" aria-hidden="true"></i></a>
+        </div>
+        <div class="banner-img">
+            <img src="{{ site.logo_policy }}" type="image/svg+xml" />
+        </div>
+        <div class="banner-title">{{ site.banner_title }}</div>
+        <div class="banner-text">{{ site.banner_text }}</div>
+    </div>
+
+    <div class="banner-buttons">
+        <a class="btn lap-accept">{{ site.banner_accept_text }}</a>
+        <a class="btn lap-refuse">{{ site.banner_refuse_text }}</a>
+        <a class="btn lap-cookies-more" href="{{ site.path_policy | relative_url }}">{{ site.banner_more_text }}</a>
+    </div>
+</div>
\ No newline at end of file
--- a/_includes/policy.html
+++ b/_includes/policy.html
+<li>- <span id="doNotTrack-text"><span id="gdpr-result-text"></span> - <a href="javascript: showBanner();">change</a></span></li>
\ No newline at end of file
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -5,6 +5,26 @@
        <meta http-equiv="X-UA-Compatible" content="IE=edge">
        <meta name="viewport" content="width=device-width, initial-scale=1">

+        {% if site.siteID > 0 %}
+        <script>
+            const settings = {
+                expires: "{{ site.cookies_expire }}",
+                matomoURL: "{{ site.analyticsurl }}",
+                siteID: "{{ site.siteID }}",
+                accept_all_text: "{{ site.accept_all_text }}",
+                only_necessary_text: "{{ site.only_necessary_text }}",
+                doNotTrack_text: "{{ site.doNotTrack_text }}",
+                cookieName: "{{ site.cookieName }}",
+                bots: /bot|crawler|spider|crawling/i,
+                timeout_hidebanner: "{{ site.timeout_hidebanner }}",
+                cookieDomain: "{{ site.cookieDomain }}",
+            }
+        </script>
+        <script src="{{ site.lapurl }}/static/js/jquery.min.js"></script>
+        <script src="{{ site.lapurl }}/static/js/lap.js"></script>
+        <link rel="stylesheet" href="{{ '/assets/fontawesome/css/fontawesome-all.min.css' | relative_url }}">
+        {%- endif -%}
+
        <link rel="stylesheet" href="{{ "/assets/main.css" | relative_url }}">
        <link rel="shortcut icon" href="{{ "/assets/favicon.png" | relative_url }}" />
        <link type="text/css" rel="stylesheet" href="{{ "/assets/lato.css" | relative_url }}" media="all">

--- a/_sass/elixir.scss
+++ b/_sass/elixir.scss
@@ -7,5 +7,6 @@
    "elixir/header",
    "elixir/helpers",
    "elixir/layout",
-    "elixir/responsive"
+    "elixir/responsive",
+    "elixir/lap"
 ;
--- a/_sass/elixir/_footer.scss
+++ b/_sass/elixir/_footer.scss
@@ -40,6 +40,7 @@
          width: auto;
          float: none;
          min-width: 0;
+          color: #ebebeb;

          @media only screen and (max-width: $FOOTER_RESPONSIVENESS_THRESHOLD) {
              padding-bottom: 9px;

--- a/_sass/elixir/_lap.scss
+++ b/_sass/elixir/_lap.scss
+#lap-cookies-banner {
+    position: fixed;
+    bottom: 0;
+    background-color: #fff;
+    padding-top: 1em;
+    padding-bottom: 1em;
+    z-index: 1000;
+    left: 0;
+    text-align: center;
+    border-top: 1px solid #023452;
+    width: 100%;
+    display: none;
+
+    /* hidden by default */
+}
+
+#lap-cookies-banner .banner-intro {
+    width: 40%;
+    position: relative;
+    left: 30%;
+    text-align: left;
+}
+
+#lap-cookies-banner .banner-img {
+    width: 90px;
+    padding-top: 0;
+    height: 90px;
+    position: absolute;
+    padding-left: 10px;
+}
+
+#lap-cookies-banner .banner-title {
+    padding-left: 110px;
+}
+
+#lap-cookies-banner .banner-text {
+    padding-left: 110px;
+    padding-bottom: 1em;
+}
+
+#lap-cookies-banner .banner-buttons {
+    padding-top: 5px;
+    height: 20px;
+    margin-bottom: 10px;
+}
+
+#lap-cookies-banner .close-button {
+    position: absolute;
+    left: 100%;
+}
+
+#lap-cookies-banner .banner-buttons .lap-accept,
+#lap-cookies-banner .banner-buttons .lap-refuse,
+#lap-cookies-banner .banner-buttons .lap-cookies-more,
+#lap-cookies-banner .banner-buttons .btn.active {
+    border: 1px solid #023452;
+    font-weight: bold;
+    background-color: #023452;
+    color: #ffffff !important;
+    box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+}
+
+#lap-cookies-banner .banner-buttons .lap-accept:hover,
+#lap-cookies-banner .banner-buttons .lap-refuse:hover,
+#lap-cookies-banner .banner-buttons .lap-cookies-more:hover,
+#lap-cookies-banner .banner-buttons .btn.selected {
+    background: white;
+    color: #023452 !important;
+    border: 1px solid #023452;
+    box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    text-decoration: none;
+}
+
+#lap-cookies-banner .btn {
+    text-decoration: none;
+    display: inline-block;
+    margin-bottom: 0;
+    text-align: center;
+    vertical-align: middle;
+    touch-action: manipulation;
+    background-image: none;
+    white-space: nowrap;
+    padding: 3px 10px;
+    font-size: 9pt;
+    line-height: 20px;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+    margin-right: 10px;
+    margin-bottom: 10px;
+    cursor: pointer;
+}
+
+#lap-cookies-banner .banner-checkboxes {
+    font-size: 80%;
+    margin-top: 1em;
+}
+
+#lap-cookies-banner .checkbox-label {
+    margin-left: 0.3em;
+    margin-right: 1.5em;
+    top: -0.2em;
+    position: relative;
+}
+
+@media(max-width: 500px) {
+    #lap-cookies-banner {
+        position: fixed;
+        bottom: 0;
+        background-color: #fff;
+        padding-top: 1em;
+        padding-bottom: 1em;
+        z-index: 1000;
+        left: 0;
+        text-align: center;
+        border-top: 1px solid #023452;
+        width: 100%;
+        display: none;
+        height: 280px;
+        overflow: auto;
+        /* hidden by default */
+    }
+
+    #lap-cookies-banner .banner-intro {
+        width: 60%;
+        position: relative;
+        left: 20%;
+        text-align: left;
+    }
+}
+
+@media(max-width: 1100px) {
+    #lap-cookies-banner .banner-intro {
+        width: 90%;
+        position: relative;
+        left: 5%;
+        text-align: left;
+    }
+    #lap-cookies-banner .banner-buttons {
+        padding-top: 5px;
+        height: 60px;
+        margin-bottom: 10px;
+    }
+}
+
+@media(max-width: 1600px) {
+    #lap-cookies-banner .banner-intro {
+        width: 60%;
+        position: relative;
+        left: 20%;
+        text-align: left;
+    }
+}
+
+/* ultra-wide screen */
+@media(min-width: 2400px) {
+    #lap-cookies-banner .banner-intro {
+        position: relative;
+        text-align: left;
+        max-width: 800px;
+        left: 35%;
+    }
+}
--- a/assets/Elixir_LU.svg
+++ b/assets/Elixir_LU.svg
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1138.8099 631.61"><defs><style>.cls-1{fill:#ee7601;}.cls-2{fill:#544f4c;}</style></defs><title>ELIXIR_LU_Logo_white_background_Vector</title><g id="Layer_2" data-name="Layer 2"><path class="cls-1" d="M756.3626,26.28421a43.02771,43.02771,0,0,0-37.8041,63.5519c-4.2822,2.1328-14.2523,7.1354-28.2202,14.3891a31.99685,31.99685,0,1,0-56.368,30.1869c-7.1823,3.9629-14.6385,8.12269-22.2852,12.44769a25.14022,25.14022,0,0,0-43.425,25.20471q-11.8722,7.083-23.8708,14.4869a18.33617,18.33617,0,0,0-29.5967,18.7331c-32.1669,20.8967-62.9359,42.7956-87.8559,64.0709-29.0602-64.9833-71.9138-136.3157-131.5574-194.3928q-.0846-.08445-.1693-.1689c-6.9784-6.87691-12.7604-3.8437-4.7382,4.722.0995.1074.2039.22.3061.3299,50.6233,54.4698,90.3888,133.3029,117.49,205.1841C305.4593,372.82,192.1251,542.9244,316.3444,596.3759c18.0863,7.7835,26.3286-7.0966,18.5451-11.6766-1.3979-.8237-56.7221-30.7289-21.5528-122.604h88.5242a8.58575,8.58575,0,0,0,0-17.1715h-81.186a346.88274,346.88274,0,0,1,17.52-32.5103h63.6632a8.5857,8.5857,0,0,0,0-17.1714h-52.719c6.5707-9.8334,13.9465-20.1255,22.2344-30.9086h30.4846a8.58575,8.58575,0,0,0,0-17.1715H384.998c9.616-11.7491,20.2274-24.0213,31.971-36.8622.1019-.1113.2038-.2226.3033-.3341,23.3449,67.6032,34.6165,125.2482,32.1455,144.4777-1.3443,10.4639-8.0975,14.837-10.8128,16.1249-4.3492,2.0606-6.1306,8.0626.6868,10.0721,21.7514,6.4125,35.1399-15.1806,37.5492-32.5103,2.4281-17.4772-9.4658-81.4624-40.8733-157.74779,26.2427-26.1072,56.5262-51.0462,87.3971-73.90151a18.36049,18.36049,0,0,0,27.182-19.51529q12.30705-8.57806,24.4532-16.6466a25.10211,25.10211,0,0,0,40.0524-25.7144c8.0571-5.0011,15.8754-9.761,23.388-14.2616a31.99,31.99,0,0,0,53.8645-31.0695c13.6701-7.6118,23.6402-12.9902,28.5073-15.767a43.01247,43.01247,0,1,0,35.5504-67.2222Z"/><path class="cls-2" d="M266.9577,370.5663c1.5937-3.4826,2.9381-7.2282,4.5533-11.7895a115.55214,115.55214,0,0,0,4.5475-15.803l16.3505-70.72619c1.3361-7.2362,2.3933-12.5915,2.6832-15.8005a41.411,41.411,0,0,0,.5258-8.5722v-3.217h36.9694L310.3478,342.9738c-1.6097,6.9706-2.6669,12.3206-3.2115,16.0714a56.59585,56.59585,0,0,0-.8077,11.5211Z"/><path class="cls-2" d="M174.747,370.5663H65.1773c-10.9845,0-18.4729-2.4095-22.508-7.5019-2.1276-2.9405-3.209-6.9545-3.209-12.0521a57.04477,57.04477,0,0,1,1.8729-13.6729l13.6701-59.46529c2.9379-12.0536,7.22-20.6261,13.1198-25.7251,6.1551-5.0816,14.4696-7.4911,25.7223-7.4911H174.747c11.5184,0,19.0175,2.4095,22.763,7.4911,2.4093,2.9541,3.4986,6.9799,3.4986,12.33379a51.75055,51.75055,0,0,1-1.8833,13.39131l-8.8435,39.391H80.1756l-5.8974,25.7087a35.1434,35.1434,0,0,0-.7943,6.1656c0,1.3363,0,2.4095.5421,2.9353.7888,1.6152,3.2035,2.4202,6.965,2.4202h80.3516a97.46351,97.46351,0,0,0,20.9063-2.1304Zm-8.5722-98.31869a21.39412,21.39412,0,0,0,1.0731-6.4271,8.12845,8.12845,0,0,0-.5338-2.68171c-1.0839-1.60179-3.7483-2.40129-7.5019-2.40129H102.4097c-3.7373,0-6.4257.7995-8.0357,2.40129-1.8727,1.61661-3.2035,4.56231-3.7456,9.10881l-6.6993,28.9258H159.47Z"/><path class="cls-2" d="M202.0579,370.5663c1.7009-3.8959,3.123-8.103,4.8321-13.2113a133.34623,133.34623,0,0,0,4.8267-17.7297l28.1425-130.33509c1.7009-8.11341,2.8359-14.1223,3.4019-17.7201.2898-3.3095.5742-7.8104.5742-13.2195h39.2154L248.096,339.6253q-2.54355,11.71965-3.4129,18.03a67.663,67.663,0,0,0-.8478,12.911Z"/><path class="cls-2" d="M480.7126,370.5663c1.5938-3.4826,2.9327-7.2282,4.5396-11.7895a112.50816,112.50816,0,0,0,4.5533-15.803l16.353-70.72619c1.3361-7.2362,2.4013-12.5915,2.6642-15.8005a39.99287,39.99287,0,0,0,.5448-8.5722v-3.217H546.329L524.1028,342.9738q-2.4108,10.4559-3.209,16.0714a56.42464,56.42464,0,0,0-.8102,11.5211Z"/><path class="cls-2" d="M654.0557,265.82051c-4.0275-.2725-8.0384-.5368-12.5915-.5368H623.512c-3.464,0-6.4153.7998-8.025,2.1372-2.1438,1.6166-3.4881,4.2887-4.553,8.308L595.92749,342.9738c-2.67489,10.4477-3.74529,18.4861-3.74529,24.6464v2.9461H553.0687c1.5993-4.0192,3.209-7.781,4.2794-11.5211,1.0734-3.4771,2.4174-8.8431,4.2904-16.0714l16.0658-70.72619c1.8782-6.9639,2.6859-12.3192,3.4961-16.3371a79.081,79.081,0,0,0,.5366-11.2526h32.9423l-1.3361,12.853a22.85509,22.85509,0,0,1,8.3041-9.636c3.4799-2.1449,8.0357-3.217,14.1905-3.217h32.1589l7.7565,13.9182a30.30734,30.30734,0,0,0-4.553,5.0992c-1.8674,2.4082-3.2035,3.4813-4.0112,3.4813C662.3702,266.628,658.0642,266.08351,654.0557,265.82051Z"/><path class="cls-2" d="M338.7881,200.624a18.1347,18.1347,0,1,1-18.1295-18.1388A18.13082,18.13082,0,0,1,338.7881,200.624Z"/><path class="cls-2" d="M421.2767,585.59082l-2,8.2002H366.37679l16-64H401.1766l-14,55.7998Z"/><path class="cls-2" d="M503.9764,529.791,490.67611,582.8916a14.05108,14.05108,0,0,1-5.19971,7.64942,13.78481,13.78481,0,0,1-8.70019,3.25H436.9764a8.68978,8.68978,0,0,1-6.35009-2.39942,8.05307,8.05307,0,0,1-2.4502-6,11.102,11.102,0,0,1,.30029-2.5L441.77621,529.791H460.576l-13.2998,53.10058a4.58871,4.58871,0,0,0-.1001.89942q0,1.80029,2.3999,1.7998h28.8003a3.40554,3.40554,0,0,0,3.6997-2.69922l13.3003-53.10058Z"/><path class="cls-2" d="M576.17562,529.791l-29.30029,27.20019,15.5,36.79981h-22.2998l-9-22.2002L507.17562,593.791H496.37533l31.80029-29.5-14.40039-34.5h22.2002l8.20019,19.90039L565.27523,529.791Z"/><path class="cls-2" d="M638.87484,529.791l-2.1001,8.20019H602.67513l-4.80029,19.40039h31l-2.1001,8.19922h-31l-5,20h34.1001l-2,8.2002h-52.8999l16-64Z"/><path class="cls-2" d="M730.77474,529.791l-16,64H696.575l13.6997-54.79981h-.19921L674.47445,593.791h-13l-7.7998-54.79981h-.2002L639.77474,593.791h-8.60009l16-64h24l6.70019,46.5,30.20069-46.5Z"/><path class="cls-2" d="M798.97494,541.791l-2.5,9.90039q-1.30078,5.20018-4.75,7.0498-3.44971,1.85157-11.75,2.25l-.10059.29981q6.79981.30029,9.40039,1.5a4.6343,4.6343,0,0,1,3,4.60058,13.24093,13.24093,0,0,1-.5,3.29981l-2.90039,11.2998a15.91045,15.91045,0,0,1-5.09961,8.40039,15.69371,15.69371,0,0,1-10.20019,3.39942H723.77474l16-64h49.79981q9.90087,0,9.90039,8.2998A15.335,15.335,0,0,1,798.97494,541.791Zm-25.2002,28a8.52474,8.52474,0,0,0,.29981-2q0-2.19873-2.59961-2.2002H749.57455l-5,20h21.90039q3.39843,0,4.39941-4.09961Zm6.90039-27.59961a8.57687,8.57687,0,0,0,.29981-2q0-2.19873-2.60059-2.2002H756.47494l-4.79981,19.40039h21.89942q3.30028,0,4.2998-4.10058Z"/><path class="cls-2" d="M871.17416,542.3916l-9.7002,38.79981q-3.10107,12.59911-15.70019,12.59961h-38.2002q-10.10155,0-10.09961-8.29981a17.11792,17.11792,0,0,1,.59961-4.2998l9.7002-38.79981q3.09814-12.60059,15.7998-12.60058h38.2002q9.999,0,10,8.20019A18.28935,18.28935,0,0,1,871.17416,542.3916Zm-18.5-1a4.77108,4.77108,0,0,0,.20019-1.30078q0-2.09911-2.80078-2.09961h-19a4.03389,4.03389,0,0,0-4.19922,3.40039l-10.20019,40.79981a5.81028,5.81028,0,0,0-.2002,1.39941q0,2.00244,2.7002,2h19a4.0035,4.0035,0,0,0,4.2998-3.39941Z"/><path class="cls-2" d="M945.57357,529.791l-13.2998,53.10058a14.05213,14.05213,0,0,1-5.2002,7.64942,13.78481,13.78481,0,0,1-8.70019,3.25H878.57357a8.69016,8.69016,0,0,1-6.35058-2.39942,8.05409,8.05409,0,0,1-2.44922-6,11.10048,11.10048,0,0,1,.2998-2.5L883.37338,529.791h18.7998l-13.2998,53.10058a4.5843,4.5843,0,0,0-.09961.89942q0,1.80029,2.39941,1.7998H919.973a3.40607,3.40607,0,0,0,3.70019-2.69922L936.973,529.791Z"/><path class="cls-2" d="M1013.77279,541.69141l-3.4004,13.59961q-2.30126,9.30029-12.5,10.60058l4.1006,27.89942h-19.6006l-4-28.2002h-14l-7,28.2002H938.5726l16-64h49.79979q9.9009,0,9.9004,8.20019A15.335,15.335,0,0,1,1013.77279,541.69141Zm-18.2998.39941a7.176,7.176,0,0,0,.2998-1.7998q0-2.29835-2.7998-2.29981h-21.7002L966.473,557.3916H988.1722q3.39845,0,4.5-4.30078Z"/><path class="cls-2" d="M1087.1722,529.791l-2.10058,8.20019h-39.2002a4.03389,4.03389,0,0,0-4.19922,3.40039L1031.472,582.19141a5.81028,5.81028,0,0,0-.2002,1.39941q0,2.00244,2.7002,2h20.2998a3.11762,3.11762,0,0,0,3.40039-2.59961L1062.472,563.791h-21.2002l2-8.2002h39.40039l-9.5,38.2002H1056.472l1.39941-5.59961h-.19922q-2.20165,5.60156-8.90039,5.59961h-26.40039q-10.10155,0-10.09961-8.29981a17.11792,17.11792,0,0,1,.59961-4.2998l9.7002-38.79981q3.09815-12.60059,15.7998-12.60058Z"/></g></svg>
\ No newline at end of file
--- a/assets/buttons/data_catalog.jpg
+++ b/assets/buttons/data_catalog.jpg
--- a/assets/buttons/data_catalog_small.jpg
+++ b/assets/buttons/data_catalog_small.jpg
--- a/assets/buttons/gdpr.jpg
+++ b/assets/buttons/gdpr.jpg
--- a/assets/buttons/gdpr_small.jpg
+++ b/assets/buttons/gdpr_small.jpg
--- a/assets/buttons/index_events.jpg
+++ b/assets/buttons/index_events.jpg
--- a/assets/buttons/index_flyer.jpg
+++ b/assets/buttons/index_flyer.jpg
--- a/assets/buttons/index_jobs.jpg
+++ b/assets/buttons/index_jobs.jpg
--- a/assets/buttons/tools_registry.jpg
+++ b/assets/buttons/tools_registry.jpg
--- a/assets/buttons/tools_registry_small.jpg
+++ b/assets/buttons/tools_registry_small.jpg
--- a/assets/fontawesome/css/all.css
+++ b/assets/fontawesome/css/all.css
--- a/assets/fontawesome/css/all.min.css
+++ b/assets/fontawesome/css/all.min.css
--- a/assets/fontawesome/css/brands.css
+++ b/assets/fontawesome/css/brands.css
+/*!
+ * Font Awesome Free 5.8.1 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ */
+@font-face {
+  font-family: 'Font Awesome 5 Brands';
+  font-style: normal;
+  font-weight: normal;
+  font-display: auto;
+  src: url("../webfonts/fa-brands-400.eot");
+  src: url("../webfonts/fa-brands-400.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-brands-400.woff2") format("woff2"), url("../webfonts/fa-brands-400.woff") format("woff"), url("../webfonts/fa-brands-400.ttf") format("truetype"), url("../webfonts/fa-brands-400.svg#fontawesome") format("svg"); }
+
+.fab {
+  font-family: 'Font Awesome 5 Brands'; }
--- a/assets/fontawesome/css/brands.min.css
+++ b/assets/fontawesome/css/brands.min.css
+/*!
+ * Font Awesome Free 5.8.1 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ */
+@font-face{font-family:"Font Awesome 5 Brands";font-style:normal;font-weight:normal;font-display:auto;src:url(../webfonts/fa-brands-400.eot);src:url(../webfonts/fa-brands-400.eot?#iefix) format("embedded-opentype"),url(../webfonts/fa-brands-400.woff2) format("woff2"),url(../webfonts/fa-brands-400.woff) format("woff"),url(../webfonts/fa-brands-400.ttf) format("truetype"),url(../webfonts/fa-brands-400.svg#fontawesome) format("svg")}.fab{font-family:"Font Awesome 5 Brands"}
\ No newline at end of file
--- a/assets/fontawesome/css/fontawesome-all.css
+++ b/assets/fontawesome/css/fontawesome-all.css
--- a/assets/fontawesome/css/fontawesome-all.min.css
+++ b/assets/fontawesome/css/fontawesome-all.min.css
--- a/assets/fontawesome/css/fontawesome.css
+++ b/assets/fontawesome/css/fontawesome.css
--- a/assets/fontawesome/css/fontawesome.min.css
+++ b/assets/fontawesome/css/fontawesome.min.css
--- a/assets/fontawesome/css/regular.css
+++ b/assets/fontawesome/css/regular.css
+/*!
+ * Font Awesome Free 5.8.1 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ */
+@font-face {
+  font-family: 'Font Awesome 5 Free';
+  font-style: normal;
+  font-weight: 400;
+  font-display: auto;
+  src: url("../webfonts/fa-regular-400.eot");
+  src: url("../webfonts/fa-regular-400.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-regular-400.woff2") format("woff2"), url("../webfonts/fa-regular-400.woff") format("woff"), url("../webfonts/fa-regular-400.ttf") format("truetype"), url("../webfonts/fa-regular-400.svg#fontawesome") format("svg"); }
+
+.far {
+  font-family: 'Font Awesome 5 Free';
+  font-weight: 400; }
--- a/assets/fontawesome/css/regular.min.css
+++ b/assets/fontawesome/css/regular.min.css
+/*!
+ * Font Awesome Free 5.8.1 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ */
+@font-face{font-family:"Font Awesome 5 Free";font-style:normal;font-weight:400;font-display:auto;src:url(../webfonts/fa-regular-400.eot);src:url(../webfonts/fa-regular-400.eot?#iefix) format("embedded-opentype"),url(../webfonts/fa-regular-400.woff2) format("woff2"),url(../webfonts/fa-regular-400.woff) format("woff"),url(../webfonts/fa-regular-400.ttf) format("truetype"),url(../webfonts/fa-regular-400.svg#fontawesome) format("svg")}.far{font-family:"Font Awesome 5 Free";font-weight:400}
\ No newline at end of file
--- a/assets/fontawesome/css/solid.css
+++ b/assets/fontawesome/css/solid.css
+/*!
+ * Font Awesome Free 5.8.1 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ */
+@font-face {
+  font-family: 'Font Awesome 5 Free';
+  font-style: normal;
+  font-weight: 900;
+  font-display: auto;
+  src: url("../webfonts/fa-solid-900.eot");
+  src: url("../webfonts/fa-solid-900.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-solid-900.woff2") format("woff2"), url("../webfonts/fa-solid-900.woff") format("woff"), url("../webfonts/fa-solid-900.ttf") format("truetype"), url("../webfonts/fa-solid-900.svg#fontawesome") format("svg"); }
+
+.fa,
+.fas {
+  font-family: 'Font Awesome 5 Free';
+  font-weight: 900; }
--- a/assets/fontawesome/css/solid.min.css
+++ b/assets/fontawesome/css/solid.min.css
+/*!
+ * Font Awesome Free 5.8.1 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ */
+@font-face{font-family:"Font Awesome 5 Free";font-style:normal;font-weight:900;font-display:auto;src:url(../webfonts/fa-solid-900.eot);src:url(../webfonts/fa-solid-900.eot?#iefix) format("embedded-opentype"),url(../webfonts/fa-solid-900.woff2) format("woff2"),url(../webfonts/fa-solid-900.woff) format("woff"),url(../webfonts/fa-solid-900.ttf) format("truetype"),url(../webfonts/fa-solid-900.svg#fontawesome) format("svg")}.fa,.fas{font-family:"Font Awesome 5 Free";font-weight:900}
\ No newline at end of file
--- a/assets/fontawesome/css/svg-with-js.css
+++ b/assets/fontawesome/css/svg-with-js.css
--- a/assets/fontawesome/css/svg-with-js.min.css
+++ b/assets/fontawesome/css/svg-with-js.min.css
+/*!
+ * Font Awesome Free 5.8.1 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ */
+.svg-inline--fa,svg:not(:root).svg-inline--fa{overflow:visible}.svg-inline--fa{display:inline-block;font-size:inherit;height:1em;vertical-align:-.125em}.svg-inline--fa.fa-lg{vertical-align:-.225em}.svg-inline--fa.fa-w-1{width:.0625em}.svg-inline--fa.fa-w-2{width:.125em}.svg-inline--fa.fa-w-3{width:.1875em}.svg-inline--fa.fa-w-4{width:.25em}.svg-inline--fa.fa-w-5{width:.3125em}.svg-inline--fa.fa-w-6{width:.375em}.svg-inline--fa.fa-w-7{width:.4375em}.svg-inline--fa.fa-w-8{width:.5em}.svg-inline--fa.fa-w-9{width:.5625em}.svg-inline--fa.fa-w-10{width:.625em}.svg-inline--fa.fa-w-11{width:.6875em}.svg-inline--fa.fa-w-12{width:.75em}.svg-inline--fa.fa-w-13{width:.8125em}.svg-inline--fa.fa-w-14{width:.875em}.svg-inline--fa.fa-w-15{width:.9375em}.svg-inline--fa.fa-w-16{width:1em}.svg-inline--fa.fa-w-17{width:1.0625em}.svg-inline--fa.fa-w-18{width:1.125em}.svg-inline--fa.fa-w-19{width:1.1875em}.svg-inline--fa.fa-w-20{width:1.25em}.svg-inline--fa.fa-pull-left{margin-right:.3em;width:auto}.svg-inline--fa.fa-pull-right{margin-left:.3em;width:auto}.svg-inline--fa.fa-border{height:1.5em}.svg-inline--fa.fa-li{width:2em}.svg-inline--fa.fa-fw{width:1.25em}.fa-layers svg.svg-inline--fa{bottom:0;left:0;margin:auto;position:absolute;right:0;top:0}.fa-layers{display:inline-block;height:1em;position:relative;text-align:center;vertical-align:-.125em;width:1em}.fa-layers svg.svg-inline--fa{transform-origin:center center}.fa-layers-counter,.fa-layers-text{display:inline-block;position:absolute;text-align:center}.fa-layers-text{left:50%;top:50%;transform:translate(-50%,-50%);transform-origin:center center}.fa-layers-counter{background-color:#ff253a;border-radius:1em;box-sizing:border-box;color:#fff;height:1.5em;line-height:1;max-width:5em;min-width:1.5em;overflow:hidden;padding:.25em;right:0;text-overflow:ellipsis;top:0;transform:scale(.25);transform-origin:top right}.fa-layers-bottom-right{bottom:0;right:0;top:auto;transform:scale(.25);transform-origin:bottom right}.fa-layers-bottom-left{bottom:0;left:0;right:auto;top:auto;transform:scale(.25);transform-origin:bottom left}.fa-layers-top-right{right:0;top:0;transform:scale(.25);transform-origin:top right}.fa-layers-top-left{left:0;right:auto;top:0;transform:scale(.25);transform-origin:top left}.fa-lg{font-size:1.33333em;line-height:.75em;vertical-align:-.0667em}.fa-xs{font-size:.75em}.fa-sm{font-size:.875em}.fa-1x{font-size:1em}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-6x{font-size:6em}.fa-7x{font-size:7em}.fa-8x{font-size:8em}.fa-9x{font-size:9em}.fa-10x{font-size:10em}.fa-fw{text-align:center;width:1.25em}.fa-ul{list-style-type:none;margin-left:2.5em;padding-left:0}.fa-ul>li{position:relative}.fa-li{left:-2em;position:absolute;text-align:center;width:2em;line-height:inherit}.fa-border{border:.08em solid #eee;border-radius:.1em;padding:.2em .25em .15em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left,.fab.fa-pull-left,.fal.fa-pull-left,.far.fa-pull-left,.fas.fa-pull-left{margin-right:.3em}.fa.fa-pull-right,.fab.fa-pull-right,.fal.fa-pull-right,.far.fa-pull-right,.fas.fa-pull-right{margin-left:.3em}.fa-spin{animation:fa-spin 2s infinite linear}.fa-pulse{animation:fa-spin 1s infinite steps(8)}@keyframes fa-spin{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";transform:scaleX(-1)}.fa-flip-vertical{transform:scaleY(-1)}.fa-flip-both,.fa-flip-horizontal.fa-flip-vertical,.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)"}.fa-flip-both,.fa-flip-horizontal.fa-flip-vertical{transform:scale(-1)}:root .fa-flip-both,:root .fa-flip-horizontal,:root .fa-flip-vertical,:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270{filter:none}.fa-stack{display:inline-block;height:2em;position:relative;width:2.5em}.fa-stack-1x,.fa-stack-2x{bottom:0;left:0;margin:auto;position:absolute;right:0;top:0}.svg-inline--fa.fa-stack-1x{height:1em;width:1.25em}.svg-inline--fa.fa-stack-2x{height:2em;width:2.5em}.fa-inverse{color:#fff}.sr-only{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.sr-only-focusable:active,.sr-only-focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}
\ No newline at end of file
--- a/assets/fontawesome/css/v4-shims.css
+++ b/assets/fontawesome/css/v4-shims.css
--- a/assets/fontawesome/css/v4-shims.min.css
+++ b/assets/fontawesome/css/v4-shims.min.css
--- a/assets/fontawesome/less/_animated.less
+++ b/assets/fontawesome/less/_animated.less
+// Animated Icons
+// --------------------------
+
+.@{fa-css-prefix}-spin {
+  animation: fa-spin 2s infinite linear;
+}
+
+.@{fa-css-prefix}-pulse {
+  animation: fa-spin 1s infinite steps(8);
+}
+
+@keyframes fa-spin {
+  0% {
+    transform: rotate(0deg);
+  }
+  100% {
+    transform: rotate(360deg);
+  }
+}
--- a/assets/fontawesome/less/_bordered-pulled.less
+++ b/assets/fontawesome/less/_bordered-pulled.less
+// Bordered & Pulled
+// -------------------------
+
+.@{fa-css-prefix}-border {
+  border-radius: .1em;
+  border: solid .08em @fa-border-color;
+  padding: .2em .25em .15em;
+}
+
+.@{fa-css-prefix}-pull-left { float: left; }
+.@{fa-css-prefix}-pull-right { float: right; }
+
+.@{fa-css-prefix}, .fas, .far, .fal, .fab {
+  &.@{fa-css-prefix}-pull-left { margin-right: .3em; }
+  &.@{fa-css-prefix}-pull-right { margin-left: .3em; }
+}
--- a/assets/fontawesome/less/_core.less
+++ b/assets/fontawesome/less/_core.less
+// Base Class Definition
+// -------------------------
+
+.@{fa-css-prefix}, .fas, .far, .fal, .fab {
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-font-smoothing: antialiased;
+  display: inline-block;
+  font-style: normal;
+  font-variant: normal;
+  text-rendering: auto;
+  line-height: 1;
+}
--- a/assets/fontawesome/less/_fixed-width.less
+++ b/assets/fontawesome/less/_fixed-width.less
+// Fixed Width Icons
+// -------------------------
+.@{fa-css-prefix}-fw {
+  text-align: center;
+  width: (20em / 16);
+}
--- a/assets/fontawesome/less/_icons.less
+++ b/assets/fontawesome/less/_icons.less
--- a/assets/fontawesome/less/_larger.less
+++ b/assets/fontawesome/less/_larger.less
+// Icon Sizes
+// -------------------------
+
+.larger(@factor) when (@factor > 0) {
+  .larger((@factor - 1));
+
+  .@{fa-css-prefix}-@{factor}x {
+    font-size: (@factor * 1em);
+  }
+}
+
+/* makes the font 33% larger relative to the icon container */
+.@{fa-css-prefix}-lg {
+  font-size: (4em / 3);
+  line-height: (3em / 4);
+  vertical-align: -.0667em;
+}
+
+.@{fa-css-prefix}-xs {
+  font-size: .75em;
+}
+
+.@{fa-css-prefix}-sm {
+  font-size: .875em;
+}
+
+.larger(10);
--- a/assets/fontawesome/less/_list.less
+++ b/assets/fontawesome/less/_list.less
+// List Icons
+// -------------------------
+
+.@{fa-css-prefix}-ul {
+  list-style-type: none;
+  margin-left: (@fa-li-width * 5/4);
+  padding-left: 0;
+
+  > li { position: relative; }
+}
+
+.@{fa-css-prefix}-li {
+  left: -@fa-li-width;
+  position: absolute;
+  text-align: center;
+  width: @fa-li-width;
+  line-height: inherit;
+}
--- a/assets/fontawesome/less/_mixins.less
+++ b/assets/fontawesome/less/_mixins.less
+// Mixins
+// --------------------------
+
+.fa-icon() {
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-font-smoothing: antialiased;
+  display: inline-block;
+  font-style: normal;
+  font-variant: normal;
+  font-weight: normal;
+  line-height: 1;
+}
+
+.fa-icon-rotate(@degrees, @rotation) {
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=@{rotation})";
+  transform: rotate(@degrees);
+}
+
+.fa-icon-flip(@horiz, @vert, @rotation) {
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=@{rotation}, mirror=1)";
+  transform: scale(@horiz, @vert);
+}
+
+
+// Only display content to screen readers. A la Bootstrap 4.
+//
+// See: http://a11yproject.com/posts/how-to-hide-content/
+
+.sr-only() {
+  border: 0;
+  clip: rect(0,0,0,0);
+  height: 1px;
+  margin: -1px;
+  overflow: hidden;
+  padding: 0;
+  position: absolute;
+  width: 1px;
+}
+
+// Use in conjunction with .sr-only to only display content when it's focused.
+//
+// Useful for "Skip to main content" links; see http://www.w3.org/TR/2013/NOTE-WCAG20-TECHS-20130905/G1
+//
+// Credit: HTML5 Boilerplate
+
+.sr-only-focusable() {
+  &:active,
+  &:focus {
+    clip: auto;
+    height: auto;
+    margin: 0;
+    overflow: visible;
+    position: static;
+    width: auto;
+  }
+}
--- a/assets/fontawesome/less/_rotated-flipped.less
+++ b/assets/fontawesome/less/_rotated-flipped.less
+// Rotated & Flipped Icons
+// -------------------------
+
+.@{fa-css-prefix}-rotate-90  { .fa-icon-rotate(90deg, 1);  }
+.@{fa-css-prefix}-rotate-180 { .fa-icon-rotate(180deg, 2); }
+.@{fa-css-prefix}-rotate-270 { .fa-icon-rotate(270deg, 3); }
+
+.@{fa-css-prefix}-flip-horizontal { .fa-icon-flip(-1, 1, 0); }
+.@{fa-css-prefix}-flip-vertical   { .fa-icon-flip(1, -1, 2); }
+.@{fa-css-prefix}-flip-both, .@{fa-css-prefix}-flip-horizontal.@{fa-css-prefix}-flip-vertical { .fa-icon-flip(-1, -1, 2); }
+
+// Hook for IE8-9
+// -------------------------
+
+:root {
+  .@{fa-css-prefix}-rotate-90,
+  .@{fa-css-prefix}-rotate-180,
+  .@{fa-css-prefix}-rotate-270,
+  .@{fa-css-prefix}-flip-horizontal,
+  .@{fa-css-prefix}-flip-vertical,