Merge pull request #200 from t3solution/5.1.11

New release v5.1.11
t3solution · Apr 27, 2022 · db71f16 · db71f16
2 parents 0a5cca1 + 268b47a
commit db71f16
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 7 deletions.
diff --git a/Classes/Command/CustomScss.php b/Classes/Command/CustomScss.php
@@ -152,8 +152,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 			GeneralUtility::writeFile($customFile, $customContent);
 
 			# Custom
-#			$customDir = 'fileadmin/T3SB/Resources/Public/SCSS/';
-			$customDir = $settings['customScssPath'] ? $settings['customScssPath'] : 'fileadmin/T3SB/Resources/Public/SCSS/';
+			$customDir = !empty($settings['customScssPath']) ? $settings['customScssPath'] : 'fileadmin/T3SB/Resources/Public/SCSS/';
 			$customPath = GeneralUtility::getFileAbsFileName($customDir);
 
 			$queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('pages');

diff --git a/Classes/Components/Card.php b/Classes/Components/Card.php
@@ -113,6 +113,7 @@ public function getProcessedData(array $processedData, array $flexconf): array
 		}
 		// class
 		$cardClass = 'card';
+		$cardClass = $processedData['class'];
 		$cardClass .= !empty($parentflexconf['equalHeight']) ? ' h-100' : '';
 
 		if ( $processedData['data']['tx_t3sbootstrap_textcolor'] ) {

diff --git a/Classes/Controller/ConfigController.php b/Classes/Controller/ConfigController.php
@@ -461,7 +461,7 @@ protected function overrideConfig(): array
 	public function getCustomScss( string $file ): array
 	{
 		$assignedOptions = [];
-		$customScssDir = 'fileadmin/T3SB/Resources/Public/SCSS/';
+		$customScssDir = !empty($this->settings['customScssPath']) ? $this->settings['customScssPath'] : 'fileadmin/T3SB/Resources/Public/SCSS/';
 		$customScssFilePath = GeneralUtility::getFileAbsFileName($customScssDir);
 		$queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('pages');
 		$result = $queryBuilder
@@ -503,7 +503,6 @@ public function getCustomScss( string $file ): array
 			} else {
 				$scss = !empty($arguments[$file]) ? $arguments[$file] : '';
 			}
-
 			if ($scss) {
 				$assignedOptions[$file] = $scss;
 				$handle = fopen($customScssFile, 'w') or die('Cannot open file:	 '.$customScssFile);

diff --git a/Classes/DataProcessing/BootstrapProcessor.php b/Classes/DataProcessing/BootstrapProcessor.php
@@ -300,7 +300,7 @@ public function process(ContentObjectRenderer $cObj, array $contentObjectConfigu
 		 (int)$processorConfiguration['defaultHeaderType'], $processorConfiguration['contentMarginTop'], $extConf['animateCss'], $parentCType);
 
 		// trim header
-		$processedData['data']['header'] = trim($processedData['data']['header']);
+		$processedData['data']['header'] = !empty($processedData['data']['header']) ? trim($processedData['data']['header']) : '';
 
 		$processedData['style'] .= ' '.$processedData['data']['tx_t3sbootstrap_extra_style'];
 		$processedData['style'] = trim($processedData['style']);

diff --git a/Classes/Helper/ClassHelper.php b/Classes/Helper/ClassHelper.php
@@ -21,6 +21,9 @@ class ClassHelper implements SingletonInterface
 	 */
 	public function getDefaultClass(array $data, array $flexconf, string $cTypeClass): string
 	{
+
+
+
 	 	// class
 		if ( $cTypeClass ) {
 			$class = 'fsc-default ce-'. $data['CType'];

diff --git a/Configuration/TypoScript/constants.typoscript b/Configuration/TypoScript/constants.typoscript
@@ -196,6 +196,9 @@ bootstrap.config.darkMode = 0
 # include print template
 bootstrap.print.enable = 0
 
+# Custom path to your custom.scss files: e.g.: fileadmin/T3SB/Resources/Public/SCSS/ (clear cache and run the Scheduler).
+bootstrap.customScssPath = 
+
 # disable default CSS - t3sbootstrap.css
 bootstrap.config.disableDefaultCss = 0
 

diff --git a/Resources/Private/Backend/Templates/Config/List.html b/Resources/Private/Backend/Templates/Config/List.html
@@ -148,7 +148,7 @@ <h2><em class="fa fas fa-cogs" aria-hidden="true"></em> Configuration</h2>
 								</f:then>
 								<f:else>
 									<p class="text-center text-secondary">
-										You can override default Bootstrap variables in <strong>fileadmin/T3SB/Resources/Public/SCSS/custom-variables.scss</strong>
+										You can override default Bootstrap variables in <strong>{settings.customScssPath}</strong>
 										 without modifying source files.<br />
 										 <small>Clean up temporary files in typo3temp/assets/t3sbootstrap/css/ after edit this file!</small>
 									</p>

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -19,7 +19,7 @@
     'state' => 'stable',
     'clearCacheOnLoad' => true,
     'author_company' => 't3solution',
-    'version' => '5.1.10',
+    'version' => '5.1.11',
     'constraints' => [
       'depends' => [
         'typo3' => '10.4.18-11.9.99',