From 175f47be5b9ceefe7c0ff142963c8f21722d682c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Sun, 26 Nov 2017 11:09:09 +0100
Subject: [PATCH] Remove legacy css build and move scss imports to the top
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 Makefile        |  5 +----
 css/legacy.scss | 37 -------------------------------------
 css/style.scss  |  6 +++---
 3 files changed, 4 insertions(+), 44 deletions(-)
 delete mode 100644 css/legacy.scss

diff --git a/Makefile b/Makefile
index 0af7aa611..e398722f7 100644
--- a/Makefile
+++ b/Makefile
@@ -25,14 +25,11 @@ install-deps:
 	cd js && npm install --deps
 	cd js && ./node_modules/.bin/bower install
 
-build: build-js build-css
+build: build-js
 
 build-js: install-deps
 	cd js && ./node_modules/.bin/grunt build
 
-build-css: install-deps
-	./js/node_modules/node-sass/bin/node-sass --output-style compressed css/legacy.scss css/style.css
-
 watch:
 	cd js && ./node_modules/.bin/grunt watch
 
diff --git a/css/legacy.scss b/css/legacy.scss
deleted file mode 100644
index 9206113f1..000000000
--- a/css/legacy.scss
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * @copyright Copyright (c) 2016 Julius Härtl <jus@bitgrid.net>
- *
- * @author Julius Härtl <jus@bitgrid.net>
- *
- * @license GNU AGPL version 3 or any later version
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-
-/**
- * Variables
- */
-$color-main-background: #fff;
-$color-primary-text: #fff;
-$color-error: #e9322d;
-$color-warning: #fbd850;
-$color-warning-light: nc-lighten($color-warning, 15%);
-$color-success: #46ba61;
-$color-lightgrey: nc-darken($color-main-background, 4%);
-$color-grey: nc-darken($color-main-background, 7%);
-$color-darkgrey: nc-darken($color-main-background, 32%);
-
-@import 'style.scss';
diff --git a/css/style.scss b/css/style.scss
index 7b18067d2..8ea555390 100644
--- a/css/style.scss
+++ b/css/style.scss
@@ -27,6 +27,9 @@ $color-lightgrey: nc-darken($color-main-background, 4%);
 $color-grey: nc-darken($color-main-background, 7%);
 $color-darkgrey: nc-darken($color-main-background, 32%);
 
+@import 'comp-appnav.scss';
+@import 'icons.scss';
+
 /**
  * General styles
  */
@@ -1154,6 +1157,3 @@ input.input-inline {
 .ui-select-dropdown.select2-drop-active {
 	opacity: 1 !important;
 }
-
-@import 'comp-appnav.scss';
-@import 'icons.scss';
\ No newline at end of file