Skip to content

Commit 53194d6

Browse files
committed
Badge style fixes
1 parent cc707be commit 53194d6

File tree

5 files changed

+72
-14
lines changed

5 files changed

+72
-14
lines changed
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
@inherits Blazorise.Badge
2+
@if ( Link is not null )
3+
{
4+
<a @ref="@ElementRef" id="@ElementId" href="@Link" class="@ClassNames" style="@StyleNames" @attributes="@Attributes">
5+
@ChildContent
6+
@if ( Closable )
7+
{
8+
<span class="@CloseClassBuilder.Class" aria-label="Close" tabindex="0" @onclick="@OnCloseClickedHandler" @onclick:preventDefault @onkeydown="@OnCloseKeyDownHandler">
9+
<svg viewBox="0 96 960 960">
10+
<path d="m249 849-42-42 231-231-231-231 42-42 231 231 231-231 42 42-231 231 231 231-42 42-231-231-231 231Z"></path>
11+
</svg>
12+
</span>
13+
}
14+
</a>
15+
}
16+
else
17+
{
18+
<span @ref="@ElementRef" id="@ElementId" class="@ClassNames" style="@StyleNames" @attributes="@Attributes">
19+
@ChildContent
20+
@if ( Closable )
21+
{
22+
<span class="@CloseClassBuilder.Class" aria-label="Close" tabindex="0" @onclick="@OnCloseClickedHandler" @onclick:preventDefault @onkeydown="@OnCloseKeyDownHandler">
23+
<svg viewBox="0 96 960 960">
24+
<path d="m249 849-42-42 231-231-231-231 42-42 231 231 231-231 42 42-231 231 231 231-42 42-231-231-231 231Z"></path>
25+
</svg>
26+
</span>
27+
}
28+
</span>
29+
}

