Merge pull request #58 from contao-themes-net/3.4.0

3.4.0
contao-themes-net · Jan 26, 2024 · b1294d1 · b1294d1
2 parents c968f14 + b44cbd4
commit b1294d1
Show file tree

Hide file tree

Showing 22 changed files with 100 additions and 43 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,11 @@ Types of changes
     Security in case of vulnerabilities.
 )
 
+## [3.4.0](https://github.com/contao-themes-net/odd-theme-bundle/tree/3.4.0) – 2024-01-08
+
+- [Added] Add transition for logo (use logo_odd.html.twig template) [#56](https://github.com/contao-themes-net/odd-theme-bundle/issues/56)
+- [Fixed] Fix image alignment in text elements
+
 ## [3.3.2](https://github.com/contao-themes-net/odd-theme-bundle/tree/3.3.2) – 2023-09-21
 
 - [Fixed] Fix youtube and video element

diff --git a/contao/templates/_new/content_element/image/logo_odd.html.twig b/contao/templates/_new/content_element/image/logo_odd.html.twig
@@ -0,0 +1,22 @@
+{% extends "@Contao/content_element/image.html.twig" %}
+{% use "@Contao/component/_picture.html.twig" %}
+
+{% block image %}
+  {% set img = figure.image.img %}
+  {% set defineProportions = img.width|default(false) and img.height|default(false) %}
+  {% set img_attributes = attrs(img_attributes|default)
+    .set('src', img.src)
+    .set('alt', figure.hasMetadata ? figure.metadata.alt : '')
+    .setIfExists('title', figure.hasMetadata ? (figure.metadata.title ?: null) : null)
+    .setIfExists('srcset', img.srcset is defined and img.srcset != img.src ? img.srcset : null)
+    .setIfExists('sizes', img.sizes|default)
+    .setIfExists('width', defineProportions ? img.width : null)
+    .setIfExists('height', defineProportions ? img.height : null)
+    .set('style', 'height:' ~ img.height ~ 'px;width:auto;')
+    .set('class', 'logo-transition')
+    .setIfExists('loading', img.loading|default)
+    .addClass(img.class|default)
+    .mergeWith(figure.options.img_attr|default)
+  %}
+  <img{{ img_attributes }}>
+{% endblock %}
diff --git a/public/fontawesome/js/all.min.js b/public/fontawesome/js/all.min.js
diff --git a/public/fontawesome/js/brands.min.js b/public/fontawesome/js/brands.min.js
diff --git a/public/fontawesome/js/fontawesome.min.js b/public/fontawesome/js/fontawesome.min.js
diff --git a/public/fontawesome/js/regular.min.js b/public/fontawesome/js/regular.min.js
diff --git a/public/fontawesome/js/solid.min.js b/public/fontawesome/js/solid.min.js
diff --git a/public/fontawesome/js/v4-shims.min.js b/public/fontawesome/js/v4-shims.min.js
diff --git a/public/scss/parts/elements.scss b/public/scss/parts/elements.scss
@@ -369,3 +369,49 @@ blockquote {
     }
   }
 }
