Skip to content

Commit

Permalink
Merge pull request #31 from hacsko-adam-evo/master
Browse files Browse the repository at this point in the history
Minor fixes, missing properties
  • Loading branch information
yagizhanNY committed Mar 6, 2024
2 parents 3f323f0 + 5d5c875 commit 944ea98
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 21 deletions.
13 changes: 13 additions & 0 deletions SiemensIXBlazor/Components/AGGrid/ColumnDefs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,18 @@ public class ColumnDefs
public bool? Sortable { get; set; }
[JsonProperty("filter")]
public bool? Filter { get; set; }
[JsonProperty("suppressSizeToFit")]
public bool? SuppressSizeToFit { get; set; }
[JsonProperty("suppressAutoSize")]
public bool? SuppressAutoSize { get; set; }
[JsonProperty("flex")]
public int? Flex { get; set; }
[JsonProperty("width")]
public int? Width { get; set; }
[JsonProperty("maxWidth")]
public int? MaxWidth { get; set; }
[JsonProperty("minWidth")]
public int? MinWidth { get; set; }

}
}
2 changes: 1 addition & 1 deletion SiemensIXBlazor/Components/Breadcrumb/Breadcrumb.razor
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

@namespace SiemensIXBlazor.Components

<ix-breadcrumb @attributes="UserAttributes" class="@Class" style="@Style" ghost="@Ghost" nextItems="@NextItems" visibleItemCount="@VisibleItemCount" id="@Id" aria-label-previous-button="@AriaLabelPreviousButton">
<ix-breadcrumb @attributes="UserAttributes" class="@Class" style="@Style" ghost="@Ghost.ToString().ToLower()" nextItems="@NextItems" visibleItemCount="@VisibleItemCount" id="@Id" aria-label-previous-button="@AriaLabelPreviousButton">
@ChildContent
</ix-breadcrumb>
17 changes: 8 additions & 9 deletions SiemensIXBlazor/Components/EventList/EventList.razor
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
@namespace SiemensIXBlazor.Components
@inherits IXBaseComponent

<ix-event-list
@attributes="UserAttributes"
animated="@Animated"
chevron="@Chevron"
compact="@Compact"
item-height="@ItemHeight"
style="@Style"
class="@Class">
@if(ChildContent != null)
<ix-event-list @attributes="UserAttributes"
animated="@Animated.ToString().ToLower()"
chevron="@Chevron"
compact="@Compact"
item-height="@ItemHeight"
style="@Style"
class="@Class">
@if (ChildContent != null)
{
@ChildContent
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace SiemensIXBlazor.Components.NavigationMenu
{
public partial class NavigationMenuCategory
public partial class NavigationMenuCategory: IXBaseComponent
{
[Parameter]
public RenderFragment? ChildContent { get; set; }
Expand Down
10 changes: 0 additions & 10 deletions SiemensIXBlazor/SiemensIXBlazor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
</PropertyGroup>

<ItemGroup>
<Content Remove="Components\NavigationMenu\NavigationMenuCategory.razor" />
<Content Remove="SiemensIXBlazor_NpmJS\package-lock.json" />
<Content Remove="SiemensIXBlazor_NpmJS\package.json" />
<Content Remove="wwwroot\css\siemens-ix\" />
Expand All @@ -39,7 +38,6 @@
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
<None Include="Components\NavigationMenu\NavigationMenuCategory.razor" />
<None Include="SiemensIXBlazor_NpmJS\package-lock.json" />
<None Include="SiemensIXBlazor_NpmJS\package.json" />
</ItemGroup>
Expand Down Expand Up @@ -74,12 +72,4 @@
<Folder Include="Components\ActionCard\" />
</ItemGroup>

<ItemGroup>
<UpToDateCheckInput Remove="Components\NavigationMenu\NavigationMenuCategory.razor" />
</ItemGroup>

<ItemGroup>
<_ContentIncludedByDefault Remove="Components\NavigationMenu\NavigationMenuCategory.razor" />
</ItemGroup>

</Project>

0 comments on commit 944ea98

Please sign in to comment.