Add topbar, move account info to top-right corner

This commit is contained in:
2018-06-16 15:36:21 +02:00
parent 575c1a11c2
commit 24e3171311
7 changed files with 43 additions and 15 deletions
+2
View File
@@ -1,4 +1,6 @@
import Controller from '@ember/controller'; import Controller from '@ember/controller';
import { inject as injectService } from '@ember/service';
export default Controller.extend({ export default Controller.extend({
kredits: injectService(),
}); });
+5
View File
@@ -6,3 +6,8 @@ $yellow: #fbe468;
$red: #fb6868; $red: #fb6868;
$primaryColor: $blue; $primaryColor: $blue;
#topbar {
background-color: rgba(255,0,255,.2);
}
+4 -1
View File
@@ -1,4 +1,7 @@
section { #topbar {
}
main section {
@include outer-container; @include outer-container;
margin-bottom: 8rem; margin-bottom: 8rem;
&:first-of-type { &:first-of-type {
+2 -1
View File
@@ -2,6 +2,7 @@
margin: 0; margin: 0;
padding: 0; padding: 0;
box-sizing: border-box; box-sizing: border-box;
font-size: 14px;
} }
*:hover, *:active, *:focus { *:hover, *:active, *:focus {
@@ -24,7 +25,6 @@ body {
background-repeat: none; background-repeat: none;
background-attachment: fixed; background-attachment: fixed;
font-family: $font-family-sans; font-family: $font-family-sans;
font-size: 14px;
font-weight: 300; font-weight: 300;
color: #fff; color: #fff;
} }
@@ -100,6 +100,7 @@ button, input[type=submit] {
} }
} }
@import "components/topbar";
@import "components/loading-spinner"; @import "components/loading-spinner";
@import "components/contributor-list"; @import "components/contributor-list";
@import "components/add-contributor"; @import "components/add-contributor";
+15
View File
@@ -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;
}
}
+15 -1
View File
@@ -1,3 +1,17 @@
<main> <header id="topbar">
<h1>Kosmos Kredits</h1>
<section id="user-account">
{{#if kredits.hasAccounts }}
{{#if kredits.currentUser}}
{{kredits.currentUser.name}}
{{#if kredits.currentUserIsCore}}(core){{/if}}
{{/if}}
{{else}}
Anonymous
{{/if}}
</section>
</header>
<main id="content">
{{outlet}} {{outlet}}
</main> </main>
-12
View File
@@ -1,15 +1,3 @@
{{#if kredits.hasAccounts }}
<section id="user-account">
{{#if kredits.currentUser }}
{{ kredits.currentUser.name }}
{{#if kredits.currentUserIsCore }}
(core)
{{/if}}
Account: {{kredits.currentUser.account}}
{{/if}}
</section>
{{/if}}
<section id="contributors"> <section id="contributors">
<header> <header>
<h2>Kosmos Contributors</h2> <h2>Kosmos Contributors</h2>