mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-04 15:37:51 +02:00
Code Issues Releases Wiki Activity

Fix up LESS compilation.

Browse Source
This commit is contained in:
Toby Zerner
2014-12-24 09:36:47 +10:30
parent b37deb248c
commit dab9a6d7bc
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/core/ember/app/styles/app.less
View File

@@ -1,8 +1,8 @@
@import "config.less"; @import "config.less";
@flarum-base: "flarum/"; @flarum-base: "flarum/";
@bootstrap-base: "../../vendor/bootstrap/less/"; @bootstrap-base: "../../bower_components/bootstrap/less/";
@font-awesome-base: "../../vendor/font-awesome/less/"; @font-awesome-base: "../../bower_components/font-awesome/less/";
@import "@{flarum-base}bootstrap/bootstrap.less"; @import "@{flarum-base}bootstrap/bootstrap.less";
@import "@{font-awesome-base}font-awesome.less"; @import "@{font-awesome-base}font-awesome.less";

1
framework/core/ember/app/styles/flarum/bootstrap/bootstrap.less vendored
View File

@@ -1,4 +1,5 @@
// Core variables and mixins // Core variables and mixins
@import "@{bootstrap-base}variables.less";
@import "variables.less"; @import "variables.less";
@import "@{bootstrap-base}mixins.less"; @import "@{bootstrap-base}mixins.less";

1
framework/core/ember/package.json
View File

@@ -26,6 +26,7 @@
"ember-cli-htmlbars": "^0.5.4", "ember-cli-htmlbars": "^0.5.4",
"ember-cli-ic-ajax": "0.1.1", "ember-cli-ic-ajax": "0.1.1",
"ember-cli-inject-live-reload": "^1.3.0", "ember-cli-inject-live-reload": "^1.3.0",
"ember-cli-less": "^1.0.5",
"ember-cli-qunit": "0.1.2", "ember-cli-qunit": "0.1.2",
"ember-data": "1.0.0-beta.12", "ember-data": "1.0.0-beta.12",
"ember-dynamic-component": "0.0.4", "ember-dynamic-component": "0.0.4",