diff --git a/package.json b/package.json
index 047ca78..cf50507 100644
--- a/package.json
+++ b/package.json
@@ -52,8 +52,9 @@
"merge-stream": "^1.0.0",
"reflect-metadata": "0.1.2",
"rxjs": "5.0.0-beta.2",
- "scss-base": "^1.0.0",
+ "scss-base": "^1.1.0",
"systemjs": "^0.19.26",
"zone.js": "^0.6.12"
}
}
+
diff --git a/src/app/app.template.html b/src/app/app.template.html
index 5c3ca36..fb3118d 100644
--- a/src/app/app.template.html
+++ b/src/app/app.template.html
@@ -1,3 +1,2 @@
-
- So it begins...
-
+
+
diff --git a/src/app/app.ts b/src/app/app.ts
index 21d9fa1..b58addd 100644
--- a/src/app/app.ts
+++ b/src/app/app.ts
@@ -3,10 +3,13 @@ import { ROUTER_DIRECTIVES, RouteConfig } from 'angular2/router';
import 'rxjs/Rx'; // Import all of RxJs
+import { TopNav } from './top-nav/top-nav.component';
+
@Component({
selector: 'app-component',
- directives: [ ROUTER_DIRECTIVES ],
+ directives: [ ROUTER_DIRECTIVES, TopNav ],
templateUrl: 'app/app.template.html'
})
export class AppComponent {
}
+
diff --git a/src/app/top-nav/top-nav.component.ts b/src/app/top-nav/top-nav.component.ts
new file mode 100644
index 0000000..25f2969
--- /dev/null
+++ b/src/app/top-nav/top-nav.component.ts
@@ -0,0 +1,16 @@
+import { Component } from 'angular2/core';
+
+@Component({
+ selector: 'top-nav',
+ templateUrl: 'app/top-nav/top-nav.template.html'
+})
+export class TopNav {
+ pageName: string;
+ version: string;
+
+ constructor() {
+ this.pageName = 'Testing';
+ this.version = 'v1.0.0';
+ }
+}
+
diff --git a/src/app/top-nav/top-nav.template.html b/src/app/top-nav/top-nav.template.html
new file mode 100644
index 0000000..a963282
--- /dev/null
+++ b/src/app/top-nav/top-nav.template.html
@@ -0,0 +1,10 @@
+
+
diff --git a/src/scss/_core.scss b/src/scss/_core.scss
new file mode 100644
index 0000000..ca01279
--- /dev/null
+++ b/src/scss/_core.scss
@@ -0,0 +1,20 @@
+html {
+ background-color: $color-background;
+ height: 100%;
+}
+
+body {
+ background-image: url('../images/bg.png');
+ height: 100%;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+ font-weight: 500;
+ margin: 0;
+}
+
diff --git a/src/scss/_nav-top.scss b/src/scss/_nav-top.scss
new file mode 100644
index 0000000..dadcae1
--- /dev/null
+++ b/src/scss/_nav-top.scss
@@ -0,0 +1,27 @@
+.nav-top {
+ border-bottom: 1px solid lighten($color-border, 10%);
+ padding: .5em;
+
+ h1 {
+ margin-top: 3px;
+ }
+
+ .dark {
+ color: $color-text;
+ }
+
+ .buttons {
+ float: right;
+ margin-top: -2.2em;
+
+ .flat {
+ color: $color-primary;
+ }
+
+ .active {
+ background: $color-primary;
+ color: $color-text-button;
+ }
+ }
+}
+
diff --git a/src/scss/_scss-base-settings.scss b/src/scss/_scss-base-settings.scss
index 495b642..d64ca51 100644
--- a/src/scss/_scss-base-settings.scss
+++ b/src/scss/_scss-base-settings.scss
@@ -1,7 +1,8 @@
-$color-primary: #2b87d8;
+$color-background: #e6e6e6;
+$color-primary: #1d7faf;
$color-text-button: #fff;
-$font-url: 'https://fonts.googleapis.com/css?family=Oxygen:400,700';
-$font-name: 'Oxygen';
-$font-name-mono: 'Oxygen';
+$font-url: 'https://fonts.googleapis.com/css?family=Raleway:400,500|Fira+Mono';
+$font-name: 'Raleway';
+$font-name-mono: 'Fira Mono';
diff --git a/src/scss/main.scss b/src/scss/main.scss
index 327369e..6310a38 100644
--- a/src/scss/main.scss
+++ b/src/scss/main.scss
@@ -8,4 +8,6 @@
@import 'scss-base';
// Local styles
+@import 'core';
+@import 'nav-top';