Skip to content

Commit

Permalink
Merge pull request #271 from t3solution/5.2.5
Browse files Browse the repository at this point in the history
New release v5.2.5
  • Loading branch information
t3solution committed Sep 25, 2022
2 parents c708ef0 + db3e665 commit c4cf5ba
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 13 deletions.
10 changes: 6 additions & 4 deletions Classes/DataProcessing/ConfigProcessor.php
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,12 @@ public function process(ContentObjectRenderer $cObj, array $contentObjectConfigu
// global override page data
if ( !empty($contentObjectConfiguration['settings.']['pages.']['override.']) ) {
foreach ( $contentObjectConfiguration['settings.']['pages.']['override.'] as $field=>$override ) {
if ( ($field === 'tx_t3sbootstrap_titlecolor' || $field === 'tx_t3sbootstrap_subtitlecolor') && str_starts_with($override, '--bs-')) {
$processedData['data'][$field] = 'var('.$override.')';
} else {
$processedData['data'][$field] = $override;
if (!empty($override)) {
if ( ($field === 'tx_t3sbootstrap_titlecolor' || $field === 'tx_t3sbootstrap_subtitlecolor') && str_starts_with($override, '--bs-')) {
$processedData['data'][$field] = 'var('.$override.')';
} else {
$processedData['data'][$field] = $override;
}
}
}
}
Expand Down
16 changes: 8 additions & 8 deletions Configuration/TypoScript/constants.typoscript
Original file line number Diff line number Diff line change
Expand Up @@ -190,21 +190,21 @@ bootstrap.optimize {
# customcategory=bootstrap-pages=* T3SB::Global pages override
# customsubcategory=a-pages=Global pages override
bootstrap.pages.override {
# cat=bootstrap-pages/a-pages/05; type=options[none=0, container, container-sm, container-md, container-lg, container-xl, container-xxl, container-fluid]; label=Container (for the whole page):
# cat=bootstrap-pages/a-pages/10; type=options[none=0, container=container, container-sm=container-sm, container-md=container-md, container-lg=container-lg, container-xl=container-xl, container-xxl=container-xxl, container-fluid=container-fluid]; label=Container (for the whole page):
container = 0
# cat=bootstrap-pages/a-pages/10; type=boolean; label=Link to top:
# cat=bootstrap-pages/a-pages/20; type=boolean; label=Link to top:
linkToTop = 0
# cat=bootstrap-pages/a-pages/15; type=options[0, 1, 2, 3, 4, 5, 6]; label=Aside columns width:
# cat=bootstrap-pages/a-pages/25; type=options[0=0, 1=1, 2=2, 3=3, 4=4, 5=5, 6=6]; label=Aside columns width:
smallColumns = 0
# cat=bootstrap-pages/a-pages/20; type=boolean; label=Dropdown menu right:
# cat=bootstrap-pages/a-pages/30; type=boolean; label=Dropdown menu right:
dropdownRight = 0
# cat=bootstrap-pages/a-pages/25; type=options[0, default, top, bottom, leftTop, leftBottom, rightTop, rightBottom]; label=Aside order on mobile:
# cat=bootstrap-pages/a-pages/35; type=options[0=0, default=default, top=top, bottom=bottom, leftTop=leftTop, leftBottom=leftBottom, rightTop=rightTop, rightBottom=rightBottom]; label=Aside order on mobile:
mobileOrder = 0
# cat=bootstrap-pages/a-pages/30; type=options[0, md, sm, md, lg, xl, xxl]; label=Breakpoint:
# cat=bootstrap-pages/a-pages/40; type=options[0=0, md=md, sm=sm, md=md, lg=lg, xl=xl, xxl=xxl]; label=Breakpoint:
breakpoint = 0
# cat=bootstrap-pages/a-pages/50; type=small; label=Title color: Hex color codes, RGB or CSS variables e.g. var(--bs-primary)
# cat=bootstrap-pages/a-pages/60; type=small; label=Title color: Hex color codes, RGB or CSS variables e.g. var(--bs-primary)
titlecolor =
# cat=bootstrap-pages/a-pages/55; type=small; label=Subtitle color: Hex color codes, RGB or CSS variables e.g. var(--bs-primary)
# cat=bootstrap-pages/a-pages/65; type=small; label=Subtitle color: Hex color codes, RGB or CSS variables e.g. var(--bs-primary)
subtitlecolor =
}

Expand Down
2 changes: 1 addition & 1 deletion ext_emconf.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
'title' => 'Bootstrap Components',
'description' => 'Startup extension to use bootstrap 5 classes, components and more out of the box. Example and info: www.t3sbootstrap.de',
'category' => 'templates',
'version' => '5.2.4',
'version' => '5.2.5',
'state' => 'stable',
'uploadfolder' => false,
'clearcacheonload' => true,
Expand Down

0 comments on commit c4cf5ba

Please sign in to comment.