Merge branch 'cherry-pick-6ebe9a97' into 'next-1.x'

fix: improve scroll behavior depending on css custom variable

See merge request !15

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/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()}">