Skip to content

feat(BootstrapIcon): integrated Bootstrap icon #5245

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
merged 6 commits into from
Jan 29, 2025
Merged

feat(BootstrapIcon): integrated Bootstrap icon #5245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c734946
refactor: 移动 fa 图标
ArgoZhang Jan 29, 2025
68798a0
chore: 增加 bs 图标
ArgoZhang Jan 29, 2025
1505646
feat: 增加 bs 图标集
ArgoZhang Jan 29, 2025
aa8bd24
refactor: 调整顺序
ArgoZhang Jan 29, 2025
9803d28
refactor: 移除 bs 图标集配置
ArgoZhang Jan 29, 2025
9d2ef1a
chore: 移除包
ArgoZhang Jan 29, 2025
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
1 change: 0 additions & 1 deletion src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
<PackageReference Include="BootstrapBlazor.BarCode" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.BarcodeGenerator" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.BootstrapIcon" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.BootstrapIcon.Extensions" Version="9.1.0" />
<PackageReference Include="BootstrapBlazor.Chart" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.CherryMarkdown" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.Dock" Version="9.0.0" />
Expand Down
4 changes: 2 additions & 2 deletions src/BootstrapBlazor.Server/Components/Layout/ComponentLayout.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ protected override void OnInitialized()
IconThemes.AddRange(new SelectedItem[]
{
new("fa", "Font Awesome"),
new("mdi", "Material Design"),
new("bootstrap", "Bootstrap")
new("bootstrap", "Bootstrap"),
new("mdi", "Material Design")
});
IconThemeKey = IconThemeOptions.Value.ThemeKey;

