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

1.9.2
contao-themes-net · Oct 11, 2022 · 4fe1028 · 4fe1028
2 parents fc5d5df + bd81784
commit 4fe1028
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,13 @@ Types of changes
     Security in case of vulnerabilities.
 )
 
+## [1.9.2](https://github.com/contao-themes-net/nature-theme-bundle/tree/1.9.2) – 2022-10-11
+
+- [Changed] now require terminal42/contao-folderpage version 2.* or 3.*
+- [Changed] load custom stylesheets after nature stylesheets [#56](https://github.com/contao-themes-net/nature-theme-bundle/issues/56)
+- [Fixed] css fix for bold font in footer
+- [Changed] add bulma container variables to _custom_variables.scss [#56](https://github.com/contao-themes-net/nature-theme-bundle/issues/56)
+
 ## [1.9.1](https://github.com/contao-themes-net/nature-theme-bundle/tree/1.9.1) – 2022-09-22
 
 - [Changed] change templates for maklermodul bundle

diff --git a/composer.json b/composer.json
@@ -28,7 +28,7 @@
     "require": {
         "php": "^7.1 || ^8.0",
         "contao/core-bundle": "^4.4",
-        "terminal42/contao-folderpage": "^2.0",
+        "terminal42/contao-folderpage": "^2.0 || ^3.0",
         "pdir/contao-theme-helper-bundle": "^1.0",
         "contao-themes-net/theme-components-bundle": "^1.3",
         "pdir/css-style-selector-bundle": "^1.6",

diff --git a/src/Module/NatureThemeSetup.php b/src/Module/NatureThemeSetup.php
@@ -26,7 +26,7 @@
 
 class NatureThemeSetup extends BackendModule
 {
-    public const VERSION = '1.9.1';
+    public const VERSION = '1.9.2';
 
     protected $strTemplate = 'be_naturetheme_setup';
 

diff --git a/src/Resources/contao/templates/frontend/fe_page_nature.html5 b/src/Resources/contao/templates/frontend/fe_page_nature.html5
@@ -22,10 +22,10 @@
 
   <link rel="shortcut icon" href="files/naturetheme/img/favicon.ico" type="image/x-icon" />
 
-  <?= $this->stylesheets ?>
-
   <link rel="stylesheet" type="text/css" media="all" href="<?= ContaoThemesNet\NatureThemeBundle\ThemeUtils::getCombinedStylesheet(); // nature theme css optimization ?>">
 
+  <?= $this->stylesheets ?>
+
   <?= $this->head ?>
 
   <?= $this->mooScripts ?>

diff --git a/src/Resources/public/scss/_custom_variables.scss b/src/Resources/public/scss/_custom_variables.scss
@@ -14,6 +14,10 @@
 //$font-weight: 300;
 //$strong-weight: 500;
 
+//$container-max-width: 1200px;
+//$container-offset: 0;
+//$container-padding: 0 20px;
+
 /* ====================== */
 /*      Breadcrumb        */
 /* ====================== */

diff --git a/src/Resources/public/scss/_nature_variables.scss b/src/Resources/public/scss/_nature_variables.scss
@@ -5,6 +5,8 @@ $font-size: 1.2rem !default;
 $font-weight: 300 !default;
 $strong-weight: 500 !default;
 
+$container-padding: 0 20px !default;
+
 /* Navigation */
 $navbar-background-color: #eaeaea !default;
 $navbar-background-color-home: rgba(#eaeaea, .7) !default;

diff --git a/src/Resources/public/scss/parts/footer.scss b/src/Resources/public/scss/parts/footer.scss
@@ -59,6 +59,11 @@
       text-decoration: underline;
       font-weight: 700;
     }
+
+    strong {
+      color: $footer-color;
+      font-weight: 700;
+    }
   }
 
   .footer-copyright {
@@ -78,6 +83,11 @@
       color: $footer-copyright-color;
       text-decoration: underline;
     }
+
+    strong {
+      color: $footer-copyright-color;
+      font-weight: 700;
+    }
   }
 
   .is-vertical-center {

diff --git a/src/Resources/public/scss/parts/modules.scss b/src/Resources/public/scss/parts/modules.scss
@@ -411,7 +411,7 @@ body:not(.home) #header .inside {
   width: 100%;
 
   .breadcrumb {
-    padding: 0 20px;
+    padding: $container-padding;
 
     li {
       white-space: normal;
@@ -420,7 +420,7 @@ body:not(.home) #header .inside {
 }
 
 .mod_article:not(.article-full-width) .container {
-  padding: 0 20px;
+  padding: $container-padding;
 }
 
 .mod_calendar {