ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Remove legacy css build and move scss imports to the top

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2017-11-26 11:09:09 +01:00
committed by Julius Härtl
parent 8cfaca8a75
commit 175f47be5b
3 changed files with 4 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@@ -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

37
css/legacy.scss
View File

@@ -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';

6
css/style.scss
View File

@@ -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';