diff --git a/Brocfile.js b/Brocfile.js index d0f5bbb..7005e48 100644 --- a/Brocfile.js +++ b/Brocfile.js @@ -4,8 +4,20 @@ var EmberApp = require('ember-cli/lib/broccoli/ember-app'); var app = new EmberApp(); +// STYLES ////////////////////////////////////////////////////////////////////// +// flakes (and deps) app.import('bower_components/flakes/css/all.css'); +app.import('bower_components/gridforms/gridforms/gridforms.css'); +// nprogress app.import('bower_components/nprogress/nprogress.css'); + +// LIBS //////////////////////////////////////////////////////////////////////// +// flakes (and deps) +app.import('bower_components/snapjs/snap.js'); +app.import('bower_components/responsive-elements/responsive-elements.js'); +app.import('bower_components/gridforms/gridforms/gridforms.js'); +app.import('bower_components/flakes/js/base.js'); +// nprogress app.import('bower_components/nprogress/nprogress.js'); module.exports = app.toTree(); diff --git a/app/index.html b/app/index.html index a937368..f75c736 100644 --- a/app/index.html +++ b/app/index.html @@ -5,7 +5,9 @@ Hymenobacterdotinfo - + + + {{content-for 'head'}} diff --git a/app/models/characteristic.js b/app/models/characteristic.js index b8ef634..db5ffb0 100644 --- a/app/models/characteristic.js +++ b/app/models/characteristic.js @@ -1,5 +1,4 @@ import DS from 'ember-data'; -import Ember from 'ember'; export default DS.Model.extend({ characteristicName: DS.attr(), diff --git a/app/styles/app.css b/app/styles/app.css index a1a141f..e69de29 100644 --- a/app/styles/app.css +++ b/app/styles/app.css @@ -1,7 +0,0 @@ -html, body { - margin: 20px; -} - -[data-ember-action] { - cursor: pointer; -} diff --git a/app/templates/application.hbs b/app/templates/application.hbs index 60a907b..fcc8ea8 100644 --- a/app/templates/application.hbs +++ b/app/templates/application.hbs @@ -1,5 +1,7 @@ -
+
+ +
+ +
{{outlet}}
-
diff --git a/app/views/application.js b/app/views/application.js new file mode 100644 index 0000000..f5d92cd --- /dev/null +++ b/app/views/application.js @@ -0,0 +1,8 @@ +import Ember from 'ember'; + +export default Ember.View.extend({ + classNames: ['flakes-frame'], + didInsertElement: function() { + FlakesFrame.init(); + } +}); diff --git a/public/img/logo.png b/public/img/logo.png new file mode 100755 index 0000000..42fd725 Binary files /dev/null and b/public/img/logo.png differ diff --git a/public/img/navigation-expand-target.png b/public/img/navigation-expand-target.png new file mode 100755 index 0000000..6d76baf Binary files /dev/null and b/public/img/navigation-expand-target.png differ diff --git a/tests/unit/views/application-test.js b/tests/unit/views/application-test.js new file mode 100644 index 0000000..87a9a92 --- /dev/null +++ b/tests/unit/views/application-test.js @@ -0,0 +1,12 @@ +import { + moduleFor, + test +} from 'ember-qunit'; + +moduleFor('view:application'); + +// Replace this with your real tests. +test('it exists', function(assert) { + var view = this.subject(); + assert.ok(view); +});