From 82d88d4a91e4cb3681ce0aad8146a7ddb691c86d Mon Sep 17 00:00:00 2001 From: "ala'n (Alexey Stsefanovich)" Date: Fri, 22 Sep 2023 15:05:20 +0200 Subject: [PATCH] fix(core): fix css/less output of the project --- {src => pages/src}/common/code.less | 0 {src => pages/src}/common/typography.less | 2 +- pages/{views/styles => src}/examples/form.less | 0 .../{views/styles => src}/examples/image.less | 0 pages/{views/styles => src}/examples/list.less | 0 .../examples/multiple-playgrounds.less | 0 pages/{views/styles => src/page}/header.less | 0 pages/{views/styles => src/page}/page.less | 4 ++-- pages/{views/styles => src/page}/sidebar.less | 0 pages/src/playground.less | 18 ++++++++++++------ src/common/variables.less | 2 ++ src/core/base/plugin.less | 3 +++ src/core/base/root.less | 5 +++-- src/core/registration.less | 9 +++------ src/plugins/editor/editor.less | 2 ++ src/plugins/header/header.less | 2 ++ src/plugins/header/options/option/option.less | 2 ++ src/plugins/header/options/option/theme.less | 3 +++ src/plugins/header/options/options.less | 6 +++--- src/plugins/header/snippets/snippets.less | 5 ++++- src/plugins/registration.less | 13 +++++-------- src/plugins/settings/setting.less | 2 ++ src/plugins/settings/settings.less | 3 +++ src/registration.less | 12 +++--------- src/settings/bool-setting/bool-setting.less | 2 ++ src/settings/registration.less | 11 +++++------ .../select-setting/select-setting.less | 6 ++++-- .../slider-setting/slider-setting.less | 2 ++ src/settings/text-setting/text-setting.less | 2 ++ 29 files changed, 70 insertions(+), 46 deletions(-) rename {src => pages/src}/common/code.less (100%) rename {src => pages/src}/common/typography.less (93%) rename pages/{views/styles => src}/examples/form.less (100%) rename pages/{views/styles => src}/examples/image.less (100%) rename pages/{views/styles => src}/examples/list.less (100%) rename pages/{views/styles => src}/examples/multiple-playgrounds.less (100%) rename pages/{views/styles => src/page}/header.less (100%) rename pages/{views/styles => src/page}/page.less (98%) rename pages/{views/styles => src/page}/sidebar.less (100%) diff --git a/src/common/code.less b/pages/src/common/code.less similarity index 100% rename from src/common/code.less rename to pages/src/common/code.less diff --git a/src/common/typography.less b/pages/src/common/typography.less similarity index 93% rename from src/common/typography.less rename to pages/src/common/typography.less index a5d2def8..cad6919b 100644 --- a/src/common/typography.less +++ b/pages/src/common/typography.less @@ -1,4 +1,4 @@ -@import "./variables"; +@import "../../../src/common/variables"; body { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; diff --git a/pages/views/styles/examples/form.less b/pages/src/examples/form.less similarity index 100% rename from pages/views/styles/examples/form.less rename to pages/src/examples/form.less diff --git a/pages/views/styles/examples/image.less b/pages/src/examples/image.less similarity index 100% rename from pages/views/styles/examples/image.less rename to pages/src/examples/image.less diff --git a/pages/views/styles/examples/list.less b/pages/src/examples/list.less similarity index 100% rename from pages/views/styles/examples/list.less rename to pages/src/examples/list.less diff --git a/pages/views/styles/examples/multiple-playgrounds.less b/pages/src/examples/multiple-playgrounds.less similarity index 100% rename from pages/views/styles/examples/multiple-playgrounds.less rename to pages/src/examples/multiple-playgrounds.less diff --git a/pages/views/styles/header.less b/pages/src/page/header.less similarity index 100% rename from pages/views/styles/header.less rename to pages/src/page/header.less diff --git a/pages/views/styles/page.less b/pages/src/page/page.less similarity index 98% rename from pages/views/styles/page.less rename to pages/src/page/page.less index 938a799f..084abaaa 100644 --- a/pages/views/styles/page.less +++ b/pages/src/page/page.less @@ -192,5 +192,5 @@ hr { } } -@import "./header.less"; -@import "./sidebar.less"; +@import "header.less"; +@import "sidebar.less"; diff --git a/pages/views/styles/sidebar.less b/pages/src/page/sidebar.less similarity index 100% rename from pages/views/styles/sidebar.less rename to pages/src/page/sidebar.less diff --git a/pages/src/playground.less b/pages/src/playground.less index 63e310b9..0f89afc8 100644 --- a/pages/src/playground.less +++ b/pages/src/playground.less @@ -1,9 +1,15 @@ -@import "../views/styles/page.less"; -@import "../views/styles/examples/form.less"; -@import "../views/styles/examples/image.less"; -@import "../views/styles/examples/list.less"; -@import "../views/styles/examples/multiple-playgrounds.less"; +@import "../../src/common/variables"; +@import "../../src/common/mixins"; -@import "../../src/registration.less"; +@import "./common/typography"; +@import "./common/code"; +@import "./page/page.less"; + +@import "./examples/form.less"; +@import "./examples/image.less"; +@import "./examples/list.less"; +@import "./examples/multiple-playgrounds.less"; @import (inline) "../../node_modules/prismjs/themes/prism.css"; + +@import "../../src/registration.less"; diff --git a/src/common/variables.less b/src/common/variables.less index d245e5b8..672b17a6 100644 --- a/src/common/variables.less +++ b/src/common/variables.less @@ -1,3 +1,5 @@ +// TODO: rework with css variables instead + @active-font-weight: 600; @landing-dark-bg: #4e4e4e; diff --git a/src/core/base/plugin.less b/src/core/base/plugin.less index 11ddd4dc..9bad8590 100644 --- a/src/core/base/plugin.less +++ b/src/core/base/plugin.less @@ -1,3 +1,6 @@ +@import (reference) "../../common/mixins.less"; +@import (reference) "../../common/variables.less"; + .uip-plugin { &-inner { padding: 10px; diff --git a/src/core/base/root.less b/src/core/base/root.less index 053b8d8e..2d3457e8 100644 --- a/src/core/base/root.less +++ b/src/core/base/root.less @@ -1,4 +1,5 @@ -@import '~@exadel/esl/modules/esl-alert/core'; +@import (reference) "../../common/variables.less"; +@import '@exadel/esl/modules/esl-alert/core.less'; .uip-root { position: relative; @@ -31,7 +32,7 @@ transition: visibility 0s .3s; } } - + &[settings-collapsed] > .uip-settings { max-width: 0; max-height: 0; diff --git a/src/core/registration.less b/src/core/registration.less index 7528a1c3..79682ceb 100644 --- a/src/core/registration.less +++ b/src/core/registration.less @@ -1,6 +1,3 @@ -@import "src/common/variables"; -@import "src/common/mixins"; - -@import "./base/root"; -@import "./base/plugin"; -@import "./preview/preview"; +@import "./base/root.less"; +@import "./base/plugin.less"; +@import "./preview/preview.less"; diff --git a/src/plugins/editor/editor.less b/src/plugins/editor/editor.less index d8468485..7bc20074 100644 --- a/src/plugins/editor/editor.less +++ b/src/plugins/editor/editor.less @@ -1,3 +1,5 @@ +@import (reference) "../../common/variables.less"; + .uip-editor { position: relative; grid-area: editor; diff --git a/src/plugins/header/header.less b/src/plugins/header/header.less index 7fcd6d58..efc69e3f 100644 --- a/src/plugins/header/header.less +++ b/src/plugins/header/header.less @@ -1,3 +1,5 @@ +@import (reference) "../../common/variables.less"; + .uip-header { grid-area: header; position: relative; diff --git a/src/plugins/header/options/option/option.less b/src/plugins/header/options/option/option.less index 928084cc..e0c3b8ed 100644 --- a/src/plugins/header/options/option/option.less +++ b/src/plugins/header/options/option/option.less @@ -1,3 +1,5 @@ +@import (reference) "../../../../common/variables.less"; + uip-option { display: flex; width: 1.5rem; diff --git a/src/plugins/header/options/option/theme.less b/src/plugins/header/options/option/theme.less index bc7a5e05..a8bfd857 100644 --- a/src/plugins/header/options/option/theme.less +++ b/src/plugins/header/options/option/theme.less @@ -1,3 +1,6 @@ +@import (reference) "../../../../common/mixins.less"; +@import (reference) "../../../../common/variables.less"; + .uip-root { background-color: @light-color; diff --git a/src/plugins/header/options/options.less b/src/plugins/header/options/options.less index a744ed1a..ddca78d3 100644 --- a/src/plugins/header/options/options.less +++ b/src/plugins/header/options/options.less @@ -1,6 +1,6 @@ -@import "./option/theme"; -@import "./option/direction"; -@import "./option/option"; +@import "./option/theme.less"; +@import "./option/direction.less"; +@import "./option/option.less"; .uip-options { display: flex; diff --git a/src/plugins/header/snippets/snippets.less b/src/plugins/header/snippets/snippets.less index 343e8732..d4bd4e83 100644 --- a/src/plugins/header/snippets/snippets.less +++ b/src/plugins/header/snippets/snippets.less @@ -1,4 +1,7 @@ -@import 'node_modules/@exadel/esl/modules/esl-scrollbar/core'; +@import (reference) "../../../common/mixins.less"; +@import (reference) "../../../common/variables.less"; + +@import '@exadel/esl/modules/esl-scrollbar/core.less'; .uip-snippets { display: flex; diff --git a/src/plugins/registration.less b/src/plugins/registration.less index a8422970..f38dcea5 100644 --- a/src/plugins/registration.less +++ b/src/plugins/registration.less @@ -1,8 +1,5 @@ -@import "src/common/variables"; -@import "src/common/mixins"; - -@import "./header/header"; -@import "./header/snippets/snippets"; -@import "./header/options/options"; -@import "./editor/editor"; -@import "./settings/settings"; +@import "./header/header.less"; +@import "./header/snippets/snippets.less"; +@import "./header/options/options.less"; +@import "./editor/editor.less"; +@import "./settings/settings.less"; diff --git a/src/plugins/settings/setting.less b/src/plugins/settings/setting.less index d44bab6a..4a3c86e6 100644 --- a/src/plugins/settings/setting.less +++ b/src/plugins/settings/setting.less @@ -1,3 +1,5 @@ +@import (reference) "../../common/variables.less"; + .uip-setting { display: block; width: 100%; diff --git a/src/plugins/settings/settings.less b/src/plugins/settings/settings.less index adcd3a1f..0368a1ca 100644 --- a/src/plugins/settings/settings.less +++ b/src/plugins/settings/settings.less @@ -1,3 +1,6 @@ +@import (reference) "../../common/mixins.less"; +@import (reference) "../../common/variables.less"; + .uip-settings { grid-area: settings; width: 250px; diff --git a/src/registration.less b/src/registration.less index 34c8dc25..26c07880 100644 --- a/src/registration.less +++ b/src/registration.less @@ -1,9 +1,3 @@ -// TODO: get rid of extra styles for outside users -@import "src/common/variables"; -@import "src/common/typography"; -@import "src/common/mixins"; -@import "src/common/code"; - -@import "./core/registration"; -@import "./plugins/registration"; -@import "./settings/registration"; +@import "./core/registration.less"; +@import "./plugins/registration.less"; +@import "./settings/registration.less"; diff --git a/src/settings/bool-setting/bool-setting.less b/src/settings/bool-setting/bool-setting.less index 9181d114..6f8f6bd8 100644 --- a/src/settings/bool-setting/bool-setting.less +++ b/src/settings/bool-setting/bool-setting.less @@ -1,3 +1,5 @@ +@import (reference) "../../common/variables.less"; + .uip-bool-setting { label { display: inline-flex; diff --git a/src/settings/registration.less b/src/settings/registration.less index 7d868569..dba50c1d 100644 --- a/src/settings/registration.less +++ b/src/settings/registration.less @@ -1,7 +1,6 @@ -@import "src/common/variables"; -@import "src/plugins/settings/setting"; +@import "../plugins/settings/setting.less"; -@import 'src/settings/bool-setting/bool-setting'; -@import 'src/settings/select-setting/select-setting'; -@import 'src/settings/text-setting/text-setting'; -@import 'src/settings/slider-setting/slider-setting'; +@import './bool-setting/bool-setting.less'; +@import './text-setting/text-setting.less'; +@import './select-setting/select-setting.less'; +@import './slider-setting/slider-setting.less'; diff --git a/src/settings/select-setting/select-setting.less b/src/settings/select-setting/select-setting.less index f0ac6f11..f9957b1c 100644 --- a/src/settings/select-setting/select-setting.less +++ b/src/settings/select-setting/select-setting.less @@ -1,5 +1,7 @@ -@import '~@exadel/esl/modules/esl-forms/esl-select/core'; -@import '~@exadel/esl/modules/esl-forms/esl-select-list/core'; +@import (reference) "../../common/variables.less"; + +@import '@exadel/esl/modules/esl-forms/esl-select/core.less'; +@import '@exadel/esl/modules/esl-forms/esl-select-list/core.less'; .uip-select-setting .esl-select { display: block; diff --git a/src/settings/slider-setting/slider-setting.less b/src/settings/slider-setting/slider-setting.less index 8b6a7ef5..70bf69d9 100644 --- a/src/settings/slider-setting/slider-setting.less +++ b/src/settings/slider-setting/slider-setting.less @@ -1,3 +1,5 @@ +@import (reference) "../../common/variables.less"; + .uip-slider-setting { input { display: block; diff --git a/src/settings/text-setting/text-setting.less b/src/settings/text-setting/text-setting.less index 38bb0dab..382d9a84 100644 --- a/src/settings/text-setting/text-setting.less +++ b/src/settings/text-setting/text-setting.less @@ -1,3 +1,5 @@ +@import (reference) "../../common/variables.less"; + .uip-text-setting input { width: 100%; padding: 3px 1px 1px;