From c5d33cc91cb9c3a9c8ca9140cf84df7b3551a422 Mon Sep 17 00:00:00 2001 From: lorenszendre Date: Sun, 7 Oct 2018 01:37:51 +0300 Subject: [PATCH 1/3] Added Span Tag capability to IWBSRegion --- source/IWBSRegion.pas | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/IWBSRegion.pas b/source/IWBSRegion.pas index 18d9bfe..d4ef8f0 100644 --- a/source/IWBSRegion.pas +++ b/source/IWBSRegion.pas @@ -37,10 +37,10 @@ interface 'panel-group', 'panel', 'panel-body', 'panel-heading', 'panel-footer'); type - TIWBSRegionTagType = (bsttDiv, bsttH1, bsttH2, bsttH3, bsttH4, bsttH5, bsttH6, bsttP); + TIWBSRegionTagType = (bsttDiv, bsttH1, bsttH2, bsttH3, bsttH4, bsttH5, bsttH6, bsttP, bsttSpan); const - aIWBSRegionTagType: array[bsttDiv..bsttP] of string = ('div', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p'); + aIWBSRegionTagType: array[bsttDiv..bsttSpan] of string = ('div', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p', 'span'); type TIWBSRegion = class(TIWBSCustomRegion) From f7faf5ccd56bdac7f43d5825b5777674517d8b6a Mon Sep 17 00:00:00 2001 From: lorenszendre Date: Sun, 7 Oct 2018 13:09:14 +0300 Subject: [PATCH 2/3] Fix Design Flaw in IWBSRegion While coding today I tried to put a fluid container inside of a navbar. I discovered that it added extra attributes. I appreciate the attempt to try to handle the common usage of a container inside a navbar, but it doesn't work to force these attributes on a container, because it's sometimes necessary to have a fluid container without them. --- source/IWBSRegion.pas | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/IWBSRegion.pas b/source/IWBSRegion.pas index d4ef8f0..26f9359 100644 --- a/source/IWBSRegion.pas +++ b/source/IWBSRegion.pas @@ -74,12 +74,12 @@ procedure TIWBSRegion.InternalRenderCss(var ACss: string); else if (FRegionType in [bsrtWell, bsrtWellLarge, bsrtWellSmall]) and (FBackground <> bsrbDefault) then TIWBSCommon.AddCssClass(ACss, 'well-'+aIWBSRegionBack[FBackground]) else if (FBackground <> bsrbDefault) then - TIWBSCommon.AddCssClass(ACss, 'bg-'+aIWBSRegionBack[FBackground]) - else if (Parent is TIWBSNavBar) then + TIWBSCommon.AddCssClass(ACss, 'bg-'+aIWBSRegionBack[FBackground]); + {else if (Parent is TIWBSNavBar) then if TagType = bsttDiv then TIWBSCommon.AddCssClass(ACss, 'navbar-btn') else - TIWBSCommon.AddCssClass(ACss, 'navbar-text'); + TIWBSCommon.AddCssClass(ACss, 'navbar-text');} inherited; end; From 6cd2bac14a01a7ab883ba795cb51815cea2b9b1b Mon Sep 17 00:00:00 2001 From: lorenszendre Date: Sun, 7 Oct 2018 16:58:23 +0300 Subject: [PATCH 3/3] Add Span option to TIWBSRegion --- source/IWBSRegion.pas | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/IWBSRegion.pas b/source/IWBSRegion.pas index 26f9359..d4ef8f0 100644 --- a/source/IWBSRegion.pas +++ b/source/IWBSRegion.pas @@ -74,12 +74,12 @@ procedure TIWBSRegion.InternalRenderCss(var ACss: string); else if (FRegionType in [bsrtWell, bsrtWellLarge, bsrtWellSmall]) and (FBackground <> bsrbDefault) then TIWBSCommon.AddCssClass(ACss, 'well-'+aIWBSRegionBack[FBackground]) else if (FBackground <> bsrbDefault) then - TIWBSCommon.AddCssClass(ACss, 'bg-'+aIWBSRegionBack[FBackground]); - {else if (Parent is TIWBSNavBar) then + TIWBSCommon.AddCssClass(ACss, 'bg-'+aIWBSRegionBack[FBackground]) + else if (Parent is TIWBSNavBar) then if TagType = bsttDiv then TIWBSCommon.AddCssClass(ACss, 'navbar-btn') else - TIWBSCommon.AddCssClass(ACss, 'navbar-text');} + TIWBSCommon.AddCssClass(ACss, 'navbar-text'); inherited; end;