From 1d1bbd6706f3d51293b01dc207f2bbf37d78e213 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Wed, 18 Mar 2015 13:49:36 -0800 Subject: [PATCH] Cleaned up Flakes import & init. --- Brocfile.js | 12 ++++++++++++ app/index.html | 4 +++- app/models/characteristic.js | 1 - app/styles/app.css | 7 ------- app/templates/application.hbs | 16 ++++++++++++++-- app/views/application.js | 8 ++++++++ public/img/logo.png | Bin 0 -> 1737 bytes public/img/navigation-expand-target.png | Bin 0 -> 192 bytes tests/unit/views/application-test.js | 12 ++++++++++++ 9 files changed, 49 insertions(+), 11 deletions(-) create mode 100644 app/views/application.js create mode 100755 public/img/logo.png create mode 100755 public/img/navigation-expand-target.png create mode 100644 tests/unit/views/application-test.js 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 @@ -
+
    {{#link-to 'genera' tagName='li' href=false}} {{#link-to 'genera'}}Genera{{/link-to}} @@ -26,9 +28,19 @@ {{/if}}

+ +
+
+ + + + + + +
+
{{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 0000000000000000000000000000000000000000..42fd72548cb46f5d41aadc20b1f95372803160d5 GIT binary patch literal 1737 zcmV;)1~&PLP)X1^@s6aN~1q00004b3#c}2nYxW zd~8aNGJMVFFF2`YG%MS*DKk%BsDd1cZ>CaIZbY2|9VnrDB^yzcA#X1CpS zf8rl~;pLs@d1jtx=6UCMo_TZ5pFd9;LaJ84P@px?1lR{`0%ifVfZk-{q&0d{RSPxuL z&dW^-LaJuK9Gv3-KCwpM2R!cS9AGZc7&w}(4q2ne5}$cj9CB0TF#&D;du_UbHF_Vg zIh&obMt=?bmQ5QKf%LK+7|06z`w+0$m(Te3scd%2$%l-K`N>Z6Q?yUoNmlpDd37AyppG2KRxQ;0~VM zz)oxQ_vO*)^;Q9{iHMF_qmM=E*8$r3zU%=uTch`upg+ggZ-zT04+DFByF=iX?S7zA zr2TaN06YpTDAlNnjCaJvivxhVo_&ssPj~~2wMMTii*64Itcvg_0k5QNTn)?v`g+!R z+y_KRwG0?&js836dnaHj(7u>{e_)M%Bo}xJm=Wp39N-WVP0o0&>@f=N|kru zR?R60(z6Q2GeB)$-WAAp2Xsv#RU>QkuccA!H~(coeV~sudRwI0xPZ2)au|U35K>hF z8glWh1LzKX2w;sKhIce%(RtSBZ%PoKi15NVGYTP9Enqp&9O!F}UK6QP9cUG>(<$YF zKvoI37WgY-a)^*>i8Xq0D9Gl_y9oZ&YX~#|ZZ4;e8o=kk9l&a9bnLVRxGBO*hc5*Y zd3|g2K_S&T+~Jm>GVrmG>IGoBHTuFeR92lQq-qa53p_;Tawse60-ph$Jl#!5^{_R1 zQKW9nc`pm8p7-TgXjad^M**vG*KY|b1MdR;g;YbV(FY)l2ZoSp8ZJy2jB}jDIk6co zhAJ!Ska@67_4{9ldJ*0d;5GkD#9f4>pI-p1(OYo)+@6Sz?!b0`=a`+DC!`vMyZcLU z5a?`;KH}vW89*tp6ZjMtKPIT}=@CKQLNc+z8vRab3|XT$38~uRX4{ZJTo+g-r0SWi znfGEqFGw7BiI@Ux33$VWR9yq!AuZ}0eeqH z=(a|m#a+&ZmliXHR8>>-)=2Yq<+QmJmx-JXM7Jl-%Zap$@rpzGBQ%c4V;gvg%Ku?M z7r@7KZw0cZ!1#o)Mjs~g!nTW$sx~D+NYzwGb<#g=Q~K5cVg7w28FZD1uKWnEIHcSE z5RqR z6x|pqq$niFFhu6;$`?|#2Jm}Z7`S#2Qhgz$8i`v{BY^OV>-v<9s$@F2r4N3wMxOwl z2;@1yTp?9*y*3LlL7l$9QX$oFAyqpeRevGX1mI`fPp&lj1a#+A`6Td0PRq{Y49-#E zGCAc3y3rc_oF7y#U^bb18n~2aiZ%Lm|1)U|a8;zLa!W7_6&{znv z3wMRJ$oFS9sdUMs5SU<%p6tVzCBeXp!-K$gz>l6j>)S5IId%|k>o@@nvqmqK00000NkvXXu0mjfar+?M literal 0 HcmV?d00001 diff --git a/public/img/navigation-expand-target.png b/public/img/navigation-expand-target.png new file mode 100755 index 0000000000000000000000000000000000000000..6d76bafeebec6e7cb5a893d11352350149256557 GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^azHG}!3HGNOy@}fDVAa<&kznEsNqQI0P;BtJR*yM z>aT+^qm#z$3XqNx*NBqf{Irtt#G+J&^73-M%)IR4wf^WeOsH^b3TX`p$fjeBrm?KsYXe3&gn~ YEc&vBZ&I>A8pw?dp00i_>zopr0L9ZfJpcdz literal 0 HcmV?d00001 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); +});