Skip to content

Commit dd156bc

Browse files
stsrkistsrki
authored
AntDesign v6 support (#6471)
* variables and buttons * antd.css * vars * alert * Badge * spacing utils * card * dropdown * split dropdown * fix cards * fix split dropdowns * fix button groups * loading button * button align * card borders * accordion * bar * vertical bar * bar toggler * bar items * menus * nested menus * selected items color * arrow animation * fix horizontal menus * optimize bar scss * inputs * fileinput * radio * color * addons * fix labels * fix select size * list group * carousel * pagination * validation error * date picker * numeric picker * table * modal * check * check * radio sizes * switch * addon sizes * select * index format * split form styles * offcanvas * layout * progress * steps, tabs, toast * tabs * tooltip * typography * skeleton * utilities * divider, filepicker, rating, figure * file picker * skeleton * segmented * FieldsLabel * sliders * clean * wave effect * table margins * background color cards * breadcrumb * bar color * progress values * accordion animation * theming * typography * obsolete classes * datepicker * fix demo * add readme.md * docs api json * horizontal scrollbar * fix bar responsivness * fix button light color * flex bar submenu # Conflicts: # Source/Blazorise.AntDesign/wwwroot/blazorise.antdesign.min.css * fix bar regression * badge theming * optimize badge scss * optimize bar scss * carousel demo * filepicker on mobile * listgroup light color * table headers * tabs lazy reload * typo elipsis * fix columns * fix multiple select * fix form labels word wrap * fix labels align regression * smaller labels on picker page * numericinput padding * switch hover * fixes addons sizing * css variables * fix selfreference spacer * version fix * formating * buttonrow * responsive form * fix demo form sizes * fix datepicker menu * onetime wrap * demo password fix * scrollable menu * fix menu placement in collapsed mode * emphasis colors * background subtle * css variables * setps validation ui fix * css variables * cleaning unused vars * fix check sizes * css vars * refactor autocomplete demo ui * full width autocomplete * recompile * fix table selector * table cleanup * button light outline * bar menu arrow * bar menu hover * implement accesibility from merged version * show color value in colorinput * colorpicker * fix warnings * select tag hover * divider fix * cleanup * skeleton and figure * fix button link * link button theming * fix tab click * fix datagrid sorticon * menu filter toggle * fix table height * fix grid and cropper * borders on signature pad * check validation * rating spacing * fix horizontal scroll * fix wave offset * fix datagrid filter menus * block btn * hover on bar item * bar hover * striped hover fix * range binding * fix dropdownlist * filepicker overflow * disabled buttons * badges demo
1 parent d4b4f56 commit dd156bc

209 files changed

Lines changed: 142023 additions & 8597 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Demos/Blazorise.Demo.AntDesign/wwwroot/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<link rel="icon" type="image/png" sizes="16x16" href="favicon-16x16.png">
1212
<link rel="manifest" href="manifest.json">
1313

14-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/antd/4.24.15/antd.min.css" integrity="sha512-Ac6zlwN6S+uQSinFAcV27Gd/TtKEDt7XWXn2xWO4Xi9dTbbpT9/vJb+VT5af6nZywrgBD3qUFTb5y1VN4YD94Q==" crossorigin="anonymous" referrerpolicy="no-referrer" />
14+
<link href="_content/Blazorise.AntDesign/antd.css?v=2.0.3.0" rel="stylesheet" />
1515
<link href="_content/Blazorise.Icons.FontAwesome/v6/css/all.min.css" rel="stylesheet">
1616

1717
<link href="_content/Blazorise/blazorise.css?v=2.0.3.0" rel="stylesheet" />

‎Demos/Blazorise.Demo/Components/SideMenu.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Bar Breakpoint="Breakpoint.Desktop" NavigationBreakpoint="Breakpoint.Tablet" ThemeContrast="ThemeContrast.Dark"
1+
<Bar Breakpoint="Breakpoint.Desktop" NavigationBreakpoint="Breakpoint.Tablet"
22
Mode="BarMode.VerticalInline" CollapseMode="BarCollapseMode.Small" MenuToggleBehavior=BarMenuToggleBehavior.AllowSingleMenu>
33
<BarToggler />
44
<BarBrand>

‎Demos/Blazorise.Demo/Pages/Tests/AutocompletesPage.razor‎

Lines changed: 218 additions & 246 deletions
Large diffs are not rendered by default.

‎Demos/Blazorise.Demo/Pages/Tests/BadgesPage.razor‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,14 @@
6262
</CardBody>
6363
<CardBody>
6464
<Div Flex="Flex.Wrap" Gap="Gap.Is2">
65-
<Badge Color="Color.Primary" CloseClicked="@(() => Console.WriteLine( "Primary closed" ))">Primary</Badge>
66-
<Badge Color="Color.Secondary" CloseClicked="@(() => Console.WriteLine( "Secondary closed" ))">Secondary</Badge>
67-
<Badge Color="Color.Success" CloseClicked="@(() => Console.WriteLine( "Success closed" ))">Success</Badge>
68-
<Badge Color="Color.Danger" CloseClicked="@(() => Console.WriteLine( "Danger closed" ))">Danger</Badge>
69-
<Badge Color="Color.Warning" CloseClicked="@(() => Console.WriteLine( "Warning closed" ))">Warning</Badge>
70-
<Badge Color="Color.Info" CloseClicked="@(() => Console.WriteLine( "Info closed" ))">Info</Badge>
71-
<Badge Color="Color.Light" CloseClicked="@(() => Console.WriteLine( "Light closed" ))">Light</Badge>
72-
<Badge Color="Color.Dark" CloseClicked="@(() => Console.WriteLine( "Dark closed" ))">Dark</Badge>
65+
<Badge Color="Color.Primary" CloseClicked="@(() => NotificationService.Info( "Primary closed" ))">Primary</Badge>
66+
<Badge Color="Color.Secondary" CloseClicked="@(() => NotificationService.Info( "Secondary closed" ))">Secondary</Badge>
67+
<Badge Color="Color.Success" CloseClicked="@(() => NotificationService.Info( "Success closed" ))">Success</Badge>
68+
<Badge Color="Color.Danger" CloseClicked="@(() => NotificationService.Info( "Danger closed" ))">Danger</Badge>
69+
<Badge Color="Color.Warning" CloseClicked="@(() => NotificationService.Info( "Warning closed" ))">Warning</Badge>
70+
<Badge Color="Color.Info" CloseClicked="@(() => NotificationService.Info( "Info closed" ))">Info</Badge>
71+
<Badge Color="Color.Light" CloseClicked="@(() => NotificationService.Info( "Light closed" ))">Light</Badge>
72+
<Badge Color="Color.Dark" CloseClicked="@(() => NotificationService.Info( "Dark closed" ))">Dark</Badge>
7373
</Div>
7474
</CardBody>
7575
</Card>
@@ -120,4 +120,7 @@
120120
</CardBody>
121121
</Card>
122122
</Column>
123-
</Row>
123+
</Row>
124+
@code {
125+
[Inject] private INotificationService NotificationService { get; set; }
126+
}

‎Demos/Blazorise.Demo/Pages/Tests/CarouselPage.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<CardText>Carousel with disabled <Code>Autoplay</Code>.</CardText>
5959
</CardBody>
6060
<CardBody>
61-
<Carousel @bind-SelectedSlide="@selectedSlide2" ShowIndicators ShowControls="true" Autoplay="false">
61+
<Carousel @bind-SelectedSlide="@selectedSlide2" ShowIndicators="@showIndicators" ShowControls="@showControls" Autoplay="false">
6262
<CarouselSlide Name="1">
6363
<Image Source="_content/Blazorise.Demo/img/slides/slide-01.jpg" Text="City Skyline" Display="Display.Block" Width="Width.Is100" />
6464
</CarouselSlide>

‎Demos/Blazorise.Demo/Pages/Tests/FormsPage.razor‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,7 @@
147147
<Field Horizontal>
148148
<FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is2.OnDesktop">Range values</FieldLabel>
149149
<FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is10.OnDesktop">
150-
<Div Width="Blazorise.Width.Is100">
151-
<RangeSlider TValue="decimal" @bind-Value="decimalRangeValue" Min="0m" Max="100m" Step="1m" />
152-
<FieldHelp Style="white-space: nowrap;">Selected range: @decimalRangeValue.Start - @decimalRangeValue.End</FieldHelp>
153-
</Div>
150+
<RangeSlider TValue="decimal" @bind-Value="@decimalRangeValue" Min="0m" Max="100m" Step="1m" />
154151
</FieldBody>
155152
</Field>
156153
<Field Horizontal>
@@ -465,11 +462,11 @@
465462
</CardHeader>
466463
<CardBody>
467464
<Fields>
468-
<Field ColumnSize="ColumnSize.Is6.OnDesktop">
465+
<Field ColumnSize="ColumnSize.IsFull.OnMobile.Is6.OnTablet">
469466
<FieldLabel>Email</FieldLabel>
470467
<TextInput Role="TextRole.Email" Placeholder="Email" />
471468
</Field>
472-
<Field ColumnSize="ColumnSize.Is6.OnDesktop">
469+
<Field ColumnSize="ColumnSize.IsFull.OnMobile.Is6.OnTablet">
473470
<FieldLabel>Password</FieldLabel>
474471
<TextInput Role="TextRole.Password" Placeholder="Password" />
475472
</Field>
@@ -483,19 +480,19 @@
483480
<TextInput Placeholder="Appartment, studio, or floor" />
484481
</Field>
485482
<Fields>
486-
<Field ColumnSize="ColumnSize.Is6.OnDesktop">
483+
<Field ColumnSize="ColumnSize.IsFull.OnMobile.Is6.OnTablet">
487484
<FieldLabel>City</FieldLabel>
488485
<TextInput />
489486
</Field>
490-
<Field ColumnSize="ColumnSize.Is4.OnDesktop">
487+
<Field ColumnSize="ColumnSize.IsFull.OnMobile.Is4.OnTablet">
491488
<FieldLabel>State</FieldLabel>
492489
<Select TValue="string">
493490
<SelectItem Value="@("AL")">Alabama</SelectItem>
494491
<SelectItem Value="@("AK")">Alaska</SelectItem>
495492
<SelectItem Value="@("AZ")">Arizona</SelectItem>
496493
</Select>
497494
</Field>
498-
<Field ColumnSize="ColumnSize.Is2.OnDesktop">
495+
<Field ColumnSize="ColumnSize.IsFull.OnMobile.Is2.OnTablet">
499496
<FieldLabel>Zip</FieldLabel>
500497
<TextInput />
501498
</Field>

‎Demos/Blazorise.Demo/Pages/Tests/OneTimeInputPage.razor‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
</Row>
5858

5959
<Row>
60-
<Column ColumnSize="ColumnSize.IsFull.OnDesktop.Is7">
60+
<Column ColumnSize="ColumnSize.IsFull.OnMobile.Is7.OnDesktop">
6161
<Card Margin="Margin.Is4.OnY">
6262
<CardHeader>
6363
<CardTitle>Validation</CardTitle>
@@ -91,7 +91,7 @@
9191
</Card>
9292
</Column>
9393

94-
<Column ColumnSize="ColumnSize.IsFull.OnDesktop.Is5">
94+
<Column ColumnSize="ColumnSize.IsFull.OnMobile.Is5.OnDesktop">
9595
<Card Margin="Margin.Is4.OnY">
9696
<CardHeader>
9797
<CardTitle>Text mode</CardTitle>

‎Demos/Blazorise.Demo/Pages/Tests/PasswordStrengthPage.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
</Row>
5555

5656
<Row>
57-
<Column ColumnSize="ColumnSize.IsFull.OnDesktop.Is8">
57+
<Column>
5858
<Card Margin="Margin.Is4.OnY">
5959
<CardHeader>
6060
<CardTitle>Validation integration</CardTitle>

‎Demos/Blazorise.Demo/Pages/Tests/PickersPage.razor‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
<CardBody>
134134
<Validation Validator="@ValidateNumber">
135135
<Field Horizontal>
136-
<FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">Bind with Immediate enabled</FieldLabel>
136+
<FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">Immediate enabled</FieldLabel>
137137
<FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is9.OnDesktop">
138138
<Addons>
139139
<Addon AddonType="AddonType.Body">
@@ -148,7 +148,7 @@
148148
</Validation>
149149
<Validation Validator="@ValidateNumber">
150150
<Field Horizontal>
151-
<FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">Bind with Immediate disabled</FieldLabel>
151+
<FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">Immediate disabled</FieldLabel>
152152
<FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is9.OnDesktop">
153153
<Addons>
154154
<Addon AddonType="AddonType.Body">
@@ -163,7 +163,7 @@
163163
</Validation>
164164
<Validation Validator="@ValidateNumber">
165165
<Field Horizontal>
166-
<FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">Bind with Debounce enabled</FieldLabel>
166+
<FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">Debounce enabled</FieldLabel>
167167
<FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is9.OnDesktop">
168168
<Addons>
169169
<Addon AddonType="AddonType.Body">
@@ -178,7 +178,7 @@
178178
</Validation>
179179
<Validation Validator="@ValidateNumber">
180180
<Field Horizontal>
181-
<FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">Currency</FieldLabel>
181+
<FieldLabel ColumnSize="ColumnSize.IsFull.OnTablet.Is3.OnDesktop">Currency Symbol</FieldLabel>
182182
<FieldBody ColumnSize="ColumnSize.IsFull.OnTablet.Is9.OnDesktop">
183183
<Addons>
184184
<Addon AddonType="AddonType.Body">

‎Demos/Blazorise.Demo/Pages/Tests/SignaturePadPage.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
</Button>
7979
</CardHeader>
8080
<CardBody>
81-
<SignaturePad @ref="@signaturePadRef" @bind-Value="@data" BackgroundColor="@backgroundColor" PenColor="@penColor" DotSize="@dotSize" MinLineWidth="@minLineWidth" MaxLineWidth="@maxLineWidth" Throttle="@throttle" MinDistance="@minDistance" VelocityFilterWeight="@velocityFilterWeight" ReadOnly="@readOnly" BeginStroke="@OnBegin" EndStroke="@OnEnd" />
81+
<SignaturePad @ref="@signaturePadRef" @bind-Value="@data" Border="Border.Is1" BackgroundColor="@backgroundColor" PenColor="@penColor" DotSize="@dotSize" MinLineWidth="@minLineWidth" MaxLineWidth="@maxLineWidth" Throttle="@throttle" MinDistance="@minDistance" VelocityFilterWeight="@velocityFilterWeight" ReadOnly="@readOnly" BeginStroke="@OnBegin" EndStroke="@OnEnd" />
8282
</CardBody>
8383
</Card>
8484
</Column>

0 commit comments

Comments
 (0)