diff --git a/app/index.html b/app/index.html index 8d922b7..66c230b 100644 --- a/app/index.html +++ b/app/index.html @@ -5,7 +5,7 @@ KreditsWeb - + {{content-for "head"}} diff --git a/app/routes/application.js b/app/routes/application.js new file mode 100644 index 0000000..26d9f31 --- /dev/null +++ b/app/routes/application.js @@ -0,0 +1,4 @@ +import Ember from 'ember'; + +export default Ember.Route.extend({ +}); diff --git a/app/routes/index.js b/app/routes/index.js new file mode 100644 index 0000000..26d9f31 --- /dev/null +++ b/app/routes/index.js @@ -0,0 +1,4 @@ +import Ember from 'ember'; + +export default Ember.Route.extend({ +}); diff --git a/app/styles/_layout.scss b/app/styles/_layout.scss new file mode 100644 index 0000000..f4f9a98 --- /dev/null +++ b/app/styles/_layout.scss @@ -0,0 +1,23 @@ +body { +} + +section { + @include outer-container; + margin-top: 6rem; + + @include media($mobile) { + margin-top: 3rem; + } + + header { + @include span-columns(10); + @include shift(1); + text-align: center; + // background-color: purple; + + @include media($mobile) { + @include span-columns(10); + @include shift(1); + } + } +} diff --git a/app/styles/app.css b/app/styles/app.css deleted file mode 100644 index e69de29..0000000 diff --git a/app/styles/app.scss b/app/styles/app.scss new file mode 100644 index 0000000..c89c7ff --- /dev/null +++ b/app/styles/app.scss @@ -0,0 +1,54 @@ +* { + margin: 0; + padding: 0; + box-sizing: border-box; +} + +*:hover, *:active, *:focus { + outline: none; + -webkit-tap-highlight-color: rgba(255, 255, 255, 0); + -webkit-tap-highlight-color: transparent; +} + +@import "bourbon"; +@import "settings/neat"; +@import "neat"; +@import "settings/breakpoints"; +@import "layout"; + +$font-family-sans: 'Open Sans', sans-serif; + +body { + font-family: $font-family-sans; + font-size: 16px; + color: #fff; + background-image: url('/img/bg.jpg'); + background-repeat: none; +} + +@media screen and (min-width: 900px) { + body { + background-size: cover; + } +} + +h1, h2, h3, h4, h5 { + font-weight: normal; + font-size: 1rem; +} + +input, button { + font-family: $font-family-sans; + font-size: 1rem; +} + +section { + h2 { + font-size: 2.8rem; + font-weight: 300; + color: lightblue; + @include media($mobile) { + font-size: 2rem; + } + } +} diff --git a/app/styles/settings/_breakpoints.scss b/app/styles/settings/_breakpoints.scss new file mode 100644 index 0000000..3f33a0d --- /dev/null +++ b/app/styles/settings/_breakpoints.scss @@ -0,0 +1 @@ +$mobile: new-breakpoint(max-width 600px); diff --git a/app/styles/settings/_neat.scss b/app/styles/settings/_neat.scss new file mode 100644 index 0000000..3ed8174 --- /dev/null +++ b/app/styles/settings/_neat.scss @@ -0,0 +1,5 @@ +// $visual-grid: true; +// $visual-grid-color: red; +// $visual-grid-index: front; +// $visual-grid-opacity: 0.5; +$max-width: em(500, 12); diff --git a/app/templates/application.hbs b/app/templates/application.hbs new file mode 100644 index 0000000..1338264 --- /dev/null +++ b/app/templates/application.hbs @@ -0,0 +1,3 @@ +
+ {{outlet}} +
diff --git a/app/templates/index.hbs b/app/templates/index.hbs new file mode 100644 index 0000000..1b6ebf0 --- /dev/null +++ b/app/templates/index.hbs @@ -0,0 +1,7 @@ +
+ +
+

Kosmos Contributors

+
+ +
diff --git a/bower.json b/bower.json index aecbdd0..6ec98ce 100644 --- a/bower.json +++ b/bower.json @@ -2,6 +2,8 @@ "name": "kredits-web", "dependencies": { "ember": "~2.10.0", - "ember-cli-shims": "0.1.3" + "ember-cli-shims": "0.1.3", + "bourbon": "^4.2.7", + "neat": "^1.8.0" } } diff --git a/ember-cli-build.js b/ember-cli-build.js index 2537ce2..ea0c4de 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -5,6 +5,12 @@ var EmberApp = require('ember-cli/lib/broccoli/ember-app'); module.exports = function(defaults) { var app = new EmberApp(defaults, { // Add options here + sassOptions: { + includePaths: [ + 'bower_components/bourbon/app/assets/stylesheets', + 'bower_components/neat/app/assets/stylesheets' + ] + } }); // Use `app.import` to add additional libraries to the generated diff --git a/package.json b/package.json index a8adf80..4a36641 100644 --- a/package.json +++ b/package.json @@ -27,14 +27,13 @@ "ember-cli-jshint": "^2.0.1", "ember-cli-qunit": "^3.0.1", "ember-cli-release": "^0.2.9", + "ember-cli-sass": "6.1.1", "ember-cli-sri": "^2.1.0", "ember-cli-test-loader": "^1.1.0", "ember-cli-uglify": "^1.2.0", - "ember-data": "^2.10.0", "ember-export-application-global": "^1.0.5", "ember-load-initializers": "^0.5.1", "ember-resolver": "^2.0.3", - "ember-welcome-page": "^1.0.3", "loader.js": "^4.0.10" }, "engines": { diff --git a/public/img/bg.jpg b/public/img/bg.jpg new file mode 100644 index 0000000..72fa30b Binary files /dev/null and b/public/img/bg.jpg differ diff --git a/tests/unit/routes/application-test.js b/tests/unit/routes/application-test.js new file mode 100644 index 0000000..9808c43 --- /dev/null +++ b/tests/unit/routes/application-test.js @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:application', 'Unit | Route | application', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + let route = this.subject(); + assert.ok(route); +}); diff --git a/tests/unit/routes/index-test.js b/tests/unit/routes/index-test.js new file mode 100644 index 0000000..5d0f50d --- /dev/null +++ b/tests/unit/routes/index-test.js @@ -0,0 +1,11 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('route:index', 'Unit | Route | index', { + // Specify the other units that are required for this test. + // needs: ['controller:foo'] +}); + +test('it exists', function(assert) { + let route = this.subject(); + assert.ok(route); +});