From 5d4bfe0271b9c47bd945b382d42e036a9ba1a79e Mon Sep 17 00:00:00 2001 From: Ron Lucke Date: Mon, 2 Mar 2026 13:40:24 +0100 Subject: ref #6177 --- Makefile | 8 +++++--- resources/assets/stylesheets/scss/root.scss | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 0233143..4ec39e8 100644 --- a/Makefile +++ b/Makefile @@ -6,9 +6,10 @@ PHP_SOURCES = $(shell find app config lib public templates -name '*.php' \( ! -p VUE_SOURCES = $(shell find resources -name '*.js' -o -name '*.vue') STUDIP_UI_PATH = packages/studip-ui +UI_KIT_SOURCES = $(shell find $(STUDIP_UI_PATH)/src -type f) # build all needed files -build: composer webpack-prod build-ui +build: composer webpack-prod # remove all generated files clean: clean-composer clean-npm clean-webpack clean-doc @@ -43,12 +44,12 @@ webpack-prod: .webpack.prod webpack-watch: npm npm run webpack-watch -.webpack.dev: node_modules/.package-lock.json $(RESOURCES) +.webpack.dev: node_modules/.package-lock.json $(RESOURCES) $(UI_KIT_SOURCES) @rm -f .webpack.prod npm run webpack-dev @touch $@ -.webpack.prod: node_modules/.package-lock.json $(RESOURCES) +.webpack.prod: node_modules/.package-lock.json $(RESOURCES) $(UI_KIT_SOURCES) @rm -f .webpack.dev npm run webpack-prod @touch $@ @@ -59,6 +60,7 @@ clean-webpack: rm -rf public/assets/javascripts/*.js.map rm -rf public/assets/stylesheets/*.css rm -rf public/assets/stylesheets/*.css.map + rm -rf $(STUDIP_UI_PATH)/dist/* doc: force_update doxygen Doxyfile diff --git a/resources/assets/stylesheets/scss/root.scss b/resources/assets/stylesheets/scss/root.scss index 032e989..95c997d 100644 --- a/resources/assets/stylesheets/scss/root.scss +++ b/resources/assets/stylesheets/scss/root.scss @@ -1,6 +1,6 @@ -@import '../../../../packages/studip-ui/src/styles/tokens/colors'; // color scss vars +@import '~@studip-ui/styles/tokens/colors'; // color scss vars -@import '../../../../packages/studip-ui/src/styles/tokens/index'; // custom props from ui-kit +@import '~@studip-ui/styles/tokens/index'; // custom props from ui-kit :root { --text-color: #{$color--font-primary}; -- cgit v1.0