Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[sass] update #3318

Open
wants to merge 1 commit into
base: rc
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .storybook/styles.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import '../packages/icons/src/main';
@import '../packages/scss/src/main-all';
@import '../packages/ng/styles/main';
@use '../packages/icons/src/main' as icons;
@use '../packages/scss/src/main-all' as scss;
@use '../packages/ng/styles/main' as ng;

.demo-utilityWrapper {
display: flex;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@import '_definitions';
@include selectInputStyle;
@use '_definitions';
@include definitions.selectInputStyle;
4 changes: 2 additions & 2 deletions packages/ng/api/select/searcher/api-searcher.component.scss
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@import '_definitions';
@include optionSearcherStyle;
@use '_definitions';
@include definitions.optionSearcherStyle;
4 changes: 2 additions & 2 deletions packages/ng/core-select/option/option.component.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '_definitions';
@include optionItemStyle;
@use '_definitions';
@include definitions.optionItemStyle;

.is-disabled {
color: var(--palettes-neutral-500); // disabled token candidate
Expand Down
1 change: 0 additions & 1 deletion packages/ng/date/calendar/calendar-input.component.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@use '@lucca-front/scss/src/commons/utils/a11y';
@import '_definitions';

.calendar {
background-color: var(--pr-t-elevation-surface-raised);
Expand Down
4 changes: 2 additions & 2 deletions packages/ng/date/select/date-select-input.component.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@use '@lucca-front/icons/src/commons/utils/icon';

@import '_definitions';
@include selectInputStyle;
@use '_definitions';
@include definitions.selectInputStyle;

:host {
&::after {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '_definitions';
@include selectInputStyle;
@use '_definitions';
@include definitions.selectInputStyle;

.lu-picker-header {
.option-selector {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '_definitions';
@include selectInputStyle;
@use '_definitions';
@include definitions.selectInputStyle;

.lu-picker-header {
.option-selector {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@import '_definitions';
@include optionSearcherStyle;
@use '_definitions';
@include definitions.optionSearcherStyle;
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
@import "_definitions";
@use '_definitions';

:host {
@include optionSelectorStyle;
@include definitions.optionSelectorStyle;
}

button[disabled]:hover {
// TODO: remove hover animation when disabled
}
4 changes: 2 additions & 2 deletions packages/ng/formly/style/main.scss
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@import 'theming';
@import 'components';
@forward 'theming';
@forward 'components';
5 changes: 3 additions & 2 deletions packages/ng/input/clearer/clearer.component.scss
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
@import '_definitions';
@include selectClearerStyle;
@use '_definitions';

@include definitions.selectClearerStyle;
4 changes: 2 additions & 2 deletions packages/ng/option/item/option-item.component.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '_definitions';
@include optionItemStyle;
@use '_definitions';
@include definitions.optionItemStyle;

.is-disabled {
color: var(--palettes-neutral-500); // disabled token candidate
Expand Down
4 changes: 2 additions & 2 deletions packages/ng/option/item/tree-option-item.component.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '_definitions';
@include optionItemStyle;
@use '_definitions';
@include definitions.optionItemStyle;

:host {
--components-options-tree-multiple-padding: 2.25rem;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@import '_definitions';
@include optionSearcherStyle;
@use '_definitions';
@include definitions.optionSearcherStyle;
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@import '_definitions';
@include optionPlaceholderStyle;
@use '_definitions';
@include definitions.optionPlaceholderStyle;
5 changes: 3 additions & 2 deletions packages/ng/option/selector/all/select-all.component.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@import '_definitions';
@use '_definitions';

:host {
@include optionSelectorStyle;
@include definitions.optionSelectorStyle;
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '_definitions';
@include selectInputStyle;
@use '_definitions';
@include definitions.selectInputStyle;

.optionItem-groupKey {
padding: var(--components-options-item-padding-vertical) var(--components-options-item-padding-horizontal) var(--pr-t-spacings-50);
Expand Down
4 changes: 2 additions & 2 deletions packages/ng/select/input/select-input.component.scss
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@import '_definitions';
@include selectInputStyle;
@use '_definitions';
@include definitions.selectInputStyle;
6 changes: 3 additions & 3 deletions packages/ng/simple-select/panel/panel.component.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import '_definitions';
@include optionSearcherStyle;
@include optionPlaceholderStyle;
@use '_definitions';
@include definitions.optionSearcherStyle;
@include definitions.optionPlaceholderStyle;
25 changes: 13 additions & 12 deletions packages/ng/styles/_components.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
@import 'components/calendar';
@import 'components/input';
@import 'components/picker';
@import 'components/popover';
@import 'components/popup';
@import 'components/dropdown';
@import 'components/sidepanel';
@import 'components/cdk/overlay';
@import 'components/cdk/textarea';
@import 'components/cdk/misc';
@import 'components/cdk/global';
@import 'components/cdk/dragDrop';
@forward 'components/calendar';
@forward 'components/input';
@forward 'components/popover';
@forward 'components/picker';
@forward 'components/popup';
@forward 'components/dropdown';
@forward 'components/sidepanel';

@forward 'components/cdk/overlay';
@forward 'components/cdk/textarea';
@forward 'components/cdk/misc';
@forward 'components/cdk/global';
@forward 'components/cdk/dragDrop';
12 changes: 6 additions & 6 deletions packages/ng/styles/_definitions.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import 'definitions/select/select-input';
@import 'definitions/select/select-clearer';
@import 'definitions/option/option-item';
@import 'definitions/option/option-searcher';
@import 'definitions/option/option-selector';
@import 'definitions/option/option-placeholder';
@forward 'definitions/select/select-input';
@forward 'definitions/select/select-clearer';
@forward 'definitions/option/option-item';
@forward 'definitions/option/option-searcher';
@forward 'definitions/option/option-selector';
@forward 'definitions/option/option-placeholder';
2 changes: 2 additions & 0 deletions packages/ng/styles/components/_picker.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use 'popover';

.lu-picker-panel {
@extend %popover-panel;
}
Expand Down
4 changes: 2 additions & 2 deletions packages/ng/styles/components/cdk/_overlay.scss
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@
}

.cdk-overlay-backdrop.cdk-overlay-backdrop-showing.lu-popup-backdrop {
@include keyframe.fadeIn;

opacity: var(--pr-t-elevation-surface-backdrop);

@include keyframe.fadeIn;
}

// MODS
Expand Down
4 changes: 2 additions & 2 deletions packages/ng/styles/main.scss
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@import 'definitions';
@import 'components';
@use 'definitions';
@use 'components';
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '_definitions';
@include selectInputStyle;
@use '_definitions';
@include definitions.selectInputStyle;

.lu-select-value {
padding-right: 3.5rem;
Expand All @@ -8,5 +8,5 @@
.lu-select-additionalInformation {
font-size: 80%;
font-style: italic;
margin-top: -.25em;
margin-top: -0.25em;
}
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@import '_definitions';
@include optionSearcherStyle;
@use '_definitions';
@include definitions.optionSearcherStyle;
6 changes: 4 additions & 2 deletions packages/scss/src/commons/config.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use 'sass:list';
@use 'sass:map';

$isNamespaced: false !default;

Expand Down Expand Up @@ -382,7 +383,7 @@ $pineapple: (
) !default;

// switch case
$prod: map-get(
$prod: map.get(
(
'brand': $brand,
'cleemy': $cleemy,
Expand Down Expand Up @@ -567,7 +568,8 @@ $loading: (
$textLink: (
color: var(--palettes-product-700),
hover: var(--palettes-product-600),
disabled: var(--palettes-neutral-500), // disabled token candidate
disabled: var(--palettes-neutral-500),
// disabled token candidate
);

// Deprecated
Expand Down
5 changes: 3 additions & 2 deletions packages/scss/src/commons/core.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@use 'sass:meta';
@use 'sass:string';
@use 'sass:map';
@use 'sass:math';
Expand Down Expand Up @@ -112,9 +113,9 @@ $overflow: 'hidden', 'auto', 'visible', 'scroll';
}

@mixin rosetta($before, $after, $iterations) {
@if type-of($iterations) == map {
@if meta.type-of($iterations) == map {
@each $iterationBefore, $iterationAfter in $iterations {
@if type-of($iterationAfter) == string {
@if meta.type-of($iterationAfter) == string {
#{$before}-#{$iterationBefore}: var(#{$after}-#{$iterationAfter});
} @else {
#{$before}-#{$iterationBefore}: #{$iterationAfter};
Expand Down
48 changes: 24 additions & 24 deletions packages/scss/src/commons/utils/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -38,88 +38,88 @@
.u-animated {
&FadeIn,
&FadeOut {
@include keyframe.fadeIn;

animation-name: fadeIn;

@include keyframe.fadeIn;
}

&ScaleIn,
&ScaleOut {
@include keyframe.scaleIn;

animation-name: scaleIn;

@include keyframe.scaleIn;
}

&ScaleInTop,
&ScaleOutTop {
@include keyframe.scaleIn;

animation-name: scaleInTop;

@include keyframe.scaleIn;
}

&ScaleInRight,
&ScaleOutRight {
@include keyframe.scaleInRight;

animation-name: scaleInRight;

@include keyframe.scaleInRight;
}

&ScaleInBottom,
&ScaleOutBottom {
@include keyframe.scaleInBottom;

animation-name: scaleInBottom;

@include keyframe.scaleInBottom;
}

&ScaleInLeft,
&ScaleOutLeft {
@include keyframe.scaleInLeft;

animation-name: scaleInLeft;

@include keyframe.scaleInLeft;
}

&SlideIn,
&SlideInTop,
&SlideOut,
&SlideOutTop {
@include keyframe.slideIn;

animation-name: slideIn;

@include keyframe.slideIn;
}

&SlideInRight,
&SlideOutRight {
@include keyframe.slideInRight;

animation-name: slideInRight;

@include keyframe.slideInRight;
}

&SlideInBottom,
&SlideOutBottom {
@include keyframe.slideInBottom;

animation-name: slideInBottom;

@include keyframe.slideInBottom;
}

&SlideInLeft,
&SlideOutLeft {
@include keyframe.slideInLeft;

animation-name: slideInLeft;

@include keyframe.slideInLeft;
}

&Shake {
@include keyframe.shake;

animation-name: shake;

@include keyframe.shake;
}

&Pulse {
@include keyframe.pulse;

animation-name: pulse;
animation-direction: alternate;
animation-iteration-count: var(--commons-animations-iteration-count);

@include keyframe.pulse;
}

&FadeOut,
Expand Down
Loading