Merge branch 'next-1.x' into '1.x'

fix: remove not allowed elements to pass html validator

See merge request !16

bin/Category.js

@@ -130,11 +130,11 @@ define('package/quiqqer/faq/bin/Category', [
                     y: -this.offset
                 },
                 onComplete: function () {
-                    if (window.location.hash === '#' + self.FAQList.getAttribute('name')) {
+                    if (window.location.hash === '#' + self.FAQList.getAttribute('id')) {
                         return;
                     }
 
-                    window.location = '#' + self.FAQList.getAttribute('name');
+                    window.location = '#' + self.FAQList.getAttribute('id');
                 }
             }).toElement(this.FAQList);
         }

bin/types/category.css

-
-
-/*
-.quiqqer-faq article {
-    clear: both;
-    float: right;
-    width: 100%;
-}*/
-
 .quiqqer-faq-list {
+    scroll-margin-top: var(--_qui-faq-scrollOffset, 0);
     list-style: none;
     padding-left: 0;
 }
@@ -34,6 +26,12 @@
     opacity: 0.5;
 }
 
+.quiqqer-faq__entry {
+    scroll-margin-top: var(--_qui-faq-scrollOffset, 0);
+    display: flow-root;
+    margin-block: 1rem;
+}
+
 .quiqqer-faq-list li:hover:before {
     background: #e2e2e2;
 }
@@ -52,7 +50,6 @@
 
 .quiqqer-faq-list-linkToTop .fa {
     opacity: 0.4;
-    transition: 0.3s all ease-in-out;
 }
 
 .quiqqer-faq-list-linkToTop:hover .fa {

types/category.html

@@ -6,28 +6,14 @@
 
 {* Template: default*}
 {if $faqTemplate == 'default'}
-    {if $offset}
-        {*
-        This CSS is used to scroll the page down a bit when accessed with a # in the url.
-        By doing this the menu no longer hides the linked content.
-        *}
-        <style type="text/css">
-            :target::before {
-                content: '';
-                display: block;
-                height: {$offset}px;
-                margin-top: -{$offset}px;
-            }
-        </style>
-    {/if}
-
-    <section itemscope itemtype="http://schema.org/ItemList"
+    <section itemscope itemtype="https://schema.org/ItemList"
              class="content-template quiqqer-faq clear-fix"
              data-qui="package/quiqqer/faq/bin/Category"
              data-qui-options-offset="{$offset}"
+             {if $offset}style="--_qui-faq-scrollOffset: var(--qui-faq-scrollOffset, {$offset}px);"{/if}
     >
         {if count($entries)}
-            <ul class="quiqqer-faq-list" id="faqList" name="faqList">
+            <ul class="quiqqer-faq-list" id="faqList">
                 {foreach $entries as $Faq}
                     <li>
                         <a href="{url site=$Site}#faq{$Faq->getId()}">
@@ -41,7 +27,7 @@
         <hr />
 
         {foreach $entries as $Faq}
-            <article id="faq{$Faq->getId()}" class="clear-fix">
+            <article id="faq{$Faq->getId()}" class="quiqqer-faq__entry">
                 <header>
                     <h2>{$Faq->getAttribute('title')}</h2>
                 </header>

types/entry.html

-<div itemscope itemtype="http://schema.org/Question">
+<div itemscope itemtype="https://schema.org/Question">
 
     {if $Template->getAttribute('content-header')}
     <section class="content-header grid-100 mobile-grid-100">
@@ -16,7 +16,7 @@
 
     {if $Template->getAttribute('content-body') && $Site->getAttribute('content')}
     <section class="content-body grid-100 mobile-grid-100"
-        itemprop="suggestedAnswer acceptedAnswer" itemscope itemtype="http://schema.org/Answer">
+        itemprop="suggestedAnswer acceptedAnswer" itemscope itemtype="https://schema.org/Answer">
         {$Site->getAttribute('content')}
     </section>
     {/if}

types/list.html

@@ -17,7 +17,7 @@
 
             <section class="content-template-faq-list-category
                             {if !$nextCategoryLevel} lastCategoryLevel{/if}"
-                     itemscope itemtype="http://schema.org/ItemList"
+                     itemscope itemtype="https://schema.org/ItemList"
             >
                 <h2 class="control-color">
                     <a itemprop="mainEntityOfPage" href="{url site=$Category}">
@@ -38,10 +38,10 @@
                 {if $nextCategoryLevel}
                     {assign var=faqList value=$Category->getChildren()}
                     {if count($faqList)}
-                    <ul itemscope itemtype="http://schema.org/ItemList">
+                    <ul itemscope itemtype="https://schema.org/ItemList">
                         {assign var=position value=1}
                         {foreach $faqList as $Faq}
-                        <li itemscope itemprop="itemListElement" itemtype="http://schema.org/ListItem">
+                        <li itemscope itemprop="itemListElement" itemtype="https://schema.org/ListItem">
 
                             {if $Faq->getAttribute('type') == 'quiqqer/faq:types/entry'}
                             <a itemprop="url" href="{url site=$Category}#faq{$Faq->getId()}">