diff --git a/app/styles/_layout.scss b/app/styles/_layout.scss index 37d39e2..c55fab5 100644 --- a/app/styles/_layout.scss +++ b/app/styles/_layout.scss @@ -1,11 +1,36 @@ #topbar { + height: 3rem; +} + +main { + padding: 1rem; + + &#index { + width: 100%; + display: grid; + grid-row-gap: 2rem; + grid-template-areas: + "people" + "contributions"; + } +} + +@media (min-width: 550px) { + main { + &#index { + grid-column-gap: 4rem; + grid-row-gap: 2rem; + grid-template-columns: 2fr 4fr; + grid-template-areas: + "people contributions" + } + } } main section { - @include outer-container; margin-bottom: 8rem; &:first-of-type { - margin-top: 6rem; + margin-top: 2rem; } @include media($mobile) { @@ -16,19 +41,11 @@ main section { } header { - @include span-columns(12); padding-bottom: 3rem; text-align: center; - // background-color: purple; @include media($mobile) { - @include span-columns(10); - @include shift(1); padding-bottom: 2rem; } - - div.content { - @include span-columns(12); - } } } diff --git a/app/styles/app.scss b/app/styles/app.scss index d2560b2..30476b4 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -43,14 +43,11 @@ h1, h2, h3, h4, h5, input, button { section { h2 { - font-size: 2.8rem; + font-size: 2rem; color: $primaryColor; - @include media($mobile) { - font-size: 2rem; - } } - &#contributors { + &#people { .content { p.stats { padding-top: 3rem; diff --git a/app/styles/settings/_neat.scss b/app/styles/settings/_neat.scss index 3ed8174..eb91b1d 100644 --- a/app/styles/settings/_neat.scss +++ b/app/styles/settings/_neat.scss @@ -2,4 +2,4 @@ // $visual-grid-color: red; // $visual-grid-index: front; // $visual-grid-opacity: 0.5; -$max-width: em(500, 12); +$max-width: em(1200, 12); diff --git a/app/templates/application.hbs b/app/templates/application.hbs index d99b712..aaa3df2 100644 --- a/app/templates/application.hbs +++ b/app/templates/application.hbs @@ -12,6 +12,5 @@ {{/if}} -
- {{outlet}} -
+ +{{outlet}} diff --git a/app/templates/index.hbs b/app/templates/index.hbs index 0fe499c..4caf219 100644 --- a/app/templates/index.hbs +++ b/app/templates/index.hbs @@ -1,65 +1,71 @@ -
-
-

Kosmos Contributors

-
-
- {{contributor-list contributors=contributorsSorted}} +
-

- {{await kredits.totalSupply}} kredits issued and distributed among - {{contributorsWithKredits.length}} contributors. -

-
-
- -{{#if proposalsOpen}} -
+
-

Open Proposals

+

Contributors

- {{!-- TODO: We need a better naming for kredits.hasAccounts --}} - {{proposal-list proposals=proposalsOpenSorted - confirmProposal=(action "confirmProposal") - contractInteractionEnabled=kredits.hasAccounts}} + {{contributor-list contributors=contributorsSorted}} - {{!-- TODO: We need a better naming --}} - {{#if kredits.hasAccounts}} -

- {{#link-to 'proposals.new'}}Create new proposal{{/link-to}} -

+

+ {{await kredits.totalSupply}} kredits issued and distributed among + {{contributorsWithKredits.length}} contributors. +

+
+
+ +
+ {{#if proposalsOpen}} +
+
+

Unconfirmed Contributions

+
+
+ {{!-- TODO: We need a better naming for kredits.hasAccounts --}} + {{proposal-list proposals=proposalsOpenSorted + confirmProposal=(action "confirmProposal") + contractInteractionEnabled=kredits.hasAccounts}} + + {{!-- TODO: We need a better naming --}} + {{#if kredits.hasAccounts}} +

+ {{#link-to 'proposals.new'}}Create new proposal{{/link-to}} +

+ {{/if}} +
+
+ {{/if}} + +
+
+

Confirmed Contributions

+
+
+ {{proposal-list proposals=proposalsClosedSorted + confirmProposal=(action "confirmProposal")}} + + {{!-- TODO: We need a better naming --}} + {{#if kredits.hasAccounts}} +

+ {{#link-to 'proposals.new'}}Create new proposal{{/link-to}} +

+ {{/if}} +
+
+
+ +
+
+

Add Contributor

+
+ +
+ {{#if kredits.currentUser.isCore}} + {{add-contributor contributors=contributors save=(action 'save')}} + {{else}} + Only core team members can add new contributors. Please ask someone to set you up. {{/if}}
-{{/if}} -
-
-

Closed Proposals

-
-
- {{proposal-list proposals=proposalsClosedSorted - confirmProposal=(action "confirmProposal")}} - - {{!-- TODO: We need a better naming --}} - {{#if kredits.hasAccounts}} -

- {{#link-to 'proposals.new'}}Create new proposal{{/link-to}} -

- {{/if}} -
-
- -
-
-

Add Contributor

-
- -
- {{#if kredits.currentUser.isCore}} - {{add-contributor contributors=contributors save=(action 'save')}} - {{else}} - Only core team members can add new contributors. Please ask someone to set you up. - {{/if}} -
-
+