Merge pull request #18 from contao-themes-net/1.6.0

1.6.0

CHANGELOG.md

@@ -0,0 +1,140 @@
+# Changelog
+
+## [1.6.0](https://github.com/contao-themes-net/odd-theme-bundle/tree/1.6.0) – 2021-06-10
+
+- [feature] add sidebar modal
+- [feature] slider text box position configurable
+- [fix] remove jquery conflict and fix headroom
+
+## [1.5.0](https://github.com/contao-themes-net/odd-theme-bundle/tree/1.5.0) – 2021-02-12
+
+- [feature] add sql files for contao 4.11
+
+## [1.4.9](https://github.com/contao-themes-net/odd-theme-bundle/tree/1.4.9) – 2021-01-07
+
+- [fix] fix button css
+
+## [1.4.8](https://github.com/contao-themes-net/odd-theme-bundle/tree/1.4.8) – 2021-01-04
+
+- [fix] update sql files (set authors)
+
+## [1.4.7](https://github.com/contao-themes-net/odd-theme-bundle/tree/1.4.7) – 2020-12-14
+
+- [fix] update theme tags config
+
+## [1.4.6](https://github.com/contao-themes-net/odd-theme-bundle/tree/1.4.6) – 2020-12-04
+
+- [fix] pagespeed optimizations
+- [fix] replace classes "first" and "last" with css selectors (for contao 4.10)
+- [fix] fixed that other themes can overwrite theme helper tags
+
+## [1.4.5](https://github.com/contao-themes-net/odd-theme-bundle/tree/1.4.5) – 2020-11-30
+
+- [fix] fix dropdown navigation for touch devices
+- [fix] update templates and styling for maklermodul
+
+## [1.4.4](https://github.com/contao-themes-net/odd-theme-bundle/tree/1.4.4) – 2020-09-23
+
+- [fix] headroom bug in mobile view
+
+## [1.4.3](https://github.com/contao-themes-net/odd-theme-bundle/tree/1.4.3) – 2020-08-20
+
+- [feature] add sql files for contao 4.10
+- [fix] fix bugs with notification center newsletter and theme version in backend
+
+## [1.4.2](https://github.com/contao-themes-net/odd-theme-bundle/tree/1.4.2) – 2020-07-14
+
+- [fix] translate event more text
+
+## [1.4.1](https://github.com/contao-themes-net/odd-theme-bundle/tree/1.4.1) – 2020-05-20
+
+- [fix] remove background if footer newsletter section is hidden
+
+## [1.4.0](https://github.com/contao-themes-net/odd-theme-bundle/tree/1.4.0) – 2020-05-08
+
+- [feature] add header slope to the right
+
+## [1.3.0](https://github.com/contao-themes-net/odd-theme-bundle/tree/1.3.0) – 2020-05-06
+
+- [fix] third level in sub-navigation
+- [feature] add fourth level in main navigation
+
+## [1.2.3](https://github.com/contao-themes-net/odd-theme-bundle/tree/1.2.3) – 2020-04-23
+
+- [fix] fix css bug in subnavigation
+
+## [1.2.2](https://github.com/contao-themes-net/odd-theme-bundle/tree/1.2.2) – 2020-04-21
+
+- [fix] paths for windows
+
+## [1.2.1](https://github.com/contao-themes-net/odd-theme-bundle/tree/1.2.1) – 2020-03-27
+
+- [fix] js error if navigation is hidden
+
+## [1.2.0](https://github.com/contao-themes-net/odd-theme-bundle/tree/1.2.0) – 2020-02-21
+
+- [feature] support for contao 4.9
+
+## [1.1.8](https://github.com/contao-themes-net/odd-theme-bundle/tree/1.1.8) – 2020-02-20
+
+- [fix] Fixes the error of the empty script call
+
+## [1.1.7](https://github.com/contao-themes-net/odd-theme-bundle/tree/1.1.7) – 2020-02-04
+
+- [fix] hide headline image text if headline is empty
+- [fix] hide slider text if class "only-image" is active
+
+## [1.1.6](https://github.com/contao-themes-net/odd-theme-bundle/tree/1.1.6) – 2020-02-03
+
+- [fix] update social feed templates
+
+## [1.1.5](https://github.com/contao-themes-net/odd-theme-bundle/tree/1.1.5) – 2020-01-07
+
+- [fix] dropdown navigation fix for ie11
+
+## [1.1.4](https://github.com/contao-themes-net/odd-theme-bundle/tree/1.1.4) – 2019-12-06
+
+- [fix] add class to disable headroom navigation
+- [fix] ie fix for navigation
+- [fix] update sql files
+
+## [1.1.3](https://github.com/contao-themes-net/odd-theme-bundle/tree/1.1.3) – 2019-11-21
+
+- [fix] update sql files
+- [fix] css fix for safari
+
+## [1.1.2](https://github.com/contao-themes-net/odd-theme-bundle/tree/1.1.2) – 2019-11-14
+
+- [feature] add social feed template
+
+## [1.1.1](https://github.com/contao-themes-net/odd-theme-bundle/tree/1.1.1) – 2019-11-07
+
+- [fix] add image size for maklermodul and update sql files
+
+## [1.1.0](https://github.com/contao-themes-net/odd-theme-bundle/tree/1.1.0) – 2019-11-05
+
+- [fix] add css and templates for maklermodul bundle
+
+## [1.0.5](https://github.com/contao-themes-net/odd-theme-bundle/tree/1.0.5) – 2019-10-28
+
+- [fix] add sql files for contao minimal installation (without news, events, faq etc.)
+
+## [1.0.4](https://github.com/contao-themes-net/odd-theme-bundle/tree/1.0.4) – 2019-10-21
+
+- [fix] update docs link in setup page
+
+## [1.0.3](https://github.com/contao-themes-net/odd-theme-bundle/tree/1.0.3) – 2019-08-21
+
+- [fix] add note to updating the theme in backend setup template
+
+## [1.0.2](https://github.com/contao-themes-net/odd-theme-bundle/tree/1.0.2) – 2019-08-19
+
+- [fix] add contao 4.8 support
+
+## [1.0.1](https://github.com/contao-themes-net/odd-theme-bundle/tree/1.0.1) – 2019-06-28
+
+- [fix] fix some install issues
+
+## [1.0.0](https://github.com/contao-themes-net/odd-theme-bundle/tree/1.0.0) – 2019-06-25
+
+- first stable release

