Merge pull request #70 from contao-themes-net/change-font-paths-contao5

2.2.0
contao-themes-net · Feb 15, 2023 · eb06c2c · eb06c2c
2 parents 9eaaf95 + b7b4647
commit eb06c2c
Show file tree

Hide file tree

Showing 33 changed files with 3,685 additions and 1,804 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,13 @@ Types of changes
     Security in case of vulnerabilities.
 )
 
+## [2.2.0](https://github.com/contao-themes-net/nature-theme-bundle/tree/2.2.0) – 2023-02-13
+
+- [Added] Add sql files for Contao 5.1
+- [Changed] Change sql files for Contao 5.0
+- [Fixed] Fix error messages styles
+- [Fixed] Fix link color in hero element
+
 ## [2.1.1](https://github.com/contao-themes-net/nature-theme-bundle/tree/2.1.1) – 2022-12-08
 
 - [Fixed] Fix migrations

diff --git a/composer.json b/composer.json
@@ -81,7 +81,8 @@
             "contao-components/installer": true,
             "contao/manager-plugin": true,
             "dealerdirect/phpcodesniffer-composer-installer": true,
-            "bamarni/composer-bin-plugin": true
+            "bamarni/composer-bin-plugin": true,
+            "php-http/discovery": true
         }
     }
 }
