Merge pull request #22 from contao-themes-net/bugfix/bootstrap-grid-g…

…allery

Bugfix/bootstrap grid gallery

CHANGELOG.md

@@ -1,7 +1,10 @@
 # Changelog
 
-## [1.7.1](https://github.com/contao-themes-net/odd-theme-bundle/tree/1.7.1) – 2021-12-02
+## [1.7.1](https://github.com/contao-themes-net/odd-theme-bundle/tree/1.7.1) – 2021-12-15
+
+- [fix] update composer.json to solve problem with bootstrap grid gallery
 - [fix] add newsreader template for header image to hide comments
+- [fix] update social feed template
 
 ## [1.7.0](https://github.com/contao-themes-net/odd-theme-bundle/tree/1.7.0) – 2021-10-04
 

composer.json

@@ -34,7 +34,8 @@
     "madeyourday/contao-rocksolid-frontend-helper": "~2.0",
     "terminal42/contao-folderpage": "^2.0",
     "pdir/contao-theme-helper-bundle": "^1.0",
-    "contao-themes-net/theme-components-bundle": "^1.2"
+    "contao-themes-net/theme-components-bundle": "^1.2",
+    "contao-bootstrap/grid": "^2.3"
   },
   "conflict": {
     "contao/core": "*",

src/Resources/contao/templates/news/news_social_feed_extended_odd.html5

@@ -1,29 +1,31 @@
 <div class="social_feed_element extended arc_<?= $this->archive->id ?> block<?= $this->class ?>" itemscope itemtype="http://schema.org/Article">
     <div class="inner">
 
-        <div class="icon">
-            {{picture::<?php echo \StringUtil::binToUuid($this->sfFbAccountPicture); ?>}}
-        </div>
+        <?php if($this->accountPicture): ?>
+            <div class="icon">
+                <?php $this->insert('picture_default', $this->accountPicture); ?>
+            </div>
+        <?php endif; ?>
 
         <?php if ($this->hasMetaFields): ?>
-        <p class="info"><time datetime="<?= $this->datetime ?>" itemprop="datePublished">
-            <?= $this->date ?></time> <?= $this->author ?> <?= $this->commentCount ?>
-            <?php if($this->socialFeedType == "Facebook" || $this->socialFeedType == ""): ?>
-                <i class="fab fa-facebook" aria-hidden="true"></i>
-            <?php elseif($this->socialFeedType == "Instagram"): ?>
-                <i class="fab fa-instagram" aria-hidden="true"></i>
-            <?php elseif($this->socialFeedType == "Twitter"): ?>
-                <i class="fab fa-twitter" aria-hidden="true"></i>
-            <?php endif; ?>
-        </p>
+            <p class="info"><time datetime="<?= $this->datetime ?>" itemprop="datePublished">
+                <?= $this->date ?></time> <?= $this->author ?> <?= $this->commentCount ?>
+                <?php if($this->socialFeedType == "Facebook" || $this->socialFeedType == ""): ?>
+                    <i class="fab fa-facebook" aria-hidden="true"></i>
+                <?php elseif($this->socialFeedType == "Instagram"): ?>
+                    <i class="fab fa-instagram" aria-hidden="true"></i>
+                <?php elseif($this->socialFeedType == "Twitter"): ?>
+                    <i class="fab fa-twitter" aria-hidden="true"></i>
+                <?php endif; ?>
+            </p>
         <?php endif; ?>
 
         <div class="title"><?= $this->sfFbAccount ?></div>
 
         <?php if ($this->addImage): ?>
-        <?php if ($this->sfImages): ?>
-        <?php $this->insert('image', $this->arrData); ?>
-        <?php endif; ?>
+            <?php if ($this->sfImages): ?>
+                <?php $this->insert('image', $this->arrData); ?>
+            <?php endif; ?>
         <?php endif; ?>
 
         <div class="ce_text block" itemprop="description">

src/Resources/contao/templates/news/news_social_feed_odd.html5

@@ -2,30 +2,34 @@
     <div class="inner">
 
         <a href="<?= $this->url ?>" target="_blank">
-            <div class="icon">
-                {{picture::<?php echo \StringUtil::binToUuid($this->sfFbAccountPicture); ?>}}
-            </div>
+            <?php if($this->accountPicture): ?>
+                <div class="icon">
+                    <?php $this->insert('picture_default', $this->accountPicture); ?>
+                </div>
+            <?php endif; ?>
 
             <?php if ($this->hasMetaFields): ?>
-            <p class="info"><time datetime="<?= $this->datetime ?>" itemprop="datePublished">
-                <?= $this->date ?></time> <?= $this->author ?> <?= $this->commentCount ?>
-                <?php if($this->socialFeedType == "Facebook" || $this->socialFeedType == ""): ?>
-                    <i class="fab fa-facebook" aria-hidden="true"></i>
-                <?php elseif($this->socialFeedType == "Instagram"): ?>
-                    <i class="fab fa-instagram" aria-hidden="true"></i>
-                <?php elseif($this->socialFeedType == "Twitter"): ?>
-                    <i class="fab fa-twitter" aria-hidden="true"></i>
-                <?php endif; ?>
-            </p>
+                <p class="info"><time datetime="<?= $this->datetime ?>" itemprop="datePublished">
+                    <?= $this->date ?></time> <?= $this->author ?> <?= $this->commentCount ?>
+                    <?php if($this->socialFeedType == "Facebook" || $this->socialFeedType == ""): ?>
+                        <i class="fab fa-facebook" aria-hidden="true"></i>
+                    <?php elseif($this->socialFeedType == "Instagram"): ?>
+                        <i class="fab fa-instagram" aria-hidden="true"></i>
+                    <?php elseif($this->socialFeedType == "Twitter"): ?>
+                        <i class="fab fa-twitter" aria-hidden="true"></i>
+                    <?php elseif($this->socialFeedType == "LinkedIn"): ?>
+                        <i class="fab fa-linkedin" aria-hidden="true"></i>
+                    <?php endif; ?>
+                </p>
             <?php endif; ?>
 
             <div class="title"><?= $this->sfFbAccount ?></div>
         </a>
 
         <?php if ($this->addImage): ?>
-        <?php if ($this->sfImages): ?>
-        <?php $this->insert('image', $this->arrData); ?>
-        <?php endif; ?>
+            <?php if ($this->sfImages): ?>
+                <?php $this->insert('image', $this->arrData); ?>
+            <?php endif; ?>
         <?php endif; ?>
 
 

src/Resources/public/scss/parts/modules.scss

@@ -184,6 +184,8 @@ p.confirm {
 
   svg {
     color: $oddColor2;
+    margin-left: 10px;
+    font-size: 1.2rem;
   }
 
   .title {