+
diff --git a/src/app/components/footer/footer.component.scss b/src/app/components/footer/footer.component.scss
index 75edd01..cf792fc 100644
--- a/src/app/components/footer/footer.component.scss
+++ b/src/app/components/footer/footer.component.scss
@@ -8,16 +8,7 @@ ul {
margin: 0;
}
-.social {
- background: #7f0000;
-
- a, a:visited { color: #fff; }
- a:hover, a:visited:hover { color: rgba(255, 255, 255, 0.8); }
-}
-
.copywright {
a, a:visited { color: #b10000; }
a:hover, a:visited:hover { color: #cc0000; }
}
-
-
diff --git a/src/app/components/footer/footer.component.ts b/src/app/components/footer/footer.component.ts
index 28ca3e5..e10182e 100644
--- a/src/app/components/footer/footer.component.ts
+++ b/src/app/components/footer/footer.component.ts
@@ -1,8 +1,11 @@
import {Component} from '@angular/core';
+import {NAVIGATION} from '../../misc/navigation';
@Component({
selector: 'xxx-footer',
templateUrl: './footer.component.html',
styleUrls: ['./footer.component.scss']
})
-export class FooterComponent { }
+export class FooterComponent {
+ navigation = NAVIGATION;
+}
diff --git a/src/app/components/navbar/navbar.component.html b/src/app/components/navbar/navbar.component.html
index 4f2c258..3e904d7 100644
--- a/src/app/components/navbar/navbar.component.html
+++ b/src/app/components/navbar/navbar.component.html
@@ -1,51 +1,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/components/navbar/navbar.component.scss b/src/app/components/navbar/navbar.component.scss
index 22dfb3c..7c9d863 100644
--- a/src/app/components/navbar/navbar.component.scss
+++ b/src/app/components/navbar/navbar.component.scss
@@ -19,19 +19,16 @@
color: #fff;
font-weight: lighter;
- &:hover img {
- filter: brightness(5%) sepia(75) saturate(100) hue-rotate(25deg);
- }
+ &:hover img { filter: brightness(5%) sepia(75) saturate(100) hue-rotate(25deg); }
+ &:hover, &:visited:hover { color: #b10000; }
}
.navbar-button {
- //color: rgba(255, 255, 255, 0.55);
+ color: rgba(255, 255, 255, 0.6);
font-weight: normal;
padding: 0 8px 0 8px;
- //&:hover {
- // color: rgba(255, 255, 255, 0.75);
- //}
+ &:hover { color: #b10000; }
}
}
@@ -48,11 +45,10 @@
}
button {
+ color: rgba(255, 255, 255, 0.6);
height: 36px;
line-height: 36px;
- &:hover {
- background: rgba(255, 255, 255, 0.15) !important;
- }
+ &:hover { color: #b10000; }
}
}
diff --git a/src/app/components/navbar/navbar.component.ts b/src/app/components/navbar/navbar.component.ts
index 23463f7..2388426 100644
--- a/src/app/components/navbar/navbar.component.ts
+++ b/src/app/components/navbar/navbar.component.ts
@@ -1,6 +1,7 @@
import {AfterViewInit, Component, EventEmitter, Input, OnDestroy, Output} from '@angular/core';
import {ActivatedRoute, NavigationEnd, Router} from '@angular/router';
import {filter, Subscription} from 'rxjs';
+import {NAVIGATION} from '../../misc/navigation';
@Component({
selector: 'xxx-navbar',
@@ -10,6 +11,11 @@ import {filter, Subscription} from 'rxjs';
export class NavbarComponent implements AfterViewInit, OnDestroy {
private sub!: Subscription;
+ links = {
+ topLevel: NAVIGATION[0].children[0],
+ other: NAVIGATION.slice(1)
+ }
+
@Input() hamburger = true;
@Output() hamburgerClick = new EventEmitter
();
@@ -18,7 +24,9 @@ export class NavbarComponent implements AfterViewInit, OnDestroy {
ngAfterViewInit() {
this.sub = this.route.fragment.subscribe(frag => {
+ console.log('fire');
if(frag) this.scroll(frag);
+ else this.scroll('top');
});
}
diff --git a/src/app/containers/app/app.component.html b/src/app/containers/app/app.component.html
index 99fb817..35163fa 100644
--- a/src/app/containers/app/app.component.html
+++ b/src/app/containers/app/app.component.html
@@ -1,5 +1,6 @@
diff --git a/src/app/misc/navigation.ts b/src/app/misc/navigation.ts
new file mode 100644
index 0000000..a7c09a1
--- /dev/null
+++ b/src/app/misc/navigation.ts
@@ -0,0 +1,44 @@
+export type NavigationItem = {
+ label: string,
+ url: string,
+ fragment?: string
+};
+
+export type NavigationGroup = {
+ label: string,
+ children: NavigationItem[][]
+}[];
+
+export const NAVIGATION: NavigationGroup = [
+ {label: 'Home', children: [[
+ {label: 'About', url: '/', fragment: 'about'},
+ {label: 'Contact', url: '/', fragment: 'contact'},
+ {label: 'Gallery', url: '/gallery'},
+ ]]},
+ {label: 'Events', children: [[
+ {label: 'Castra Aestiva', url: '/event', fragment: 'aestiva'},
+ {label: 'Castra Hiberna', url: '/event', fragment: 'hiberna'},
+ ], [
+ {label: 'Calendar', url: '/event/calendar'},
+ ]]},
+ {label: 'Learn', children: [[
+ {label: 'Legio XXX', url: '/info/legio-xxx'},
+ {label: 'Legion Camp', url: '/info/legion-camp'},
+ {label: 'Legion Headquarters', url: '/info/legion-headquarters'},
+ {label: 'Legion Organization', url: '/info/legion-organization'},
+ {label: 'Legionairy Equipment', url: '/info/legionairy-equipment'},
+ {label: 'Legionairy Training', url: '/info/legionairy-training'},
+ ], [
+ {label: 'Resources', url: '/info/resources'},
+ ]]},
+ {label: 'Reenact', children: [[
+ {label: 'Getting Started', url: '/getting-started'},
+ {label: 'Rules & Regulations', url: '/rules'},
+ ], [
+ {label: 'Kit Assembly', url: '/diy'},
+ {label: 'Kit Maintinance', url: '/info/maintinance'},
+ {label: 'Trusted Vendors', url: '/vendors'},
+ ], [
+ {label: 'Login/Register', url: '/login'},
+ ]]},
+]
diff --git a/src/app/views/404/404.component.html b/src/app/views/404/404.component.html
index 8b7fe33..00bfc22 100644
--- a/src/app/views/404/404.component.html
+++ b/src/app/views/404/404.component.html
@@ -1,11 +1,12 @@
-
+
+
CDIV
404
-
Page Not Found
+
Page Not Found
diff --git a/src/app/views/home/home.component.html b/src/app/views/home/home.component.html
index f885f1c..6f63086 100644
--- a/src/app/views/home/home.component.html
+++ b/src/app/views/home/home.component.html
@@ -1,52 +1,75 @@
+
-
-
- About
-
-
-
-
-
-
-
Legio XXX Vlpia Victrix
-
(Trajan's Victorious Thirtieth Legion)
-
Legio XXX is a North American Roman re-enactment group that has been active since 2004.
-
It's members represent a cross between living history enthusiasts and edutainers
-
recreating the lives of LEGIO XXX, founded by emperor Trajan in the 2nd centery AD.
-
-
-
-
-
-
LEGIO · XXX
-
-
VLPIA · VICTRIX
-
-
-
+
+
+
+
+
+
About
+
Legio XXX - Vlpia Victrix
+
(Trajan's Victorious Thirtieth Legion)
+
+ Legio XXX is a North American Roman reenactment group established in 2004.
+
+ It's members represent a cross between living history enthusiasts and "edutainers"
+
+ that recreate the lives of soldiers found in Trajan's leagions during the 1st - 2nd Century AD
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Ask us questions, get involved
+
+ and celebrate the glory of Rome with us!
+
-
-
-
-
-
-
-
+
+
+
+
+
+
Enlist Today!
-
Legio XXX is looking for new recruits.
-
Check out the Getting Started page to learn more
-
and register here.
+
+ Interested in any events?
+
+ Legio XXX is looking for new recruits.
+
+ Check out the Getting Started page to learn more
+
+ or register here.
+
+
- 
+
+
Contact
diff --git a/src/app/views/home/home.component.ts b/src/app/views/home/home.component.ts
index e33b89d..e2f05ea 100644
--- a/src/app/views/home/home.component.ts
+++ b/src/app/views/home/home.component.ts
@@ -1,4 +1,5 @@
import {Component} from '@angular/core';
+import {NAVIGATION} from '../../misc/navigation';
@Component({
selector: 'xxx-home',
@@ -6,5 +7,5 @@ import {Component} from '@angular/core';
styleUrls: ['./home.component.scss']
})
export class HomeComponent {
-
+ navigation = NAVIGATION;
}
diff --git a/src/assets/img/banner/ROM.jpg b/src/assets/img/banner/ROM.jpg
new file mode 100644
index 0000000..1092676
Binary files /dev/null and b/src/assets/img/banner/ROM.jpg differ
diff --git a/src/assets/img/banner/castra.jpg b/src/assets/img/banner/castra.jpg
new file mode 100644
index 0000000..2979e8e
Binary files /dev/null and b/src/assets/img/banner/castra.jpg differ
diff --git a/src/assets/img/discord.png b/src/assets/img/discord.png
new file mode 100644
index 0000000..2dcc4ed
Binary files /dev/null and b/src/assets/img/discord.png differ
diff --git a/src/assets/img/eagle.png b/src/assets/img/eagle.png
new file mode 100644
index 0000000..19b0395
Binary files /dev/null and b/src/assets/img/eagle.png differ
diff --git a/src/assets/img/old/standard.png b/src/assets/img/standard.png
similarity index 100%
rename from src/assets/img/old/standard.png
rename to src/assets/img/standard.png
diff --git a/src/assets/img/trajan2.png b/src/assets/img/trajan2.png
new file mode 100644
index 0000000..78a055b
Binary files /dev/null and b/src/assets/img/trajan2.png differ
diff --git a/src/assets/img/wall.png b/src/assets/img/wall.png
new file mode 100644
index 0000000..ca925f0
Binary files /dev/null and b/src/assets/img/wall.png differ
diff --git a/src/index.html b/src/index.html
index 4a91966..0676a30 100644
--- a/src/index.html
+++ b/src/index.html
@@ -1,23 +1,31 @@
-
-
-
-
-
-
+
+
+
+
- LEGIO · XXX
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+ LEGIO · XXX
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/src/styles.scss b/src/styles.scss
index 78d7713..73e9b49 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -48,7 +48,23 @@ a, a:visited {
}
a:hover, a:visited:hover { color: #b10000; }
+.invert {
+ background: #fff;
+ color: #000;
+
+ a, a:visited {
+ text-decoration: none;
+ color: #b10000;
+ }
+ a:hover, a:visited:hover { color: #cc0000; }
+}
+
.fill {
height: 0;
min-height: calc(100vh - 64px);
}
+
+.transparent-link {
+ a, a:visited { color: #fff; }
+ a:hover, a:visited:hover { color: rgba(255, 255, 255, 0.8); }
+}
- 
- 
- 
- 
+ 