From 2465433b5fb9ab64f55bd122c94d4717684ca836 Mon Sep 17 00:00:00 2001 From: Jonathan McCaffrey Date: Mon, 2 May 2022 01:03:04 -0400 Subject: [PATCH] feat(Icons) Added font awesome icons (#29) --- Components/Inputs/CodeLinkComponent.razor | 8 ++-- Components/Inputs/EditLinkComponent.razor | 2 +- Components/Inputs/LinkButtonComponent.razor | 35 ++++++++++++++++++ Components/Inputs/SearchButtonComponent.razor | 26 ++++++++----- .../Inputs/SearchIconButtonComponent.razor | 14 ++++--- .../Navigation/DesktopNavComponent.razor | 13 +++++-- .../Navigation/MobileNavComponent.razor | 5 ++- .../Navigation/TabletNavComponent.razor | 2 +- IGP/Database.db | Bin 278528 -> 278528 bytes IGP/Dialog/SearchDialogComponent.razor | 10 +++++ IGP/Index.razor | 5 ++- .../Parts/DocumentComponent.razor | 4 +- IGP/Pages/HarassCalculatorPage.razor | 5 ++- IGP/Pages/Notes/Parts/NoteComponent.razor | 4 +- IGP/wwwroot/generated/WebSectionModels.json | 2 +- IGP/wwwroot/index.html | 1 + Model/Website/WebPageModel.cs | 1 + Model/Website/WebSectionModel.cs | 3 ++ 18 files changed, 109 insertions(+), 31 deletions(-) create mode 100644 Components/Inputs/LinkButtonComponent.razor diff --git a/Components/Inputs/CodeLinkComponent.razor b/Components/Inputs/CodeLinkComponent.razor index c08a69a..9d54a69 100644 --- a/Components/Inputs/CodeLinkComponent.razor +++ b/Components/Inputs/CodeLinkComponent.razor @@ -1,16 +1,16 @@ - - View on GitHub + + View on GitHub + + +@code { + + [Parameter] + public RenderFragment ChildContent { get; set; } = default!; + + + [Parameter] + public string Href { get; set; } = ""; + + +} \ No newline at end of file diff --git a/Components/Inputs/SearchButtonComponent.razor b/Components/Inputs/SearchButtonComponent.razor index f06a8b1..0df50f0 100644 --- a/Components/Inputs/SearchButtonComponent.razor +++ b/Components/Inputs/SearchButtonComponent.razor @@ -4,10 +4,18 @@ @@ -28,10 +36,10 @@ } .searchHotkey { - padding: 2px; - - background-color: var(--info); - border: 2px solid var(--primary-border); + padding: 4px; + background-color: rgba(255,255,255,0.05); + border: 2px solid rgba(255,255,255,0.25); + border-radius: 4px; } @@ -42,9 +50,9 @@ [Parameter] public string Id { get; set; } = default!; - private string userAgent = ""; + private string _userAgent = ""; - string CommandKey => userAgent.Contains("Mac OS") ? "CMD" : "Ctrl"; + bool IsMac => _userAgent.Contains("Mac OS"); private void ButtonClicked(EventArgs eventArgs) { @@ -53,7 +61,7 @@ protected override async Task OnInitializedAsync() { - userAgent = await JsRuntime.InvokeAsync("getUserAgent"); + _userAgent = await JsRuntime.InvokeAsync("getUserAgent"); } } \ No newline at end of file diff --git a/Components/Inputs/SearchIconButtonComponent.razor b/Components/Inputs/SearchIconButtonComponent.razor index 87d725d..381c542 100644 --- a/Components/Inputs/SearchIconButtonComponent.razor +++ b/Components/Inputs/SearchIconButtonComponent.razor @@ -3,24 +3,28 @@ @inject IJSRuntime JsRuntime @code { diff --git a/Components/Navigation/DesktopNavComponent.razor b/Components/Navigation/DesktopNavComponent.razor index cf79575..019f183 100644 --- a/Components/Navigation/DesktopNavComponent.razor +++ b/Components/Navigation/DesktopNavComponent.razor @@ -13,7 +13,7 @@
- IGP Fan Reference + IGP Fan Reference
@@ -27,7 +27,13 @@ }
- + + @if (isSelected) {
@@ -95,7 +101,7 @@ .sectionNavs { display: flex; - gap: 8px; + gap: 16px; align-items: center; } @@ -140,6 +146,7 @@ box-shadow: 0 2px 3px black; background-color: var(--info); transform: translateY(-1px) scale(1.08); + border-radius: 12px; } @@media only screen and (max-width: 1025px) { diff --git a/Components/Navigation/MobileNavComponent.razor b/Components/Navigation/MobileNavComponent.razor index d0f6e59..3a5a4f4 100644 --- a/Components/Navigation/MobileNavComponent.razor +++ b/Components/Navigation/MobileNavComponent.razor @@ -7,7 +7,7 @@ {
- @webSection?.Name +
} @@ -96,6 +96,7 @@ border: 1px solid var(--primary); width: 100%; height: 64px; + border-radius: 2px; display: flex; background-color: var(--primary); cursor: pointer; @@ -146,7 +147,7 @@ @code { #if NO_SQL [Parameter] - public List WebSections { get; set; } = default!; + public List WebSections { get; set; } = default!; [Parameter] public List WebPages { get; set; } = default!; diff --git a/Components/Navigation/TabletNavComponent.razor b/Components/Navigation/TabletNavComponent.razor index 0e53d63..c2691cc 100644 --- a/Components/Navigation/TabletNavComponent.razor +++ b/Components/Navigation/TabletNavComponent.razor @@ -10,7 +10,7 @@
- Menu +
diff --git a/IGP/Database.db b/IGP/Database.db index 3d41b653b734f5b02aaa7a957e3fe5e9135e0051..e9856105992fafad41a09ddd83c4c6ce848f4d72 100644 GIT binary patch delta 519 zcmZo@5Nv1=oFFY|&A`Cm0>lnLEDgl3C+Zk8S~n(aO<-KeFUa?rft7DN1K)OjWB&8} zRs5`*1qGJ!)f+K#aEdE)igTEU?veY8o z@}ktdODb#)n=ji;~IVN{*|+L&>gosNQkUQVTFa(tIG4u8V#w-pz02POo A%m4rY delta 309 zcmZo@5Nv1=oFFY|#lXPe0>lnLEDgjjC+Zk8S~VtYO<-KeF9;N1<@aXbf6Tv!e>Q&s zzxQTA0ZV=kWmYyuSxrXq>HPAHvK*Q$Y>dkKKwgVHqq3$vGaI9{GNU-Ndum>4QDTl` zQhsTPLU2iGS{k!kVoq_YDia%{yf#p|tvsVVhcqJ_r?@hw`1FHvjH25V7#RiRftK2LOI^Q04#t diff --git a/IGP/Dialog/SearchDialogComponent.razor b/IGP/Dialog/SearchDialogComponent.razor index 4c54c3a..19cb31c 100644 --- a/IGP/Dialog/SearchDialogComponent.razor +++ b/IGP/Dialog/SearchDialogComponent.razor @@ -116,8 +116,18 @@ .searchLink { text-decoration: underline; +} + +@@media only screen and (max-width: 1025px) { + .searchContainer { + height: 300px; + } + .searchBox { + height: 230px; + } } + } diff --git a/IGP/Index.razor b/IGP/Index.razor index e0bbd08..1334f31 100644 --- a/IGP/Index.razor +++ b/IGP/Index.razor @@ -6,7 +6,8 @@ @layout PageLayout - + + View on GitHub + - \ No newline at end of file diff --git a/IGP/Pages/Documentation/Parts/DocumentComponent.razor b/IGP/Pages/Documentation/Parts/DocumentComponent.razor index 8f245b9..c3c1aaf 100644 --- a/IGP/Pages/Documentation/Parts/DocumentComponent.razor +++ b/IGP/Pages/Documentation/Parts/DocumentComponent.razor @@ -16,7 +16,9 @@ else
@((MarkupString)Markdown.ToHtml(content, Pipeline))
- + + Edit on GitHub +
} diff --git a/IGP/Pages/HarassCalculatorPage.razor b/IGP/Pages/HarassCalculatorPage.razor index e962545..f904384 100644 --- a/IGP/Pages/HarassCalculatorPage.razor +++ b/IGP/Pages/HarassCalculatorPage.razor @@ -180,7 +180,10 @@ Can I see the code for the calculation? - +
+ + View on GitHub + diff --git a/IGP/Pages/Notes/Parts/NoteComponent.razor b/IGP/Pages/Notes/Parts/NoteComponent.razor index f8b5239..249bff9 100644 --- a/IGP/Pages/Notes/Parts/NoteComponent.razor +++ b/IGP/Pages/Notes/Parts/NoteComponent.razor @@ -16,7 +16,9 @@ else
@((MarkupString)Markdown.ToHtml(content, Pipeline))
- + + Edit on GitHub +
} diff --git a/IGP/wwwroot/generated/WebSectionModels.json b/IGP/wwwroot/generated/WebSectionModels.json index fe0eaa1..17de1da 100644 --- a/IGP/wwwroot/generated/WebSectionModels.json +++ b/IGP/wwwroot/generated/WebSectionModels.json @@ -1 +1 @@ -[{"Id":1,"Name":"Tools","Description":"Tools Stuff","Order":1,"IsPrivate":"False","WebPageModels":[]},{"Id":2,"Name":"Resources","Description":"Resources Stuff","Order":2,"IsPrivate":"False","WebPageModels":[]},{"Id":3,"Name":"General","Description":"About Stuff","Order":3,"IsPrivate":"False","WebPageModels":[]},{"Id":4,"Name":"Development","Description":"Development Stuff","Order":4,"IsPrivate":"False","WebPageModels":[]},{"Id":5,"Name":"Settings","Description":"Settings Stuff","Order":5,"IsPrivate":"False","WebPageModels":[]}] \ No newline at end of file +[{"Id":1,"Name":"Tools","Description":"Tools Stuff","Order":1,"IsPrivate":"False","Icon":"fa-screwdriver-wrench","OnlyIcon":false,"WebPageModels":[]},{"Id":2,"Name":"Resources","Description":"Resources Stuff","Order":2,"IsPrivate":"False","Icon":"fa-toolbox","OnlyIcon":false,"WebPageModels":[]},{"Id":3,"Name":"General","Description":"About Stuff","Order":3,"IsPrivate":"False","Icon":"fa-circle-info","OnlyIcon":false,"WebPageModels":[]},{"Id":4,"Name":"Development","Description":"Development Stuff","Order":4,"IsPrivate":"False","Icon":"fa-code","OnlyIcon":false,"WebPageModels":[]},{"Id":5,"Name":"Settings","Description":"Settings Stuff","Order":5,"IsPrivate":"False","Icon":"fa-gear","OnlyIcon":false,"WebPageModels":[]}] \ No newline at end of file diff --git a/IGP/wwwroot/index.html b/IGP/wwwroot/index.html index 1537ee3..45c3853 100644 --- a/IGP/wwwroot/index.html +++ b/IGP/wwwroot/index.html @@ -32,6 +32,7 @@ src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.min.js"> +