Skip to content

Commit

Permalink
Merge pull request #105 from stsrki/dev075
Browse files Browse the repository at this point in the history
Dev075
  • Loading branch information
stsrki committed Jun 5, 2019
2 parents 0690e17 + 47c2a5e commit 11bab1e
Show file tree
Hide file tree
Showing 29 changed files with 161 additions and 169 deletions.
4 changes: 2 additions & 2 deletions Build/Blazorise.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Version>0.7.4</Version>
<PackageVersion>0.7.4</PackageVersion>
<Version>0.7.5</Version>
<PackageVersion>0.7.5</PackageVersion>

<Description>Blazorise is a component library built on top of Blazor and CSS frameworks like Bootstrap, Bulma and Material.</Description>
<Authors>Mladen Macanovic</Authors>
Expand Down
6 changes: 3 additions & 3 deletions NuGet/Blazorise.Bootstrap.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<metadata>
<id>Blazorise.Bootstrap</id>
<title>Blazorise.Bootstrap</title>
<version>0.7.4</version>
<version>0.7.5</version>
<authors>Mladen Macanovic</authors>
<owners>Mladen Macanovic</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
Expand All @@ -16,11 +16,11 @@
<iconUrl>https://github.com/stsrki/Blazorise/raw/master/NuGet/Blazorise.png</iconUrl>
<dependencies>
<group targetFramework=".NETStandard2.0">
<dependency id="Blazorise" version="0.7.4" exclude="Build,Analyzers" />
<dependency id="Blazorise" version="0.7.5" exclude="Build,Analyzers" />
<dependency id="Microsoft.AspNetCore.Blazor" version="3.0.0-preview4-19216-03" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETCoreApp3.0">
<dependency id="Blazorise" version="0.7.4" exclude="Build,Analyzers" />
<dependency id="Blazorise" version="0.7.5" exclude="Build,Analyzers" />
<dependency id="Microsoft.AspNetCore.Blazor" version="3.0.0-preview4-19216-03" exclude="Build,Analyzers" />
</group>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions NuGet/Blazorise.Bulma.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<metadata>
<id>Blazorise.Bulma</id>
<title>Blazorise.Bulma</title>
<version>0.7.4</version>
<version>0.7.5</version>
<authors>Mladen Macanovic</authors>
<owners>Mladen Macanovic</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
Expand All @@ -16,11 +16,11 @@
<iconUrl>https://github.com/stsrki/Blazorise/raw/master/NuGet/Blazorise.png</iconUrl>
<dependencies>
<group targetFramework=".NETStandard2.0">
<dependency id="Blazorise" version="0.7.4" exclude="Build,Analyzers" />
<dependency id="Blazorise" version="0.7.5" exclude="Build,Analyzers" />
<dependency id="Microsoft.AspNetCore.Blazor" version="3.0.0-preview4-19216-03" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETCoreApp3.0">
<dependency id="Blazorise" version="0.7.4" exclude="Build,Analyzers" />
<dependency id="Blazorise" version="0.7.5" exclude="Build,Analyzers" />
<dependency id="Microsoft.AspNetCore.Blazor" version="3.0.0-preview4-19216-03" exclude="Build,Analyzers" />
</group>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions NuGet/Blazorise.Charts.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<metadata>
<id>Blazorise.Charts</id>
<title>Blazorise.Charts</title>
<version>0.7.4</version>
<version>0.7.5</version>
<authors>Mladen Macanovic</authors>
<owners>Mladen Macanovic</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
Expand All @@ -16,11 +16,11 @@
<iconUrl>https://github.com/stsrki/Blazorise/raw/master/NuGet/Blazorise.png</iconUrl>
<dependencies>
<group targetFramework=".NETStandard2.0">
<dependency id="Blazorise" version="0.7.4" exclude="Build,Analyzers" />
<dependency id="Blazorise" version="0.7.5" exclude="Build,Analyzers" />
<dependency id="Microsoft.AspNetCore.Blazor" version="3.0.0-preview4-19216-03" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETCoreApp3.0">
<dependency id="Blazorise" version="0.7.4" exclude="Build,Analyzers" />
<dependency id="Blazorise" version="0.7.5" exclude="Build,Analyzers" />
<dependency id="Microsoft.AspNetCore.Blazor" version="3.0.0-preview4-19216-03" exclude="Build,Analyzers" />
</group>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions NuGet/Blazorise.Components.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<metadata>
<id>Blazorise.Components</id>
<title>Blazorise.Components</title>
<version>0.7.4</version>
<version>0.7.5</version>
<authors>Mladen Macanovic</authors>
<owners>Mladen Macanovic</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
Expand All @@ -16,11 +16,11 @@
<iconUrl>https://github.com/stsrki/Blazorise/raw/master/NuGet/Blazorise.png</iconUrl>
<dependencies>
<group targetFramework=".NETStandard2.0">
<dependency id="Blazorise" version="0.7.4" exclude="Build,Analyzers" />
<dependency id="Blazorise" version="0.7.5" exclude="Build,Analyzers" />
<dependency id="Microsoft.AspNetCore.Blazor" version="3.0.0-preview4-19216-03" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETCoreApp3.0">
<dependency id="Blazorise" version="0.7.4" exclude="Build,Analyzers" />
<dependency id="Blazorise" version="0.7.5" exclude="Build,Analyzers" />
<dependency id="Microsoft.AspNetCore.Blazor" version="3.0.0-preview4-19216-03" exclude="Build,Analyzers" />
</group>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions NuGet/Blazorise.Frolic.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<metadata>
<id>Blazorise.Frolic</id>
<title>Blazorise.Frolic</title>
<version>0.7.4</version>
<version>0.7.5</version>
<authors>Mladen Macanovic</authors>
<owners>Mladen Macanovic</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
Expand All @@ -16,11 +16,11 @@
<iconUrl>https://github.com/stsrki/Blazorise/raw/master/NuGet/Blazorise.png</iconUrl>
<dependencies>
<group targetFramework=".NETStandard2.0">
<dependency id="Blazorise" version="0.7.4" exclude="Build,Analyzers" />
<dependency id="Blazorise" version="0.7.5" exclude="Build,Analyzers" />
<dependency id="Microsoft.AspNetCore.Blazor" version="3.0.0-preview4-19216-03" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETCoreApp3.0">
<dependency id="Blazorise" version="0.7.4" exclude="Build,Analyzers" />
<dependency id="Blazorise" version="0.7.5" exclude="Build,Analyzers" />
<dependency id="Microsoft.AspNetCore.Blazor" version="3.0.0-preview4-19216-03" exclude="Build,Analyzers" />
</group>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions NuGet/Blazorise.Icons.FontAwesome.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<metadata>
<id>Blazorise.Icons.FontAwesome</id>
<title>Blazorise.Icons.FontAwesome</title>
<version>0.7.4</version>
<version>0.7.5</version>
<authors>Mladen Macanovic</authors>
<owners>Mladen Macanovic</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
Expand All @@ -16,11 +16,11 @@
<iconUrl>https://github.com/stsrki/Blazorise/raw/master/NuGet/Blazorise.png</iconUrl>
<dependencies>
<group targetFramework=".NETStandard2.0">
<dependency id="Blazorise" version="0.7.4" exclude="Build,Analyzers" />
<dependency id="Blazorise" version="0.7.5" exclude="Build,Analyzers" />
<dependency id="Microsoft.AspNetCore.Blazor" version="3.0.0-preview4-19216-03" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETCoreApp3.0">
<dependency id="Blazorise" version="0.7.4" exclude="Build,Analyzers" />
<dependency id="Blazorise" version="0.7.5" exclude="Build,Analyzers" />
<dependency id="Microsoft.AspNetCore.Blazor" version="3.0.0-preview4-19216-03" exclude="Build,Analyzers" />
</group>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions NuGet/Blazorise.Icons.Material.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<metadata>
<id>Blazorise.Icons.Material</id>
<title>Blazorise.Icons.Material</title>
<version>0.7.4</version>
<version>0.7.5</version>
<authors>Mladen Macanovic</authors>
<owners>Mladen Macanovic</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
Expand All @@ -16,11 +16,11 @@
<iconUrl>https://github.com/stsrki/Blazorise/raw/master/NuGet/Blazorise.png</iconUrl>
<dependencies>
<group targetFramework=".NETStandard2.0">
<dependency id="Blazorise" version="0.7.4" exclude="Build,Analyzers" />
<dependency id="Blazorise" version="0.7.5" exclude="Build,Analyzers" />
<dependency id="Microsoft.AspNetCore.Blazor" version="3.0.0-preview4-19216-03" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETCoreApp3.0">
<dependency id="Blazorise" version="0.7.4" exclude="Build,Analyzers" />
<dependency id="Blazorise" version="0.7.5" exclude="Build,Analyzers" />
<dependency id="Microsoft.AspNetCore.Blazor" version="3.0.0-preview4-19216-03" exclude="Build,Analyzers" />
</group>
</dependencies>
Expand Down
10 changes: 5 additions & 5 deletions NuGet/Blazorise.Material.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<metadata>
<id>Blazorise.Material</id>
<title>Blazorise.Material</title>
<version>0.7.4</version>
<version>0.7.5</version>
<authors>Mladen Macanovic</authors>
<owners>Mladen Macanovic</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
Expand All @@ -16,13 +16,13 @@
<iconUrl>https://github.com/stsrki/Blazorise/raw/master/NuGet/Blazorise.png</iconUrl>
<dependencies>
<group targetFramework=".NETStandard2.0">
<dependency id="Blazorise" version="0.7.4" exclude="Build,Analyzers" />
<dependency id="Blazorise.Bootstrap" version="0.7.4" exclude="Build,Analyzers" />
<dependency id="Blazorise" version="0.7.5" exclude="Build,Analyzers" />
<dependency id="Blazorise.Bootstrap" version="0.7.5" exclude="Build,Analyzers" />
<dependency id="Microsoft.AspNetCore.Blazor" version="3.0.0-preview4-19216-03" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETCoreApp3.0">
<dependency id="Blazorise" version="0.7.4" exclude="Build,Analyzers" />
<dependency id="Blazorise.Bootstrap" version="0.7.4" exclude="Build,Analyzers" />
<dependency id="Blazorise" version="0.7.5" exclude="Build,Analyzers" />
<dependency id="Blazorise.Bootstrap" version="0.7.5" exclude="Build,Analyzers" />
<dependency id="Microsoft.AspNetCore.Blazor" version="3.0.0-preview4-19216-03" exclude="Build,Analyzers" />
</group>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions NuGet/Blazorise.Sidebar.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<metadata>
<id>Blazorise.Sidebar</id>
<title>Blazorise.Sidebar</title>
<version>0.7.4</version>
<version>0.7.5</version>
<authors>Mladen Macanovic</authors>
<owners>Mladen Macanovic</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
Expand All @@ -16,11 +16,11 @@
<iconUrl>https://github.com/stsrki/Blazorise/raw/master/NuGet/Blazorise.png</iconUrl>
<dependencies>
<group targetFramework=".NETStandard2.0">
<dependency id="Blazorise" version="0.7.4" exclude="Build,Analyzers" />
<dependency id="Blazorise" version="0.7.5" exclude="Build,Analyzers" />
<dependency id="Microsoft.AspNetCore.Blazor" version="3.0.0-preview4-19216-03" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETCoreApp3.0">
<dependency id="Blazorise" version="0.7.4" exclude="Build,Analyzers" />
<dependency id="Blazorise" version="0.7.5" exclude="Build,Analyzers" />
<dependency id="Microsoft.AspNetCore.Blazor" version="3.0.0-preview4-19216-03" exclude="Build,Analyzers" />
</group>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions NuGet/Blazorise.Snackbar.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<metadata>
<id>Blazorise.Snackbar</id>
<title>Blazorise.Snackbar</title>
<version>0.7.4</version>
<version>0.7.5</version>
<authors>Mladen Macanovic</authors>
<owners>Mladen Macanovic</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
Expand All @@ -16,11 +16,11 @@
<iconUrl>https://github.com/stsrki/Blazorise/raw/master/NuGet/Blazorise.png</iconUrl>
<dependencies>
<group targetFramework=".NETStandard2.0">
<dependency id="Blazorise" version="0.7.4" exclude="Build,Analyzers" />
<dependency id="Blazorise" version="0.7.5" exclude="Build,Analyzers" />
<dependency id="Microsoft.AspNetCore.Blazor" version="3.0.0-preview4-19216-03" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETCoreApp3.0">
<dependency id="Blazorise" version="0.7.4" exclude="Build,Analyzers" />
<dependency id="Blazorise" version="0.7.5" exclude="Build,Analyzers" />
<dependency id="Microsoft.AspNetCore.Blazor" version="3.0.0-preview4-19216-03" exclude="Build,Analyzers" />
</group>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion NuGet/Blazorise.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<metadata>
<id>Blazorise</id>
<title>Blazorise</title>
<version>0.7.4</version>
<version>0.7.5</version>
<authors>Mladen Macanovic</authors>
<owners>Mladen Macanovic</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
Expand Down
2 changes: 1 addition & 1 deletion Source/Blazorise.Bootstrap/CheckEdit.razor
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@inherits Base.BaseCheckEdit
<Control Role="@Role" IsInline="@IsInline">
<input type="@Type" class="@ClassMapper.Class" disabled="@IsDisabled" readonly="@IsReadonly" checked="@Checked" onchange="@CheckedChangedHandled" name="@RadioGroup" id="@ElementId" />
<input type="@Type" class="@ClassMapper.Class" disabled="@IsDisabled" readonly="@IsReadonly" checked="@Checked" onchange="@HandleCheckedChanged" name="@RadioGroup" id="@ElementId" />
<FormLabel IsCheck="true" For="@ElementId">@ChildContent</FormLabel>
@Feedback
</Control>
4 changes: 2 additions & 2 deletions Source/Blazorise.Bulma/CheckEdit.razor
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="field">
<Control Role="@Role" IsInline="@IsInline">
<FormLabel IsCheck="true" For="@ElementId">
<input type="@Type" class="@ClassMapper.Class" disabled="@IsDisabled" readonly="@IsReadonly" checked="@Checked" onchange="@CheckedChangedHandled" name="@RadioGroup" id="@ElementId" />
<input type="@Type" class="@ClassMapper.Class" disabled="@IsDisabled" readonly="@IsReadonly" checked="@Checked" onchange="@HandleCheckedChanged" name="@RadioGroup" id="@ElementId" />
@ChildContent
</FormLabel>
</Control>
Expand All @@ -15,7 +15,7 @@ else
{
<Control Role="@Role" IsInline="@IsInline">
<FormLabel IsCheck="true" For="@ElementId">
<input type="@Type" class="@ClassMapper.Class" disabled="@IsDisabled" readonly="@IsReadonly" checked="@Checked" onchange="@CheckedChangedHandled" name="@RadioGroup" id="@ElementId" />
<input type="@Type" class="@ClassMapper.Class" disabled="@IsDisabled" readonly="@IsReadonly" checked="@Checked" onchange="@HandleCheckedChanged" name="@RadioGroup" id="@ElementId" />
@ChildContent
</FormLabel>
</Control>
Expand Down
8 changes: 8 additions & 0 deletions Source/Blazorise.Bulma/content/blazorise.bulma.css
Original file line number Diff line number Diff line change
Expand Up @@ -2051,6 +2051,14 @@ table.is-borderless tr {
flex-direction: column;
}

.tabs.is-vertical li {
width: 100%;
}

.tabs.is-vertical li > a {
border: none;
}

@media (min-width: 576px) {
.modal-sm {
width: 300px;
Expand Down
2 changes: 1 addition & 1 deletion Source/Blazorise.Frolic/CheckEdit.razor
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@inherits Blazorise.Base.BaseCheckEdit
<FormLabel IsCheck="true" For="@ElementId">
<input type="@Type" class="@ClassMapper.Class" disabled="@IsDisabled" readonly="@IsReadonly" checked="@Checked" onchange="@CheckedChangedHandled" name="@RadioGroup" id="@ElementId" />
<input type="@Type" class="@ClassMapper.Class" disabled="@IsDisabled" readonly="@IsReadonly" checked="@Checked" onchange="@HandleCheckedChanged" name="@RadioGroup" id="@ElementId" />
@ChildContent
</FormLabel>
@Feedback
13 changes: 13 additions & 0 deletions Source/Blazorise.Frolic/content/blazorise.frolic.css
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,19 @@ select.e-select {
width: 100%;
}

.e-tabs.vertical ul {
-webkit-flex-direction: column;
flex-direction: column;
}

.e-tabs.vertical li {
width: 100%;
}

.e-tabs.vertical li > a {
width: 100%;
}

.e-tabs-content > .e-tabs-panel {
display: none;
}
Expand Down
22 changes: 17 additions & 5 deletions Source/Blazorise/Base/BaseCheckEdit.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace Blazorise.Base
{
public abstract class BaseCheckEdit : BaseInputComponent<bool>
public abstract class BaseCheckEdit : BaseInputComponent<bool?>
{
#region Members

Expand All @@ -30,10 +30,11 @@ protected override void RegisterClasses()
base.RegisterClasses();
}

protected void CheckedChangedHandled( UIChangeEventArgs e )
protected void HandleCheckedChanged( UIChangeEventArgs e )
{
Checked = e.Value?.ToString().ToLowerInvariant() == ( RadioGroup != null ? "on" : "true" );
InternalValue = e.Value?.ToString().ToLowerInvariant() == ( RadioGroup != null ? "on" : "true" );
CheckedChanged.InvokeAsync( Checked );
NullableCheckedChanged.InvokeAsync( NullableChecked );
}

#endregion
Expand All @@ -47,15 +48,26 @@ protected void CheckedChangedHandled( UIChangeEventArgs e )
/// <summary>
/// Gets or sets the checked flag.
/// </summary>
[Parameter] protected bool Checked { get => InternalValue; set => InternalValue = value; }
[Parameter] protected bool Checked { get => InternalValue ?? false; set => InternalValue = value; }

/// <summary>
/// Gets or sets the nullable value for checked flag.
/// </summary>
[Parameter] protected bool? NullableChecked { get => InternalValue; set => InternalValue = value; }

/// <summary>
/// Occurs when the check state is changed.
/// </summary>
[Obsolete( "This parameter is only temporary until the issue with generic componnets is fixed. see http://git.travelsoft.hr/Travelsoft/_git/Adriagate/pullrequest/59?_a=overview" )]
[Parameter] protected EventCallback<bool> CheckedChanged { get; set; }

/// <summary>
/// Sets the field help-text postioned bellow the field.
/// Occurs when the check state of nullable value is changed.
/// </summary>
[Parameter] protected EventCallback<bool?> NullableCheckedChanged { get; set; }

/// <summary>
/// Sets the radio group name.
/// </summary>
[Parameter]
protected string RadioGroup
Expand Down
Loading

0 comments on commit 11bab1e

Please sign in to comment.