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

1.11.1
contao-themes-net · Feb 15, 2023 · db5ea3f · db5ea3f
2 parents 1566a08 + b04f17b
commit db5ea3f
Show file tree

Hide file tree

Showing 25 changed files with 1,273 additions and 1,250 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,14 @@ Types of changes
     Security in case of vulnerabilities.
 )
 
+## [1.11.1](https://github.com/contao-themes-net/nature-theme-bundle/tree/1.11.1) – 2023-02-13
+
+- [Changed] Change font paths
+- [Changed] Change sql files for Contao 4.13
+- [Fixed] Fix smooth scroll javascript (return nothing if href is empty)
+- [Fixed] Fix error messages styles
+- [Fixed] Fix link color in hero element
+
 ## [1.11.0](https://github.com/contao-themes-net/nature-theme-bundle/tree/1.11.0) – 2022-11-30
 
 - [Added] Add multi domain support

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 <[email protected]>
+ * Copyright (C) 2023 pdir / digital agentur <[email protected]>
  *
  * @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 <[email protected]>
+ * Copyright (C) 2023 pdir / digital agentur <[email protected]>
  *
  * @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 <[email protected]>
+ * Copyright (C) 2023 pdir / digital agentur <[email protected]>
  *
  * @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 <[email protected]>
+ * Copyright (C) 2023 pdir / digital agentur <[email protected]>
  *
  * @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 <[email protected]>
+ * Copyright (C) 2023 pdir / digital agentur <[email protected]>
  *
  * @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 <[email protected]>
+ * Copyright (C) 2023 pdir / digital agentur <[email protected]>
  *
  * @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 <[email protected]>
+ * Copyright (C) 2023 pdir / digital agentur <[email protected]>
  *
  * @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 <[email protected]>
+ * Copyright (C) 2023 pdir / digital agentur <[email protected]>
  *
  * @package    contao-themes-net/nature-theme-bundle
  * @link       https://github.com/contao-themes-net/nature-theme-bundle

diff --git a/src/Module/NatureThemeSetup.php b/src/Module/NatureThemeSetup.php
@@ -5,7 +5,7 @@
 /*
  * nature theme bundle for Contao Open Source CMS
  *
- * Copyright (C) 2022 pdir / digital agentur <[email protected]>
+ * Copyright (C) 2023 pdir / digital agentur <[email protected]>
  *
  * @package    contao-themes-net/nature-theme-bundle
  * @link       https://github.com/contao-themes-net/nature-theme-bundle
@@ -26,7 +26,7 @@
 
 class NatureThemeSetup extends BackendModule
 {
-    public const VERSION = '1.11.0';
+    public const VERSION = '1.11.1';
 
     protected $strTemplate = 'be_naturetheme_setup';
 

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

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

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

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

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

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

diff --git a/src/Resources/public/js/theme.js b/src/Resources/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/src/Resources/public/scss/color_schemes/nature_dark_mode.scss b/src/Resources/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/src/Resources/public/scss/fonts.scss b/src/Resources/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/src/Resources/public/scss/parts/elements.scss b/src/Resources/public/scss/parts/elements.scss
@@ -1211,7 +1211,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;
     }
   }

diff --git a/src/Resources/public/scss/parts/modules.scss b/src/Resources/public/scss/parts/modules.scss
@@ -813,6 +813,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/ThemeUtils.php b/src/ThemeUtils.php
@@ -5,7 +5,7 @@
 /*
  * nature theme bundle for Contao Open Source CMS
  *
- * Copyright (C) 2022 pdir / digital agentur <[email protected]>
+ * Copyright (C) 2023 pdir / digital agentur <[email protected]>
  *
  * @package    contao-themes-net/nature-theme-bundle
  * @link       https://github.com/contao-themes-net/nature-theme-bundle