From b1516b33718ec67a554afbbbebe3cfd31fd66fca Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Sun, 2 Jun 2019 14:44:41 +0200 Subject: [PATCH] Basic layout --- app/index.html | 3 +- app/routes/mastodon/index.js | 4 ++ app/styles/app.css | 83 ++++++++++++++++++++++-- app/templates/application.hbs | 58 ++++++++++++++++- app/templates/mastodon/index.hbs | 4 ++ tests/unit/routes/mastodon/index-test.js | 11 ++++ 6 files changed, 154 insertions(+), 9 deletions(-) create mode 100644 app/routes/mastodon/index.js create mode 100644 app/templates/mastodon/index.hbs create mode 100644 tests/unit/routes/mastodon/index-test.js diff --git a/app/index.html b/app/index.html index 0322090..80d16cb 100644 --- a/app/index.html +++ b/app/index.html @@ -9,6 +9,7 @@ {{content-for "head"}} + {{content-for "head-footer"}} @@ -16,6 +17,6 @@ {{content-for "body-footer"}} - + diff --git a/app/routes/mastodon/index.js b/app/routes/mastodon/index.js new file mode 100644 index 0000000..6c74252 --- /dev/null +++ b/app/routes/mastodon/index.js @@ -0,0 +1,4 @@ +import Route from '@ember/routing/route'; + +export default Route.extend({ +}); diff --git a/app/styles/app.css b/app/styles/app.css index 9172df8..467bf1d 100644 --- a/app/styles/app.css +++ b/app/styles/app.css @@ -1,20 +1,93 @@ -fieldset { - border: none; +h1, h2, ul, li, p { + margin: 0; + padding: 0; } body { font-size: 16px; - text-align: center; + margin: 0; + padding: 0; + font-family: Abel, sans-serif; + font-size: 18px; + text-rendering: optimizeLegibility; +} + +#grid-container { + display: grid; + grid-template-columns: 38.2% 61.8%; + grid-template-rows: 10rem 1fr; + grid-template-areas: "A C" "B C"; + height: 100vh; +} + +header.site { + grid-area: A; + display: flex; + align-items: center; + justify-content: center; + padding: 2rem; + background: rgb(137,85,160); + background: linear-gradient(35deg, rgba(137,85,160,1) 0%, rgba(13,79,153,1) 100%); + color: white; +} + +header.site h1 { + flex: 1; + font-family: Raleway, sans-serif; + font-weight: 300; + font-size: 2rem; + letter-spacing: 0.025em; + text-transform: uppercase; +} + +nav.site { + grid-area: B; + padding: 2rem 0; + background-color: #222; + color: #ccc; +} + +nav.site header { + margin-bottom: 1rem; + color: white; +} + +nav.site ul { + list-style: none; +} + +nav.site ul li > a { + display: block; + padding: 2rem 2rem; + text-decoration: none; + color: inherit; +} + +nav.site ul li > a:hover, +nav.site ul li > a.active { + background-color: #333; } main { - margin: 5rem auto; + grid-area: C; + grid-row: span 2 / auto; + /* margin: 5rem auto; */ + background-color: white; + text-align: center; } -p { +main h2 { + margin-bottom: 4rem; +} + +main p { margin-bottom: 2rem; } +fieldset { + border: none; +} + input#email, input#amount { padding: 1rem; font-size: 1.25rem; diff --git a/app/templates/application.hbs b/app/templates/application.hbs index 5040a7d..3a7e523 100644 --- a/app/templates/application.hbs +++ b/app/templates/application.hbs @@ -1,3 +1,55 @@ -
- {{outlet}} -
\ No newline at end of file +
+
+

+ Kosmos + Services +

+
+ + + +
+ {{outlet}} +
+
\ No newline at end of file diff --git a/app/templates/mastodon/index.hbs b/app/templates/mastodon/index.hbs new file mode 100644 index 0000000..9cce350 --- /dev/null +++ b/app/templates/mastodon/index.hbs @@ -0,0 +1,4 @@ +

kosmos.social

+

+ {{#link-to "mastodon.signup"}}I would like to register a new account{{/link-to}} +

\ No newline at end of file diff --git a/tests/unit/routes/mastodon/index-test.js b/tests/unit/routes/mastodon/index-test.js new file mode 100644 index 0000000..8aead82 --- /dev/null +++ b/tests/unit/routes/mastodon/index-test.js @@ -0,0 +1,11 @@ +import { module, test } from 'qunit'; +import { setupTest } from 'ember-qunit'; + +module('Unit | Route | mastodon/index', function(hooks) { + setupTest(hooks); + + test('it exists', function(assert) { + let route = this.owner.lookup('route:mastodon/index'); + assert.ok(route); + }); +});