Skip to content

Commit

Permalink
merge 1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
stsrki committed Oct 18, 2023
2 parents 1cbf8f4 + d9c409e commit 40571b0
Show file tree
Hide file tree
Showing 52 changed files with 2,193 additions and 106 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions Documentation/Blazorise.Docs/Components/PageHeader.razor
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Div Class="page-header" TextAlignment="TextAlignment.Center" Padding="Padding.Is5.OnY">
<Container>
<Image Display="Display.Block" Margin="Margin.IsAuto.OnX.Is4.FromTop.Is4.FromBottom" Source="@BlazoriseLogo" Text="Blazorise logo" Style="width: 120px; height: 120px;" />
<Image Display="Display.Block" Margin="Margin.IsAuto.OnX.Is4.FromTop.Is4.FromBottom" Source="@BlazoriseLogo" Text="Blazorise logo" Style="width: 160px; height: 160px;" />
@if ( Title != null )
{
<DisplayHeading Size="DisplayHeadingSize.Is4" TextWeight="TextWeight.Bold" Padding="Padding.Is3.OnY">
<DisplayHeading Size="DisplayHeadingSize.Is4" TextWeight="TextWeight.Bold" Padding="Padding.Is3.OnY.Is4.FromBottom">
@Title
</DisplayHeading>
}
Expand All @@ -21,7 +21,7 @@
}
@if ( Actions != null )
{
<Div Flex="Flex.Column.Row.OnDesktop.AlignItems.Stretch.JustifyContent.Center" Gap="Gap.Is3">
<Div Flex="Flex.Column.Row.OnDesktop.AlignItems.Stretch.JustifyContent.Center" Gap="Gap.Is3" Padding="Padding.Is4.FromTop">
@Actions
</Div>
}
Expand Down
47 changes: 42 additions & 5 deletions Documentation/Blazorise.Docs/Models/Snippets.generated.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4073,7 +4073,24 @@ therefore re-calculated.

public const string TextEditDisabledExample = @"<TextEdit Disabled />";

public const string TextEditMaskExample = @"<TextEdit MaskType=""MaskType.RegEx"" EditMask=""^[a-zA-Z ]*$"" />";
public const string TextEditMaskExample = @"<Fields>
<Field ColumnSize=""ColumnSize.Is6.OnDesktop.Is12.OnMobile"">
<FieldLabel>
Text only
</FieldLabel>
<FieldBody>
<TextEdit MaskType=""MaskType.RegEx"" EditMask=""^[a-zA-Z ]*$"" />
</FieldBody>
</Field>
<Field ColumnSize=""ColumnSize.Is6.OnDesktop.Is12.OnMobile"">
<FieldLabel>
Numbers only
</FieldLabel>
<FieldBody>
<TextEdit MaskType=""MaskType.RegEx"" EditMask=""^(\d+(.\d{0,2})?|.?\d{1,2})$"" />
</FieldBody>
</Field>
</Fields>";

public const string TextEditPatternExample = @"<Validation UsePattern>
<TextEdit Pattern=""[A-Za-z]{3}"">
Expand All @@ -4089,11 +4106,31 @@ therefore re-calculated.

public const string TextEditReadonlyExample = @"<TextEdit ReadOnly />";

public const string TextEditRoleExample = @"<TextEdit Role=""TextRole.Email"" />
<TextEdit Role=""TextRole.Password"" />";
public const string TextEditRoleExample = @"<Fields>
<Field ColumnSize=""ColumnSize.Is6.OnDesktop.Is12.OnMobile"">
<FieldLabel>
Email
</FieldLabel>
<FieldBody>
<TextEdit Role=""TextRole.Email"" />
</FieldBody>
</Field>
<Field ColumnSize=""ColumnSize.Is6.OnDesktop.Is12.OnMobile"">
<FieldLabel>
Password
</FieldLabel>
<FieldBody>
<TextEdit Role=""TextRole.Password"" autocomplete=""new-password"" />
</FieldBody>
</Field>
</Fields>";

public const string TextEditSizingExample = @"<TextEdit Size=""Size.Small"" />
<TextEdit Size=""Size.Large"" />";
public const string TextEditSizingExample = @"<Field>
<TextEdit Size=""Size.Small"" />
</Field>
<Field>
<TextEdit Size=""Size.Large"" />
</Field>";