diff --git a/contao/config/config.php b/contao/config/config.php
@@ -5,7 +5,7 @@
 /*
  * nature theme bundle for Contao Open Source CMS
  *
- * Copyright (C) 2022 pdir / digital agentur <develop@pdir.de>
+ * Copyright (C) 2023 pdir / digital agentur <develop@pdir.de>
  *
  * @package    contao-themes-net/nature-theme-bundle
  * @link       https://github.com/contao-themes-net/nature-theme-bundle

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

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

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

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

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

diff --git a/contao/sql/contao50/full.sql b/contao/sql/contao50/full.sql
diff --git a/contao/sql/contao50/minimal.sql b/contao/sql/contao50/minimal.sql
diff --git a/contao/sql/contao51/full.sql b/contao/sql/contao51/full.sql
diff --git a/contao/sql/contao51/minimal.sql b/contao/sql/contao51/minimal.sql
diff --git a/public/js/theme.js b/public/js/theme.js
@@ -107,6 +107,10 @@ jQuery(document).ready(function($) {
         href = href.substr(0,href.indexOf('#'));
         href = href.replace('./','');
 
+        if( href === '' ) {
+            return;
+        }
+
         var path = window.location.pathname;
         path = path.replace('/','');
 

diff --git a/public/scss/color_schemes/nature_dark_mode.scss b/public/scss/color_schemes/nature_dark_mode.scss
@@ -162,7 +162,7 @@ $darkMode_input-focus-border-color: $grey-darker;
         background: $darkMode_boxes-background;
         color: $darkMode_boxes-color;
 
-        h1, h2, h3, h4, h5, h6, a, strong {
+        h1, h2, h3, h4, h5, h6, strong {
           color: $darkMode_boxes-color;
         }
       }

diff --git a/public/scss/fonts.scss b/public/scss/fonts.scss
@@ -4,76 +4,76 @@
   font-weight: 100;
   font-display: swap;
   src: local('Roboto Slab Thin'),
-  url('../../../bundles/contaothemesnetnaturetheme/fonts/robotoslab/robotoslab-thin-webfont.woff2') format('woff2'),
-  url('../../../bundles/contaothemesnetnaturetheme/fonts/robotoslab/robotoslab-thin-webfont.woff') format('woff'),
-  url('../../../bundles/contaothemesnetnaturetheme/fonts/robotoslab/robotoslab-thin-webfont.ttf') format('ttf'),
-  url('../../../bundles/contaothemesnetnaturetheme/fonts/robotoslab/robotoslab-thin-webfont.eot') format('eot');
+  url('/bundles/contaothemesnetnaturetheme/fonts/robotoslab/robotoslab-thin-webfont.woff2') format('woff2'),
+  url('/bundles/contaothemesnetnaturetheme/fonts/robotoslab/robotoslab-thin-webfont.woff') format('woff'),
+  url('/bundles/contaothemesnetnaturetheme/fonts/robotoslab/robotoslab-thin-webfont.ttf') format('ttf'),
+  url('/bundles/contaothemesnetnaturetheme/fonts/robotoslab/robotoslab-thin-webfont.eot') format('eot');
 }
 @font-face {
   font-family: 'Roboto Slab Light';
   font-style: normal;
   font-weight: 300;
   font-display: swap;
   src: local('Roboto Slab Light'),
-  url('../../../bundles/contaothemesnetnaturetheme/fonts/robotoslab/robotoslab-light-webfont.woff2') format('woff2'),
-  url('../../../bundles/contaothemesnetnaturetheme/fonts/robotoslab/robotoslab-light-webfont.woff') format('woff'),
-  url('../../../bundles/contaothemesnetnaturetheme/fonts/robotoslab/robotoslab-light-webfont.ttf') format('ttf'),
-  url('../../../bundles/contaothemesnetnaturetheme/fonts/robotoslab/robotoslab-light-webfont.eot') format('eot');
+  url('/bundles/contaothemesnetnaturetheme/fonts/robotoslab/robotoslab-light-webfont.woff2') format('woff2'),
+  url('/bundles/contaothemesnetnaturetheme/fonts/robotoslab/robotoslab-light-webfont.woff') format('woff'),
+  url('/bundles/contaothemesnetnaturetheme/fonts/robotoslab/robotoslab-light-webfont.ttf') format('ttf'),
+  url('/bundles/contaothemesnetnaturetheme/fonts/robotoslab/robotoslab-light-webfont.eot') format('eot');
 }
 @font-face {
   font-family: 'Roboto Slab';
   font-style: normal;
   font-weight: 400;
   font-display: swap;
   src: local('Roboto Slab'),
-  url('../../../bundles/contaothemesnetnaturetheme/fonts/robotoslab/robotoslab-regular-webfont.woff2') format('woff2'),
-  url('../../../bundles/contaothemesnetnaturetheme/fonts/robotoslab/robotoslab-regular-webfont.woff') format('woff'),
-  url('../../../bundles/contaothemesnetnaturetheme/fonts/robotoslab/robotoslab-regular-webfont.ttf') format('ttf'),
-  url('../../../bundles/contaothemesnetnaturetheme/fonts/robotoslab/robotoslab-regular-webfont.eot') format('eot');
+  url('/bundles/contaothemesnetnaturetheme/fonts/robotoslab/robotoslab-regular-webfont.woff2') format('woff2'),
+  url('/bundles/contaothemesnetnaturetheme/fonts/robotoslab/robotoslab-regular-webfont.woff') format('woff'),
+  url('/bundles/contaothemesnetnaturetheme/fonts/robotoslab/robotoslab-regular-webfont.ttf') format('ttf'),
+  url('/bundles/contaothemesnetnaturetheme/fonts/robotoslab/robotoslab-regular-webfont.eot') format('eot');
 }
 @font-face {
   font-family: 'Roboto Slab';
   font-style: normal;
   font-weight: 700;
   font-display: swap;
   src: local('Roboto Slab Bold'),
-  url('../../../bundles/contaothemesnetnaturetheme/fonts/robotoslab/robotoslab-bold-webfont.woff2') format('woff2'),
-  url('../../../bundles/contaothemesnetnaturetheme/fonts/robotoslab/robotoslab-bold-webfont.woff') format('woff'),
-  url('../../../bundles/contaothemesnetnaturetheme/fonts/robotoslab/robotoslab-bold-webfont.ttf') format('ttf'),
-  url('../../../bundles/contaothemesnetnaturetheme/fonts/robotoslab/robotoslab-bold-webfont.eot') format('eot');
+  url('/bundles/contaothemesnetnaturetheme/fonts/robotoslab/robotoslab-bold-webfont.woff2') format('woff2'),
+  url('/bundles/contaothemesnetnaturetheme/fonts/robotoslab/robotoslab-bold-webfont.woff') format('woff'),
+  url('/bundles/contaothemesnetnaturetheme/fonts/robotoslab/robotoslab-bold-webfont.ttf') format('ttf'),
+  url('/bundles/contaothemesnetnaturetheme/fonts/robotoslab/robotoslab-bold-webfont.eot') format('eot');
 }
 @font-face {
   font-family: 'Roboto';
   font-style: normal;
   font-weight: 100;
   font-display: swap;
   src: local('Roboto Thin'),
-  url('../../../bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-thin-webfont.woff2') format('woff2'),
-  url('../../../bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-thin-webfont.woff') format('woff'),
-  url('../../../bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-thin-webfont.ttf') format('ttf'),
-  url('../../../bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-thin-webfont.eot') format('eot');
+  url('/bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-thin-webfont.woff2') format('woff2'),
+  url('/bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-thin-webfont.woff') format('woff'),
+  url('/bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-thin-webfont.ttf') format('ttf'),
+  url('/bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-thin-webfont.eot') format('eot');
 }
 @font-face {
   font-family: 'Roboto';
   font-style: normal;
   font-weight: 300;
   font-display: swap;
   src: local('Roboto Light'),
-  url('../../../bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-light-webfont.woff2') format('woff2'),
-  url('../../../bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-light-webfont.woff') format('woff'),
-  url('../../../bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-light-webfont.ttf') format('ttf'),
-  url('../../../bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-light-webfont.eot') format('eot');
+  url('/bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-light-webfont.woff2') format('woff2'),
+  url('/bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-light-webfont.woff') format('woff'),
+  url('/bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-light-webfont.ttf') format('ttf'),
+  url('/bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-light-webfont.eot') format('eot');
 }
 @font-face {
   font-family: 'Roboto';
   font-style: normal;
   font-weight: 400;
   font-display: swap;
   src: local('Roboto'),
-  url('../../../bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-regular-webfont.woff2') format('woff2'),
-  url('../../../bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-regular-webfont.woff') format('woff'),
-  url('../../../bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-regular-webfont.ttf') format('ttf'),
-  url('../../../bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-regular-webfont.eot') format('eot');
+  url('/bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-regular-webfont.woff2') format('woff2'),
+  url('/bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-regular-webfont.woff') format('woff'),
+  url('/bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-regular-webfont.ttf') format('ttf'),
+  url('/bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-regular-webfont.eot') format('eot');
 }
 
 @font-face {
@@ -82,19 +82,19 @@
   font-weight: 700;
   font-display: swap;
   src: local('Roboto Bold'),
-  url('../../../bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-bold-webfont.woff2') format('woff2'),
-  url('../../../bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-bold-webfont.woff') format('woff'),
-  url('../../../bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-bold-webfont.ttf') format('ttf'),
-  url('../../../bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-bold-webfont.eot') format('eot');
+  url('/bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-bold-webfont.woff2') format('woff2'),
+  url('/bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-bold-webfont.woff') format('woff'),
+  url('/bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-bold-webfont.ttf') format('ttf'),
+  url('/bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-bold-webfont.eot') format('eot');
 }
 @font-face {
   font-family: 'Roboto';
   font-style: normal;
   font-weight: 900;
   font-display: swap;
   src: local('Roboto Black'),
-  url('../../../bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-black-webfont.woff2') format('woff2'),
-  url('../../../bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-black-webfont.woff') format('woff'),
-  url('../../../bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-black-webfont.ttf') format('ttf'),
-  url('../../../bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-black-webfont.eot') format('eot');
-}
+  url('/bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-black-webfont.woff2') format('woff2'),
+  url('/bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-black-webfont.woff') format('woff'),
+  url('/bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-black-webfont.ttf') format('ttf'),
+  url('/bundles/contaothemesnetnaturetheme/fonts/roboto/roboto-black-webfont.eot') format('eot');
+}
diff --git a/public/scss/parts/elements.scss b/public/scss/parts/elements.scss
@@ -1227,7 +1227,7 @@ h1, h2, h3, h4, h5, h6 {
     background: $boxes-background;
     color: $boxes-color;
 
-    h1, h2, h3, h4, h5, h6, a, strong {
+    h1, h2, h3, h4, h5, h6, strong {
       color: $boxes-color;
     }
   }
@@ -1341,8 +1341,6 @@ pre {
   }
 }
 
-
-
 .sticky-container {
   position: relative;
 

diff --git a/public/scss/parts/modules.scss b/public/scss/parts/modules.scss
@@ -812,6 +812,11 @@ body:not(.home) #header .inside {
   display: none;
 }
 
+p.error {
+  padding: 0 0.75rem;
+  color: $danger;
+}
+
 .submit {
   @extend .button;
   @extend .is-primary;

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

diff --git a/src/ContaoThemesNetNatureThemeBundle.php b/src/ContaoThemesNetNatureThemeBundle.php
@@ -5,7 +5,7 @@
 /*
  * nature theme bundle for Contao Open Source CMS
  *
- * Copyright (C) 2022 pdir / digital agentur  // pdir GmbH
+ * Copyright (C) 2023 pdir / digital agentur  // pdir GmbH
  *
  * @package    contao-themes-net/nature-theme-bundle
  * @link       https://github.com/contao-themes-net/nature-theme-bundle

diff --git a/src/DependencyInjection/ContaoThemesNetNatureThemeExtension.php b/src/DependencyInjection/ContaoThemesNetNatureThemeExtension.php
@@ -5,7 +5,7 @@
 /*
  * nature theme bundle for Contao Open Source CMS
  *
- * Copyright (C) 2022 pdir / digital agentur  // pdir GmbH
+ * Copyright (C) 2023 pdir / digital agentur  // pdir GmbH
  *
  * @package    contao-themes-net/nature-theme-bundle
  * @link       https://github.com/contao-themes-net/nature-theme-bundle

diff --git a/src/Element/SliderElementNature.php b/src/Element/SliderElementNature.php
@@ -5,7 +5,7 @@
 /*
  * nature theme bundle for Contao Open Source CMS
  *
- * Copyright (C) 2022 pdir / digital agentur  // pdir GmbH
+ * Copyright (C) 2023 pdir / digital agentur  // pdir GmbH
  *
  * @package    contao-themes-net/nature-theme-bundle
  * @link       https://github.com/contao-themes-net/nature-theme-bundle

diff --git a/src/Element/TabsNavElement.php b/src/Element/TabsNavElement.php
@@ -5,7 +5,7 @@
 /*
  * nature theme bundle for Contao Open Source CMS
  *
- * Copyright (C) 2022 pdir / digital agentur  // pdir GmbH
+ * Copyright (C) 2023 pdir / digital agentur  // pdir GmbH
  *
  * @package    contao-themes-net/nature-theme-bundle
  * @link       https://github.com/contao-themes-net/nature-theme-bundle

diff --git a/src/Element/TabsStartElement.php b/src/Element/TabsStartElement.php
@@ -5,7 +5,7 @@
 /*
  * nature theme bundle for Contao Open Source CMS
  *
- * Copyright (C) 2022 pdir / digital agentur  // pdir GmbH
+ * Copyright (C) 2023 pdir / digital agentur  // pdir GmbH
  *
  * @package    contao-themes-net/nature-theme-bundle
  * @link       https://github.com/contao-themes-net/nature-theme-bundle

diff --git a/src/Element/TabsStopElement.php b/src/Element/TabsStopElement.php
@@ -5,7 +5,7 @@
 /*
  * nature theme bundle for Contao Open Source CMS
  *
- * Copyright (C) 2022 pdir / digital agentur  // pdir GmbH
+ * Copyright (C) 2023 pdir / digital agentur  // pdir GmbH
  *
  * @package    contao-themes-net/nature-theme-bundle
  * @link       https://github.com/contao-themes-net/nature-theme-bundle

diff --git a/src/Element/TextModalElement.php b/src/Element/TextModalElement.php
@@ -5,7 +5,7 @@
 /*
  * nature theme bundle for Contao Open Source CMS
  *
- * Copyright (C) 2022 pdir / digital agentur  // pdir GmbH
+ * Copyright (C) 2023 pdir / digital agentur  // pdir GmbH
  *
  * @package    contao-themes-net/nature-theme-bundle
  * @link       https://github.com/contao-themes-net/nature-theme-bundle

diff --git a/src/Migration/InitialDemoDataMigration.php b/src/Migration/InitialDemoDataMigration.php
@@ -5,7 +5,7 @@
 /*
  * nature theme bundle for Contao Open Source CMS
  *
- * Copyright (C) 2022 pdir / digital agentur  // pdir GmbH
+ * Copyright (C) 2023 pdir / digital agentur  // pdir GmbH
  *
  * @package    contao-themes-net/nature-theme-bundle
  * @link       https://github.com/contao-themes-net/nature-theme-bundle
@@ -56,6 +56,11 @@ public function shouldRun(): bool
             $this->sqlFile = str_replace('minimal', 'full', $this->sqlFile);
         }
 
+        // Contao 5.1
+        if (isset($schemaManager->listTableColumns('tl_form')['ajax'])) {
+            $this->sqlFile = str_replace('50', '51', $this->sqlFile);
+        }
+
         // check some tables for content
         $count = $this->connection->fetchOne('SELECT COUNT(*) FROM `tl_article`');
         $count += $this->connection->fetchOne('SELECT COUNT(*) FROM `tl_content`');

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

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

diff --git a/src/Migration/Version200.php b/src/Migration/Version200.php
@@ -5,7 +5,7 @@
 /*
  * nature theme bundle for Contao Open Source CMS
  *
- * Copyright (C) 2022 pdir / digital agentur  // pdir GmbH
+ * Copyright (C) 2023 pdir / digital agentur  // pdir GmbH
  *
  * @package    contao-themes-net/nature-theme-bundle
  * @link       https://github.com/contao-themes-net/nature-theme-bundle