From 247201ed2e6c3e07e2ad87384e19df1345506b06 Mon Sep 17 00:00:00 2001 From: ztimson Date: Thu, 3 Nov 2022 19:55:11 -0400 Subject: [PATCH] Updates --- src/app/app.module.ts | 2 + src/app/app.routing.ts | 2 + src/app/containers/app/app.component.html | 8 ++- src/app/containers/app/app.component.scss | 5 ++ src/app/views/about/about.component.html | 4 +- .../events/aestiva/aestiva.component.html | 2 +- .../events/hiberna/hiberna.component.html | 2 +- .../views/reenact/drill/drill.component.html | 55 +++++++++++++++++++ .../views/reenact/drill/drill.component.ts | 7 +++ .../getting-started.component.html | 2 +- src/styles.scss | 7 ++- 11 files changed, 88 insertions(+), 8 deletions(-) create mode 100644 src/app/views/reenact/drill/drill.component.html create mode 100644 src/app/views/reenact/drill/drill.component.ts diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 0215165..367e6a3 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -14,6 +14,7 @@ import {CalendarComponent} from './views/events/calendar/calendar.component'; import {HibernaComponent} from './views/events/hiberna/hiberna.component'; import {GalleryComponent} from './views/gallery/gallery.component'; import {HomeComponent} from './views/home/home.component'; +import {DrillComponent} from './views/reenact/drill/drill.component'; import {GettingStartedComponent} from './views/reenact/getting-started/getting-started.component'; import {RulesComponent} from './views/reenact/rules/rules.component'; @@ -23,6 +24,7 @@ export const APP_COMPONENTS = [ AppComponent, BannerComponent, CalendarComponent, + DrillComponent, GettingStartedComponent, HibernaComponent, FooterComponent, diff --git a/src/app/app.routing.ts b/src/app/app.routing.ts index 821a91b..b46a10a 100644 --- a/src/app/app.routing.ts +++ b/src/app/app.routing.ts @@ -7,12 +7,14 @@ import {CalendarComponent} from './views/events/calendar/calendar.component'; import {HibernaComponent} from './views/events/hiberna/hiberna.component'; import {GalleryComponent} from './views/gallery/gallery.component'; import {HomeComponent} from './views/home/home.component'; +import {DrillComponent} from './views/reenact/drill/drill.component'; import {GettingStartedComponent} from './views/reenact/getting-started/getting-started.component'; import {RulesComponent} from './views/reenact/rules/rules.component'; const routes: Routes = [ {path: '', pathMatch: 'full', component: HomeComponent}, {path: 'about', component: AboutComponent}, + {path: 'drill', component: DrillComponent}, {path: 'events/aestiva', component: AestivaComponent}, {path: 'events/hiberna', component: HibernaComponent}, {path: 'events/calendar', component: CalendarComponent}, diff --git a/src/app/containers/app/app.component.html b/src/app/containers/app/app.component.html index 35163fa..ee8d83d 100644 --- a/src/app/containers/app/app.component.html +++ b/src/app/containers/app/app.component.html @@ -1,6 +1,8 @@ - +
-
+
+ +
- +
diff --git a/src/app/containers/app/app.component.scss b/src/app/containers/app/app.component.scss index 2b27cf7..4aa0869 100644 --- a/src/app/containers/app/app.component.scss +++ b/src/app/containers/app/app.component.scss @@ -2,4 +2,9 @@ overflow-x: hidden; overflow-y: auto; scroll-behavior: smooth; + + @media print { + overflow-x: inherit !important; + overflow-y: inherit !important; + } } diff --git a/src/app/views/about/about.component.html b/src/app/views/about/about.component.html index 35193c7..b72a448 100644 --- a/src/app/views/about/about.component.html +++ b/src/app/views/about/about.component.html @@ -83,7 +83,9 @@
  • Castra Hiberna (2017, 2018, 2021, 2022)

    • Special Thanks

    - +

    David - Commanding Officer & subject matter expert, providing much of this site's content

    +

    Tom Ross - Provides Legio XXX's re-enactment facilities near Tillsonburg Ontario

    +

    Robert Nortin - Armicustos (Quartermaster) & provider of most of our manuals

    diff --git a/src/app/views/events/aestiva/aestiva.component.html b/src/app/views/events/aestiva/aestiva.component.html index 43ab582..b8144b5 100644 --- a/src/app/views/events/aestiva/aestiva.component.html +++ b/src/app/views/events/aestiva/aestiva.component.html @@ -23,7 +23,7 @@
  • Weapons Training
    • diff --git a/src/styles.scss b/src/styles.scss index fb7c9f7..59f541e 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -15,7 +15,7 @@ $LegioXXX-theme: mat.define-dark-theme(( @include mat.all-component-themes($LegioXXX-theme); -@import '~bootstrap/dist/css/bootstrap-utilities.min.css'; +@import "~bootstrap/dist/css/bootstrap.min.css"; ::-webkit-scrollbar-track { background: rgba(0, 0, 0, 0); @@ -40,6 +40,11 @@ body { font-family: Roboto, sans-serif; margin: 0; overflow: hidden; + + @media print { + background: #fff !important; + overflow: visible !important; + } } a, a:visited {