From dab9a6d7bc90a4ae86b0515782d62b3cd7711b56 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Wed, 24 Dec 2014 09:36:47 +1030 Subject: [PATCH] Fix up LESS compilation. --- framework/core/ember/app/styles/app.less | 4 ++-- .../core/ember/app/styles/flarum/bootstrap/bootstrap.less | 1 + framework/core/ember/package.json | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/framework/core/ember/app/styles/app.less b/framework/core/ember/app/styles/app.less index c0ff2e3f5..3e9bf677f 100644 --- a/framework/core/ember/app/styles/app.less +++ b/framework/core/ember/app/styles/app.less @@ -1,8 +1,8 @@ @import "config.less"; @flarum-base: "flarum/"; -@bootstrap-base: "../../vendor/bootstrap/less/"; -@font-awesome-base: "../../vendor/font-awesome/less/"; +@bootstrap-base: "../../bower_components/bootstrap/less/"; +@font-awesome-base: "../../bower_components/font-awesome/less/"; @import "@{flarum-base}bootstrap/bootstrap.less"; @import "@{font-awesome-base}font-awesome.less"; diff --git a/framework/core/ember/app/styles/flarum/bootstrap/bootstrap.less b/framework/core/ember/app/styles/flarum/bootstrap/bootstrap.less index 46b334bf0..18e83472b 100644 --- a/framework/core/ember/app/styles/flarum/bootstrap/bootstrap.less +++ b/framework/core/ember/app/styles/flarum/bootstrap/bootstrap.less @@ -1,4 +1,5 @@ // Core variables and mixins +@import "@{bootstrap-base}variables.less"; @import "variables.less"; @import "@{bootstrap-base}mixins.less"; diff --git a/framework/core/ember/package.json b/framework/core/ember/package.json index dfd63176b..691b20c56 100644 --- a/framework/core/ember/package.json +++ b/framework/core/ember/package.json @@ -26,6 +26,7 @@ "ember-cli-htmlbars": "^0.5.4", "ember-cli-ic-ajax": "0.1.1", "ember-cli-inject-live-reload": "^1.3.0", + "ember-cli-less": "^1.0.5", "ember-cli-qunit": "0.1.2", "ember-data": "1.0.0-beta.12", "ember-dynamic-component": "0.0.4",