From ab32623ddeff3ca844943b4afe36bfd214b4cc64 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Thu, 27 Aug 2020 14:47:03 +1000 Subject: [PATCH] move _vars to outer ts folder First step in sharing styling with graphs + future .html files --- qt/tools/extract_scss_colors.py | 2 +- qt/ts/Makefile | 2 +- {qt/ts => ts/src}/scss/_vars.scss | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename {qt/ts => ts/src}/scss/_vars.scss (97%) diff --git a/qt/tools/extract_scss_colors.py b/qt/tools/extract_scss_colors.py index 7928b7027..08010c119 100644 --- a/qt/tools/extract_scss_colors.py +++ b/qt/tools/extract_scss_colors.py @@ -6,7 +6,7 @@ import json colors = {} -for line in open("ts/scss/_vars.scss"): +for line in open("../ts/src/scss/_vars.scss"): line = line.strip() if not line: continue diff --git a/qt/ts/Makefile b/qt/ts/Makefile index cc644e0cb..a18ce4830 100644 --- a/qt/ts/Makefile +++ b/qt/ts/Makefile @@ -23,7 +23,7 @@ all: check PHONY: build build: $(BIN)/tsc --build - $(BIN)/sass --no-source-map scss:css + $(BIN)/sass --no-source-map -I ../../ts/src/scss scss:css rsync -a css/ ../aqt_data/web/ .PHONY: check diff --git a/qt/ts/scss/_vars.scss b/ts/src/scss/_vars.scss similarity index 97% rename from qt/ts/scss/_vars.scss rename to ts/src/scss/_vars.scss index ac746d65f..10ea7cd36 100644 --- a/qt/ts/scss/_vars.scss +++ b/ts/src/scss/_vars.scss @@ -46,4 +46,4 @@ $fusion-button-gradient-end: #656565; $fusion-button-outline: #222222; $fusion-button-hover-bg: #656565; $fusion-button-border: #646464; -$fusion-button-base-bg: #454545; \ No newline at end of file +$fusion-button-base-bg: #454545;