Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor fixes, missing properties #31

Merged
merged 5 commits into from
Mar 6, 2024
Merged

Minor fixes, missing properties #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fd2dc08
ag grid column size options
hacsko-adam-evo Mar 5, 2024
5ca017d
boolen to string
hacsko-adam-evo Mar 5, 2024
bba1cfe
fix NavigationMenuCategory not working at all
hacsko-adam-evo Mar 5, 2024
6b3e75f
add using form components
hacsko-adam-evo Mar 6, 2024
5d5c875
Merge branch 'yagizhanNY:master' into master
hacsko-adam-evo Mar 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions SiemensIXBlazor/Components/AGGrid/ColumnDefs.cs
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion SiemensIXBlazor/Components/NavigationMenu/NavigationMenuCategory.razor.cs
View file
Open in desktop
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
View file
Open in desktop
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>
Loading