diff --git a/BeauFindlay/BeauFindlay/Features/Typewriter/ITypewriterNotificationService.cs b/BeauFindlay/BeauFindlay/Components/Typewriter/ITypewriterNotificationService.cs similarity index 79% rename from BeauFindlay/BeauFindlay/Features/Typewriter/ITypewriterNotificationService.cs rename to BeauFindlay/BeauFindlay/Components/Typewriter/ITypewriterNotificationService.cs index 0bb711a..87ddda9 100644 --- a/BeauFindlay/BeauFindlay/Features/Typewriter/ITypewriterNotificationService.cs +++ b/BeauFindlay/BeauFindlay/Components/Typewriter/ITypewriterNotificationService.cs @@ -1,4 +1,4 @@ -namespace BeauFindlay.Features.Typewriter; +namespace BeauFindlay.Components.Typewriter; public interface ITypewriterNotificationService { diff --git a/BeauFindlay/BeauFindlay/Features/Typewriter/Typewriter.razor b/BeauFindlay/BeauFindlay/Components/Typewriter/Typewriter.razor similarity index 100% rename from BeauFindlay/BeauFindlay/Features/Typewriter/Typewriter.razor rename to BeauFindlay/BeauFindlay/Components/Typewriter/Typewriter.razor diff --git a/BeauFindlay/BeauFindlay/Features/Typewriter/TypewriterConstants.cs b/BeauFindlay/BeauFindlay/Components/Typewriter/TypewriterConstants.cs similarity index 76% rename from BeauFindlay/BeauFindlay/Features/Typewriter/TypewriterConstants.cs rename to BeauFindlay/BeauFindlay/Components/Typewriter/TypewriterConstants.cs index 57ea318..6153ff0 100644 --- a/BeauFindlay/BeauFindlay/Features/Typewriter/TypewriterConstants.cs +++ b/BeauFindlay/BeauFindlay/Components/Typewriter/TypewriterConstants.cs @@ -1,4 +1,4 @@ -namespace BeauFindlay.Features.Typewriter; +namespace BeauFindlay.Components.Typewriter; public static class TypewriterConstants { diff --git a/BeauFindlay/BeauFindlay/Features/Typewriter/TypewriterNotificationService.cs b/BeauFindlay/BeauFindlay/Components/Typewriter/TypewriterNotificationService.cs similarity index 89% rename from BeauFindlay/BeauFindlay/Features/Typewriter/TypewriterNotificationService.cs rename to BeauFindlay/BeauFindlay/Components/Typewriter/TypewriterNotificationService.cs index 8c00ca7..95c6511 100644 --- a/BeauFindlay/BeauFindlay/Features/Typewriter/TypewriterNotificationService.cs +++ b/BeauFindlay/BeauFindlay/Components/Typewriter/TypewriterNotificationService.cs @@ -1,4 +1,4 @@ -namespace BeauFindlay.Features.Typewriter; +namespace BeauFindlay.Components.Typewriter; public class TypewriterNotificationService : ITypewriterNotificationService { diff --git a/BeauFindlay/BeauFindlay/Layout/MainLayout.razor b/BeauFindlay/BeauFindlay/Layout/MainLayout.razor index 7549092..5141b4d 100644 --- a/BeauFindlay/BeauFindlay/Layout/MainLayout.razor +++ b/BeauFindlay/BeauFindlay/Layout/MainLayout.razor @@ -1,13 +1,7 @@ @inherits LayoutComponentBase -@inject ITypewriterNotificationService TypingNotification -
- +
@Body @@ -15,8 +9,3 @@
- -@code { - - -} \ No newline at end of file diff --git a/BeauFindlay/BeauFindlay/Layout/NavBar.razor b/BeauFindlay/BeauFindlay/Layout/NavBar.razor new file mode 100644 index 0000000..bc88f61 --- /dev/null +++ b/BeauFindlay/BeauFindlay/Layout/NavBar.razor @@ -0,0 +1,11 @@ + \ No newline at end of file diff --git a/BeauFindlay/BeauFindlay/Program.cs b/BeauFindlay/BeauFindlay/Program.cs index f59c195..1151e4b 100644 --- a/BeauFindlay/BeauFindlay/Program.cs +++ b/BeauFindlay/BeauFindlay/Program.cs @@ -1,5 +1,5 @@ using BeauFindlay; -using BeauFindlay.Features.Typewriter; +using BeauFindlay.Components.Typewriter; using Microsoft.AspNetCore.Components.Web; using Microsoft.AspNetCore.Components.WebAssembly.Hosting; diff --git a/BeauFindlay/BeauFindlay/_Imports.razor b/BeauFindlay/BeauFindlay/_Imports.razor index 58fe83c..6c21cbd 100644 --- a/BeauFindlay/BeauFindlay/_Imports.razor +++ b/BeauFindlay/BeauFindlay/_Imports.razor @@ -8,4 +8,4 @@ @using Microsoft.JSInterop @using BeauFindlay @using BeauFindlay.Layout -@using BeauFindlay.Features.Typewriter \ No newline at end of file +@using BeauFindlay.Components.Typewriter \ No newline at end of file diff --git a/BeauFindlay/BeauFindlay/wwwroot/css/app.min.css b/BeauFindlay/BeauFindlay/wwwroot/css/app.min.css index 754cd5b..8bd5637 100644 --- a/BeauFindlay/BeauFindlay/wwwroot/css/app.min.css +++ b/BeauFindlay/BeauFindlay/wwwroot/css/app.min.css @@ -581,22 +581,22 @@ video { margin-top: auto; } +.mt-10 { + margin-top: 2.5rem; +} + .flex { display: flex; } -.h-full { - height: 100%; -} - -.h-10 { - height: 2.5rem; -} - .h-20 { height: 5rem; } +.h-full { + height: 100%; +} + .min-h-screen { min-height: 100vh; } @@ -619,12 +619,14 @@ video { margin-left: calc(1.5rem * calc(1 - var(--tw-space-x-reverse))); } -.rounded { - border-radius: 0.25rem; +.space-x-8 > :not([hidden]) ~ :not([hidden]) { + --tw-space-x-reverse: 0; + margin-right: calc(2rem * var(--tw-space-x-reverse)); + margin-left: calc(2rem * calc(1 - var(--tw-space-x-reverse))); } -.border { - border-width: 1px; +.rounded { + border-radius: 0.25rem; } .border-l-2 { @@ -635,11 +637,6 @@ video { border-right-width: 2px; } -.border-black { - --tw-border-opacity: 1; - border-color: rgb(0 0 0 / var(--tw-border-opacity)); -} - .bg-black { --tw-bg-opacity: 1; background-color: rgb(0 0 0 / var(--tw-bg-opacity)); @@ -649,13 +646,9 @@ video { padding: 2rem; } -.p-4 { - padding: 1rem; -} - -.py-10 { - padding-top: 2.5rem; - padding-bottom: 2.5rem; +.px-2 { + padding-left: 0.5rem; + padding-right: 0.5rem; } .px-4 { @@ -663,9 +656,24 @@ video { padding-right: 1rem; } -.px-2 { - padding-left: 0.5rem; - padding-right: 0.5rem; +.py-10 { + padding-top: 2.5rem; + padding-bottom: 2.5rem; +} + +.py-28 { + padding-top: 7rem; + padding-bottom: 7rem; +} + +.py-20 { + padding-top: 5rem; + padding-bottom: 5rem; +} + +.py-12 { + padding-top: 3rem; + padding-bottom: 3rem; } .font-mono { @@ -677,14 +685,9 @@ video { line-height: 2rem; } -.text-3xl { - font-size: 1.875rem; - line-height: 2.25rem; -} - -.text-sm { - font-size: 0.875rem; - line-height: 1.25rem; +.text-4xl { + font-size: 2.25rem; + line-height: 2.5rem; } .text-xl { @@ -697,15 +700,24 @@ video { line-height: 1rem; } -.text-4xl { - font-size: 2.25rem; - line-height: 2.5rem; +.text-3xl { + font-size: 1.875rem; + line-height: 2.25rem; +} + +.font-semibold { + font-weight: 600; } .leading-5 { line-height: 1.25rem; } +.text-slate-100 { + --tw-text-opacity: 1; + color: rgb(241 245 249 / var(--tw-text-opacity)); +} + .text-slate-200 { --tw-text-opacity: 1; color: rgb(226 232 240 / var(--tw-text-opacity)); @@ -716,11 +728,6 @@ video { color: rgb(248 250 252 / var(--tw-text-opacity)); } -.text-slate-100 { - --tw-text-opacity: 1; - color: rgb(241 245 249 / var(--tw-text-opacity)); -} - .underline { text-decoration-line: underline; } @@ -734,11 +741,6 @@ video { -moz-osx-font-smoothing: grayscale; } -.subpixel-antialiased { - -webkit-font-smoothing: auto; - -moz-osx-font-smoothing: auto; -} - @keyframes blink { from, to { opacity: 1 @@ -799,10 +801,6 @@ video { justify-content: space-between; } - .md\:p-8 { - padding: 2rem; - } - .md\:px-8 { padding-left: 2rem; padding-right: 2rem;