Merge pull request #27 from contao-themes-net/contao-4.12-support

update sql files for contao 4.12 and update styling
contao-themes-net · Aug 25, 2021 · b66e9e5 · b66e9e5
2 parents d8fcdb3 + df17011
commit b66e9e5
Show file tree

Hide file tree

Showing 7 changed files with 1,622 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [1.5.0](https://github.com/contao-themes-net/nature-theme-bundle/tree/1.5.0) – 2021-08-25
+
+- [feature] add sql files for contao 4.12
+- [fix] update styling
+
 ## [1.4.3](https://github.com/contao-themes-net/nature-theme-bundle/tree/1.4.3) – 2021-04-30
 
 - [fix] sticky teaserbox ([#23](https://github.com/contao-themes-net/nature-theme-bundle/issues/23))

diff --git a/src/Module/NatureThemeSetup.php b/src/Module/NatureThemeSetup.php
@@ -4,7 +4,7 @@
 
 class NatureThemeSetup extends \BackendModule
 {
-    const VERSION = '1.4.3';
+    const VERSION = '1.5.0';
 
     protected $strTemplate = 'be_naturetheme_setup';
 

diff --git a/src/Resources/public/js/theme.js b/src/Resources/public/js/theme.js
@@ -1,9 +1,5 @@
 jQuery(document).ready(function($) {
 
-    if($(".home #header .full-width-height-slider").length == 0) {
-        $("#main .mod_article.first").addClass("first-element");
-    }
-
     /* =================== *
      * Tabs         	   *
      * =================== */

diff --git a/src/Resources/public/scss/parts/elements.scss b/src/Resources/public/scss/parts/elements.scss
@@ -207,6 +207,89 @@ a {
     }
   }
 
+  &[class*="has-background-"] {
+    .inside {
+      background: none;
+    }
+  }
+
+  &.has-background-white {
+    background: none !important;
+    .inside { @extend .has-background-white }
+  }
+  &.has-background-black {
+    background: none !important;
+    .inside { @extend .has-background-black }
+  }
+  &.has-background-light {
+    background: none !important;
+    .inside { @extend .has-background-light }
+  }
+  &.has-background-dark {
+    background: none !important;
+    .inside { @extend .has-background-dark }
+  }
+  &.has-background-primary {
+    background: none !important;
+    .inside { @extend .has-background-primary }
+  }
+  &.has-background-link {
+    background: none !important;
+    .inside { @extend .has-background-link }
+  }
+  &.has-background-info {
+    background: none !important;
+    .inside { @extend .has-background-info }
+  }
+  &.has-background-success {
+    background: none !important;
+    .inside { @extend .has-background-success }
+  }
+  &.has-background-warning {
+    background: none !important;
+    .inside { @extend .has-background-warning }
+  }
+  &.has-background-danger {
+    background: none !important;
+    .inside { @extend .has-background-danger }
+  }
+  &.has-background-black-bis {
+    background: none !important;
+    .inside { @extend .has-background-black-bis }
+  }
+  &.has-background-black-ter {
+    background: none !important;
+    .inside { @extend .has-background-black-ter }
+  }
+  &.has-background-grey-darker {
+    background: none !important;
+    .inside { @extend .has-background-grey-darker }
+  }
+  &.has-background-grey-dark {
+    background: none !important;
+    .inside { @extend .has-background-grey-dark }
+  }
+  &.has-background-grey {
+    background: none !important;
+    .inside { @extend .has-background-grey }
+  }
+  &.has-background-grey-light {
+    background: none !important;
+    .inside { @extend .has-background-grey-light }
+  }
+  &.has-background-grey-lighter {
+    background: none  !important;
+    .inside { @extend .has-background-grey-lighter }
+  }
+  &.has-background-white-ter {
+    background: none !important;
+    .inside { @extend .has-background-white-ter }
+  }
+  &.has-background-white-bis {
+    background: none !important;
+    .inside { @extend .has-background-white-bis }
+  }
+
   &.column.block:not(:last-child) {
     margin-bottom: 0;
   }
@@ -745,6 +828,7 @@ a {
 
 .columns {
   flex-wrap: wrap;
+  display: flex;
 }
 
 .content {

diff --git a/src/Resources/public/scss/parts/modules.scss b/src/Resources/public/scss/parts/modules.scss
@@ -40,6 +40,10 @@ body:not(.home) #header .inside {
     padding: 50px;
     margin: 0;
 
+    a {
+      color: $white;
+    }
+
     .ce_text.block:not(:last-child) {
       margin-bottom: 3rem;
     }
@@ -408,6 +412,10 @@ body:not(.home) #header .inside {
 
   .breadcrumb {
     padding: 0 20px;
+
+    li {
+      white-space: normal;
+    }
   }
 }