Cleaned up Flakes import & init.

This commit is contained in:
Matthew Dillon 2015-03-18 13:49:36 -08:00
parent 82c3bd9e38
commit 1d1bbd6706
9 changed files with 49 additions and 11 deletions

View file

@ -4,8 +4,20 @@ var EmberApp = require('ember-cli/lib/broccoli/ember-app');
var app = new EmberApp(); var app = new EmberApp();
// STYLES //////////////////////////////////////////////////////////////////////
// flakes (and deps)
app.import('bower_components/flakes/css/all.css'); app.import('bower_components/flakes/css/all.css');
app.import('bower_components/gridforms/gridforms/gridforms.css');
// nprogress
app.import('bower_components/nprogress/nprogress.css'); 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'); app.import('bower_components/nprogress/nprogress.js');
module.exports = app.toTree(); module.exports = app.toTree();

View file

@ -5,7 +5,9 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>Hymenobacterdotinfo</title> <title>Hymenobacterdotinfo</title>
<meta name="description" content=""> <meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-touch-fullscreen" content="yes">
{{content-for 'head'}} {{content-for 'head'}}

View file

@ -1,5 +1,4 @@
import DS from 'ember-data'; import DS from 'ember-data';
import Ember from 'ember';
export default DS.Model.extend({ export default DS.Model.extend({
characteristicName: DS.attr(), characteristicName: DS.attr(),

View file

@ -1,7 +0,0 @@
html, body {
margin: 20px;
}
[data-ember-action] {
cursor: pointer;
}

View file

@ -1,5 +1,7 @@
<div class="flakes-frame">
<div class="flakes-navigation"> <div class="flakes-navigation">
<a href="index.html" class="logo">
<img src="img/logo.png" width="120">
</a>
<ul> <ul>
{{#link-to 'genera' tagName='li' href=false}} {{#link-to 'genera' tagName='li' href=false}}
{{#link-to 'genera'}}Genera{{/link-to}} {{#link-to 'genera'}}Genera{{/link-to}}
@ -26,9 +28,19 @@
{{/if}} {{/if}}
</p> </p>
</div> </div>
<div class="flakes-content"> <div class="flakes-content">
<div class="flakes-mobile-top-bar">
<a href="" class="logo-wrap">
<img src="img/logo.png" height="30px">
</a>
<a href="" class="navigation-expand-target">
<img src="img/navigation-expand-target.png" height="26px">
</a>
</div>
<div class="view-wrap"> <div class="view-wrap">
{{outlet}} {{outlet}}
</div> </div>
</div> </div>
</div>

8
app/views/application.js Normal file
View file

@ -0,0 +1,8 @@
import Ember from 'ember';
export default Ember.View.extend({
classNames: ['flakes-frame'],
didInsertElement: function() {
FlakesFrame.init();
}
});

BIN
public/img/logo.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 192 B

View file

@ -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);
});