Move styles to addon tree

app/styles/ember-freestyle.scss → addon/styles/addon.scss

@@ -10,7 +10,7 @@ $FreestyleBreakpoints: (
 };
 
 // Default Ember Freestyle Palette
-$FreestyleGuide-color--primary: #0d47a1 !default;
+$FreestyleGuide-color--primary: #00bcd4 !default;
 $FreestyleGuide-color--accent: #ffc107 !default;
 $FreestyleGuide-color--secondary: #b6b6b6 !default;
 $FreestyleGuide-color--foreground: #212121 !default;

ember-cli-build.js

@@ -9,7 +9,7 @@ module.exports = function(defaults) {
       cascade: false
     },
     freestyle: {
-      snippetSearchPaths: ['tests/dummy/app', 'app/styles']
+      snippetSearchPaths: ['tests/dummy/app', 'addon/styles']
     }
   });
 

index.js

@@ -49,22 +49,29 @@ module.exports = {
     return ['app'];
   },
 
-  treeForStyles: function(tree) {
-    tree = this._super.treeForStyles.apply(this, [tree]);
+  treeForAddonStyles: function() {
+    var addonStyles = new Funnel('addon/styles');
 
     var highlightJsTree = new Funnel(unwatchedTree(path.dirname(require.resolve('highlight.js/package.json'))), {
       srcDir: '/styles',
-      destDir: '/app/styles/ember-freestyle/highlight.js'
+      destDir: '/ember-freestyle/highlight.js',
+      files: [
+        'tomorrow-night.css',
+        'zenburn.css',
+        'hybrid.css',
+        'atelier-cave-dark.css',
+        'solarized-light.css',
+        'docco.css',
+        'monokai-sublime.css'
+      ]
     });
     highlightJsTree = stew.rename(highlightJsTree, '.css', '.scss');
 
-    return mergeTrees([highlightJsTree, tree], {
-      overwrite: true
-    });
+    return mergeTrees([highlightJsTree, addonStyles]);
   },
 
   included: function(app, parentAddon) {
-    this._super.included(app);
+    this._super.included(arguments);
 
     var target = app || parentAddon;
     if (target.import) {

package.json

@@ -27,6 +27,7 @@
     "broccoli-writer": "^0.1.1",
     "ember-cli-babel": "^6.0.0",
     "ember-cli-htmlbars": "^1.3.0",
+    "ember-cli-sass": "6.1.2",
     "ember-remarkable": "chrislopresto/ember-remarkable#highlightjs-css-compatibility-3.2.0",
     "ember-runtime-enumerable-includes-polyfill": "^1.0.4",
     "ember-truth-helpers": "^1.3.0",
@@ -47,7 +48,6 @@
     "ember-cli-page-object": "1.4.0",
     "ember-cli-qunit": "^4.0.0-beta.1",
     "ember-cli-release": "v1.0.0-beta.2",
-    "ember-cli-sass": "5.3.1",
     "ember-cli-sass-lint": "1.0.2",
     "ember-cli-shims": "^1.1.0",
     "ember-cli-sri": "^2.1.0",

tests/dummy/app/styles/app.scss

@@ -2,9 +2,5 @@
 @import 'mixins';
 @import 'palette';
 
-@import 'ember-freestyle';
-
 @import 'site';
 @import 'components/all';
-
-@import 'todo';

tests/dummy/app/styles/reset.scss

@@ -11,6 +11,10 @@ html {
   box-sizing: border-box;
 }
 
+body {
+  font-family: sans-serif;
+}
+
 *,
 *:before,
 *:after {