diff --git a/app/controllers/application.js b/app/controllers/application.js index d630f31..2fe85e2 100644 --- a/app/controllers/application.js +++ b/app/controllers/application.js @@ -1,4 +1,6 @@ import Controller from '@ember/controller'; +import { inject as injectService } from '@ember/service'; export default Controller.extend({ + kredits: injectService(), }); diff --git a/app/styles/_colors.scss b/app/styles/_colors.scss index 9578f1d..d01df0f 100644 --- a/app/styles/_colors.scss +++ b/app/styles/_colors.scss @@ -6,3 +6,8 @@ $yellow: #fbe468; $red: #fb6868; $primaryColor: $blue; + +#topbar { + background-color: rgba(255,0,255,.2); +} + diff --git a/app/styles/_layout.scss b/app/styles/_layout.scss index e3b93d0..37d39e2 100644 --- a/app/styles/_layout.scss +++ b/app/styles/_layout.scss @@ -1,4 +1,7 @@ -section { +#topbar { +} + +main section { @include outer-container; margin-bottom: 8rem; &:first-of-type { diff --git a/app/styles/app.scss b/app/styles/app.scss index 8c04cf8..d2560b2 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -2,6 +2,7 @@ margin: 0; padding: 0; box-sizing: border-box; + font-size: 14px; } *:hover, *:active, *:focus { @@ -24,7 +25,6 @@ body { background-repeat: none; background-attachment: fixed; font-family: $font-family-sans; - font-size: 14px; font-weight: 300; color: #fff; } @@ -100,6 +100,7 @@ button, input[type=submit] { } } +@import "components/topbar"; @import "components/loading-spinner"; @import "components/contributor-list"; @import "components/add-contributor"; diff --git a/app/styles/components/_topbar.scss b/app/styles/components/_topbar.scss new file mode 100644 index 0000000..48ed6c1 --- /dev/null +++ b/app/styles/components/_topbar.scss @@ -0,0 +1,15 @@ +#topbar { + padding: 0 1rem; + line-height: 3rem; + background-color: rgba(0,0,0,.3); + + h1 { + display: inline-block; + text-transform: uppercase; + } + + section#user-account { + display: inline-block; + float: right; + } +} diff --git a/app/templates/application.hbs b/app/templates/application.hbs index 1338264..d99b712 100644 --- a/app/templates/application.hbs +++ b/app/templates/application.hbs @@ -1,3 +1,17 @@ -
+
+

Kosmos Kredits

+ +
+ {{#if kredits.hasAccounts }} + {{#if kredits.currentUser}} + {{kredits.currentUser.name}} + {{#if kredits.currentUserIsCore}}(core){{/if}} + {{/if}} + {{else}} + Anonymous + {{/if}} +
+
+
{{outlet}}
diff --git a/app/templates/index.hbs b/app/templates/index.hbs index 99ccd78..0fe499c 100644 --- a/app/templates/index.hbs +++ b/app/templates/index.hbs @@ -1,15 +1,3 @@ -{{#if kredits.hasAccounts }} -
- {{#if kredits.currentUser }} - {{ kredits.currentUser.name }} - {{#if kredits.currentUserIsCore }} - (core) - {{/if}} - Account: {{kredits.currentUser.account}} - {{/if}} -
-{{/if}} -

Kosmos Contributors