Merge branch 'rel-1.7'

Author: stsrki

Source/Blazorise.Bootstrap5/Providers/Bootstrap5ThemeGenerator.cs

@@ -436,8 +436,9 @@ protected override void GenerateBadgeVariantStyles( StringBuilder sb, Theme them
         var background = ToHex( backgroundColor );
         var yiqBackground = ToHex( yiqBackgroundColor );
 
-        sb.Append( $".badge.bg-{variant}" ).Append( "{" )
-            .Append( $"color: {yiqBackground};" )
+        sb.Append( $".badge.text-bg-{variant}" ).Append( "{" )
+            .Append( $"color: {yiqBackground} !important;" )
+            .Append( $"background-color: {background} !important;" )
             .AppendLine( "}" );
     }
 
@@ -727,9 +728,12 @@ protected override void GenerateBreadcrumbStyles( StringBuilder sb, Theme theme,
 
     protected override void GenerateBadgeStyles( StringBuilder sb, Theme theme, ThemeBadgeOptions options )
     {
-        sb.Append( ".badge:not(.rounded-pill)" ).Append( "{" )
-            .Append( $"border-radius: {GetBorderRadius( theme, options?.BorderRadius, Var( ThemeVariables.BorderRadius ) )};" )
-            .AppendLine( "}" );
+        if ( !string.IsNullOrEmpty( options?.BorderRadius ) )
+        {
+            sb.Append( ".badge:not(.rounded-pill)" ).Append( "{" )
+                .Append( $"border-radius: {GetBorderRadius( theme, options?.BorderRadius, Var( ThemeVariables.BorderRadius ) )};" )
+                .AppendLine( "}" );
+        }
     }
 
     protected override void GeneratePaginationStyles( StringBuilder sb, Theme theme, ThemePaginationOptions options )