From 404eeffbebc0a72af63d07fe6839d7b8ba3969ee Mon Sep 17 00:00:00 2001 From: Juan Cruz Viotti Date: Fri, 6 Jan 2017 15:55:07 -0400 Subject: [PATCH] chore: compile CSS into lib/gui/css (#1002) We currently compile CSS into `build/css`, however we plan to use node-gyp in this project, which can't be configured to build to a directory other than `build`, therefore, the compiled CSS must move somewhere else. Signed-off-by: Juan Cruz Viotti --- Makefile | 2 +- {build => lib/gui}/css/main.css | 0 lib/gui/index.html | 2 +- package.json | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename {build => lib/gui}/css/main.css (100%) diff --git a/Makefile b/Makefile index 45a09038..f9198e2c 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ APPLICATION_VERSION = $(shell jq -r '.version' package.json) APPLICATION_COPYRIGHT = $(shell jq -r '.copyright' package.json) APPLICATION_CATEGORY = public.app-category.developer-tools APPLICATION_BUNDLE_ID = io.resin.etcher -APPLICATION_FILES = lib,build,assets +APPLICATION_FILES = lib,assets # --------------------------------------------------------------------- # Operating system and architecture detection diff --git a/build/css/main.css b/lib/gui/css/main.css similarity index 100% rename from build/css/main.css rename to lib/gui/css/main.css diff --git a/lib/gui/index.html b/lib/gui/index.html index b369cf10..da1f2728 100644 --- a/lib/gui/index.html +++ b/lib/gui/index.html @@ -3,7 +3,7 @@ Etcher - + diff --git a/package.json b/package.json index e14e3855..86fda758 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ }, "scripts": { "test": "npm run lint && electron-mocha --recursive --renderer tests/gui -R min && electron-mocha --recursive tests/cli tests/shared -R min", - "sass": "node-sass ./lib/gui/scss/main.scss > build/css/main.css", + "sass": "node-sass ./lib/gui/scss/main.scss > ./lib/gui/css/main.css", "jslint": "eslint lib tests scripts bin versionist.conf.js", "scsslint": "scss-lint lib/gui/scss", "lint": "npm run jslint && npm run scsslint",