Skip to content

Commit 5109039

Browse files
Brano5Brano5
committed
rss layout update
1 parent dc32e46 commit 5109039

File tree

9 files changed

+31
-61
lines changed

9 files changed

+31
-61
lines changed

‎src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Layouts/LayoutSetters/ArrayBorderSetter.razor

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@if (IsArray)
22
{
3-
<div class="card p-2 mt-2">
3+
<div class="flex flex-wrap card p-2">
44
<h4>@Name</h4>
55
@ChildContent
66
</div>
@@ -10,14 +10,11 @@ else
1010
@ChildContent
1111
}
1212

13-
1413
@code {
15-
1614
[Parameter]
1715
public RenderFragment ChildContent { get; set; }
1816
[Parameter]
1917
public bool IsArray { get; set; }
2018
[Parameter]
2119
public string Name { get; set; }
22-
2320
}

‎src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Layouts/LayoutSetters/ChildrenLayoutPropSetter.razor

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,33 +10,9 @@
1010
break;
1111
}
1212
case "WrapPanelLayout":
13-
{
14-
<div class="p-2 @Class">
15-
@ChildContent
16-
</div>
17-
break;
18-
}
1913
case "GroupBoxLayout":
20-
{
21-
<div class="p-2 @Class">
22-
@ChildContent
23-
</div>
24-
break;
25-
}
2614
case "UniformGridLayout":
27-
{
28-
<div class="flex-1 p-2 @Class">
29-
@ChildContent
30-
</div>
31-
break;
32-
}
3315
case "StackPanelLayout":
34-
{
35-
<div class="@Class">
36-
@ChildContent
37-
</div>
38-
break;
39-
}
4016
default:
4117
@ChildContent
4218
break;

‎src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Layouts/LayoutSetters/GroupContainerAttributeSetter.razor

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ else
99
</LayoutView>
1010
}
1111

12-
1312
@code
1413
{
1514
[Parameter]
@@ -19,7 +18,6 @@ else
1918
[Parameter]
2019
public string GroupName { get; set; }
2120

22-
2321
public string LayoutName { get; set; }
2422

2523
protected override void OnInitialized()

‎src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Layouts/LayoutSetters/GroupLayoutSetter.razor

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,35 +19,29 @@
1919
}
2020
case "WrapPanelLayout":
2121
{
22-
<div class="flex p-2">
23-
<GroupContainerAttributeSetter GroupType="GroupContainer" GroupName="@GroupName">
24-
<LayoutView Layout="GroupLayout">
25-
@ChildContent
26-
</LayoutView>
27-
</GroupContainerAttributeSetter>
28-
</div>
22+
<GroupContainerAttributeSetter GroupType="GroupContainer" GroupName="@GroupName">
23+
<LayoutView Layout="GroupLayout">
24+
@ChildContent
25+
</LayoutView>
26+
</GroupContainerAttributeSetter>
2927
break;
3028
}
3129
case "GroupBoxLayout":
3230
{
33-
<div class="p-2">
34-
<GroupContainerAttributeSetter GroupType="GroupContainer" GroupName="@GroupName">
35-
<LayoutView Layout="GroupLayout">
36-
@ChildContent
37-
</LayoutView>
38-
</GroupContainerAttributeSetter>
39-
</div>
31+
<GroupContainerAttributeSetter GroupType="GroupContainer" GroupName="@GroupName">
32+
<LayoutView Layout="GroupLayout">
33+
@ChildContent
34+
</LayoutView>
35+
</GroupContainerAttributeSetter>
4036
break;
4137
}
4238
case "UniformGridLayout":
4339
{
44-
<div class="p-2 flex-even">
45-
<GroupContainerAttributeSetter GroupType="GroupContainer" GroupName="@GroupName">
46-
<LayoutView Layout="GroupLayout">
47-
@ChildContent
48-
</LayoutView>
49-
</GroupContainerAttributeSetter>
50-
</div>
40+
<GroupContainerAttributeSetter GroupType="GroupContainer" GroupName="@GroupName">
41+
<LayoutView Layout="GroupLayout">
42+
@ChildContent
43+
</LayoutView>
44+
</GroupContainerAttributeSetter>
5145
break;
5246
}
5347
default:

‎src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Layouts/StackPanelLayout.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@inherits LayoutComponentBase
22

3-
<div class="flex flex-col @LayoutClass">
3+
<div class="flex flex-wrap flex-col @LayoutClass">
44
@Body
55
</div>
66

‎src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Layouts/TabControlLayout.razor

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
@using Operon.Components.Tab
22
@inherits LayoutComponentBase
33

4-
<div class="@LayoutClass">
5-
<Tab>
6-
@Body
7-
</Tab>
8-
</div>
4+
<Tab Class="@LayoutClass">
5+
@Body
6+
</Tab>
97

108
@code
119
{

‎src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Layouts/UniformGridLayout.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@inherits LayoutComponentBase
22

3-
<div class="flex overflow-x-auto @LayoutClass">
3+
<div class="flex flex-nowrap flex-row @LayoutClass">
44
@Body
55
</div>
66

‎src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/Layouts/WrapPanelLayout.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@inherits LayoutComponentBase
22

3-
<div class="flex flex-wrap @LayoutClass">
3+
<div class="flex flex-wrap w-full @LayoutClass">
44
@Body
55
</div>
66

‎src/AXSharp.blazor/src/AXSharp.Presentation.Blazor.Controls/RenderableContent/RenderableContentControl.razor

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,16 @@
33
@*Call rendering method over context object*@
44
@if (Context != null)
55
{
6-
<div name="@Context.Symbol.Replace(".", "-")" class="@Class">
6+
if (!string.IsNullOrEmpty(Class))
7+
{
8+
<div name="@Context.Symbol.Replace(".", "-")" class="@Class">
9+
@RenderComponent(Context)
10+
</div>
11+
}
12+
else
13+
{
714
@RenderComponent(Context)
8-
</div>
15+
}
916
}
1017

1118
@code

0 commit comments

Comments
 (0)