Merge pull request #72 from contao-themes-net/2.15.0

2.15.0

src/Resources/contao/templates/elements/mate/ce_bs_gridStart.html5

@@ -1 +1,6 @@
-<div<?= $this->cssID; ?> class="<?= $this->class ?> <?= $this->rowClasses ?>">
+<?php
+if(strpos($this->rowClasses,"content-wrapper")) {
+  $this->rowClasses = str_replace("row","",$this->rowClasses);
+}
+?>
+<div<?= $this->cssID; ?> class="<?= $this->class ?> <?= $this->rowClasses ?>">

src/Resources/contao/templates/elements/mate/ce_hyperlink_teaser_mate.html5

@@ -0,0 +1,19 @@
+<div class="<?= $this->class ?> teaser block"<?= $this->cssID ?><?php if ($this->style): ?> style="<?= $this->style ?>"<?php endif; ?>>
+
+  <?php if ($this->useImage): ?>
+    <figure class="image_container">
+      <?= $this->embed_pre ?>
+      <a href="<?= $this->href ?>"<?php if ($this->linkTitle): ?> title="<?= $this->linkTitle ?>"<?php endif; ?> class="hyperlink_img"<?= $this->attribute ?><?= $this->target ?><?= $this->rel ?>><?php $this->insert('picture_default', $this->picture); ?>
+        <?php if ($this->caption): ?>
+          <figcaption class="caption"><?= $this->caption ?></figcaption>
+        <?php endif; ?>
+      </a>
+      <?= $this->embed_post ?>
+    </figure>
+  <?php else: ?>
+    <?= $this->embed_pre ?>
+    <a href="<?= $this->href ?>" class="hyperlink_txt" title="<?= $this->linkTitle ?>"<?= $this->attribute ?><?= $this->target ?><?= $this->rel ?>><?= $this->link ?></a>
+    <?= $this->embed_post ?>
+  <?php endif; ?>
+
+</div>

src/Resources/contao/templates/elements/mate/ce_mate_contentbox.html5

@@ -17,7 +17,7 @@
 
         <?= $this->text ?>
 
-        <?php if($this->page != ""): ?>
+        <?php if($this->pageText != ""): ?>
           <div class="pageLink">
             <a href="{{link_url::<?= $this->page ?>}}"><?= $this->pageText ?></a>
           </div>

src/Resources/contao/templates/elements/mate/ce_mate_teaserbox.html5

@@ -20,7 +20,7 @@
 
       <?= $this->text ?>
 
-      <?php if($this->page != ""): ?>
+      <?php if($this->pageText != ""): ?>
         <div class="pageLink">
           <a href="{{link_url::<?= $this->page ?>}}"><?= $this->pageText ?></a>
         </div>

src/Resources/contao/templates/elements/mate/ce_mate_teaserbox_link.html5

@@ -0,0 +1,21 @@
+<div class="<?= $this->class ?> block"<?= $this->cssID ?><?php if ($this->style): ?> style="<?= $this->style ?>"<?php endif; ?>>
+	<a href="{{link_url::<?= $this->page ?>}}" <?= $this->target ?><?= $this->rel ?> class="inside">
+    <?php $this->block('content'); ?>
+
+      <?php if ($this->addImage): ?>
+        <?php $this->insert('image', $this->arrData); ?>
+      <?php endif; ?>
+
+      <?php if($this->subheadline): ?><div class="subheadline"><?= $this->subheadline ?></div><?php endif; ?>
+
+      <?php if ($this->headline): ?>
+        <<?= $this->hl ?>>
+          <?= $this->headline ?>
+        </<?= $this->hl ?>>
+      <?php endif; ?>
+
+      <?= $this->text ?>
+
+    <?php $this->endblock(); ?>
+	</a>
+</div>

src/Resources/public/js/theme.js

