Skip to content

Refactor tab button styles for consistency across VisualComposer and DataExchange views #1077

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

Merged
PTKu merged 3 commits into from
Mar 24, 2026
+31 −9
Merged

Refactor tab button styles for consistency across VisualComposer and DataExchange views #1077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
593f6e7
Refactor tab button styles for consistency across VisualComposer and …
PTKu Mar 23, 2026
86006b3
Potential fix for pull request finding 'Constant condition'
PTKu Mar 24, 2026
0cbf40d
Refactor modal headers; update build config and references
PTKu Mar 24, 2026
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
11 changes: 6 additions & 5 deletions src/base/src/AXOpen.VisualComposer/Components/VisualComposerContainer.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,19 @@

<AuthorizeView Roles="Administrator">
<Authorized>
<div class="flex flex-wrap items-center">
<nav class="tab m-2 grow">
<div class="flex flex-wrap">

<nav class="tab">
@foreach (var item in _serverStorageAllViews)
{
<button class="btn tab-btn @(_currentViewName == item ? "active" : null) @GetBgColor(SaveLocationType.Server)" @onclick="() => LoadAsync(item)">@item</button>
<button class="tab-btn @(_currentViewName == item ? "active" : null) @GetBgColor(SaveLocationType.Server)" @onclick="() => LoadAsync(item)">@item</button>
}
@foreach (var item in _localStorageData.Keys)
{
<button class="btn tab-btn @(_currentViewName == item ? "active" : null) @GetBgColor(SaveLocationType.Local)" @onclick="() => LoadAsync(item)">@item</button>
<button class="tab-btn @(_currentViewName == item ? "active" : null) @GetBgColor(SaveLocationType.Local)" @onclick="() => LoadAsync(item)">@item</button>
}
</nav>

<div class="flex items-center ms-auto">
@if (_inDesignMode)
{
Expand Down
27 changes: 24 additions & 3 deletions src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeView.razor
View file
Open in desktop
Copy link
Collaborator

@kuh0005 kuh0005 Mar 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks bigg. It shold be added also to other modals (edit ....)
Image

Copy link
Contributor Author

@PTKu PTKu Mar 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is too big?

Copy link
Contributor Author

@PTKu PTKu Mar 24, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what about this:
image
?
@kuh0005?

Copy link
Collaborator

@kuh0005 kuh0005 Mar 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

better one

Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,14 @@ else

<Modal @ref="_modalView">
<div class="modal-header">
<h4>@Vm.SelectedRecord?._EntityId</h4>
<div class="flex flex-row">
<div class="basis-1/3 mx-4">
<h4>@Vm.RefUIData.AttributeName</h4>
</div>
<div class="basis-2/3 my-1">
<h5>@Vm.SelectedRecord?._EntityId</h5>
</div>
</div>
<button type="button" class="cursor-pointer ms-auto my-auto" @onclick="() => _modalView.CloseModal()">
<Operon.Icons.HeroIcon Icon="x-mark" Type="Operon.Icons.IconType.Outline" Class="size-6" />
</button>
Expand Down Expand Up @@ -486,7 +493,14 @@ else

<Modal @ref="_modalChanges">
<div class="modal-header">
<h4>@Vm.SelectedRecord?._EntityId</h4>
<div class="flex flex-row">
<div class="basis-1/3 mx-4">
<h4>@Vm.RefUIData.AttributeName</h4>
</div>
<div class="basis-2/3 my-1">
<h5>@Vm.SelectedRecord?._EntityId</h5>
</div>
</div>
<button type="button" class="cursor-pointer ms-auto my-auto" @onclick="() => _modalChanges.CloseModal()">
<Operon.Icons.HeroIcon Icon="x-mark" Type="Operon.Icons.IconType.Outline" Class="size-6" />
</button>
Expand Down Expand Up @@ -537,7 +551,14 @@ else

<Modal @ref="_modalEdit">
<div class="modal-header">
<h4>@Vm.SelectedRecord?._EntityId</h4>
<div class="flex flex-row">
<div class="basis-1/3 mx-4">
<h4>@Vm.RefUIData.AttributeName</h4>
</div>
<div class="basis-2/3 my-1">
<h5>@Vm.SelectedRecord?._EntityId</h5>
</div>
</div>
<button class="cursor-pointer ms-auto my-auto" @onclick="() => { _modalEdit.CloseModal(); Vm.UnLocked(); }">
<Operon.Icons.HeroIcon Icon="x-mark" Type="Operon.Icons.IconType.Outline" Class="size-6" />
</button>
Expand Down
2 changes: 1 addition & 1 deletion src/data/src/AXOpen.Data.Blazor/Distributed/DistributedDataView.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ else
<ul class="tab">
@foreach (var exchange in DistributedVM.DisplayedExchanges)
{
<button type="button" class="btn tab-btn @(DistributedVM?.SelectedManagerVm?.Model == exchange ? "active" : null)" @onclick="async () => { await DistributedVM.SelectManager(exchange); }">@exchange.PresentableInstanceName</button>
<button type="button" class="tab-btn @(DistributedVM.SelectedManagerVm?.Model == exchange ? "active" : null)" @onclick="async () => { await DistributedVM.SelectManager(exchange); }">@exchange.PresentableInstanceName</button>
}
</ul>
}
Expand Down
Loading