public const string TextEditTextChangedModeExample = @"public void ConfigureServices( IServiceCollection services )
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,22 @@
<div class="blazorise-codeblock">
<div class="html"><pre>
<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">MaskType</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">MaskType</span><span class="enumValue">.RegEx</span><span class="quot">&quot;</span> <span class="htmlAttributeName">EditMask</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">^[a-zA-Z ]*$</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Fields</span><span class="htmlTagDelimiter">&gt;</span>
<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">ColumnSize.Is6.OnDesktop.Is12.OnMobile</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
Text only
<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">MaskType</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">MaskType</span><span class="enumValue">.RegEx</span><span class="quot">&quot;</span> <span class="htmlAttributeName">EditMask</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">^[a-zA-Z ]*$</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">ColumnSize.Is6.OnDesktop.Is12.OnMobile</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
Numbers only
<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">MaskType</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">MaskType</span><span class="enumValue">.RegEx</span><span class="quot">&quot;</span> <span class="htmlAttributeName">EditMask</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">^(\d+(.\d{0,2})?|.?\d{1,2})$</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Fields</span><span class="htmlTagDelimiter">&gt;</span>
</pre></div>
</div>
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
<div class="blazorise-codeblock">
<div class="html"><pre>
<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Role</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">TextRole</span><span class="enumValue">.Email</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Role</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">TextRole</span><span class="enumValue">.Password</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Fields</span><span class="htmlTagDelimiter">&gt;</span>
<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">ColumnSize.Is6.OnDesktop.Is12.OnMobile</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
Email
<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Role</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">TextRole</span><span class="enumValue">.Email</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span> <span class="htmlAttributeName">ColumnSize</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">ColumnSize.Is6.OnDesktop.Is12.OnMobile</span><span class="quot">&quot;</span><span class="htmlTagDelimiter">&gt;</span>
<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
Password
<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldLabel</span><span class="htmlTagDelimiter">&gt;</span>
<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Role</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">TextRole</span><span class="enumValue">.Password</span><span class="quot">&quot;</span> <span class="htmlAttributeName">autocomplete</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="htmlAttributeValue">new-password</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">FieldBody</span><span class="htmlTagDelimiter">&gt;</span>
<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Fields</span><span class="htmlTagDelimiter">&gt;</span>
</pre></div>
</div>
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<div class="blazorise-codeblock">
<div class="html"><pre>
<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Size</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">Size</span><span class="enumValue">.Small</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Size</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">Size</span><span class="enumValue">.Large</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Size</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">Size</span><span class="enumValue">.Small</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
<span class="htmlTagDelimiter">&lt;</span><span class="htmlElementName">TextEdit</span> <span class="htmlAttributeName">Size</span><span class="htmlOperator">=</span><span class="quot">&quot;</span><span class="enum">Size</span><span class="enumValue">.Large</span><span class="quot">&quot;</span> <span class="htmlTagDelimiter">/&gt;</span>
<span class="htmlTagDelimiter">&lt;/</span><span class="htmlElementName">Field</span><span class="htmlTagDelimiter">&gt;</span>
</pre></div>
</div>
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
@namespace Blazorise.Docs.Docs.Examples

<TextEdit MaskType="MaskType.RegEx" EditMask="^[a-zA-Z ]*$" />
<Fields>
<Field ColumnSize="ColumnSize.Is6.OnDesktop.Is12.OnMobile">
<FieldLabel>
Text only
</FieldLabel>
<FieldBody>
<TextEdit MaskType="MaskType.RegEx" EditMask="^[a-zA-Z ]*$" />
</FieldBody>
</Field>
<Field ColumnSize="ColumnSize.Is6.OnDesktop.Is12.OnMobile">
<FieldLabel>
Numbers only
</FieldLabel>
<FieldBody>
<TextEdit MaskType="MaskType.RegEx" EditMask="^(\d+(.\d{0,2})?|.?\d{1,2})$" />
</FieldBody>
</Field>
</Fields>
Original file line number Diff line number Diff line change
@@ -1,4 +1,20 @@
@namespace Blazorise.Docs.Docs.Examples