@@ -294,7 +294,12 @@ jQuery(document).ready(function ($) {
         inDuration: 0,
         outDuration: 0,
         alignment: "right",
-        closeOnClick: false
+        closeOnClick: false,
+        hover: false
+    });
+
+    $("nav.subnav a.dropdown-button").click(function() {
+        window.location.href = $(this).attr('href');
     });
 
     /* ===================== *

src/Resources/public/sass/_mate_variables.scss

@@ -160,3 +160,7 @@ $slider-navigation-border-color: $mateColor1;
 $table-odd-background: $mateColorWhite;
 $table-even-background: $mateColorGreyLight;
 $table-border-color: $mateColorGreyDark;
+
+/* Dropdown */
+$dropdown-bg-color: $mateColorWhite;
+$dropdown-color: $primary-text-color;

src/Resources/public/sass/hofff_consent.scss

@@ -0,0 +1,181 @@
+#hofff-consent-banner {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  background: #fff;
+  z-index: 100000;
+  max-height: 100%;
+  overflow-y: auto;
+  box-shadow: 0px 5px 7px #000000;
+  padding: 10px 0;
+
+  .card {
+    background: $boxes-background;
+    box-shadow: none;
+    margin: 30px 0 0;
+    border-radius: 0;
+  }
+
+  .card-header {
+    overflow: hidden;
+    background: #e0e0e0;
+    padding: 30px;
+  }
+
+  .checkbox_container {
+    padding: 0;
+    background: none;
+
+    &:nth-of-type(1) {
+      padding-top: 0;
+    }
+
+    label {
+      font-size: 16px;
+      font-weight: 400;
+    }
+  }
+
+  .col {
+    display: block;
+  }
+
+  .formbody {
+    flex-wrap: wrap;
+  }
+
+  .h2 {
+    font-size: 24px;
+    font-weight: 700;
+    margin-bottom: 0;
+  }
+
+  .h3 {
+    font-size: 20px;
+    font-weight: 700;
+  }
+
+  .hofff-consent-privacy-settings-toggle {
+    @extend .btn;
+    background: #f2f2f2;
+    color: #000;
+
+    &:hover, &:focus {
+      color: #fff;
+    }
+  }
+
+  .hofff-consent-buttons {
+    float: left;
+    margin-right: 10px;
+  }
+
+  .hofff-consent-button-accept {
+    margin-right: 5px;
+    background: $mateColor2;
+  }
+
+  .hofff-consent-button-revoke {
+    background: #b50000;
+  }
+
+  .hofff-consent-privacy-settings-button {
+    float: right;
+  }
+
+  .hofff-consent-privacy-settings {
+    clear: both;
+
+    .hofff-consent-buttons {
+      width: 100%;
+    }
+
+    .hofff-consent-button-close {
+      float: right;
+
+      &:hover, &:focus {
+        color: #fff;
+      }
+    }
+  }
+
+  .hofff-consent-feedback {
+    opacity: 0;
+    transition: opacity .5s;
+  }
+
+  .hofff-consent-button-close {
+    background: #f2f2f2;
+    color: #000;
+  }
+
+  .hofff-consent-banner-additional-content {
+    clear: both;
+    padding-top: 15px;
+
+    nav ul a {
+      color: #000;
+      padding: 0;
+      margin-right: 15px;
+      font-size: 14px;
+      line-height: 1.2;
+
+      &:hover {
+        background: none;
+        color: $mateColor2;
+      }
+    }
+  }
+
+  .list-group-item {
+    padding: 30px;
+
+    &:not(:last-child) {
+      border-bottom: 1px solid #e0e0e0;
+    }
+  }
+}
+
+@media (max-width: 992px) {
+  #hofff-consent-banner {
+    .btn, .hofff-consent-privacy-settings-toggle {
+      padding: 0 15px;
+    }
+  }
+}
+
+@media (max-width: 767px) {
+  #hofff-consent-banner {
+    .card-header, .list-group-item {
+      padding: 20px;
+    }
+
+    .hofff-consent-buttons {
+      margin-bottom: 0;
+
+      button {
+        margin-bottom: 10px;
+      }
+    }
+
+    .hofff-consent-privacy-settings-button {
+      float: none;
+    }
+
+    .hofff-consent-privacy-settings {
+      .hofff-consent-button-close {
+        float: none;
+      }
+
+      .hofff-consent-buttons button {
+        margin-bottom: 10px;
+        margin-right: 5px;
+      }
+    }
+
+    p {
+      font-size: 14px;
+    }
+  }
+}