+
+.media.content-text {
+  display: block;
+  overflow: hidden;
+
+  &.hero.media--left figure {
+    float: left;
+  }
+
+  &.hero.media--right figure {
+    float: right;
+  }
+
+  &.hero.media--below .container {
+    display: flex;
+    flex-wrap: wrap;
+  }
+
+  &.media--left figure {
+    margin: 0 20px 20px 0;
+    float: left;
+  }
+
+  &.media--right figure {
+    margin: 0 0 20px 20px;
+    float: right;
+  }
+
+  &.media--below {
+    display: flex;
+    flex-wrap: wrap;
+
+    figure {
+      order: 2;
+      margin-top: 15px;
+    }
+
+    h1, h2, h3, h4, h5, h6 {
+      margin-bottom: 10px;
+    }
+
+    .rte {
+      order: 1;
+    }
+  }
+}
diff --git a/public/scss/parts/header.scss b/public/scss/parts/header.scss
@@ -340,6 +340,10 @@ header, footer {
   }
 
   .nav-container {
+    .navbar-brand img {
+      transition: height .3s;
+    }
+
     &.stuck {
       .navbar {
         height: 60px;
@@ -350,6 +354,10 @@ header, footer {
         height: 60px;
         padding: 5px 0;
         width: auto;
+
+        &.logo-transition {
+          height: 60px !important;
+        }
       }
     }
   }

diff --git a/src/ContaoManager/Plugin.php b/src/ContaoManager/Plugin.php
@@ -5,7 +5,7 @@
 /*
  * pdir theme odd bundle for Contao Open Source CMS
  *
- * Copyright (C) 2023 pdir / digital agentur <develop@pdir.de>
+ * Copyright (C) 2024 pdir / digital agentur <develop@pdir.de>
  *
  * @package    theme odd bundle
  * @link       https://github.com/contao-themes-net/odd-theme-bundle

diff --git a/src/ContaoThemesNetOddThemeBundle.php b/src/ContaoThemesNetOddThemeBundle.php
@@ -5,7 +5,7 @@
 /*
  * pdir theme odd bundle for Contao Open Source CMS
  *
- * Copyright (C) 2023 pdir / digital agentur <develop@pdir.de>
+ * Copyright (C) 2024 pdir / digital agentur <develop@pdir.de>
  *
  * @package    theme odd bundle
  * @link       https://github.com/contao-themes-net/odd-theme-bundle

diff --git a/src/DependencyInjection/ContaoThemesNetOddThemeExtension.php b/src/DependencyInjection/ContaoThemesNetOddThemeExtension.php
@@ -5,7 +5,7 @@
 /*
  * pdir theme odd bundle for Contao Open Source CMS
  *
- * Copyright (C) 2023 pdir / digital agentur <develop@pdir.de>
+ * Copyright (C) 2024 pdir / digital agentur <develop@pdir.de>
  *
  * @package    theme odd bundle
  * @link       https://github.com/contao-themes-net/odd-theme-bundle

diff --git a/src/Element/SliderElement.php b/src/Element/SliderElement.php
@@ -5,7 +5,7 @@
 /*
  * pdir theme odd bundle for Contao Open Source CMS
  *
- * Copyright (C) 2023 pdir / digital agentur <develop@pdir.de>
+ * Copyright (C) 2024 pdir / digital agentur <develop@pdir.de>
  *
  * @package    theme odd bundle
  * @link       https://github.com/contao-themes-net/odd-theme-bundle

diff --git a/src/Migration/InitialDemoDataMigration.php b/src/Migration/InitialDemoDataMigration.php
@@ -5,7 +5,7 @@
 /*
  * pdir theme odd bundle for Contao Open Source CMS
  *
- * Copyright (C) 2023 pdir / digital agentur <develop@pdir.de>
+ * Copyright (C) 2024 pdir / digital agentur <develop@pdir.de>
  *
  * @package    theme odd bundle
  * @link       https://github.com/contao-themes-net/odd-theme-bundle

diff --git a/src/Migration/InitialFilesFolderMigration.php b/src/Migration/InitialFilesFolderMigration.php
@@ -5,7 +5,7 @@
 /*
  * pdir theme odd bundle for Contao Open Source CMS
  *
- * Copyright (C) 2023 pdir / digital agentur <develop@pdir.de>
+ * Copyright (C) 2024 pdir / digital agentur <develop@pdir.de>
  *
  * @package    theme odd bundle
  * @link       https://github.com/contao-themes-net/odd-theme-bundle

diff --git a/src/Migration/MigrationHelperTrait.php b/src/Migration/MigrationHelperTrait.php
@@ -5,7 +5,7 @@
 /*
  * pdir theme odd bundle for Contao Open Source CMS
  *
- * Copyright (C) 2023 pdir / digital agentur <develop@pdir.de>
+ * Copyright (C) 2024 pdir / digital agentur <develop@pdir.de>
  *
  * @package    theme odd bundle
  * @link       https://github.com/contao-themes-net/odd-theme-bundle

diff --git a/src/Migration/Version300.php b/src/Migration/Version300.php
@@ -5,7 +5,7 @@
 /*
  * pdir theme odd bundle for Contao Open Source CMS
  *
- * Copyright (C) 2023 pdir / digital agentur <develop@pdir.de>
+ * Copyright (C) 2024 pdir / digital agentur <develop@pdir.de>
  *
  * @package    theme odd bundle
  * @link       https://github.com/contao-themes-net/odd-theme-bundle

diff --git a/src/Module/OddThemeSetup.php b/src/Module/OddThemeSetup.php
@@ -5,7 +5,7 @@
 /*
  * pdir theme odd bundle for Contao Open Source CMS
  *
- * Copyright (C) 2023 pdir / digital agentur <develop@pdir.de>
+ * Copyright (C) 2024 pdir / digital agentur <develop@pdir.de>
  *
  * @package    theme odd bundle
  * @link       https://github.com/contao-themes-net/odd-theme-bundle
@@ -22,7 +22,7 @@
 
 class OddThemeSetup extends BackendModule
 {
-    public const VERSION = '3.3.2';
+    public const VERSION = '3.4.0';
 
     protected $strTemplate = 'be_oddtheme_setup';
 

diff --git a/src/ThemeUtils.php b/src/ThemeUtils.php
@@ -5,7 +5,7 @@
 /*
  * pdir theme odd bundle for Contao Open Source CMS
  *
- * Copyright (C) 2023 pdir / digital agentur <develop@pdir.de>
+ * Copyright (C) 2024 pdir / digital agentur <develop@pdir.de>
  *
  * @package    theme odd bundle
  * @link       https://github.com/contao-themes-net/odd-theme-bundle

diff --git a/tests/ContaoThemesNetOddThemeBundleTest.php b/tests/ContaoThemesNetOddThemeBundleTest.php
@@ -5,7 +5,7 @@
 /*
  * pdir theme odd bundle for Contao Open Source CMS
  *
- * Copyright (C) 2023 pdir / digital agentur <develop@pdir.de>
+ * Copyright (C) 2024 pdir / digital agentur <develop@pdir.de>
  *
  * @package    theme odd bundle
  * @link       https://github.com/contao-themes-net/odd-theme-bundle

diff --git a/tests/ContaoThemesNetOddThemeExtensionTest.php b/tests/ContaoThemesNetOddThemeExtensionTest.php
@@ -5,7 +5,7 @@
 /*
  * pdir theme odd bundle for Contao Open Source CMS
  *
- * Copyright (C) 2023 pdir / digital agentur <develop@pdir.de>
+ * Copyright (C) 2024 pdir / digital agentur <develop@pdir.de>
  *
  * @package    theme odd bundle
  * @link       https://github.com/contao-themes-net/odd-theme-bundle