Merge pull request #1917 from leigh-pointer/LabelCSS

Fix for  #1914 Label Control appending Class to LabelClass
This commit is contained in:
Shaun Walker 2022-01-08 14:03:28 -05:00 committed by GitHub
commit efcfc0783c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -25,8 +25,8 @@ else
[Parameter] [Parameter]
public string HelpText { get; set; } // optional - tooltip for this label public string HelpText { get; set; } // optional - tooltip for this label
private string _spanclass = "app-tooltip"; private string _spanclass;
private string _labelclass = "form-label"; private string _labelclass;
private string _helptext = string.Empty; private string _helptext = string.Empty;
protected override void OnParametersSet() protected override void OnParametersSet()
@ -36,11 +36,15 @@ else
if (!string.IsNullOrEmpty(HelpText)) if (!string.IsNullOrEmpty(HelpText))
{ {
_helptext = Localize(nameof(HelpText), HelpText); _helptext = Localize(nameof(HelpText), HelpText);
_spanclass += (!string.IsNullOrEmpty(Class)) ? " " + Class : ""; _labelclass = "form-label";
var spanclass = (!string.IsNullOrEmpty(Class)) ? " " + Class : "";
_spanclass = "app-tooltip" + spanclass;
} }
else else
{ {
_labelclass += (!string.IsNullOrEmpty(Class)) ? " " + Class : ""; var labelclass = (!string.IsNullOrEmpty(Class)) ? " " + Class : "";
_labelclass = "form-label" + labelclass;
} }
var text = Localize("Text", String.Empty); var text = Localize("Text", String.Empty);