Source/Blazorise.Material/Config.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public static IServiceCollection AddMaterialProviders( this IServiceCollection s
3434

3535
public static IDictionary<Type, Type> ComponentMap => new Dictionary<Type, Type>( Bootstrap.Config.ComponentMap )
3636
{
37-
// material overrides
37+
[typeof( Blazorise.Badge )] = typeof( Components.Badge ),
3838
[typeof( Blazorise.Check<> )] = typeof( Components.Check<> ),
3939
[typeof( Blazorise.CarouselSlide )] = typeof( Components.CarouselSlide ),
4040
[typeof( Blazorise.DropdownToggle )] = typeof( Components.DropdownToggle ),

Source/Blazorise.Material/Styles/components/_badge.scss

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
&-#{$name} {
33
background-color: var(--mui-#{$color}-container);
44
color: var(--mui-on-#{$color}-container);
5-
border-color: var(--mui-#{$color}-container);
5+
border-color: var(--mui-outline-#{$color});
66

77
.mui-chip-close {
88
color: var(--mui-#{$color});
@@ -17,6 +17,7 @@
1717
.mui-chip {
1818
--mui-chip-padding: 0.75rem;
1919
--mui-chip-size: 2rem;
20+
--mui-chip-close-size: 1.125rem;
2021
box-sizing: border-box;
2122
display: inline-flex;
2223
align-items: center;
@@ -56,9 +57,14 @@
5657

5758
.mui-chip-close {
5859
cursor: pointer;
60+
61+
> svg {
62+
width: var(--mui-chip-close-size);
63+
height: var(--mui-chip-close-size);
64+
}
5965
}
6066

6167
+ .mui-chip {
62-
margin-left: 0.5rem;
68+
margin-left: 8px;
6369
}
6470
}

Source/Blazorise.Material/wwwroot/blazorise.material.css

Lines changed: 33 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,24 @@
8181
--mui-scrim: #000000;
8282
--mui-outline: #767680;
8383
--mui-outline-variant: #c7c5d0;
84+
--mui-outline-primary: #a2a7c2;
85+
--mui-outline-primary-variant: #d7d9ea;
86+
--mui-outline-secondary: #a5a6ad;
87+
--mui-outline-secondary-variant: #dddde3;
88+
--mui-outline-tertiary: #b2a5ab;
89+
--mui-outline-tertiary-variant: #e7dde1;
90+
--mui-outline-error: #c7a2a2;
91+
--mui-outline-error-variant: #ecd7d7;
92+
--mui-outline-success: #91a79b;
93+
--mui-outline-success-variant: #d5e3da;
94+
--mui-outline-warning: #b3a996;
95+
--mui-outline-warning-variant: #e9e2d2;
96+
--mui-outline-info: #9aacbc;
97+
--mui-outline-info-variant: #dbe4ec;
98+
--mui-outline-light: #dddce0;
99+
--mui-outline-light-variant: #f1f0f2;
100+
--mui-outline-dark: #97979a;
101+
--mui-outline-dark-variant: #d8d8da;
84102
--mui-surface-dim: #ddd8dd;
85103
--mui-surface-bright: #fdf8fd;
86104
--mui-surface-container-lowest: #ffffff;
@@ -415,6 +433,7 @@ body :is(:hover, :focus)::-webkit-scrollbar-thumb {
415433
.mui-chip {
416434
--mui-chip-padding: 0.75rem;
417435
--mui-chip-size: 2rem;
436+
--mui-chip-close-size: 1.125rem;
418437
box-sizing: border-box;
419438
display: inline-flex;
420439
align-items: center;
@@ -444,7 +463,7 @@ body :is(:hover, :focus)::-webkit-scrollbar-thumb {
444463
.mui-chip-primary {
445464
background-color: var(--mui-primary-container);
446465
color: var(--mui-on-primary-container);
447-
border-color: var(--mui-primary-container);
466+
border-color: var(--mui-outline-primary);
448467
}
449468
.mui-chip-primary .mui-chip-close {
450469
color: var(--mui-primary);
@@ -455,7 +474,7 @@ body :is(:hover, :focus)::-webkit-scrollbar-thumb {
455474
.mui-chip-secondary {
456475
background-color: var(--mui-secondary-container);
457476
color: var(--mui-on-secondary-container);
458-
border-color: var(--mui-secondary-container);
477+
border-color: var(--mui-outline-secondary);
459478
}
460479
.mui-chip-secondary .mui-chip-close {
461480
color: var(--mui-secondary);
@@ -466,7 +485,7 @@ body :is(:hover, :focus)::-webkit-scrollbar-thumb {
466485
.mui-chip-tertiary {
467486
background-color: var(--mui-tertiary-container);
468487
color: var(--mui-on-tertiary-container);
469-
border-color: var(--mui-tertiary-container);
488+
border-color: var(--mui-outline-tertiary);
470489
}
471490
.mui-chip-tertiary .mui-chip-close {
472491
color: var(--mui-tertiary);
@@ -477,7 +496,7 @@ body :is(:hover, :focus)::-webkit-scrollbar-thumb {
477496
.mui-chip-error {
478497
background-color: var(--mui-error-container);
479498
color: var(--mui-on-error-container);
480-
border-color: var(--mui-error-container);
499+
border-color: var(--mui-outline-error);
481500
}
482501
.mui-chip-error .mui-chip-close {
483502
color: var(--mui-error);
@@ -488,7 +507,7 @@ body :is(:hover, :focus)::-webkit-scrollbar-thumb {
488507
.mui-chip-success {
489508
background-color: var(--mui-success-container);
490509
color: var(--mui-on-success-container);
491-
border-color: var(--mui-success-container);
510+
border-color: var(--mui-outline-success);
492511
}
493512
.mui-chip-success .mui-chip-close {
494513
color: var(--mui-success);
@@ -499,7 +518,7 @@ body :is(:hover, :focus)::-webkit-scrollbar-thumb {
499518
.mui-chip-warning {
500519
background-color: var(--mui-warning-container);
501520
color: var(--mui-on-warning-container);
502-
border-color: var(--mui-warning-container);
521+
border-color: var(--mui-outline-warning);
503522
}
504523
.mui-chip-warning .mui-chip-close {
505524
color: var(--mui-warning);
@@ -510,7 +529,7 @@ body :is(:hover, :focus)::-webkit-scrollbar-thumb {
510529
.mui-chip-info {
511530
background-color: var(--mui-info-container);
512531
color: var(--mui-on-info-container);
513-
border-color: var(--mui-info-container);
532+
border-color: var(--mui-outline-info);
514533
}
515534
.mui-chip-info .mui-chip-close {
516535
color: var(--mui-info);
@@ -521,7 +540,7 @@ body :is(:hover, :focus)::-webkit-scrollbar-thumb {
521540
.mui-chip-light {
522541
background-color: var(--mui-light-container);
523542
color: var(--mui-on-light-container);
524-
border-color: var(--mui-light-container);
543+
border-color: var(--mui-outline-light);
525544
}
526545
.mui-chip-light .mui-chip-close {
527546
color: var(--mui-light);
@@ -532,7 +551,7 @@ body :is(:hover, :focus)::-webkit-scrollbar-thumb {
532551
.mui-chip-dark {
533552
background-color: var(--mui-dark-container);
534553
color: var(--mui-on-dark-container);
535-
border-color: var(--mui-dark-container);
554+
border-color: var(--mui-outline-dark);
536555
}
537556
.mui-chip-dark .mui-chip-close {
538557
color: var(--mui-dark);
@@ -548,8 +567,12 @@ body :is(:hover, :focus)::-webkit-scrollbar-thumb {
548567
.mui-chip .mui-chip-close {
549568
cursor: pointer;
550569
}
570+
.mui-chip .mui-chip-close > svg {
571+
width: var(--mui-chip-close-size);
572+
height: var(--mui-chip-close-size);
573+
}
551574
.mui-chip + .mui-chip {
552-
margin-left: 0.5rem;
575+
margin-left: 8px;
553576
}
554577

555578
.mui-button {

Source/Blazorise.Material/wwwroot/blazorise.material.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)