From a7e1fe699d0fa5b07889241f12c21696cfffd3a0 Mon Sep 17 00:00:00 2001 From: Vanessa Stoiber <52395160+dvvanessastoiber@users.noreply.github.com> Date: Thu, 29 Feb 2024 14:29:02 +0100 Subject: [PATCH] Release 25.0.0 (#875) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: prepare next dev release * Use correct workflow branches (#862) fix branches * prepare next dev version * deps: update React in package.json (#865) * Update package.json * Update package.json * prepare next dev version * chore: version pinning (#867) version pinning * prepare next dev version * Mantine7 (#864) * migrate to mantine 7 * add test menu item and fix cypress test * dist files and linting * add new yarn.lock * Update versions * Update backend versions --------- Co-authored-by: Michael Puehringer * prepare next dev version * feat: rspack * Remove storybook as it hoists fork-ts-checker-webpack-plugin * Remove cypress component testing * Switch to start:full * Update scripts * fix: remove polyfill (#871) * Update package.json * feat: rspack (#870) * feat: rspack * Remove storybook as it hoists fork-ts-checker-webpack-plugin * Remove cypress component testing * Switch to start:full * Update scripts * Update package.json * Revert "feat: rspack" (#872) Revert "feat: rspack (#870)" This reverts commit 5566ddf8c79d60db70a6c6b1af1bfa864a7d132b. * prepare next dev version * prepare release 25.0.0 --------- Co-authored-by: Holger Stitz Co-authored-by: Michael Pühringer <51900829+puehringer@users.noreply.github.com> Co-authored-by: dvdanielamoitzi <57343176+dvdanielamoitzi@users.noreply.github.com> Co-authored-by: Michael Puehringer --- .storybook/main.js | 22 ------- .storybook/preview.js | 15 ----- cypress.config.ts | 20 +----- dist/scss/abstracts/_variables.scss | 7 +- dist/scss/components/_view_lineup.scss | 2 +- dist/scss/fontawesome.scss | 6 +- dist/scss/main.scss | 2 +- dist/scss/storybook.scss | 2 +- dist/scss/vendors/_font-awesome.scss | 8 +-- dist/scss/vendors/_lineup.scss | 4 +- dist/scss/vendors/_select2.scss | 4 +- .../_1_variables_mixins_utilities.scss | 6 +- .../scss/vendors/bootstrap/_2_components.scss | 64 +++++++++---------- .../vendors/bootstrap/overrides/_forms.scss | 16 ++--- package.json | 29 +++------ requirements.txt | 2 +- src/scss/abstracts/_variables.scss | 7 +- src/scss/components/_view_lineup.scss | 2 +- src/scss/fontawesome.scss | 6 +- src/scss/main.scss | 2 +- src/scss/storybook.scss | 2 +- src/scss/vendors/_font-awesome.scss | 8 +-- src/scss/vendors/_lineup.scss | 4 +- src/scss/vendors/_select2.scss | 4 +- .../_1_variables_mixins_utilities.scss | 6 +- src/scss/vendors/bootstrap/_2_components.scss | 64 +++++++++---------- .../vendors/bootstrap/overrides/_forms.scss | 16 ++--- 27 files changed, 127 insertions(+), 203 deletions(-) delete mode 100644 .storybook/main.js delete mode 100644 .storybook/preview.js diff --git a/.storybook/main.js b/.storybook/main.js deleted file mode 100644 index ef6402dda..000000000 --- a/.storybook/main.js +++ /dev/null @@ -1,22 +0,0 @@ -const path = require('path'); - -module.exports = { - core: { - builder: 'webpack5', - }, - stories: ['../src/**/*.stories.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'], - addons: ['@storybook/addon-links', '@storybook/addon-essentials', '@storybook/addon-interactions', '@storybook/preset-scss', 'storybook-addon-swc'], - framework: '@storybook/react', - webpackFinal: async (config) => { - config.resolve.alias = { - ...(config.resolve.alias || {}), - // I have no clue why this is required, but if this is missing we get a "Can't resolve '../../assets/icons/datavisyn_logo.svg' in '.../src/scss'"" - '../../assets': path.resolve(__dirname, '../src/assets'), - // Add tdp_core/dist as alias, as we have scss/code imports like tdp_core/dist/assets/... - 'tdp_core/dist': path.resolve(__dirname, '../src'), - 'tdp_core/src': path.resolve(__dirname, '../src'), - 'tdp_core': path.resolve(__dirname, '../src'), - }; - return config; - }, -}; diff --git a/.storybook/preview.js b/.storybook/preview.js deleted file mode 100644 index 9deea8ee8..000000000 --- a/.storybook/preview.js +++ /dev/null @@ -1,15 +0,0 @@ -import '../src/scss/storybook.scss'; -import { initializeLibrary } from '../src/initialize'; - -// TODO: This is async, how to wait for it? -initializeLibrary(); - -export const parameters = { - actions: { argTypesRegex: '^on[A-Z].*' }, - controls: { - matchers: { - color: /(background|color)$/i, - date: /Date$/, - }, - }, -}; diff --git a/cypress.config.ts b/cypress.config.ts index d1cb430d5..bf2871be3 100644 --- a/cypress.config.ts +++ b/cypress.config.ts @@ -1,20 +1,4 @@ import { defineConfig } from 'cypress'; -import * as webpackConfig from 'visyn_scripts/config/webpack.config'; +import * as cypressConfig from 'visyn_scripts/config/cypress.config.template'; -export default defineConfig({ - viewportHeight: 1080, - viewportWidth: 1920, - defaultCommandTimeout: 10000, - e2e: { - baseUrl: 'http://localhost:8080', - // eslint-disable-next-line @typescript-eslint/no-unused-vars - setupNodeEvents(on, config) {}, - }, - component: { - devServer: { - framework: 'react', - bundler: 'webpack', - webpackConfig: webpackConfig({ workspace_mode: 'single' }, { mode: 'production' }), - }, - }, -}); +export default defineConfig(cypressConfig); diff --git a/dist/scss/abstracts/_variables.scss b/dist/scss/abstracts/_variables.scss index f2751b583..cc87c4787 100644 --- a/dist/scss/abstracts/_variables.scss +++ b/dist/scss/abstracts/_variables.scss @@ -73,9 +73,6 @@ $annotation_color_hover: #006b90 !default; $anchor_color: red !default; $anchor_color_hover: darkred !default; -/* phovea_ui */ -$fa-font-path: '~@fortawesome/fontawesome-free/webfonts' !default; - $phovea-loading-icon-url: url('../../assets/caleydo_c_anim.svg') !default; $phovea-loading-icon-size: auto !default; @@ -101,8 +98,6 @@ $anchor_color_hover: darkred !default; $select-data-color: orange !default; $hover-data-color: #ffc46b !default; -// TODO: Without this, we get "Can't resolve './node_modules/lineupengine/src/styles/lineupengine/src/assets/loading.svg' in '.../workspaces/'" -// Why do I need to do this? Probably because lineupjs defines $engine_assets and it is resolving it relatively? -$engine_assets: '~lineupengine/src/assets'; +$engine_assets: '../assets'; $engine_loading_image: url('#{$engine_assets}/loading.svg') !default; $engine_loading_static_image: url('#{$engine_assets}/loading_s.svg') !default; diff --git a/dist/scss/components/_view_lineup.scss b/dist/scss/components/_view_lineup.scss index 8c7e3652a..ee1b745fd 100644 --- a/dist/scss/components/_view_lineup.scss +++ b/dist/scss/components/_view_lineup.scss @@ -73,7 +73,7 @@ } } -$lu_assets: "~lineupjs/src/assets"; +$lu_assets: "../assets"; @at-root { .tdp-ranking-export-form { diff --git a/dist/scss/fontawesome.scss b/dist/scss/fontawesome.scss index 1bf4623ec..19d2c091e 100644 --- a/dist/scss/fontawesome.scss +++ b/dist/scss/fontawesome.scss @@ -1,3 +1,3 @@ -@import "~@fortawesome/fontawesome-free/scss/functions"; -@import "~@fortawesome/fontawesome-free/scss/variables"; -@import "~@fortawesome/fontawesome-free/scss/mixins"; \ No newline at end of file +@import "@fortawesome/fontawesome-free/scss/functions"; +@import "@fortawesome/fontawesome-free/scss/variables"; +@import "@fortawesome/fontawesome-free/scss/mixins"; \ No newline at end of file diff --git a/dist/scss/main.scss b/dist/scss/main.scss index 63d78ad69..84c889852 100644 --- a/dist/scss/main.scss +++ b/dist/scss/main.scss @@ -1,4 +1,4 @@ -@import "~visyn_core/dist/scss/main.scss"; +@import "visyn_core/scss/main.scss"; @import "./abstracts/functions"; @import './abstracts/variables'; diff --git a/dist/scss/storybook.scss b/dist/scss/storybook.scss index 8d190c8a6..93f90c1fc 100644 --- a/dist/scss/storybook.scss +++ b/dist/scss/storybook.scss @@ -6,7 +6,7 @@ @import "./vendors/bootstrap/1_variables_mixins_utilities"; // map-merge my theme-colors -// @import "~target360/dist/scss/vendors/bootstrap_modify_maps"; +// @import "target360/dist/scss/vendors/bootstrap_modify_maps"; // Include all Bootstrap components as needed @import "./vendors/bootstrap/2_components"; diff --git a/dist/scss/vendors/_font-awesome.scss b/dist/scss/vendors/_font-awesome.scss index 92ac29d97..72a203824 100644 --- a/dist/scss/vendors/_font-awesome.scss +++ b/dist/scss/vendors/_font-awesome.scss @@ -1,7 +1,7 @@ -@import '~@fortawesome/fontawesome-free/scss/solid'; -@import '~@fortawesome/fontawesome-free/scss/regular'; -@import '~@fortawesome/fontawesome-free/scss/brands'; -@import '~@fortawesome/fontawesome-free/scss/fontawesome'; +@import '@fortawesome/fontawesome-free/scss/solid'; +@import '@fortawesome/fontawesome-free/scss/regular'; +@import '@fortawesome/fontawesome-free/scss/brands'; +@import '@fortawesome/fontawesome-free/scss/fontawesome'; // vertically align all font-awesome icons inside of the .btn class diff --git a/dist/scss/vendors/_lineup.scss b/dist/scss/vendors/_lineup.scss index 1413a6492..e29e9a3f3 100644 --- a/dist/scss/vendors/_lineup.scss +++ b/dist/scss/vendors/_lineup.scss @@ -1,12 +1,12 @@ $lu_dialog_font_size: 0.9rem !default; $lu_toolbar_font_size: 0.9rem !default; -$lu_assets: '~lineupjs/src/assets' !default; +$lu_assets: '../assets' !default; $lu_use_font_awesome: true !default; // do not include Font Awesome files from LineUp, but use ours instead $lu_include_font_awesome: false !default; -@import '~lineupjs/src/style.scss'; +@import 'lineupjs/src/style.scss'; .lu { // use a fixed font-size for the ranking + side panel with the Roboto font family. diff --git a/dist/scss/vendors/_select2.scss b/dist/scss/vendors/_select2.scss index 8957d63ab..0134fd2ab 100644 --- a/dist/scss/vendors/_select2.scss +++ b/dist/scss/vendors/_select2.scss @@ -1,8 +1,8 @@ /** * Additional jQuery select2 styles */ - @import "~select2/dist/css/select2.min.css"; - @import "~select2-bootstrap-theme/dist/select2-bootstrap.min.css"; + @import "select2/dist/css/select2.min.css"; + @import "select2-bootstrap-theme/dist/select2-bootstrap.min.css"; .select2-results__option .ensg, .select2-selection__rendered .ensg { diff --git a/dist/scss/vendors/bootstrap/_1_variables_mixins_utilities.scss b/dist/scss/vendors/bootstrap/_1_variables_mixins_utilities.scss index 8f5442f2b..dabf0c144 100644 --- a/dist/scss/vendors/bootstrap/_1_variables_mixins_utilities.scss +++ b/dist/scss/vendors/bootstrap/_1_variables_mixins_utilities.scss @@ -1,13 +1,13 @@ // 1. Include functions first (so you can manipulate colors, SVGs, calc, etc) // @see https://getbootstrap.com/docs/5.1/customize/sass/#importing -@import "~bootstrap/scss/functions"; +@import "bootstrap/scss/functions"; // 2. Include remainder of required Bootstrap stylesheets (required) // @see https://getbootstrap.com/docs/5.1/customize/sass/#importing -@import "~bootstrap/scss/variables"; -@import "~bootstrap/scss/mixins"; +@import "bootstrap/scss/variables"; +@import "bootstrap/scss/mixins"; // $spacers, $theme-colors need to be adapted before importing the utilities to generate the m-* and p-*, text-*, border-*, bg-* utility classes // @see https://getbootstrap.com/docs/5.1/utilities/spacing/ and https://getbootstrap.com/docs/5.1/utilities/colors/ diff --git a/dist/scss/vendors/bootstrap/_2_components.scss b/dist/scss/vendors/bootstrap/_2_components.scss index d96df4da6..bd7494454 100644 --- a/dist/scss/vendors/bootstrap/_2_components.scss +++ b/dist/scss/vendors/bootstrap/_2_components.scss @@ -1,5 +1,5 @@ // Import utilities -@import "~bootstrap/scss/utilities"; +@import "bootstrap/scss/utilities"; // Add our custom utilities @import "./utilities"; @@ -7,41 +7,41 @@ // @see https://getbootstrap.com/docs/5.1/customize/sass/#importing // Import and reboot -@import "~bootstrap/scss/root"; // Create CSS variables from $theme-colors, ... -@import "~bootstrap/scss/reboot"; +@import "bootstrap/scss/root"; // Create CSS variables from $theme-colors, ... +@import "bootstrap/scss/reboot"; // Import all components -@import "~bootstrap/scss/accordion"; -@import "~bootstrap/scss/alert"; -@import "~bootstrap/scss/badge"; -@import "~bootstrap/scss/breadcrumb"; -@import "~bootstrap/scss/button-group"; -@import "~bootstrap/scss/buttons"; -@import "~bootstrap/scss/card"; -@import "~bootstrap/scss/carousel"; -@import "~bootstrap/scss/close"; -@import "~bootstrap/scss/containers"; -@import "~bootstrap/scss/dropdown"; +@import "bootstrap/scss/accordion"; +@import "bootstrap/scss/alert"; +@import "bootstrap/scss/badge"; +@import "bootstrap/scss/breadcrumb"; +@import "bootstrap/scss/button-group"; +@import "bootstrap/scss/buttons"; +@import "bootstrap/scss/card"; +@import "bootstrap/scss/carousel"; +@import "bootstrap/scss/close"; +@import "bootstrap/scss/containers"; +@import "bootstrap/scss/dropdown"; @import "./overrides/forms"; -@import "~bootstrap/scss/grid"; -@import "~bootstrap/scss/images"; -@import "~bootstrap/scss/list-group"; -@import "~bootstrap/scss/modal"; -@import "~bootstrap/scss/nav"; -@import "~bootstrap/scss/navbar"; -@import "~bootstrap/scss/offcanvas"; -@import "~bootstrap/scss/pagination"; -@import "~bootstrap/scss/popover"; -@import "~bootstrap/scss/progress"; -@import "~bootstrap/scss/spinners"; -@import "~bootstrap/scss/tables"; -@import "~bootstrap/scss/toasts"; -@import "~bootstrap/scss/tooltip"; -@import "~bootstrap/scss/transitions"; -@import "~bootstrap/scss/type"; +@import "bootstrap/scss/grid"; +@import "bootstrap/scss/images"; +@import "bootstrap/scss/list-group"; +@import "bootstrap/scss/modal"; +@import "bootstrap/scss/nav"; +@import "bootstrap/scss/navbar"; +@import "bootstrap/scss/offcanvas"; +@import "bootstrap/scss/pagination"; +@import "bootstrap/scss/popover"; +@import "bootstrap/scss/progress"; +@import "bootstrap/scss/spinners"; +@import "bootstrap/scss/tables"; +@import "bootstrap/scss/toasts"; +@import "bootstrap/scss/tooltip"; +@import "bootstrap/scss/transitions"; +@import "bootstrap/scss/type"; // Import helpers -@import "~bootstrap/scss/helpers"; +@import "bootstrap/scss/helpers"; // Import utilities -@import "~bootstrap/scss/utilities/api"; +@import "bootstrap/scss/utilities/api"; diff --git a/dist/scss/vendors/bootstrap/overrides/_forms.scss b/dist/scss/vendors/bootstrap/overrides/_forms.scss index a86292b23..b28593059 100644 --- a/dist/scss/vendors/bootstrap/overrides/_forms.scss +++ b/dist/scss/vendors/bootstrap/overrides/_forms.scss @@ -1,9 +1,9 @@ -@import "~bootstrap/scss/forms/labels"; -@import "~bootstrap/scss/forms/form-text"; -@import "~bootstrap/scss/forms/form-control"; -@import "~bootstrap/scss/forms/form-select"; +@import "bootstrap/scss/forms/labels"; +@import "bootstrap/scss/forms/form-text"; +@import "bootstrap/scss/forms/form-control"; +@import "bootstrap/scss/forms/form-select"; @import "./form_check"; -@import "~bootstrap/scss/forms/form-range"; -@import "~bootstrap/scss/forms/floating-labels"; -@import "~bootstrap/scss/forms/input-group"; -@import "~bootstrap/scss/forms/validation"; +@import "bootstrap/scss/forms/form-range"; +@import "bootstrap/scss/forms/floating-labels"; +@import "bootstrap/scss/forms/input-group"; +@import "bootstrap/scss/forms/validation"; diff --git a/package.json b/package.json index 7cadf4d20..319a37682 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "tdp_core", "description": "Target discovery platform for exploring rankings of genes, disease models, and other entities.", - "version": "24.0.1", + "version": "25.0.0", "author": { "name": "datavisyn GmbH", "email": "contact@datavisyn.io", @@ -38,20 +38,18 @@ "compile": "visyn_scripts compile", "copy": "visyn_scripts copy", "cy:open": "cypress open", - "cy:run": "cypress run --e2e && cypress run --component", + "cy:run": "cypress run --e2e", "delete-dependencies": "visyn_scripts clean node_modules", "dist": "mkdir lib && cd dist && tar cvzf ../lib/tdp_core.tar.gz *", "docs": "visyn_scripts docs", "lint:fix": "visyn_scripts lint --fix", "lint": "visyn_scripts lint", "predist": "yarn run lint && yarn run test && yarn run build", - "start:fast": "visyn_scripts start --env workspace_mode=single fast=true", + "start:full": "visyn_scripts start --env workspace_mode=single fast=false", "start": "visyn_scripts start --env workspace_mode=single", - "storybook:build": "NODE_OPTIONS=--max_old_space_size=4096 build-storybook", - "storybook": "NODE_OPTIONS=--max_old_space_size=4096 start-storybook -p 6006", "test": "visyn_scripts test", - "webpack:dev": "visyn_scripts build --mode development --env workspace_mode=single", - "webpack:prod": "visyn_scripts build --mode production --env workspace_mode=single" + "bundle:dev": "visyn_scripts bundle --mode development --env workspace_mode=single", + "bundle:prod": "visyn_scripts bundle --mode production --env workspace_mode=single" }, "dependencies": { "@popperjs/core": "^2.9.3", @@ -84,30 +82,19 @@ "select2": "~4.0.13", "select2-bootstrap-theme": "0.1.0-beta.9", "use-deep-compare-effect": "^1.8.0", - "visyn_core": "^8.1.3", + "visyn_core": "^9.0.0", "visyn_scripts": "^8.0.0" }, "devDependencies": { "@babel/core": "^7.17.7", "@babel/plugin-transform-typescript": "7.17.12", - "@storybook/addon-actions": "^6.5.16", - "@storybook/addon-essentials": "^6.5.16", - "@storybook/addon-interactions": "^6.5.16", - "@storybook/addon-links": "^6.5.16", - "@storybook/builder-webpack5": "^6.5.16", - "@storybook/manager-webpack5": "^6.5.16", - "@storybook/preset-scss": "^1.0.3", - "@storybook/react": "^6.5.16", - "@storybook/testing-library": "0.0.13", - "cypress": "^11.2.0", - "storybook-addon-swc": "^1.1.9" + "cypress": "^13.0.0" }, "resolutions": { "@types/react": "~18.2.0", "@types/react-dom": "~18.2.0", "react": "~18.2.0", - "react-dom": "~18.2.0", - "webpack": "5.74.0" + "react-dom": "~18.2.0" }, "visyn": { "entries": { diff --git a/requirements.txt b/requirements.txt index 6535cb8eb..b34522b1f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,5 +2,5 @@ flask-swagger-ui==3.36.0 Pillow==9.3.0 pymongo~=3.11.1 python-memcached==1.59 -visyn_core>=8.1.3,<9.0.0 +visyn_core>=9.0.0,<10.0.0 yamlreader==3.0.4 diff --git a/src/scss/abstracts/_variables.scss b/src/scss/abstracts/_variables.scss index f2751b583..cc87c4787 100644 --- a/src/scss/abstracts/_variables.scss +++ b/src/scss/abstracts/_variables.scss @@ -73,9 +73,6 @@ $annotation_color_hover: #006b90 !default; $anchor_color: red !default; $anchor_color_hover: darkred !default; -/* phovea_ui */ -$fa-font-path: '~@fortawesome/fontawesome-free/webfonts' !default; - $phovea-loading-icon-url: url('../../assets/caleydo_c_anim.svg') !default; $phovea-loading-icon-size: auto !default; @@ -101,8 +98,6 @@ $anchor_color_hover: darkred !default; $select-data-color: orange !default; $hover-data-color: #ffc46b !default; -// TODO: Without this, we get "Can't resolve './node_modules/lineupengine/src/styles/lineupengine/src/assets/loading.svg' in '.../workspaces/'" -// Why do I need to do this? Probably because lineupjs defines $engine_assets and it is resolving it relatively? -$engine_assets: '~lineupengine/src/assets'; +$engine_assets: '../assets'; $engine_loading_image: url('#{$engine_assets}/loading.svg') !default; $engine_loading_static_image: url('#{$engine_assets}/loading_s.svg') !default; diff --git a/src/scss/components/_view_lineup.scss b/src/scss/components/_view_lineup.scss index 8c7e3652a..ee1b745fd 100644 --- a/src/scss/components/_view_lineup.scss +++ b/src/scss/components/_view_lineup.scss @@ -73,7 +73,7 @@ } } -$lu_assets: "~lineupjs/src/assets"; +$lu_assets: "../assets"; @at-root { .tdp-ranking-export-form { diff --git a/src/scss/fontawesome.scss b/src/scss/fontawesome.scss index 1bf4623ec..19d2c091e 100644 --- a/src/scss/fontawesome.scss +++ b/src/scss/fontawesome.scss @@ -1,3 +1,3 @@ -@import "~@fortawesome/fontawesome-free/scss/functions"; -@import "~@fortawesome/fontawesome-free/scss/variables"; -@import "~@fortawesome/fontawesome-free/scss/mixins"; \ No newline at end of file +@import "@fortawesome/fontawesome-free/scss/functions"; +@import "@fortawesome/fontawesome-free/scss/variables"; +@import "@fortawesome/fontawesome-free/scss/mixins"; \ No newline at end of file diff --git a/src/scss/main.scss b/src/scss/main.scss index 63d78ad69..84c889852 100644 --- a/src/scss/main.scss +++ b/src/scss/main.scss @@ -1,4 +1,4 @@ -@import "~visyn_core/dist/scss/main.scss"; +@import "visyn_core/scss/main.scss"; @import "./abstracts/functions"; @import './abstracts/variables'; diff --git a/src/scss/storybook.scss b/src/scss/storybook.scss index 8d190c8a6..93f90c1fc 100644 --- a/src/scss/storybook.scss +++ b/src/scss/storybook.scss @@ -6,7 +6,7 @@ @import "./vendors/bootstrap/1_variables_mixins_utilities"; // map-merge my theme-colors -// @import "~target360/dist/scss/vendors/bootstrap_modify_maps"; +// @import "target360/dist/scss/vendors/bootstrap_modify_maps"; // Include all Bootstrap components as needed @import "./vendors/bootstrap/2_components"; diff --git a/src/scss/vendors/_font-awesome.scss b/src/scss/vendors/_font-awesome.scss index 92ac29d97..72a203824 100644 --- a/src/scss/vendors/_font-awesome.scss +++ b/src/scss/vendors/_font-awesome.scss @@ -1,7 +1,7 @@ -@import '~@fortawesome/fontawesome-free/scss/solid'; -@import '~@fortawesome/fontawesome-free/scss/regular'; -@import '~@fortawesome/fontawesome-free/scss/brands'; -@import '~@fortawesome/fontawesome-free/scss/fontawesome'; +@import '@fortawesome/fontawesome-free/scss/solid'; +@import '@fortawesome/fontawesome-free/scss/regular'; +@import '@fortawesome/fontawesome-free/scss/brands'; +@import '@fortawesome/fontawesome-free/scss/fontawesome'; // vertically align all font-awesome icons inside of the .btn class diff --git a/src/scss/vendors/_lineup.scss b/src/scss/vendors/_lineup.scss index 1413a6492..e29e9a3f3 100644 --- a/src/scss/vendors/_lineup.scss +++ b/src/scss/vendors/_lineup.scss @@ -1,12 +1,12 @@ $lu_dialog_font_size: 0.9rem !default; $lu_toolbar_font_size: 0.9rem !default; -$lu_assets: '~lineupjs/src/assets' !default; +$lu_assets: '../assets' !default; $lu_use_font_awesome: true !default; // do not include Font Awesome files from LineUp, but use ours instead $lu_include_font_awesome: false !default; -@import '~lineupjs/src/style.scss'; +@import 'lineupjs/src/style.scss'; .lu { // use a fixed font-size for the ranking + side panel with the Roboto font family. diff --git a/src/scss/vendors/_select2.scss b/src/scss/vendors/_select2.scss index 8957d63ab..0134fd2ab 100644 --- a/src/scss/vendors/_select2.scss +++ b/src/scss/vendors/_select2.scss @@ -1,8 +1,8 @@ /** * Additional jQuery select2 styles */ - @import "~select2/dist/css/select2.min.css"; - @import "~select2-bootstrap-theme/dist/select2-bootstrap.min.css"; + @import "select2/dist/css/select2.min.css"; + @import "select2-bootstrap-theme/dist/select2-bootstrap.min.css"; .select2-results__option .ensg, .select2-selection__rendered .ensg { diff --git a/src/scss/vendors/bootstrap/_1_variables_mixins_utilities.scss b/src/scss/vendors/bootstrap/_1_variables_mixins_utilities.scss index 8f5442f2b..dabf0c144 100644 --- a/src/scss/vendors/bootstrap/_1_variables_mixins_utilities.scss +++ b/src/scss/vendors/bootstrap/_1_variables_mixins_utilities.scss @@ -1,13 +1,13 @@ // 1. Include functions first (so you can manipulate colors, SVGs, calc, etc) // @see https://getbootstrap.com/docs/5.1/customize/sass/#importing -@import "~bootstrap/scss/functions"; +@import "bootstrap/scss/functions"; // 2. Include remainder of required Bootstrap stylesheets (required) // @see https://getbootstrap.com/docs/5.1/customize/sass/#importing -@import "~bootstrap/scss/variables"; -@import "~bootstrap/scss/mixins"; +@import "bootstrap/scss/variables"; +@import "bootstrap/scss/mixins"; // $spacers, $theme-colors need to be adapted before importing the utilities to generate the m-* and p-*, text-*, border-*, bg-* utility classes // @see https://getbootstrap.com/docs/5.1/utilities/spacing/ and https://getbootstrap.com/docs/5.1/utilities/colors/ diff --git a/src/scss/vendors/bootstrap/_2_components.scss b/src/scss/vendors/bootstrap/_2_components.scss index d96df4da6..bd7494454 100644 --- a/src/scss/vendors/bootstrap/_2_components.scss +++ b/src/scss/vendors/bootstrap/_2_components.scss @@ -1,5 +1,5 @@ // Import utilities -@import "~bootstrap/scss/utilities"; +@import "bootstrap/scss/utilities"; // Add our custom utilities @import "./utilities"; @@ -7,41 +7,41 @@ // @see https://getbootstrap.com/docs/5.1/customize/sass/#importing // Import and reboot -@import "~bootstrap/scss/root"; // Create CSS variables from $theme-colors, ... -@import "~bootstrap/scss/reboot"; +@import "bootstrap/scss/root"; // Create CSS variables from $theme-colors, ... +@import "bootstrap/scss/reboot"; // Import all components -@import "~bootstrap/scss/accordion"; -@import "~bootstrap/scss/alert"; -@import "~bootstrap/scss/badge"; -@import "~bootstrap/scss/breadcrumb"; -@import "~bootstrap/scss/button-group"; -@import "~bootstrap/scss/buttons"; -@import "~bootstrap/scss/card"; -@import "~bootstrap/scss/carousel"; -@import "~bootstrap/scss/close"; -@import "~bootstrap/scss/containers"; -@import "~bootstrap/scss/dropdown"; +@import "bootstrap/scss/accordion"; +@import "bootstrap/scss/alert"; +@import "bootstrap/scss/badge"; +@import "bootstrap/scss/breadcrumb"; +@import "bootstrap/scss/button-group"; +@import "bootstrap/scss/buttons"; +@import "bootstrap/scss/card"; +@import "bootstrap/scss/carousel"; +@import "bootstrap/scss/close"; +@import "bootstrap/scss/containers"; +@import "bootstrap/scss/dropdown"; @import "./overrides/forms"; -@import "~bootstrap/scss/grid"; -@import "~bootstrap/scss/images"; -@import "~bootstrap/scss/list-group"; -@import "~bootstrap/scss/modal"; -@import "~bootstrap/scss/nav"; -@import "~bootstrap/scss/navbar"; -@import "~bootstrap/scss/offcanvas"; -@import "~bootstrap/scss/pagination"; -@import "~bootstrap/scss/popover"; -@import "~bootstrap/scss/progress"; -@import "~bootstrap/scss/spinners"; -@import "~bootstrap/scss/tables"; -@import "~bootstrap/scss/toasts"; -@import "~bootstrap/scss/tooltip"; -@import "~bootstrap/scss/transitions"; -@import "~bootstrap/scss/type"; +@import "bootstrap/scss/grid"; +@import "bootstrap/scss/images"; +@import "bootstrap/scss/list-group"; +@import "bootstrap/scss/modal"; +@import "bootstrap/scss/nav"; +@import "bootstrap/scss/navbar"; +@import "bootstrap/scss/offcanvas"; +@import "bootstrap/scss/pagination"; +@import "bootstrap/scss/popover"; +@import "bootstrap/scss/progress"; +@import "bootstrap/scss/spinners"; +@import "bootstrap/scss/tables"; +@import "bootstrap/scss/toasts"; +@import "bootstrap/scss/tooltip"; +@import "bootstrap/scss/transitions"; +@import "bootstrap/scss/type"; // Import helpers -@import "~bootstrap/scss/helpers"; +@import "bootstrap/scss/helpers"; // Import utilities -@import "~bootstrap/scss/utilities/api"; +@import "bootstrap/scss/utilities/api"; diff --git a/src/scss/vendors/bootstrap/overrides/_forms.scss b/src/scss/vendors/bootstrap/overrides/_forms.scss index a86292b23..b28593059 100644 --- a/src/scss/vendors/bootstrap/overrides/_forms.scss +++ b/src/scss/vendors/bootstrap/overrides/_forms.scss @@ -1,9 +1,9 @@ -@import "~bootstrap/scss/forms/labels"; -@import "~bootstrap/scss/forms/form-text"; -@import "~bootstrap/scss/forms/form-control"; -@import "~bootstrap/scss/forms/form-select"; +@import "bootstrap/scss/forms/labels"; +@import "bootstrap/scss/forms/form-text"; +@import "bootstrap/scss/forms/form-control"; +@import "bootstrap/scss/forms/form-select"; @import "./form_check"; -@import "~bootstrap/scss/forms/form-range"; -@import "~bootstrap/scss/forms/floating-labels"; -@import "~bootstrap/scss/forms/input-group"; -@import "~bootstrap/scss/forms/validation"; +@import "bootstrap/scss/forms/form-range"; +@import "bootstrap/scss/forms/floating-labels"; +@import "bootstrap/scss/forms/input-group"; +@import "bootstrap/scss/forms/validation";