Skip to content

Commit

Permalink
Update ThemeUtils.php
Browse files Browse the repository at this point in the history
  • Loading branch information
seibtph committed Nov 30, 2022
1 parent 796ed79 commit 870fea0
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 10 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Types of changes
Security in case of vulnerabilities.
)

## [1.10.1](https://github.com/contao-themes-net/nature-theme-bundle/tree/1.10.1) – 2022-11-30
## [1.11.0](https://github.com/contao-themes-net/nature-theme-bundle/tree/1.11.0) – 2022-11-30

- [Added] Add multi domain support

Expand Down
2 changes: 1 addition & 1 deletion src/Module/NatureThemeSetup.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

class NatureThemeSetup extends BackendModule
{
public const VERSION = '1.10.1';
public const VERSION = '1.11.0';

protected $strTemplate = 'be_naturetheme_setup';

Expand Down
12 changes: 4 additions & 8 deletions src/ThemeUtils.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/*
* nature theme bundle for Contao Open Source CMS
*
* Copyright (C) 2022 pdir / digital agentur // pdir GmbH
* Copyright (C) 2022 pdir / digital agentur <develop@pdir.de>
*
* @package contao-themes-net/nature-theme-bundle
* @link https://github.com/contao-themes-net/nature-theme-bundle
Expand All @@ -19,7 +19,6 @@
namespace ContaoThemesNet\NatureThemeBundle;

use Contao\Combiner;
use Contao\CoreBundle\Exception\InvalidResourceException;
use Contao\StringUtil;
use Contao\System;

Expand All @@ -28,20 +27,17 @@ class ThemeUtils
public static string $themeFolder = 'bundles/contaothemesnetnaturetheme/';
public static string $scssFolder = 'scss/';

public static function getRootDir(): string
public static function getRootDir()
{
return System::getContainer()->getParameter('kernel.project_dir');
}

public static function getWebDir(): string
public static function getWebDir()
{
return StringUtil::stripRootDir(System::getContainer()->getParameter('contao.web_dir'));
}

/**
* @throws InvalidResourceException
*/
public static function getCombinedStylesheet($theme = null): string
public static function getCombinedStylesheet($theme = null)
{
self::$scssFolder = self::$themeFolder.self::$scssFolder;

Expand Down

0 comments on commit 870fea0

Please sign in to comment.