src/Module/OddThemeSetup.php

@@ -4,7 +4,7 @@
 
 class OddThemeSetup extends \BackendModule
 {
-    const VERSION = '1.5.0';
+    const VERSION = '1.6.0';
 
     protected $strTemplate = 'be_oddtheme_setup';
 

src/Resources/contao/templates/layout/fe_bootstrap_odd.html5

@@ -63,7 +63,7 @@
     <?php $GLOBALS['TL_JAVASCRIPT'][] = 'bundles/pdirthemeodd/bootstrap/dist/js/bootstrap.min.js|static'; ?>
     <?php $GLOBALS['TL_JAVASCRIPT'][] = 'bundles/pdirthemeodd/fontawesome/js/all.min.js|static'; ?>
     <?php $GLOBALS['TL_JAVASCRIPT'][] = 'bundles/pdirthemeodd/js/headroom.min.js|static'; ?>
-    <?php $GLOBALS['TL_JAVASCRIPT'][] = 'bundles/pdirthemeodd/js/scripts.js|static'; ?>
+    <?php $GLOBALS['TL_JAVASCRIPT'][] = 'bundles/pdirthemeodd/js/scripts.min.js|static'; ?>
 
     <?= $this->mooScripts ?>
 

src/Resources/contao/templates/modules/mod_cthemes_modal.html5

@@ -1,6 +1,8 @@
 <div class="<?= $this->class ?> block"<?= $this->cssID ?><?php if ($this->style): ?> style="<?= $this->style ?>"<?php endif; ?>>
 
-    <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#modal<?= $this->id ?>"><?= $this->linkText ?></button>
+    <?php if($this->linkText != ""): ?>
+        <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#modal<?= $this->id ?>"><?= $this->linkText ?></button>
+    <?php endif; ?>
 
     <div class="modal fade" id="modal<?= $this->id ?>" tabindex="-1" role="dialog" aria-labelledby="modal<?= $this->id ?>Label" aria-hidden="true">
         <div class="modal-dialog<?= $this->modalClass ?>" role="document">

src/Resources/public/js/scripts.js

@@ -1,4 +1,4 @@
-jQuery.noConflict(); jQuery(document).ready(function($) {
+jQuery(document).ready(function($) {
 
     /* ===================== *
      *   Toplink  			 *
@@ -81,7 +81,7 @@ jQuery.noConflict(); jQuery(document).ready(function($) {
         e.preventDefault();
     });
 
-    if( $("#header .nav-container").length > 0 && $("html").html().indexOf("headroom.min.js") !== -1 ) {
+    if( $("#header .nav-container").length > 0 && typeof Headroom !== 'undefined' ) {
         var myElement = document.querySelector("#header .nav-container");
         var headroom  = new Headroom(myElement, {
             "offset": 600

src/Resources/public/scss/parts/header.scss

@@ -485,8 +485,4 @@ header, footer {
   .mod_article:first-child:not(.slider) {
     padding-top: 120px;
   }
-}
-
-.sloping .ce_sliderElement .text .inside {
-  margin-top: 40px;
 }

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

@@ -209,4 +209,19 @@ p.confirm {
 
 .modal-header button.close {
   box-shadow: none;
-}
+}
+
+.modal-left {
+  margin: 0 auto 0 0;
+  max-width: 400px;
+  height: 100%;
+
+  button.close:hover {
+    background: none;
+  }
+
+  .modal-content {
+    height: 100%;
+    border-radius: 0;
+  }
+}

src/Resources/public/scss/parts/theme-elements.scss

@@ -388,16 +388,48 @@ input, button {
     display: none;
   }
 
+  &.top-center, &.center-center, &.bottom-center {
+    .text .inside {
+      margin-left: auto;
+      margin-right: auto;
+    }
+  }
+
+  &.top-right, &.center-right, &.bottom-right {
+    .text .inside {
+      margin-left: auto;
+    }
+  }
+
+  &.center-left, &.center-center, &.center-right {
+    .text {
+      align-items: center;
+    }
+  }
+
+  &.bottom-left, &.bottom-center, &.bottom-right {
+    .text {
+      align-items: flex-end;
+    }
+  }
+
+  .container {
+    padding: 0;
+  }
+
   .text {
     position: absolute;
-    top: 80px;
     background: none;
     padding: 0;
     width: 100%;
     left: 0;
+    top: 0;
     box-shadow: none;
     text-align: center;
     border-radius: 0;
+    height: calc(100% - 300px);
+    display: flex;
+    margin: 120px 0 0;
 
     .inside {
       background: $slider-background;
@@ -411,6 +443,7 @@ input, button {
 
     h1, h2, h3, h4, h5, h6 {
       margin-top: 0;
+
       &, a {
         color: $slider-headline-color;
       }
@@ -432,24 +465,6 @@ input, button {
     opacity: 0.8;
   }
 
-  &.top-right .inside {
-    float: right;
-  }
-  &.bottom-left .text {
-    bottom: 80px;
-    top: inherit;
-  }
-  &.bottom-right {
-    .text {
-      bottom: 80px;
-      top: inherit;
-    }
-
-    .inside {
-      float: right;
-    }
-  }
-
   img {
     width: 100%;
   }
@@ -471,6 +486,7 @@ input, button {
     font-size: 12px;
     margin-bottom: 10px;
   }
+
 }
 
 .ce_sliderStart {
@@ -599,6 +615,10 @@ input, button {
       margin-top: 0;
     }
   }
+
+  p {
+    color: $oddColor5;
+  }
 }
 
 // Content Box

src/Resources/public/scss/responsive.scss

@@ -29,11 +29,6 @@
 
 @media (max-width:1024px) {
   .ce_sliderElement {
-    .text {
-      right: 50px;
-      margin: 0;
-    }
-
     .bg-image {
       background-position: center right;
     }
@@ -312,6 +307,7 @@
       position: relative;
       top: inherit;
       right: inherit;
+      margin: 0;
 
       .inside {
         padding: 30px 80px;