Expand Down
6 changes: 0 additions & 6 deletions src/BootstrapBlazor.Server/Extensions/ServiceCollectionSharedExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,6 @@ public static IServiceCollection AddBootstrapBlazorServices(this IServiceCollect
// 增加 MaterialDesign 图标主题
services.ConfigureMaterialDesignIconTheme();

// 增加 Bootstrap 图标主题
services.ConfigureBootstrapIconTheme();

// 增加 FontAwesome 图标主题
services.ConfigureIconThemeOptions();

// 增加 BootstrapBlazor 假日服务
services.AddBootstrapHolidayService();

Expand Down
227 changes: 227 additions & 0 deletions src/BootstrapBlazor/Icons/BootstrapIcons.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,227 @@
// Copyright (c) Argo Zhang ([email protected]). All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
// Website: https://www.blazor.zone or https://argozhang.github.io/

namespace BootstrapBlazor.Components;

internal static class BootstrapIcons
{
public static Dictionary<ComponentIcons, string> Icons => new()
{
// AnchorLink 组件
{ ComponentIcons.AnchorLinkIcon, "bi bi-link-45deg" },

// Avatar 组件
{ ComponentIcons.AvatarIcon, "bi bi-person-fill" },
{ ComponentIcons.AutoFillIcon, "bi bi-chevron-up" },
{ ComponentIcons.AutoCompleteIcon, "bi bi-chevron-up" },

{ ComponentIcons.ButtonLoadingIcon, "bi bi-arrow-clockwise bi-spin" },

{ ComponentIcons.CaptchaRefreshIcon, "bi bi-arrow-clockwise" },
{ ComponentIcons.CaptchaBarIcon, "bi bi-chevron-right" },
{ ComponentIcons.CameraPlayIcon, "bi bi-circle-play" },
{ ComponentIcons.CameraStopIcon, "bi bi-circle-stop" },
{ ComponentIcons.CameraPhotoIcon, "bi bi-camera" },
{ ComponentIcons.CardCollapseIcon, "bi bi-arrow-right-circle-fill" },
{ ComponentIcons.CarouselPreviousIcon, "bi bi-chevron-left" },
{ ComponentIcons.CarouselNextIcon, "bi bi-chevron-right" },
{ ComponentIcons.CascaderIcon, "bi bi-chevron-up" },
{ ComponentIcons.CascaderSubMenuIcon, "bi bi-chevron-down" },
{ ComponentIcons.ConsoleClearButtonIcon, "bi bi-x" },

// DateTimePicker 组件
{ ComponentIcons.DatePickBodyPreviousYearIcon, "bi bi-chevron-double-left" },
{ ComponentIcons.DatePickBodyPreviousMonthIcon, "bi bi-chevron-left" },
{ ComponentIcons.DatePickBodyNextMonthIcon, "bi bi-chevron-right" },
{ ComponentIcons.DatePickBodyNextYearIcon, "bi bi-chevron-double-right" },
{ ComponentIcons.DateTimePickerIcon, "bi bi-calendar" },
{ ComponentIcons.TimePickerCellUpIcon, "bi bi-chevron-up" },
{ ComponentIcons.TimePickerCellDownIcon, "bi bi-chevron-down" },

// DateTimeRange 组件
{ ComponentIcons.DateTimeRangeIcon, "bi bi-calendar-range" },
{ ComponentIcons.DateTimeRangeClearIcon, "bi bi-x-circle" },

{ ComponentIcons.DialogCloseButtonIcon, "bi bi-x" },
{ ComponentIcons.DialogSaveButtonIcon, "bi bi-check" },
{ ComponentIcons.DialogMaximizeWindowIcon, "bi bi-window" },
{ ComponentIcons.DialogRestoreWindowIcon, "bi bi-window-stack" },

{ ComponentIcons.TopMenuDropdownIcon, "bi bi-chevron-down" },
{ ComponentIcons.SideMenuDropdownIcon, "bi bi-chevron-down" },
{ ComponentIcons.MenuLinkArrowIcon, "bi bi-chevron-left" },

{ ComponentIcons.ResultDialogYesIcon, "bi bi-check" },
{ ComponentIcons.ResultDialogNoIcon, "bi bi-x" },
{ ComponentIcons.ResultDialogCloseIcon, "bi bi-x" },

{ ComponentIcons.SearchDialogClearIcon, "bi bi-trash3" },
{ ComponentIcons.SearchDialogSearchIcon, "bi bi-search" },

{ ComponentIcons.StepIcon, "bi bi-check" },
{ ComponentIcons.StepErrorIcon, "bi bi-x" },

{ ComponentIcons.FilterButtonFilterIcon, "bi bi-funnel-fill" },
{ ComponentIcons.FilterButtonClearIcon, "bi bi-funnel" },

{ ComponentIcons.TableFilterPlusIcon, "bi bi-plus" },
{ ComponentIcons.TableFilterMinusIcon, "bi bi-dash" },

{ ComponentIcons.FullScreenButtonIcon, "bi bi-arrows-fullscreen" },
{ ComponentIcons.FullScreenExitButtonIcon, "bi bi-fullscreen-exit" },

{ ComponentIcons.GoTopIcon, "bi bi-chevron-up" },

{ ComponentIcons.ImagePreviewPreviousIcon, "bi bi-chevron-left" },
{ ComponentIcons.ImagePreviewNextIcon, "bi bi-chevron-right" },
{ ComponentIcons.ImagePreviewMinusIcon, "bi bi-search" },
{ ComponentIcons.ImagePreviewPlusIcon, "bi bi-search" },
{ ComponentIcons.ImagePreviewRotateLeftIcon, "bi bi-arrow-counterclockwise" },
{ ComponentIcons.ImagePreviewRotateRightIcon, "bi bi-arrow-clockwise" },

{ ComponentIcons.ImageViewerFileIcon, "bi bi-file-image" },

{ ComponentIcons.InputClearIcon, "bi bi-x-circle" },

{ ComponentIcons.InputNumberMinusIcon, "bi bi-dash-circle" },
{ ComponentIcons.InputNumberPlusIcon, "bi bi-plus-circle" },

{ ComponentIcons.LayoutMenuBarIcon, "bi bi-list" },
{ ComponentIcons.LogoutLinkIcon, "bi bi-box-arrow-right" },

{ ComponentIcons.LoadingIcon, "bi bi-arrow-clockwise bi-spin" },

{ ComponentIcons.PaginationPrevPageIcon, "bi bi-chevron-left" },
{ ComponentIcons.PaginationNextPageIcon, "bi bi-chevron-right" },
{ ComponentIcons.PaginationPrevEllipsisPageIcon, "bi bi-three-dots" },
{ ComponentIcons.PaginationNextEllipsisPageIcon, "bi bi-three-dots" },

{ ComponentIcons.PopConfirmButtonConfirmIcon, "bi bi-exclamation-circle" },

{ ComponentIcons.RateStarIcon, "bi bi-star-fill" },
{ ComponentIcons.RateUnStarIcon, "bi bi-star" },

{ ComponentIcons.RibbonTabArrowUpIcon, "bi bi-chevron-up" },
{ ComponentIcons.RibbonTabArrowDownIcon, "bi bi-chevron-down" },
{ ComponentIcons.RibbonTabArrowPinIcon, "bi bi-pin bi-pin-angle" },

{ ComponentIcons.MultiSelectDropdownIcon, "bi bi-chevron-up" },
{ ComponentIcons.MultiSelectClearIcon, "bi bi-x" },

{ ComponentIcons.SelectTreeDropdownIcon, "bi bi-chevron-up" },

{ ComponentIcons.SearchClearButtonIcon, "bi bi-trash3" },
{ ComponentIcons.SearchButtonIcon, "bi bi-search" },
{ ComponentIcons.SearchButtonLoadingIcon, "bi bi-arrow-clockwise bi-spin" },

{ ComponentIcons.SelectDropdownIcon, "bi bi-chevron-up" },
{ ComponentIcons.SelectClearIcon, "bi bi-x-circle" },
{ ComponentIcons.SelectSearchIcon, "bi bi-search" },

{ ComponentIcons.SweetAlertCloseIcon, "bi bi-x" },
{ ComponentIcons.SweetAlertConfirmIcon, "bi bi-check" },

{ ComponentIcons.PrintButtonIcon, "bi bi-printer" },

{ ComponentIcons.ToastSuccessIcon, "bi bi-check-circle" },
{ ComponentIcons.ToastInformationIcon, "bi bi-exclamation-circle" },
{ ComponentIcons.ToastWarningIcon, "bi bi-exclamation-triangle" },
{ ComponentIcons.ToastErrorIcon, "bi bi-x-circle" },

{ ComponentIcons.TabPreviousIcon, "bi bi-chevron-left" },
{ ComponentIcons.TabNextIcon, "bi bi-chevron-right" },
{ ComponentIcons.TabDropdownIcon, "bi bi-chevron-down" },
{ ComponentIcons.TabCloseIcon, "bi bi-x" },

{ ComponentIcons.TableColumnToolboxIcon, "bi bi-gear" },

{ ComponentIcons.TableSortIconAsc, "bi bi-sort-up-alt" },
{ ComponentIcons.TableSortDesc, "bi bi-sort-down" },
{ ComponentIcons.TableSortIcon, "bi bi-filter" },
{ ComponentIcons.TableFilterIcon, "bi bi-funnel" },
{ ComponentIcons.TableExportButtonIcon, "bi bi-download" },

{ ComponentIcons.TableAddButtonIcon, "bi bi-plus" },
{ ComponentIcons.TableEditButtonIcon, "bi bi-check2-square" },
{ ComponentIcons.TableDeleteButtonIcon, "bi bi-x" },
{ ComponentIcons.TableRefreshButtonIcon, "bi bi-arrow-clockwise" },
{ ComponentIcons.TableCardViewButtonIcon, "bi bi-list" },
{ ComponentIcons.TableColumnListButtonIcon, "bi bi-list-check" },
{ ComponentIcons.TableExportCsvIcon, "bi bi-filetype-csv" },
{ ComponentIcons.TableExportExcelIcon, "bi bi-filetype-xlsx" },
{ ComponentIcons.TableExportPdfIcon, "bi bi-filetype-pdf" },
{ ComponentIcons.TableSearchButtonIcon, "bi bi-search" },
{ ComponentIcons.TableResetSearchButtonIcon, "bi bi-trash3" },
{ ComponentIcons.TableCloseButtonIcon, "bi bi-x" },
{ ComponentIcons.TableCancelButtonIcon, "bi bi-x" },
{ ComponentIcons.TableSaveButtonIcon, "bi bi-check" },
{ ComponentIcons.TableAdvanceButtonIcon, "bi bi-search" },
{ ComponentIcons.TableAdvancedSortButtonIcon, "bi bi-sort-alpha-up" },

{ ComponentIcons.TableTreeIcon, "bi bi-caret-right-fill" },
{ ComponentIcons.TableTreeExpandIcon, "bi bi-caret-right-fill bi-rotate-90" },
{ ComponentIcons.TableTreeNodeLoadingIcon, "bi bi-arrow-clockwise bi-spin" },
{ ComponentIcons.TableCopyColumnButtonIcon, "bi bi-clipboard" },
{ ComponentIcons.TableGearIcon, "bi bi-gear" },

{ ComponentIcons.TransferLeftIcon, "bi bi-chevron-left" },
{ ComponentIcons.TransferRightIcon, "bi bi-chevron-right" },
{ ComponentIcons.TransferPanelSearchIcon, "bi bi-search" },

{ ComponentIcons.TimerIcon, "bi bi-bell" },

{ ComponentIcons.TreeViewExpandNodeIcon, "bi bi-caret-right-fill bi-rotate-90" },
{ ComponentIcons.TreeViewNodeIcon, "bi bi-caret-right-fill" },
{ ComponentIcons.TreeViewSearchIcon, "bi bi-search" },
{ ComponentIcons.TreeViewResetSearchIcon, "bi bi-backspace" },
{ ComponentIcons.TreeViewLoadingIcon, "bi bi-arrow-clockwise bi-spin" },

// Upload
{ ComponentIcons.AvatarUploadDeleteIcon, "bi bi-trash3" },
{ ComponentIcons.AvatarUploadLoadingIcon, "bi bi-arrow-clockwise bi-spin" },
{ ComponentIcons.AvatarUploadAddIcon, "bi bi-plus" },
{ ComponentIcons.AvatarUploadValidStatusIcon, "bi bi-check bi-rotate-315" },
{ ComponentIcons.AvatarUploadInvalidStatusIcon, "bi bi-x bi-rotate-315" },

{ ComponentIcons.ButtonUploadBrowserButtonIcon, "bi bi-folder2-open" },
{ ComponentIcons.ButtonUploadLoadingIcon, "bi bi-arrow-clockwise bi-spin" },
{ ComponentIcons.ButtonUploadInvalidStatusIcon, "bi bi-x-circle" },
{ ComponentIcons.ButtonUploadValidStatusIcon, "bi bi-check-circle" },
{ ComponentIcons.ButtonUploadDeleteIcon, "bi bi-trash3" },
{ ComponentIcons.ButtonUploadDownloadIcon, "bi bi-cloud-download" },

{ ComponentIcons.InputUploadBrowserButtonIcon, "bi bi-folder-open" },
{ ComponentIcons.InputUploadDeleteButtonIcon, "bi bi-trash3" },

{ ComponentIcons.CardUploadAddIcon, "bi bi-plus" },
{ ComponentIcons.CardUploadStatusIcon, "bi bi-check bi-rotate-315" },
{ ComponentIcons.CardUploadDeleteIcon, "bi bi-x bi-rotate-315" },
{ ComponentIcons.CardUploadRemoveIcon, "bi bi-trash3" },
{ ComponentIcons.CardUploadDownloadIcon, "bi bi-cloud-download" },
{ ComponentIcons.CardUploadZoomIcon, "bi bi-search" },
{ ComponentIcons.UploadCancelIcon, "bi bi-cancel" },
{ ComponentIcons.DropUploadIcon, "bi bi-cloud-arrow-up-fill" },

{ ComponentIcons.FileIconExcel, "bi bi-filetype-xlsx" },
{ ComponentIcons.FileIconDocx, "bi bi-filetype-docx" },
{ ComponentIcons.FileIconPPT, "bi bi-filetype-pptx" },
{ ComponentIcons.FileIconAudio, "bi bi-filetype-mp4" },
{ ComponentIcons.FileIconVideo, "bi bi-filetype-mov" },
{ ComponentIcons.FileIconCode, "bi bi-filetype-cs" },
{ ComponentIcons.FileIconPdf, "bi bi-filetype-pdf" },
{ ComponentIcons.FileIconZip, "bi bi-filetype-raw" },
{ ComponentIcons.FileIconArchive, "bi bi-filetype-aac" },
{ ComponentIcons.FileIconImage, "bi bi-filetype-png" },
{ ComponentIcons.FileIconFile, "bi bi-filetype-txt" },

{ ComponentIcons.QueryBuilderPlusIcon, "bi bi-plus" },
{ ComponentIcons.QueryBuilderMinusIcon, "bi bi-dash" },
{ ComponentIcons.QueryBuilderRemoveIcon, "bi bi-x" },

{ ComponentIcons.ThemeProviderAutoModeIcon, "bi bi-circle-half" },
{ ComponentIcons.ThemeProviderLightModeIcon, "bi bi-sun-fill" },
{ ComponentIcons.ThemeProviderDarkModeIcon, "bi bi-moon-stars-fill" },
{ ComponentIcons.ThemeProviderActiveModeIcon, "bi bi-check2" }
};
}
0 ...otstrapBlazor/Options/FontAwesomeIcons.cs → ...BootstrapBlazor/Icons/FontAwesomeIcons.cs
View file
Open in desktop
File renamed without changes.
6 changes: 4 additions & 2 deletions src/BootstrapBlazor/Options/IconThemeOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,14 @@ public IconThemeOptions()
#if NET8_0_OR_GREATER
Icons = new Dictionary<string, FrozenDictionary<ComponentIcons, string>>()
{
{ "fa", FontAwesomeIcons.Icons.ToFrozenDictionary() }
{ "fa", FontAwesomeIcons.Icons.ToFrozenDictionary() },
{ "bootstrap", BootstrapIcons.Icons.ToFrozenDictionary() }
}.ToFrozenDictionary();
#else
Icons = new()
{
{ "fa", FontAwesomeIcons.Icons }
{ "fa", FontAwesomeIcons.Icons },
{ "bootstrap", BootstrapIcons.Icons }
};
#endif
ThemeKey = "fa";
Expand Down