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

Add missing Outline variation buttons #18865

Merged
merged 4 commits into from
Jan 26, 2024
Merged

Add missing Outline variation buttons #18865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6784765
Update FeatureManagementModal.cshtml
enisn Jan 25, 2024
66cf837
Update Create.cshtml
enisn Jan 25, 2024
446de0b
Reorder buttons in email setting group component
enisn Jan 25, 2024
707b99f
Refactor email setting group view component
enisn Jan 25, 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
2 changes: 1 addition & 1 deletion modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Create.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@

</abp-card-body>
<abp-card-footer>
<abp-button button-type="Primary" type="button" text="@L["SaveAsDraft"].Value" id="button-blog-post-create" />
<abp-button button-type="Outline_Primary" type="button" text="@L["SaveAsDraft"].Value" id="button-blog-post-create" />
@if ((await AuthorizationService.AuthorizeAsync(CmsKitAdminPermissions.BlogPosts.Publish)).Succeeded)
{
<abp-button button-type="Primary" type="button" text="@L["Publish"].Value" id="button-blog-post-publish"/>
Expand Down
4 changes: 2 additions & 2 deletions .../src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@
</abp-tabs>
</abp-modal-body>
<abp-modal-footer>
<abp-button button-type="Primary" id="ResetToDefaults"><i class="fa fa-refresh"></i> @L["ResetToDefault"]</abp-button>
<abp-button data-bs-dismiss="modal" button-type="Secondary">@L["Cancel"]</abp-button>
<abp-button data-bs-dismiss="modal" button-type="Link">@L["Cancel"]</abp-button>
<abp-button button-type="Outline_Primary" id="ResetToDefaults"><i class="fa fa-refresh"></i> @L["ResetToDefault"]</abp-button>
<abp-button button-type="Primary" type="submit"><i class="fa fa-check"></i> @L["Save"]</abp-button>
</abp-modal-footer>
}
Expand Down
2 changes: 1 addition & 1 deletion ...ent.Blazor/Pages/SettingManagement/EmailSettingGroup/EmailSettingGroupViewComponent.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,11 @@
</Validations>
<Row>
<Column>
<SubmitButton Clicked="@UpdateSettingsAsync"/>
@if (HasSendTestEmailPermission)
{
<Button style="margin: 0.25rem" Color="Color.Primary" Outline Clicked="OpenSendTestEmailModalAsync">@L["SendTestEmail"]</Button>
}
<SubmitButton Clicked="@UpdateSettingsAsync"/>
</Column>

</Row>
Expand Down
6 changes: 3 additions & 3 deletions ...SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/Default.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
</div>
<hr class="my-4"/>
<div>
<abp-button button-type="Primary" type="submit">
<i class="fa fa-save"></i> @L["Save"]
</abp-button>
@if (await PermissionChecker.IsGrantedAsync(SettingManagementPermissions.EmailingTest))
{
<abp-button button-type="Outline_Primary" id="SendTestEmailButton">
<i class="fa fa-send"></i> @L["SendTestEmail"]
</abp-button>
}
<abp-button button-type="Primary" type="submit">
<i class="fa fa-save"></i> @L["Save"]
</abp-button>
</div>
</abp-column>
</abp-row>
Expand Down
Loading