<TextEdit Role="TextRole.Email" />
<TextEdit Role="TextRole.Password" />
<Fields>
<Field ColumnSize="ColumnSize.Is6.OnDesktop.Is12.OnMobile">
<FieldLabel>
Email
</FieldLabel>
<FieldBody>
<TextEdit Role="TextRole.Email" />
</FieldBody>
</Field>
<Field ColumnSize="ColumnSize.Is6.OnDesktop.Is12.OnMobile">
<FieldLabel>
Password
</FieldLabel>
<FieldBody>
<TextEdit Role="TextRole.Password" autocomplete="new-password" />
</FieldBody>
</Field>
</Fields>
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
@namespace Blazorise.Docs.Docs.Examples

<TextEdit Size="Size.Small" />
<TextEdit Size="Size.Large" />
<Field>
<TextEdit Size="Size.Small" />
</Field>
<Field>
<TextEdit Size="Size.Large" />
</Field>
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,18 @@
</AlertDescription>
</Alert>

<DocsPageSubtitle>
Best Practices
</DocsPageSubtitle>

<Heading Size="HeadingSize.Is3">
Prevent autocomplete
</Heading>

<DocsPageParagraph>
When working with email and password fields, in some cases browsers might automatically autofill them with the values from user system. To prevent it you can define an <Code>autocomplete</Code> attribute, eg. <Code>autocomplete="new-password"</Code> on an input field.
</DocsPageParagraph>

<DocsPageSubtitle>
API
</DocsPageSubtitle>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Blazorise CSS Framework Integrations
</Heading>
<Heading Size="HeadingSize.Is5" TextWeight="TextWeight.Normal" TextColor="TextColor.Muted">
Enhance your workflow with seamless integrations for your favorite tools using Blazorise.
Blazorise is a <Strong>Blazor component library</Strong> with support for <Strong>multiple CSS frameworks</Strong> like Bootstrap, Tailwind, Bulma, AntDesign and Material.
</Heading>
</Column>
</Row>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<Row>
<Column ColumnSize="ColumnSize.Is12" TextAlignment="TextAlignment.Center" Padding="Padding.Is5.FromBottom">
<Heading Size="HeadingSize.Is2" TextSize="TextSize.Heading1" TextWeight="TextWeight.Bold" Padding="Padding.Is3.FromBottom">
Explore some of its features
Work with a stack of your choice
</Heading>
<Heading Size="HeadingSize.Is5" TextWeight="TextWeight.Normal" TextColor="TextColor.Muted">
Get Blazorise and take advantage of its free components and features that will help you setup your web project quickly.
Get Blazorise and take advantage of its components and features that will help you setup your web project quickly.
</Heading>
</Column>
</Row>
Expand All @@ -16,7 +16,7 @@
Code better, launch faster
</Heading>
<Heading Size="HeadingSize.Is3" TextWeight="TextWeight.Bold" Margin="Margin.Is3.OnY">
With your favorite stack
Develop with your favourite technologies
</Heading>
<Paragraph>
Blazorise comes with stunning fully coded components based on Blazor, .NET and HTML. Choose you favorite technologies!
Expand Down
7 changes: 2 additions & 5 deletions Documentation/Blazorise.Docs/Pages/Home/Index.razor
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,11 @@

<PageHeader>
<Title>
Modern <Span Class="gradient-commercial">UI Component</Span> library for Blazor
Dev Focused <Span Class="gradient-commercial">Blazor Component</Span> Library
</Title>
<Subtitle>
A set of <Strong>80+</Strong> free and open source native Blazor UI controls.
Build Blazor web applications <Strong>from scratch</Strong> with a set of <Strong>80+</Strong> native Blazor UI components.
</Subtitle>
<Description>
Blazorise is a <Strong>Blazor component library</Strong> with support for <Strong>multiple CSS frameworks</Strong> like Bootstrap, Tailwind, Bulma, AntDesign and Material.
</Description>
<Actions>
<Button Class="btn-primary-gradient" Type="ButtonType.Link" To="docs" Color="Color.Primary" Size="Size.Large">
Get Started
Expand Down
Loading

0 comments on commit 40571b0

Please sign in to comment.